diff --git a/Engine/include/Camera.h b/Engine/include/Camera.h index 68d91f38..2aeea3ef 100644 --- a/Engine/include/Camera.h +++ b/Engine/include/Camera.h @@ -5,12 +5,15 @@ #include "Vec2.h" #include "ActionManager.h" -#define CAMERA_DEFAULT_MIN_ZOOM (0.075) -#define CAMERA_DEFAULT_MAX_ZOOM (1.0) +#define CAMERA_DEFAULT_MIN_LOG_ZOOM (-4.0) +#define CAMERA_DEFAULT_MAX_LOG_ZOOM (0.0) #define CAMERA_DEFAULT_ZOOMABLE (true) -#define CAMERA_DEFAULT_ZOOM_SPEED (5.0/200.) +#define CAMERA_DEFAULT_LOG_ZOOM_SPEED (0.125) #define CAMERA_DEFAULT_MIN_SPEED (200.) -#define CAMERA_DEFAULT_MAX_SPEED (1000.) +#define CAMERA_DEFAULT_MAX_SPEED (2000.) +#define CAMERA_DEFAULT_MOVE_SPEED (100.) +#define CAMERA_LOG_ZOOM_BASE 2 + /** \brief Classe que modela a câmera @@ -20,6 +23,10 @@ - Zoom atual - Velocidade de zoom - Zoom mínimo e máximo + + O zoom é armazenado internamente de forma logarítmica para permitir um comportamento linear nas suas velocidades de zoom e movimentação da câmera, + que dependem diretamente do nível atual de zoom. A base do zoom é representado em CAMERA_LOG_ZOOM_BASE e indica que, um zoom de 2, representa + multiplicar as sprites por CAMERA_LOG_ZOOM_BASE^(2). Já um zoom de -2 representa CAMERA_LOG_ZOOM_BASE^(-2). */ class Camera { public: @@ -63,9 +70,16 @@ class Camera { \brief Força um valor para o zoom. \param newZoom novo valor para o Zoom - O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será atribuído ao currentZoom., + O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será convertido para a escala logarítmica e atribuído ao currentLogZoom. + */ + static void ForceLinearZoom(float newZoom); + /** + \brief Força um valor para o zoom. + \param newZoom novo valor para o Zoom + + O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será atribuído ao currentLogZoom. */ - static void ForceZoom(float newZoom); + static void ForceLogZoom(float newZoom); /** \brief Trava ou destrava o zoom. \param newZoom novo valor para o Zoom @@ -77,9 +91,10 @@ class Camera { \brief Altera o zoom corrente. \param deltaZoom Variação no zoom. - O zoom corrente é alterado linearmente em deltaZoom*zoomSpeed. Só tem efeito se o valor de zoomFixed for falso. - Se o novo valor para o zoom extrapolar o limite superior, o valor do limite superior será atribuído ao currentZoom. - Se o novo valor para o zoom extrapolar o limite inferior, o valor do limite inferior será atribuído ao currentZoom. + O zoom corrente é alterado logaritmicamente em deltaZoom*logZoomSpeed. Só tem efeito se o valor de zoomFixed for falso. + Se o novo valor para o zoom extrapolar o limite superior, o valor do limite superior será usado. + Se o novo valor para o zoom extrapolar o limite inferior, o valor do limite inferior será usado. + Também ajusta a posição da câmera para que o ponto onde o mouse estava continue no mesmo lugar. */ static void Zoom(float deltaZoom); /** @@ -87,9 +102,9 @@ class Camera { \param minZoom Novo limite inferior. \param maxZoom Novo limite superior. - Se o valor de minZoom ou maxZoom for zero, o valor default será atribuído no lugar. + Se o valor de minZoom ou maxZoom não forem fornecidos, o valor default será atribuído no lugar. */ - static void SetZoomLimits(float minZoom=0, float maxZoom=0);// set to 0 is to set to default + static void SetZoomLimits(float minZoom=CAMERA_DEFAULT_MIN_LOG_ZOOM, float maxZoom=CAMERA_DEFAULT_MAX_LOG_ZOOM);// No args to set to default /** \brief Informa o valor do zoom corrente. @@ -97,15 +112,23 @@ class Camera { Se for maior que 1.0 significa que as imagens devem ser ampliadas. Se for menor que 1.0 significa que as imagens devem ser reduzidas. */ - static float GetZoom(void); + static float GetLinearZoom(void); + /** + \brief Informa o valor do zoom corrente na escala logarítmica. + + Se o valor for 0.0 significa que nenhum zoom está sendo aplicado. + Se for maior que 0.0 significa que as imagens devem ser ampliadas. + Se for menor que 0.0 significa que as imagens devem ser reduzidas. + */ + static float GetLogZoom(void); /** \brief Estabelece os limites superior e inferior da velocidade da câmera. \param minSpeed Novo limite inferior. \param maxSpeed Novo limite superior. - Se o valor de minSpeed ou maxSpeed for zero, o valor default será atribuído no lugar. + Se o valor de minSpeed ou maxSpeed não forem fornecidos, o valor default será atribuído no lugar. */ - static void SetSpeedLimits(float minSpeed=0, float maxSpeed=0); + static void SetSpeedLimits(float minSpeed=CAMERA_DEFAULT_MIN_SPEED, float maxSpeed=CAMERA_DEFAULT_MAX_SPEED); /** \brief Retorna a velocidade mínima da câmera. @@ -170,11 +193,11 @@ class Camera { */ Camera(); static GameObject* focus;/**< Gameobject que ficará centralizado na câmera. Caso seja nullptr a câmera se moverá pelas setinhas/WASD.*/ - static float currentZoom;/**< Armazena o valor do zoom atual, informando em quantas vezes os objetos devem ser ampliados. Ele deve estar estre o minZoom e o maxZoom, a não ser que o método ForceZoom seja usado. Os métodos Zoom e ForceZoom alteram seu valor.*/ - static float minZoom;/**< Armazena o valor mínimo que o zoom pode ter. Esse limite é ignorado pelo método ForceZoom. É alterado pelo SetZoomLimits.*/ - static float maxZoom;/**< Armazena o valor mínimo que o zoom pode ter. Esse limite é ignorado pelo método ForceZoom. É alterado pelo SetZoomLimits.*/ + static float currentLogZoom;/**< Armazena o valor do zoom atual, informando em quantas vezes os objetos devem ser ampliados. Ele deve estar estre o minZoom e o maxZoom, a não ser que o método ForceZoom seja usado. Os métodos Zoom e ForceZoom alteram seu valor.*/ + static float minLogZoom;/**< Armazena o valor mínimo que o zoom pode ter. Esse limite é ignorado pelo método ForceZoom. É alterado pelo SetZoomLimits.*/ + static float maxLogZoom;/**< Armazena o valor mínimo que o zoom pode ter. Esse limite é ignorado pelo método ForceZoom. É alterado pelo SetZoomLimits.*/ static bool zoomFixed;/**< Se for verdadeiro, o zoom não será alterado pelo método Zoom. Caso contrário o método Zoom pode mudar o valor corrente do zoom. É alterado pelo método SetZoomable.*/ - static float zoomSpeed;/**< Armazena a velocidade com a qual o zoom deve ocorrer. O argumento do método Zoom é multiplicado por esse valor para depois ser somado ao currentZoom.*/ + static float logZoomSpeed;/**< Armazena a velocidade com a qual o zoom deve ocorrer. O argumento do método Zoom é multiplicado por esse valor para depois ser somado ao currentZoom.*/ static float minSpeed;/**< Armazena o valor mínimo da velocidade da câmera.*/ static float maxSpeed;/**< Armazena o valor máximo da velocidade da câmera.*/ static float currentSpeed;/**< Armazena a velocidade atual de movimento da câmera quando não está focalizada em nenhum objeto.*/ diff --git a/Engine/include/InputManager.h b/Engine/include/InputManager.h index 79c13984..8f617dd5 100644 --- a/Engine/include/InputManager.h +++ b/Engine/include/InputManager.h @@ -168,7 +168,7 @@ class InputManager { Vec2 MouseScroll(void) const; /** \brief Informa se o usuário solicitou a saída do programa. - \return Booleano com a informação solicitada. + \return Booleano com a informação solicitada. Retorna verdadeiro se o evento SDL_QUIT ocorreu no frame atual. Caso contrário retorna falso. diff --git a/Engine/include/Resources.h b/Engine/include/Resources.h index b4e3efb0..c88a516b 100644 --- a/Engine/include/Resources.h +++ b/Engine/include/Resources.h @@ -27,7 +27,7 @@ class Resources { \param file Nome do arquivo da imagem que se deseja abrir. \return Imagem carregada em memória - Se a imagem em questão já estiver em memória, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. + Se a imagem em questão já estiver em memória, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. Ao se colocar a imagem no hash, criando o shared_ptr, um destrutor desse ponteiro é enviado como uma função lambda. Esse destrutor desaloca a imagem da memória. */ static std::shared_ptr GetImage(string file); @@ -36,7 +36,7 @@ class Resources { \param file Nome do arquivo de música que se deseja abrir. \return Música carregada em memória - Se a música em questão já estiver em memória, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. + Se a música em questão já estiver em memória, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. Ao se colocar a música no hash, criando o shared_ptr, um destrutor desse ponteiro é enviado como uma função lambda. Esse destrutor desaloca a música da memória. */ static std::shared_ptr GetMusic(string file); @@ -45,7 +45,7 @@ class Resources { \param file Nome do arquivo de áudio que se deseja abrir. \return Áudio carregado em memória - Se o áudio em questão já estiver em memória, um ponteiro para ele é enviado. Caso contrário ele é carregada, colocado no hash e então retornado. + Se o áudio em questão já estiver em memória, um ponteiro para ele é enviado. Caso contrário ele é carregada, colocado no hash e então retornado. Ao se colocar o áudio no hash, criando o shared_ptr, um destrutor desse ponteiro é enviado como uma função lambda. Esse destrutor desaloca o áudio da memória. */ static std::shared_ptr GetSound(string file); @@ -55,7 +55,7 @@ class Resources { \param fontsize O tamanho requerido para a fonte. \return Fonte carregada em memória - Se a fonte em questão já estiver em memória no tamanho requerido, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. + Se a fonte em questão já estiver em memória no tamanho requerido, um ponteiro para ela é enviado. Caso contrário ela é carregada, colocada no hash e então retornada. Ao se colocar a fonte no hash, criando o shared_ptr, um destrutor desse ponteiro é enviado como uma função lambda. Esse destrutor desaloca a fonte da memória. */ static std::shared_ptr GetFont(string file, int fontSize); diff --git a/Engine/include/Sprite.h b/Engine/include/Sprite.h index 9abeef12..7a958738 100644 --- a/Engine/include/Sprite.h +++ b/Engine/include/Sprite.h @@ -63,7 +63,7 @@ class Sprite { */ void SetClip(int x, int y, int w, int h); /** - \brief Renderiza a imagem. + \brief Renderiza a imagem. \param world Região a partir do qual a imagem deve ser renderizada. \param angle Ângulo de rotação da imagem. \param isCoordOnWorld Verdadeiro se a região a ser renderizada deve ser convertida do mundo para tela. Falso se as coordenadas já estão convertidas (UI e BGs, por exemplo). diff --git a/Engine/include/Vec2.h b/Engine/include/Vec2.h index 0a8043c6..693fcd7e 100644 --- a/Engine/include/Vec2.h +++ b/Engine/include/Vec2.h @@ -55,7 +55,7 @@ class Vec2 { \brief Sobrecarga do operador de multiplicação entre de um Vec2 por um float. \return Produto de Vec2 por escalar. - O cálculo do produto é feito de forma na qual a magnetude do vetor é multiplicada pelo argumento sem que sua angulação seja alterada. + O cálculo do produto é feito de forma na qual a magnetude do vetor é multiplicada pelo argumento sem que sua angulação seja alterada. Observação: Nennhum dos Vec2 sobre qual essa operação opera é alterado! */ Vec2 operator*(float b)const; diff --git a/Engine/src/Camera.cpp b/Engine/src/Camera.cpp index 35081357..322c91a3 100644 --- a/Engine/src/Camera.cpp +++ b/Engine/src/Camera.cpp @@ -4,7 +4,8 @@ #include "Game.h" #include "InputManager.h" -#define CAMERA_MOVE_SPEED (100) +#include + #define INPUT_MANAGER InputManager::GetInstance() GameObject* Camera::focus = nullptr; @@ -12,11 +13,11 @@ Vec2 Camera::pos = Vec2(0,0); float Camera::minSpeed = CAMERA_DEFAULT_MIN_SPEED; float Camera::maxSpeed = CAMERA_DEFAULT_MAX_SPEED; float Camera::currentSpeed = CAMERA_DEFAULT_MIN_SPEED; -float Camera::currentZoom = 1.0; -float Camera::minZoom = CAMERA_DEFAULT_MIN_ZOOM; -float Camera::maxZoom = CAMERA_DEFAULT_MAX_ZOOM; +float Camera::currentLogZoom = 0.0; +float Camera::minLogZoom = CAMERA_DEFAULT_MIN_LOG_ZOOM; +float Camera::maxLogZoom = CAMERA_DEFAULT_MAX_LOG_ZOOM; +float Camera::logZoomSpeed = CAMERA_DEFAULT_LOG_ZOOM_SPEED; bool Camera::zoomFixed = !CAMERA_DEFAULT_ZOOMABLE; -float Camera::zoomSpeed = CAMERA_DEFAULT_ZOOM_SPEED; void Camera::Follow(GameObject* newFocus) { focus = newFocus; @@ -28,15 +29,14 @@ void Camera::Unfollow(void) { void Camera::Update(float dt) { if(nullptr != focus) { - // Centrar a câmera na tela - pos= (focus->box).Center() - (Game::GetInstance().GetWindowDimensions()*0.5* (1./Camera::GetZoom())); - } - else { + // Centrar o foco no centro da tela + pos = ScreenToWorld(WorldToScreen((focus->box).Center()) - Game::GetInstance().GetWindowDimensions()*0.5); + } else { // Normaliza o nível de zoom atual - float zoomLevel = (currentZoom-minZoom)/(maxZoom-minZoom); + float zoomLevel = (currentLogZoom-minLogZoom)/(maxLogZoom-minLogZoom); // Interpola linearmente entre min e max baseado no nível de zoom float speed = zoomLevel*minSpeed + (1-zoomLevel)*maxSpeed; - if(INPUT_MANAGER.IsKeyDown(LEFT_ARROW_KEY) || INPUT_MANAGER.IsKeyDown('a')) { + if(ActionManager::LeftArrowAction()) { pos.x -= speed*dt; } if(ActionManager::RightArrowAction()) { @@ -49,13 +49,17 @@ void Camera::Update(float dt) { pos.y -= speed*dt; } } - if(InputManager::GetInstance().IsMouseScrolling()){ - Camera::Zoom( (float)InputManager::GetInstance().MouseScroll().y ); + if(INPUT_MANAGER.IsMouseScrolling()){ + Camera::Zoom( (float)INPUT_MANAGER.MouseScroll().y ); } } -void Camera::ForceZoom(float newZoom) { - currentZoom = newZoom; +void Camera::ForceLinearZoom(float newZoom) { + currentLogZoom = std::log(newZoom)/std::log(CAMERA_LOG_ZOOM_BASE); +} + +void Camera::ForceLogZoom(float newLogZoom) { + currentLogZoom = newLogZoom; } void Camera::SetZoomable(bool zoomable) { @@ -64,30 +68,40 @@ void Camera::SetZoomable(bool zoomable) { void Camera::Zoom(float deltaZoom) { if(!zoomFixed) { - currentZoom += deltaZoom*zoomSpeed; - if(maxZoom < currentZoom) { - currentZoom = maxZoom; - } else if(minZoom > currentZoom) { - currentZoom = minZoom; + Vec2 oldMousePos = ScreenToWorld(INPUT_MANAGER.GetMousePos()); + currentLogZoom += deltaZoom*logZoomSpeed; + if(maxLogZoom < currentLogZoom) { + currentLogZoom = maxLogZoom; + } else if(minLogZoom > currentLogZoom) { + currentLogZoom = minLogZoom; + } + if(nullptr == focus) { + Vec2 newMousePos = ScreenToWorld(INPUT_MANAGER.GetMousePos()); + pos = pos + (oldMousePos - newMousePos); } } } void Camera::SetZoomLimits(float minZoom, float maxZoom) { - Camera::minZoom = (minZoom == 0) ? CAMERA_DEFAULT_MIN_ZOOM : minZoom; - Camera::maxZoom = (maxZoom == 0) ? CAMERA_DEFAULT_MAX_ZOOM : maxZoom; + Camera::minLogZoom = minZoom; + Camera::maxLogZoom = maxZoom; +} + +float Camera::GetLinearZoom(void) { + return std::pow(CAMERA_LOG_ZOOM_BASE, currentLogZoom); } -float Camera::GetZoom(void) { - return currentZoom; +float Camera::GetLogZoom(void) { + return currentLogZoom; } void Camera::SetZoomSpeed(float newZoomSpeed) { - zoomSpeed = newZoomSpeed; + logZoomSpeed = newZoomSpeed; } Vec2 Camera::WorldToScreen(Vec2 world) { Vec2 screen = world-pos; + float currentZoom = GetLinearZoom(); screen.x *= currentZoom; screen.y *= currentZoom; return screen; @@ -95,6 +109,7 @@ Vec2 Camera::WorldToScreen(Vec2 world) { Rect Camera::WorldToScreen(Rect world) { Rect screen; + float currentZoom = GetLinearZoom(); screen.x = (world.x-pos.x)*currentZoom; screen.y = (world.y-pos.y)*currentZoom; screen.w = world.w*currentZoom; @@ -104,6 +119,7 @@ Rect Camera::WorldToScreen(Rect world) { Vec2 Camera::ScreenToWorld(Vec2 screen) { Vec2 world; + float currentZoom = GetLinearZoom(); world.x = screen.x/currentZoom; world.y = screen.y/currentZoom; world = world+pos; @@ -112,6 +128,7 @@ Vec2 Camera::ScreenToWorld(Vec2 screen) { Rect Camera::ScreenToWorld(Rect screen) { Rect world; + float currentZoom = GetLinearZoom(); world.x = (screen.x/currentZoom)+pos.x; world.y = (screen.y/currentZoom)+pos.y; world.w = screen.w/currentZoom; @@ -120,8 +137,8 @@ Rect Camera::ScreenToWorld(Rect screen) { } void Camera::SetSpeedLimits(float minSpeed, float maxSpeed) { - Camera::minSpeed = (0 == minSpeed) ? CAMERA_DEFAULT_MIN_SPEED : minSpeed; - Camera::maxSpeed = (0 == maxSpeed) ? CAMERA_DEFAULT_MAX_SPEED : maxSpeed; + Camera::minSpeed = minSpeed; + Camera::maxSpeed = maxSpeed; } float Camera::GetMinSpeed(void) { diff --git a/Engine/src/DragAndDrop.cpp b/Engine/src/DragAndDrop.cpp index 8af86dfc..2aea7149 100644 --- a/Engine/src/DragAndDrop.cpp +++ b/Engine/src/DragAndDrop.cpp @@ -11,7 +11,7 @@ DragAndDrop::DragAndDrop(TileMap &map,Vec2 associatedInitialPos, bool redrag, bo void DragAndDrop::Update(GameObject &associated, float dt) { InputManager &inputManager= InputManager::GetInstance(); if(inputManager.IsMouseDown(RIGHT_MOUSE_BUTTON)){ - Vec2 mousePos= inputManager.GetMousePos()*(1/Camera::GetZoom()); + Vec2 mousePos= Camera::ScreenToWorld(inputManager.GetMousePos() ); associated.box= mousePos+Camera::pos-Vec2(associated.box.w/2, associated.box.h/2); } else if(inputManager.MouseRelease(RIGHT_MOUSE_BUTTON)) { diff --git a/Engine/src/Text.cpp b/Engine/src/Text.cpp index 8dceca84..edc06fea 100644 --- a/Engine/src/Text.cpp +++ b/Engine/src/Text.cpp @@ -102,7 +102,7 @@ void Text::RemakeTexture(void) { bgColor= {0, 0, 0, 0};//preto temp= TTF_RenderText_Shaded(font.get(), text.c_str(), color, bgColor); } - else if(BLENDED == style) { + else if(BLENDED == style) { temp = TTF_RenderText_Blended(font.get(), text.c_str(), color); } texture= SDL_CreateTextureFromSurface(Game::GetInstance().GetRenderer(), temp); diff --git a/Engine/src/TileMap.cpp b/Engine/src/TileMap.cpp index c654695d..294cbfe5 100644 --- a/Engine/src/TileMap.cpp +++ b/Engine/src/TileMap.cpp @@ -53,7 +53,7 @@ int& TileMap::At(int x, int y, int z) const { try { return ( (int&)tileMatrix.at(index) ); } catch(...) { - static const int m1=-1; + static const int m1=-1; return (int&)m1; } } @@ -139,7 +139,7 @@ int TileMap::GetTileMousePos(Vec2 const &mousePos, bool affecteedByZoom, int lay if(position.x < (x+1)*tileWidth) { break; } else { - //x está pra direita + //x está pra direita xEsq = x; } } else { @@ -155,7 +155,7 @@ int TileMap::GetTileMousePos(Vec2 const &mousePos, bool affecteedByZoom, int lay if(position.y < (y+1)*tileHeight) { break; } else { - //y está pra direita + //y está pra direita yEsq = y; } } else { @@ -222,8 +222,8 @@ void TileMap::InsertGO(GameObject* obj,Vec2 initialPos) { } else { - int line = initialTile / GetWidth(); - int column = initialTile % GetWidth(); + int line = initialTile / GetWidth(); + int column = initialTile % GetWidth(); obj->box.x = column*tileSet->GetTileWidth(); obj->box.y = line*tileSet->GetTileHeight(); diff --git a/Game/src/EndState.cpp b/Game/src/EndState.cpp index 21283913..7f37e2af 100644 --- a/Game/src/EndState.cpp +++ b/Game/src/EndState.cpp @@ -6,10 +6,10 @@ EndState::EndState(EndStateData stateData) : bg( (stateData.playerVictory) ? "img/win.jpg" : "img/lose.jpg") , music( (stateData.playerVictory) ? "audio/endStateWin.ogg" : "audio/endStateLose.ogg") , instruction("font/Call me maybe.ttf", - END_STATE_FONT_SIZE, - BLENDED, - {255, 255, 255, 255}, - true) { + END_STATE_FONT_SIZE, + BLENDED, + {255, 255, 255, 255}, + true) { music.Play(0); instruction.SetText("Press Esc to go to menu or Space to play again!"); instruction.SetTimeShown(0.6); @@ -48,6 +48,6 @@ void EndState::Render() const { void EndState::Pause() {} void EndState::Resume() { - Camera::ForceZoom(1.0); + Camera::ForceLogZoom(0.0); Camera::pos = Vec2(0, 0); } diff --git a/Game/src/StageState.cpp b/Game/src/StageState.cpp index b8af3b91..d09791c6 100644 --- a/Game/src/StageState.cpp +++ b/Game/src/StageState.cpp @@ -8,18 +8,9 @@ #include "Tower.h" #include "Game.h" -#ifdef _WIN32 - #include - #include -#elif __APPLE__ - #include "TargetConditionals.h" - //mac -#elif __linux__ - #include - #include -#else - #error "Unknown compiler" -#endif +#define INCLUDE_SDL +#define INCLUDE_SDL_IMAGE +#include "SDL_include.h" // Esse valores calculam o offset em relação ao canto superior esquedo da imagem daquilo que será renderizado #define STATE_RENDER_X 0 @@ -30,7 +21,7 @@ #define STAGE_STATE_DELTA_VOLUME (1) //11*11 = 121 ~128 #define CAM_START_X 300 #define CAM_START_Y 300 -#define CAM_START_ZOOM 0.3 +#define CAM_START_ZOOM -1.75 StageState::StageState(void) : State(), @@ -46,7 +37,7 @@ StageState::StageState(void) REPORT_I_WAS_HERE; music.Play(10); Camera::pos = Vec2(CAM_START_X, CAM_START_Y); - Camera::ForceZoom(CAM_START_ZOOM); + Camera::ForceLogZoom(CAM_START_ZOOM); } StageState::~StageState(void) { @@ -156,7 +147,7 @@ void StageState::Render(void) const { break; } } - tileMap.Render(Vec2(0,0), false, highlighted ? Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()) : Vec2(-1, -1)); + tileMap.Render(Vec2(0,0), false, highlighted ? Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()) : Vec2(-1, -1)); REPORT_I_WAS_HERE; State::RenderArray(); } diff --git a/Game/src/TitleState.cpp b/Game/src/TitleState.cpp index 3e8a25fe..bbc4ffb6 100644 --- a/Game/src/TitleState.cpp +++ b/Game/src/TitleState.cpp @@ -24,6 +24,6 @@ void TitleState::Render(void) const { void TitleState::Pause(void) {} void TitleState::Resume(void) { - Camera::ForceZoom(1.0); + Camera::ForceLogZoom(0.0); Camera::pos = Vec2(0, 0); } diff --git a/docs/AIGoDown_8cpp.html b/docs/AIGoDown_8cpp.html index e44e19fc..79d9af40 100644 --- a/docs/AIGoDown_8cpp.html +++ b/docs/AIGoDown_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/AIGoDown_8h.html b/docs/AIGoDown_8h.html index 1123dfa8..fc67939d 100644 --- a/docs/AIGoDown_8h.html +++ b/docs/AIGoDown_8h.html @@ -114,7 +114,7 @@ diff --git a/docs/ActionManager_8cpp.html b/docs/ActionManager_8cpp.html index 1cdb714e..aeaa5b61 100644 --- a/docs/ActionManager_8cpp.html +++ b/docs/ActionManager_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/ActionManager_8h.html b/docs/ActionManager_8h.html index fbe11105..7f2a9ce2 100644 --- a/docs/ActionManager_8h.html +++ b/docs/ActionManager_8h.html @@ -113,7 +113,7 @@ diff --git a/docs/Animation_8cpp.html b/docs/Animation_8cpp.html index 35fc2940..d2aec85b 100644 --- a/docs/Animation_8cpp.html +++ b/docs/Animation_8cpp.html @@ -100,7 +100,7 @@ diff --git a/docs/Animation_8h.html b/docs/Animation_8h.html index 92f72b78..0be439ba 100644 --- a/docs/Animation_8h.html +++ b/docs/Animation_8h.html @@ -116,7 +116,7 @@ diff --git a/docs/Camera_8cpp.html b/docs/Camera_8cpp.html index 0b421946..feac3fd4 100644 --- a/docs/Camera_8cpp.html +++ b/docs/Camera_8cpp.html @@ -95,33 +95,20 @@ #include "Error.h"
#include "Game.h"
#include "InputManager.h"
+#include <cmath>
Gráfico de dependência de inclusões para Camera.cpp:
-
+
- -

Definições e Macros

#define CAMERA_MOVE_SPEED   (100)
 
#define INPUT_MANAGER   InputManager::GetInstance()
 

Definições e macros

- -
-
- - - - -
#define CAMERA_MOVE_SPEED   (100)
-
- -
-
@@ -137,7 +124,7 @@

Definições e macros

diff --git a/docs/Camera_8cpp__incl.map b/docs/Camera_8cpp__incl.map index d54ea843..986cecba 100644 --- a/docs/Camera_8cpp__incl.map +++ b/docs/Camera_8cpp__incl.map @@ -1,15 +1,15 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/Camera_8cpp__incl.md5 b/docs/Camera_8cpp__incl.md5 index c7f503d5..d1967593 100644 --- a/docs/Camera_8cpp__incl.md5 +++ b/docs/Camera_8cpp__incl.md5 @@ -1 +1 @@ -6576cd0e9ab8219bcc388bcfdae36038 \ No newline at end of file +4cffd9d27da1b4bf4f5254fa76e478dc \ No newline at end of file diff --git a/docs/Camera_8cpp__incl.svg b/docs/Camera_8cpp__incl.svg index 1fec8166..2e4988a1 100644 --- a/docs/Camera_8cpp__incl.svg +++ b/docs/Camera_8cpp__incl.svg @@ -4,374 +4,379 @@ - + Engine/src/Camera.cpp - + Node1 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node2 - -Camera.h + +Camera.h Node1->Node2 - - + + + + +Node12 + +cmath + + +Node1->Node12 + + Node14 - -InputManager.h + +InputManager.h Node1->Node14 - - + + Node17 - -Error.h + +Error.h Node1->Node17 - - + + Node20 - -Game.h + +Game.h Node1->Node20 - - + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + Node11 - -Vec2.h + +Vec2.h Node2->Node11 - - + + Node13 - -ActionManager.h + +ActionManager.h Node2->Node13 - - + + Node4 - -SDL_include.h + +SDL_include.h Node3->Node4 - - + + Node5 - -vector + +vector Node3->Node5 - - + + Node6 - -memory + +memory Node3->Node6 - - + + Node7 - -string + +string Node3->Node7 - - + + Node8 - -Component.h + +Component.h Node3->Node8 - - + + Node9 - -ComponentType.h + +ComponentType.h Node3->Node9 - - + + Node10 - -Rect.h + +Rect.h Node3->Node10 - - + + Node8->Node3 - - + + Node8->Node9 - - + + Node10->Node4 - - + + Node10->Node11 - - - - -Node12 - -cmath + + Node10->Node12 - - + + Node11->Node4 - - + + Node13->Node14 - - + + Node14->Node4 - - + + Node14->Node11 - - + + Node15 - -unordered_map + +unordered_map Node14->Node15 - - + + Node16 - -cstdint + +cstdint Node14->Node16 - - + + Node18 - -iostream + +iostream Node17->Node18 - - + + Node19 - -stdlib.h + +stdlib.h Node17->Node19 - - + + Node20->Node4 - - + + Node20->Node7 - - + + Node20->Node11 - - + + Node20->Node14 - - + + Node21 - -stack + +stack Node20->Node21 - - + + Node22 - -State.h + +State.h Node20->Node22 - - + + Node22->Node3 - - + + Node22->Node5 - - + + Node22->Node6 - - + + Node22->Node14 - - + + Node23 - -Resources.h + +Resources.h Node22->Node23 - - + + Node23->Node4 - - + + Node23->Node6 - - + + Node23->Node7 - - + + Node23->Node15 - - + + diff --git a/docs/Camera_8h.html b/docs/Camera_8h.html index 297d25f2..f639ed6e 100644 --- a/docs/Camera_8h.html +++ b/docs/Camera_8h.html @@ -116,38 +116,66 @@ - - - - + + + + - - + + - + + + + +

Definições e Macros

#define CAMERA_DEFAULT_MIN_ZOOM   (0.075)
 
#define CAMERA_DEFAULT_MAX_ZOOM   (1.0)
 
#define CAMERA_DEFAULT_MIN_LOG_ZOOM   (-4.0)
 
#define CAMERA_DEFAULT_MAX_LOG_ZOOM   (0.0)
 
#define CAMERA_DEFAULT_ZOOMABLE   (true)
 
#define CAMERA_DEFAULT_ZOOM_SPEED   (5.0/200.)
 
#define CAMERA_DEFAULT_LOG_ZOOM_SPEED   (0.125)
 
#define CAMERA_DEFAULT_MIN_SPEED   (200.)
 
#define CAMERA_DEFAULT_MAX_SPEED   (1000.)
#define CAMERA_DEFAULT_MAX_SPEED   (2000.)
 
#define CAMERA_DEFAULT_MOVE_SPEED   (100.)
 
#define CAMERA_LOG_ZOOM_BASE   2
 

Definições e macros

+ +
+
+ + + + +
#define CAMERA_DEFAULT_LOG_ZOOM_SPEED   (0.125)
+
+ +
+
+ +
+
+ + + + +
#define CAMERA_DEFAULT_MAX_LOG_ZOOM   (0.0)
+
+ +
+
- +
#define CAMERA_DEFAULT_MAX_SPEED   (1000.)#define CAMERA_DEFAULT_MAX_SPEED   (2000.)
- +
- +
#define CAMERA_DEFAULT_MAX_ZOOM   (1.0)#define CAMERA_DEFAULT_MIN_LOG_ZOOM   (-4.0)
@@ -166,36 +194,36 @@

Definições e macros

- +
- +
#define CAMERA_DEFAULT_MIN_ZOOM   (0.075)#define CAMERA_DEFAULT_MOVE_SPEED   (100.)
- +
- +
#define CAMERA_DEFAULT_ZOOM_SPEED   (5.0/200.)#define CAMERA_DEFAULT_ZOOMABLE   (true)
- +
- +
#define CAMERA_DEFAULT_ZOOMABLE   (true)#define CAMERA_LOG_ZOOM_BASE   2
@@ -205,7 +233,7 @@

Definições e macros

diff --git a/docs/Collision_8h.html b/docs/Collision_8h.html index 9ba7d1d5..2f730637 100644 --- a/docs/Collision_8h.html +++ b/docs/Collision_8h.html @@ -116,7 +116,7 @@
diff --git a/docs/Color_8cpp.html b/docs/Color_8cpp.html index bb719d41..c1d7c3d3 100644 --- a/docs/Color_8cpp.html +++ b/docs/Color_8cpp.html @@ -99,7 +99,7 @@
diff --git a/docs/Color_8h.html b/docs/Color_8h.html index bdc967eb..d36c7f83 100644 --- a/docs/Color_8h.html +++ b/docs/Color_8h.html @@ -107,7 +107,7 @@ diff --git a/docs/Color_8h__dep__incl.map b/docs/Color_8h__dep__incl.map index a639bf8f..50a5b707 100644 --- a/docs/Color_8h__dep__incl.map +++ b/docs/Color_8h__dep__incl.map @@ -25,6 +25,6 @@ - + diff --git a/docs/Color_8h__dep__incl.md5 b/docs/Color_8h__dep__incl.md5 index ec93fb99..f4d955db 100644 --- a/docs/Color_8h__dep__incl.md5 +++ b/docs/Color_8h__dep__incl.md5 @@ -1 +1 @@ -8ae7eefbf7e05dd6c311c1137888f47a \ No newline at end of file +bdfcef4359349306fe14d792ea567bcc \ No newline at end of file diff --git a/docs/Color_8h__dep__incl.svg b/docs/Color_8h__dep__incl.svg index 1cbc2a25..d7786e3b 100644 --- a/docs/Color_8h__dep__incl.svg +++ b/docs/Color_8h__dep__incl.svg @@ -429,9 +429,9 @@ Node25 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp @@ -442,8 +442,8 @@ Node27->Node13 - - + + Node28 diff --git a/docs/ComponentType_8h.html b/docs/ComponentType_8h.html index 4273a6c5..32134155 100644 --- a/docs/ComponentType_8h.html +++ b/docs/ComponentType_8h.html @@ -146,7 +146,7 @@

Enumerações

diff --git a/docs/ComponentType_8h__dep__incl.map b/docs/ComponentType_8h__dep__incl.map index bd069b0a..22464843 100644 --- a/docs/ComponentType_8h__dep__incl.map +++ b/docs/ComponentType_8h__dep__incl.map @@ -38,5 +38,5 @@ - + diff --git a/docs/ComponentType_8h__dep__incl.md5 b/docs/ComponentType_8h__dep__incl.md5 index 73833e99..ac1b48da 100644 --- a/docs/ComponentType_8h__dep__incl.md5 +++ b/docs/ComponentType_8h__dep__incl.md5 @@ -1 +1 @@ -0d8f5c2d4b7804302b202aaf3484fade \ No newline at end of file +256280919e733dc57cc1f5df1f56b034 \ No newline at end of file diff --git a/docs/ComponentType_8h__dep__incl.svg b/docs/ComponentType_8h__dep__incl.svg index 622976cc..b8cf032d 100644 --- a/docs/ComponentType_8h__dep__incl.svg +++ b/docs/ComponentType_8h__dep__incl.svg @@ -724,9 +724,9 @@
Node40 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp diff --git a/docs/Component_8cpp.html b/docs/Component_8cpp.html index dd69f8bd..f5925829 100644 --- a/docs/Component_8cpp.html +++ b/docs/Component_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Component_8h.html b/docs/Component_8h.html index fff563cf..88b33148 100644 --- a/docs/Component_8h.html +++ b/docs/Component_8h.html @@ -134,7 +134,7 @@

Definições e macros

diff --git a/docs/Component_8h__dep__incl.map b/docs/Component_8h__dep__incl.map index ce692038..b2022743 100644 --- a/docs/Component_8h__dep__incl.map +++ b/docs/Component_8h__dep__incl.map @@ -37,5 +37,5 @@ - + diff --git a/docs/Component_8h__dep__incl.md5 b/docs/Component_8h__dep__incl.md5 index d0fa0da4..21fa201d 100644 --- a/docs/Component_8h__dep__incl.md5 +++ b/docs/Component_8h__dep__incl.md5 @@ -1 +1 @@ -383f60414fdc444f00907aaeaa82abf0 \ No newline at end of file +a98375a227b1444e66c88628e6f1af68 \ No newline at end of file diff --git a/docs/Component_8h__dep__incl.svg b/docs/Component_8h__dep__incl.svg index 01334f23..ce86a73b 100644 --- a/docs/Component_8h__dep__incl.svg +++ b/docs/Component_8h__dep__incl.svg @@ -572,8 +572,8 @@ Node30->Node31 - - + + Node37 @@ -585,8 +585,8 @@ Node30->Node37 - - + + Node31->Node9 @@ -705,9 +705,9 @@ Node39 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp diff --git a/docs/Defines_8h.html b/docs/Defines_8h.html index 4d7bf584..bbd4c69d 100644 --- a/docs/Defines_8h.html +++ b/docs/Defines_8h.html @@ -119,7 +119,7 @@

Definições e macros

diff --git a/docs/DragAndDrop_8cpp.html b/docs/DragAndDrop_8cpp.html index 755979ec..80a69459 100644 --- a/docs/DragAndDrop_8cpp.html +++ b/docs/DragAndDrop_8cpp.html @@ -102,7 +102,7 @@ diff --git a/docs/DragAndDrop_8h.html b/docs/DragAndDrop_8h.html index eed83642..a6f590f9 100644 --- a/docs/DragAndDrop_8h.html +++ b/docs/DragAndDrop_8h.html @@ -115,7 +115,7 @@ diff --git a/docs/EndStateData_8cpp.html b/docs/EndStateData_8cpp.html index 0bc8da3d..35dce4b7 100644 --- a/docs/EndStateData_8cpp.html +++ b/docs/EndStateData_8cpp.html @@ -127,7 +127,7 @@

Definições e macros

diff --git a/docs/EndStateData_8h.html b/docs/EndStateData_8h.html index 3f300183..4649f812 100644 --- a/docs/EndStateData_8h.html +++ b/docs/EndStateData_8h.html @@ -114,7 +114,7 @@ diff --git a/docs/EndState_8cpp.html b/docs/EndState_8cpp.html index 52961590..6ef38fac 100644 --- a/docs/EndState_8cpp.html +++ b/docs/EndState_8cpp.html @@ -100,7 +100,7 @@ diff --git a/docs/EndState_8h.html b/docs/EndState_8h.html index 32a74121..d31bc0bb 100644 --- a/docs/EndState_8h.html +++ b/docs/EndState_8h.html @@ -152,7 +152,7 @@

Definições e macros

diff --git a/docs/Enemy_8cpp.html b/docs/Enemy_8cpp.html index a1f5c638..9dde970b 100644 --- a/docs/Enemy_8cpp.html +++ b/docs/Enemy_8cpp.html @@ -103,7 +103,7 @@ diff --git a/docs/Enemy_8h.html b/docs/Enemy_8h.html index 37c4c739..2a608314 100644 --- a/docs/Enemy_8h.html +++ b/docs/Enemy_8h.html @@ -212,7 +212,7 @@

Enumerações

diff --git a/docs/Error_8h.html b/docs/Error_8h.html index 13e0d87d..e25d3fae 100644 --- a/docs/Error_8h.html +++ b/docs/Error_8h.html @@ -358,7 +358,7 @@

Definições dos tipos

diff --git a/docs/GameObject_8cpp.html b/docs/GameObject_8cpp.html index 9e3e666f..e1a7e77b 100644 --- a/docs/GameObject_8cpp.html +++ b/docs/GameObject_8cpp.html @@ -101,7 +101,7 @@ diff --git a/docs/GameObject_8h.html b/docs/GameObject_8h.html index d0cdeac0..46541c09 100644 --- a/docs/GameObject_8h.html +++ b/docs/GameObject_8h.html @@ -108,7 +108,7 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
@@ -167,7 +167,7 @@

Definições e macros

diff --git a/docs/GameObject_8h__dep__incl.map b/docs/GameObject_8h__dep__incl.map index 721dd362..5441b639 100644 --- a/docs/GameObject_8h__dep__incl.map +++ b/docs/GameObject_8h__dep__incl.map @@ -1,41 +1,41 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/GameObject_8h__dep__incl.md5 b/docs/GameObject_8h__dep__incl.md5 index 9fadb7f5..2093f562 100644 --- a/docs/GameObject_8h__dep__incl.md5 +++ b/docs/GameObject_8h__dep__incl.md5 @@ -1 +1 @@ -b097a6f281b842020c998a2ac3a59d2a \ No newline at end of file +0503edea7bd7ec14c21d8b4773363884 \ No newline at end of file diff --git a/docs/GameObject_8h__dep__incl.svg b/docs/GameObject_8h__dep__incl.svg index b395e263..d56fed74 100644 --- a/docs/GameObject_8h__dep__incl.svg +++ b/docs/GameObject_8h__dep__incl.svg @@ -4,220 +4,220 @@ - + Engine/include/GameObject.h - + Node1 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node2 - -Engine/include/Component.h + +Engine/include/Component.h Node1->Node2 - - + + Node8 - -Game/include/StageState.h + +Game/include/StageState.h Node1->Node8 - - + + Node9 - -Game/include/EndState.h + +Game/include/EndState.h Node1->Node9 - - + + Node17 - -Game/include/WaveManager.h + +Game/include/WaveManager.h Node1->Node17 - - + + Node19 - -Engine/include/Animation.h + +Engine/include/Animation.h Node1->Node19 - - + + Node21 - -Engine/include/Camera.h + +Engine/include/Camera.h Node1->Node21 - - + + Node23 - -Engine/src/GameObject.cpp + +Engine/src/GameObject.cpp Node1->Node23 - - + + Node28 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node1->Node28 - - + + Node29 - -Game/include/Enemy.h + +Game/include/Enemy.h Node1->Node29 - - + + Node32 - -Game/include/Tower.h + +Game/include/Tower.h Node1->Node32 - - + + Node33 - -Engine/include/State.h + +Engine/include/State.h Node1->Node33 - - + + Node2->Node1 - - + + Node3 - -Engine/include/AIGoDown.h + +Engine/include/AIGoDown.h Node2->Node3 - - + + Node6 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node2->Node6 - - + + Node14 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h Node2->Node14 - - + + Node16 - -Engine/src/Component.cpp + +Engine/src/Component.cpp Node2->Node16 - - + + Node2->Node17 - - + + Node4 @@ -229,492 +229,492 @@ Node3->Node4 - - + + Node5 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node3->Node5 - - + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node6->Node7 - - + + Node6->Node8 - - + + Node13 - -Game/src/Tower.cpp + +Game/src/Tower.cpp Node6->Node13 - - + + Node8->Node9 - - + + Node11 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node8->Node11 - - + + Node12 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node8->Node12 - - + + Node9->Node8 - - + + Node10 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node9->Node10 - - + + Node14->Node5 - - + + Node15 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp Node14->Node15 - - + + Node17->Node8 - - + + Node18 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node17->Node18 - - + + Node20 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node19->Node20 - - + + Node21->Node5 - - + + Node21->Node7 - - + + Node21->Node10 - - + + Node21->Node11 - - + + Node21->Node12 - - + + Node21->Node13 - - + + Node21->Node20 - - + + Node22 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node21->Node22 - - + + Node21->Node23 - - + + Node24 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp Node21->Node24 - - + + Node25 - -Engine/src/State.cpp + +Engine/src/State.cpp Node21->Node25 - - + + Node26 - -Engine/src/TileMap.cpp + +Engine/src/TileMap.cpp Node21->Node26 - - + + Node27 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp Node21->Node27 - - + + Node28->Node6 - - + + Node28->Node8 - - + + Node28->Node17 - - + + Node28->Node18 - - + + Node28->Node26 - - + + Node28->Node29 - - + + Node28->Node32 - - + + Node29->Node5 - - + + Node29->Node11 - - + + Node29->Node18 - - + + Node30 - -Game/include/GameResources.h + +Game/include/GameResources.h Node29->Node30 - - + + Node30->Node18 - - + + Node31 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp Node30->Node31 - - + + Node32->Node11 - - + + Node32->Node13 - - + + Node33->Node8 - - + + Node33->Node25 - - + + Node34 - -Engine/include/Game.h + +Engine/include/Game.h Node33->Node34 - - + + Node40 - -Game/include/TitleState.h + +Game/include/TitleState.h Node33->Node40 - - + + Node34->Node11 - - + + Node34->Node12 - - + + Node34->Node18 - - + + Node34->Node22 - - + + Node34->Node24 - - + + Node34->Node27 - - + + Node35 - -Engine/include/Text.h + +Engine/include/Text.h Node34->Node35 - - + + Node37 - -Engine/src/Game.cpp + +Engine/src/Game.cpp Node34->Node37 - - + + Node38 - -Engine/src/Resources.cpp + +Engine/src/Resources.cpp Node34->Node38 - - + + Node39 - -Game/src/main.cpp + +Game/src/main.cpp Node34->Node39 - - + + Node35->Node9 - - + + Node36 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node35->Node36 - - + + Node40->Node12 - - + + Node40->Node39 - - + + diff --git a/docs/GameResources_8cpp.html b/docs/GameResources_8cpp.html index d346e2d2..ae88f116 100644 --- a/docs/GameResources_8cpp.html +++ b/docs/GameResources_8cpp.html @@ -181,7 +181,7 @@

Definições e macros

diff --git a/docs/GameResources_8h.html b/docs/GameResources_8h.html index 4d89b548..5ce60277 100644 --- a/docs/GameResources_8h.html +++ b/docs/GameResources_8h.html @@ -122,7 +122,7 @@ diff --git a/docs/Game_8cpp.html b/docs/Game_8cpp.html index 998c3746..e32be88b 100644 --- a/docs/Game_8cpp.html +++ b/docs/Game_8cpp.html @@ -103,7 +103,7 @@ diff --git a/docs/Game_8h.html b/docs/Game_8h.html index ab3a3b55..3b8f7408 100644 --- a/docs/Game_8h.html +++ b/docs/Game_8h.html @@ -208,7 +208,7 @@

Definições e macros

diff --git a/docs/HItPoints_8cpp__incl.md5 b/docs/HItPoints_8cpp__incl.md5 deleted file mode 100644 index 73a6258c..00000000 --- a/docs/HItPoints_8cpp__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -4db08c725586874e6476640252c5b3f3 \ No newline at end of file diff --git a/docs/HItPoints_8cpp.html b/docs/HitPoints_8cpp.html similarity index 95% rename from docs/HItPoints_8cpp.html rename to docs/HitPoints_8cpp.html index 8a398a4b..4b6cd51e 100644 --- a/docs/HItPoints_8cpp.html +++ b/docs/HitPoints_8cpp.html @@ -4,7 +4,7 @@ -Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/HItPoints.cpp +Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/HitPoints.cpp @@ -86,20 +86,20 @@
-
Referência do Arquivo HItPoints.cpp
+
Referência do Arquivo HitPoints.cpp
#include "HitPoints.h"
-Gráfico de dependência de inclusões para HItPoints.cpp:
+Gráfico de dependência de inclusões para HitPoints.cpp:
-
+
diff --git a/docs/HItPoints_8cpp__incl.map b/docs/HitPoints_8cpp__incl.map similarity index 94% rename from docs/HItPoints_8cpp__incl.map rename to docs/HitPoints_8cpp__incl.map index ba607cf0..abd88e34 100644 --- a/docs/HItPoints_8cpp__incl.map +++ b/docs/HitPoints_8cpp__incl.map @@ -1,4 +1,4 @@ - + diff --git a/docs/HitPoints_8cpp__incl.md5 b/docs/HitPoints_8cpp__incl.md5 new file mode 100644 index 00000000..6643158a --- /dev/null +++ b/docs/HitPoints_8cpp__incl.md5 @@ -0,0 +1 @@ +56569313e41f0122de055c682f584a66 \ No newline at end of file diff --git a/docs/HItPoints_8cpp__incl.svg b/docs/HitPoints_8cpp__incl.svg similarity index 98% rename from docs/HItPoints_8cpp__incl.svg rename to docs/HitPoints_8cpp__incl.svg index 8a519ba3..9af714ec 100644 --- a/docs/HItPoints_8cpp__incl.svg +++ b/docs/HitPoints_8cpp__incl.svg @@ -3,16 +3,16 @@ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - + -Engine/src/HItPoints.cpp +Engine/src/HitPoints.cpp Node1 - -Engine/src/HItPoints.cpp + +Engine/src/HitPoints.cpp Node2 diff --git a/docs/HitPoints_8h.html b/docs/HitPoints_8h.html index 559c41dc..96141296 100644 --- a/docs/HitPoints_8h.html +++ b/docs/HitPoints_8h.html @@ -133,7 +133,7 @@

Definições dos tipos

diff --git a/docs/HitPoints_8h__dep__incl.map b/docs/HitPoints_8h__dep__incl.map index d965170b..85638ed0 100644 --- a/docs/HitPoints_8h__dep__incl.map +++ b/docs/HitPoints_8h__dep__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/HitPoints_8h__dep__incl.md5 b/docs/HitPoints_8h__dep__incl.md5 index bbe9b974..22986942 100644 --- a/docs/HitPoints_8h__dep__incl.md5 +++ b/docs/HitPoints_8h__dep__incl.md5 @@ -1 +1 @@ -66d8729cbaa5763ab8ddb3d48e37cc57 \ No newline at end of file +6ac6582d4e6c5a2c2e73af2faf02ee74 \ No newline at end of file diff --git a/docs/HitPoints_8h__dep__incl.svg b/docs/HitPoints_8h__dep__incl.svg index 1347044d..aacf0a76 100644 --- a/docs/HitPoints_8h__dep__incl.svg +++ b/docs/HitPoints_8h__dep__incl.svg @@ -5,40 +5,40 @@ --> + viewBox="0.00 0.00 263.50 84.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> Engine/include/HitPoints.h - + Node1 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h Node2 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp Node1->Node2 - - + + Node3 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node1->Node3 - - + + diff --git a/docs/InputManager_8cpp.html b/docs/InputManager_8cpp.html index fc273c9a..c480fb05 100644 --- a/docs/InputManager_8cpp.html +++ b/docs/InputManager_8cpp.html @@ -101,7 +101,7 @@ diff --git a/docs/InputManager_8h.html b/docs/InputManager_8h.html index 84be43ab..343f2b90 100644 --- a/docs/InputManager_8h.html +++ b/docs/InputManager_8h.html @@ -318,7 +318,7 @@

Definições e macros

diff --git a/docs/InputManager_8h__dep__incl.map b/docs/InputManager_8h__dep__incl.map index 4713149d..835e80ac 100644 --- a/docs/InputManager_8h__dep__incl.map +++ b/docs/InputManager_8h__dep__incl.map @@ -35,7 +35,7 @@ - + diff --git a/docs/InputManager_8h__dep__incl.md5 b/docs/InputManager_8h__dep__incl.md5 index cafc9dba..4784416f 100644 --- a/docs/InputManager_8h__dep__incl.md5 +++ b/docs/InputManager_8h__dep__incl.md5 @@ -1 +1 @@ -4fbfa723ba2cbf622346e482945b5f2f \ No newline at end of file +129905b955aad2508a2fd9f26a087d67 \ No newline at end of file diff --git a/docs/InputManager_8h__dep__incl.svg b/docs/InputManager_8h__dep__incl.svg index 5f9368cf..c03ebe77 100644 --- a/docs/InputManager_8h__dep__incl.svg +++ b/docs/InputManager_8h__dep__incl.svg @@ -154,8 +154,8 @@ Node1->Node36 - - + + Node41 @@ -424,8 +424,8 @@ Node22->Node20 - - + + Node23 @@ -463,8 +463,8 @@ Node22->Node29 - - + + Node32 @@ -659,9 +659,9 @@ Node34 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp diff --git a/docs/Music_8cpp.html b/docs/Music_8cpp.html index e23f77f6..d19b991e 100644 --- a/docs/Music_8cpp.html +++ b/docs/Music_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Music_8h.html b/docs/Music_8h.html index fae553c9..7b7c0196 100644 --- a/docs/Music_8h.html +++ b/docs/Music_8h.html @@ -180,7 +180,7 @@

Definições e macros

diff --git a/docs/README_8md.html b/docs/README_8md.html index 29d9880b..4ce977f2 100644 --- a/docs/README_8md.html +++ b/docs/README_8md.html @@ -88,7 +88,7 @@ diff --git a/docs/Rect_8cpp.html b/docs/Rect_8cpp.html index 4c3e3a48..ff419d76 100644 --- a/docs/Rect_8cpp.html +++ b/docs/Rect_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Rect_8h.html b/docs/Rect_8h.html index 22dc590f..b29b2e5a 100644 --- a/docs/Rect_8h.html +++ b/docs/Rect_8h.html @@ -149,7 +149,7 @@

Definições e macros

diff --git a/docs/Rect_8h__dep__incl.map b/docs/Rect_8h__dep__incl.map index f3995383..95bd5644 100644 --- a/docs/Rect_8h__dep__incl.map +++ b/docs/Rect_8h__dep__incl.map @@ -26,7 +26,7 @@ - + diff --git a/docs/Rect_8h__dep__incl.md5 b/docs/Rect_8h__dep__incl.md5 index dec72356..f0777080 100644 --- a/docs/Rect_8h__dep__incl.md5 +++ b/docs/Rect_8h__dep__incl.md5 @@ -1 +1 @@ -7ba9409dddcc7b59454a47f64699c571 \ No newline at end of file +8c0fe076c6eb8eae095ff536ee20826f \ No newline at end of file diff --git a/docs/Rect_8h__dep__incl.svg b/docs/Rect_8h__dep__incl.svg index 38bb4d15..fa368991 100644 --- a/docs/Rect_8h__dep__incl.svg +++ b/docs/Rect_8h__dep__incl.svg @@ -407,9 +407,9 @@ Node16 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp @@ -451,8 +451,8 @@ Node22->Node6 - - + + Node22->Node8 diff --git a/docs/Resources_8cpp.html b/docs/Resources_8cpp.html index e11befb0..24a1b686 100644 --- a/docs/Resources_8cpp.html +++ b/docs/Resources_8cpp.html @@ -134,7 +134,7 @@

Definições e macros

diff --git a/docs/Resources_8h.html b/docs/Resources_8h.html index 5471e0d1..71e72703 100644 --- a/docs/Resources_8h.html +++ b/docs/Resources_8h.html @@ -178,7 +178,7 @@

Definições e macros

diff --git a/docs/SDL__include_8h.html b/docs/SDL__include_8h.html index bc0e4bb3..cb219149 100644 --- a/docs/SDL__include_8h.html +++ b/docs/SDL__include_8h.html @@ -92,13 +92,13 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
diff --git a/docs/SDL__include_8h__dep__incl.map b/docs/SDL__include_8h__dep__incl.map index 9ddc781b..4c921772 100644 --- a/docs/SDL__include_8h__dep__incl.map +++ b/docs/SDL__include_8h__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/SDL__include_8h__dep__incl.md5 b/docs/SDL__include_8h__dep__incl.md5 index e16d00cf..9116cda8 100644 --- a/docs/SDL__include_8h__dep__incl.md5 +++ b/docs/SDL__include_8h__dep__incl.md5 @@ -1 +1 @@ -a6855afee9bb2a96b98a609ad7017aee \ No newline at end of file +4f4789c7e7bb8b1bdbe40ff6839918a8 \ No newline at end of file diff --git a/docs/SDL__include_8h__dep__incl.svg b/docs/SDL__include_8h__dep__incl.svg index 49ba0726..ca668e58 100644 --- a/docs/SDL__include_8h__dep__incl.svg +++ b/docs/SDL__include_8h__dep__incl.svg @@ -4,1063 +4,1068 @@ - + Engine/include/SDL_include.h - + Node1 - -Engine/include/SDL -_include.h + +Engine/include/SDL +_include.h Node2 - -Engine/include/InputManager.h + +Engine/include/InputManager.h Node1->Node2 - - + + + + +Node15 + + +Game/src/StageState.cpp + + + + +Node1->Node15 + + Node23 - -Engine/include/Sprite.h + +Engine/include/Sprite.h Node1->Node23 - - + + Node33 - -Engine/include/Game.h + +Engine/include/Game.h Node1->Node33 - - + + Node34 - -Engine/include/Text.h + +Engine/include/Text.h Node1->Node34 - - + + Node38 - -Engine/include/Music.h + +Engine/include/Music.h Node1->Node38 - - + + Node41 - -Engine/include/Vec2.h + +Engine/include/Vec2.h Node1->Node41 - - + + Node42 - -Engine/include/Rect.h + +Engine/include/Rect.h Node1->Node42 - - + + Node43 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node1->Node43 - - + + Node48 - -Engine/include/Resources.h + +Engine/include/Resources.h Node1->Node48 - - + + Node50 - -Engine/include/Sound.h + +Engine/include/Sound.h Node1->Node50 - - + + Node3 - -Engine/include/ActionManager.h + +Engine/include/ActionManager.h Node2->Node3 - - + + Node6 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node2->Node6 - - + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node2->Node7 - - + + Node11 - -Engine/src/TileMap.cpp + +Engine/src/TileMap.cpp Node2->Node11 - - + + Node16 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node2->Node16 - - + + Node19 - -Game/include/StageState.h + +Game/include/StageState.h Node2->Node19 - - + + Node20 - -Game/include/EndState.h + +Game/include/EndState.h Node2->Node20 - - + + Node2->Node23 - - + + Node28 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node2->Node28 - - + + Node32 - -Engine/include/State.h + +Engine/include/State.h Node2->Node32 - - + + Node2->Node33 - - + + Node2->Node38 - - + + Node40 - -Engine/src/InputManager.cpp + +Engine/src/InputManager.cpp Node2->Node40 - - + + Node4 - -Engine/include/Camera.h + +Engine/include/Camera.h Node3->Node4 - - + + Node18 - -Engine/src/ActionManager.cpp + +Engine/src/ActionManager.cpp Node3->Node18 - - + + Node3->Node19 - - + + Node21 - -Game/include/TitleState.h + +Game/include/TitleState.h Node3->Node21 - - + + Node5 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node4->Node5 - - + + Node4->Node6 - - + + Node4->Node7 - - + + Node8 - -Engine/src/GameObject.cpp + +Engine/src/GameObject.cpp Node4->Node8 - - + + Node9 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp Node4->Node9 - - + + Node10 - -Engine/src/State.cpp + +Engine/src/State.cpp Node4->Node10 - - + + Node4->Node11 - - + + Node12 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp Node4->Node12 - - + + Node13 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node4->Node13 - - + + Node14 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node4->Node14 - - - - -Node15 - - -Game/src/StageState.cpp - - + + Node4->Node15 - - + + Node4->Node16 - - + + Node17 - -Game/src/Tower.cpp + +Game/src/Tower.cpp Node4->Node17 - - + + Node19->Node15 - - + + Node19->Node16 - - + + Node19->Node20 - - + + Node20->Node13 - - + + Node20->Node19 - - + + Node21->Node16 - - + + Node22 - -Game/src/main.cpp + +Game/src/main.cpp Node21->Node22 - - + + Node23->Node9 - - + + Node23->Node19 - - + + Node23->Node20 - - + + Node23->Node21 - - + + Node24 - -Engine/include/Animation.h + +Engine/include/Animation.h Node23->Node24 - - + + Node25 - -Engine/include/Tileset.h + +Engine/include/Tileset.h Node23->Node25 - - + + Node29 - -Game/include/Enemy.h + +Game/include/Enemy.h Node23->Node29 - - + + Node30 - -Game/include/Tower.h + +Game/include/Tower.h Node23->Node30 - - + + Node31 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h Node23->Node31 - - + + Node24->Node5 - - + + Node25->Node12 - - + + Node25->Node19 - - + + Node26 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node25->Node26 - - + + Node26->Node11 - - + + Node26->Node19 - - + + Node27 - -Game/include/WaveManager.h + +Game/include/WaveManager.h Node26->Node27 - - + + Node26->Node28 - - + + Node26->Node29 - - + + Node26->Node30 - - + + Node27->Node19 - - + + Node27->Node28 - - + + Node29->Node14 - - + + Node29->Node15 - - + + Node29->Node28 - - + + Node30->Node15 - - + + Node30->Node17 - - + + Node31->Node14 - - + + Node32->Node10 - - + + Node32->Node19 - - + + Node32->Node21 - - + + Node32->Node33 - - + + Node33->Node6 - - + + Node33->Node9 - - + + Node33->Node12 - - + + Node33->Node15 - - + + Node33->Node16 - - + + Node33->Node22 - - + + Node33->Node28 - - + + Node33->Node34 - - + + Node36 - -Engine/src/Game.cpp + +Engine/src/Game.cpp Node33->Node36 - - + + Node37 - -Engine/src/Resources.cpp + +Engine/src/Resources.cpp Node33->Node37 - - + + Node34->Node20 - - + + Node35 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node34->Node35 - - + + Node38->Node19 - - + + Node38->Node20 - - + + Node39 - -Engine/src/Music.cpp + +Engine/src/Music.cpp Node38->Node39 - - + + Node41->Node2 - - + + Node41->Node4 - - + + Node41->Node26 - - + + Node41->Node28 - - + + Node41->Node30 - - + + Node41->Node33 - - + + Node41->Node42 - - + + Node47 - -Engine/src/Vec2.cpp + +Engine/src/Vec2.cpp Node41->Node47 - - + + Node42->Node23 - - + + Node42->Node29 - - + + Node42->Node30 - - + + Node42->Node34 - - + + Node42->Node43 - - + + Node45 - -Engine/include/Collision.h + +Engine/include/Collision.h Node42->Node45 - - + + Node46 - -Engine/src/Rect.cpp + +Engine/src/Rect.cpp Node42->Node46 - - + + Node43->Node4 - - + + Node43->Node8 - - + + Node43->Node19 - - + + Node43->Node20 - - + + Node43->Node24 - - + + Node43->Node26 - - + + Node43->Node27 - - + + Node43->Node29 - - + + Node43->Node30 - - + + Node43->Node32 - - + + Node44 - -Engine/include/Component.h + +Engine/include/Component.h Node43->Node44 - - + + Node44->Node27 - - + + Node44->Node31 - - + + Node44->Node43 - - + + Node45->Node15 - - + + Node48->Node9 - - + + Node48->Node32 - - + + Node48->Node34 - - + + Node48->Node36 - - + + Node48->Node37 - - + + Node48->Node38 - - + + Node49 - -Engine/src/Sound.cpp + +Engine/src/Sound.cpp Node48->Node49 - - + + Node50->Node49 - - + + diff --git a/docs/Sound_8cpp.html b/docs/Sound_8cpp.html index 86c47b5f..5fcd270e 100644 --- a/docs/Sound_8cpp.html +++ b/docs/Sound_8cpp.html @@ -100,7 +100,7 @@ diff --git a/docs/Sound_8h.html b/docs/Sound_8h.html index 59c0c572..54c93645 100644 --- a/docs/Sound_8h.html +++ b/docs/Sound_8h.html @@ -163,7 +163,7 @@

Definições e macros

diff --git a/docs/Sprite_8cpp.html b/docs/Sprite_8cpp.html index 268ed19a..d9bb783f 100644 --- a/docs/Sprite_8cpp.html +++ b/docs/Sprite_8cpp.html @@ -152,7 +152,7 @@

Definições e macros

diff --git a/docs/Sprite_8h.html b/docs/Sprite_8h.html index c1e438eb..4bddc90a 100644 --- a/docs/Sprite_8h.html +++ b/docs/Sprite_8h.html @@ -194,7 +194,7 @@

Definições e macros

diff --git a/docs/Sprite_8h__dep__incl.map b/docs/Sprite_8h__dep__incl.map index 3faec578..12a8900f 100644 --- a/docs/Sprite_8h__dep__incl.map +++ b/docs/Sprite_8h__dep__incl.map @@ -23,6 +23,6 @@ - +
diff --git a/docs/Sprite_8h__dep__incl.md5 b/docs/Sprite_8h__dep__incl.md5 index 551d79f2..5ea7b3c1 100644 --- a/docs/Sprite_8h__dep__incl.md5 +++ b/docs/Sprite_8h__dep__incl.md5 @@ -1 +1 @@ -5329a368d7c7e4a5714fb4c46e040e64 \ No newline at end of file +6e70bc8da84a38ee6a01dcdc6bae45ab \ No newline at end of file diff --git a/docs/Sprite_8h__dep__incl.svg b/docs/Sprite_8h__dep__incl.svg index 7b1492e0..495c0346 100644 --- a/docs/Sprite_8h__dep__incl.svg +++ b/docs/Sprite_8h__dep__incl.svg @@ -403,9 +403,9 @@ Node24 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp @@ -416,8 +416,8 @@ Node26->Node12 - - + + Node27 diff --git a/docs/StageState_8cpp.html b/docs/StageState_8cpp.html index 754b416b..4b81c983 100644 --- a/docs/StageState_8cpp.html +++ b/docs/StageState_8cpp.html @@ -99,15 +99,20 @@ #include "Error.h"
#include "Tower.h"
#include "Game.h"
+#include "SDL_include.h"
Gráfico de dependência de inclusões para StageState.cpp:
-
+
+ + + + @@ -124,7 +129,7 @@ - +

Definições e Macros

#define INCLUDE_SDL
 
#define INCLUDE_SDL_IMAGE
 
#define STATE_RENDER_X   0
 
#define STATE_RENDER_Y   0
 
#define CAM_START_Y   300
 
#define CAM_START_ZOOM   0.3
#define CAM_START_ZOOM   -1.75
 

Definições e macros

@@ -157,7 +162,7 @@

Definições e macros

- +
#define CAM_START_ZOOM   0.3#define CAM_START_ZOOM   -1.75
@@ -174,6 +179,30 @@

Definições e macros

+
+
+ +
+
+ + + + +
#define INCLUDE_SDL
+
+ +
+
+ +
+
+ + + + +
#define INCLUDE_SDL_IMAGE
+
+
@@ -239,7 +268,7 @@

Definições e macros

diff --git a/docs/StageState_8cpp__incl.map b/docs/StageState_8cpp__incl.map index 2a6434db..6223c894 100644 --- a/docs/StageState_8cpp__incl.map +++ b/docs/StageState_8cpp__incl.map @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/StageState_8cpp__incl.md5 b/docs/StageState_8cpp__incl.md5 index 12b138b5..7bec766c 100644 --- a/docs/StageState_8cpp__incl.md5 +++ b/docs/StageState_8cpp__incl.md5 @@ -1 +1 @@ -ef1cecb141f2219dc7de4f898442eabf \ No newline at end of file +8395aa8e28eeb56cf2f4728fe2d3c315 \ No newline at end of file diff --git a/docs/StageState_8cpp__incl.svg b/docs/StageState_8cpp__incl.svg index 246e2818..fc4c5491 100644 --- a/docs/StageState_8cpp__incl.svg +++ b/docs/StageState_8cpp__incl.svg @@ -4,928 +4,933 @@ - + Game/src/StageState.cpp - + Node1 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node2 - -StageState.h + +StageState.h Node1->Node2 - - + + + + +Node7 + + +SDL_include.h + + + + +Node1->Node7 + + Node24 - -Error.h + +Error.h Node1->Node24 - - + + Node32 - -EndStateData.h + +EndStateData.h Node1->Node32 - - + + Node36 - -Game.h + +Game.h Node1->Node36 - - + + Node38 - -Camera.h + +Camera.h Node1->Node38 - - + + Node39 - -Collision.h + +Collision.h Node1->Node39 - - + + Node41 - -Enemy.h + +Enemy.h Node1->Node41 - - + + Node42 - -Tower.h + +Tower.h Node1->Node42 - - + + Node3 - -vector + +vector Node2->Node3 - - + + Node4 - -memory + +memory Node2->Node4 - - + + Node5 - -ActionManager.h + +ActionManager.h Node2->Node5 - - + + Node6 - -InputManager.h + +InputManager.h Node2->Node6 - - + + Node11 - -DragAndDrop.h + +DragAndDrop.h Node2->Node11 - - + + Node14 - -GameObject.h + +GameObject.h Node2->Node14 - - + + Node18 - -TileMap.h + +TileMap.h Node2->Node18 - - + + Node19 - -Tileset.h + +Tileset.h Node2->Node19 - - + + Node20 - -Sprite.h + +Sprite.h Node2->Node20 - - + + Node22 - -Music.h + +Music.h Node2->Node22 - - + + Node27 - -State.h + +State.h Node2->Node27 - - + + Node28 - -Timer.h + +Timer.h Node2->Node28 - - + + Node29 - -WaveManager.h + +WaveManager.h Node2->Node29 - - + + Node31 - -EndState.h + +EndState.h Node2->Node31 - - + + Node5->Node6 - - - - -Node7 - - -SDL_include.h - - + + Node6->Node7 - - + + Node8 - -Vec2.h + +Vec2.h Node6->Node8 - - + + Node9 - -unordered_map + +unordered_map Node6->Node9 - - + + Node10 - -cstdint + +cstdint Node6->Node10 - - + + Node8->Node7 - - + + Node12 - -Component.h + +Component.h Node11->Node12 - - + + Node11->Node18 - - + + Node13 - -ComponentType.h + +ComponentType.h Node12->Node13 - - + + Node12->Node14 - - + + Node14->Node3 - - + + Node14->Node4 - - + + Node14->Node7 - - + + Node14->Node12 - - + + Node14->Node13 - - + + Node15 - -string + +string Node14->Node15 - - + + Node16 - -Rect.h + +Rect.h Node14->Node16 - - + + Node16->Node7 - - + + Node16->Node8 - - + + Node17 - -cmath + +cmath Node16->Node17 - - + + Node18->Node3 - - + + Node18->Node8 - - + + Node18->Node14 - - + + Node18->Node15 - - + + Node18->Node19 - - + + Node19->Node15 - - + + Node19->Node20 - - + + Node20->Node4 - - + + Node20->Node6 - - + + Node20->Node7 - - + + Node20->Node15 - - + + Node20->Node16 - - + + Node21 - -Color.h + +Color.h Node20->Node21 - - + + Node22->Node4 - - + + Node22->Node6 - - + + Node22->Node7 - - + + Node22->Node15 - - + + Node23 - -Resources.h + +Resources.h Node22->Node23 - - + + Node22->Node24 - - + + Node23->Node4 - - + + Node23->Node7 - - + + Node23->Node9 - - + + Node23->Node15 - - + + Node25 - -iostream + +iostream Node24->Node25 - - + + Node26 - -stdlib.h + +stdlib.h Node24->Node26 - - + + Node27->Node3 - - + + Node27->Node4 - - + + Node27->Node6 - - + + Node27->Node14 - - + + Node27->Node23 - - + + Node29->Node4 - - + + Node29->Node12 - - + + Node29->Node14 - - + + Node29->Node18 - - + + Node29->Node24 - - + + Node29->Node28 - - + + Node30 - -WaveData.h + +WaveData.h Node29->Node30 - - + + Node30->Node3 - - + + Node30->Node15 - - + + Node30->Node24 - - + + Node31->Node2 - - + + Node31->Node6 - - + + Node31->Node14 - - + + Node31->Node20 - - + + Node31->Node22 - - + + Node31->Node32 - - + + Node35 - -Text.h + +Text.h Node31->Node35 - - + + Node33 - -StateData.h + +StateData.h Node32->Node33 - - + + Node34 - -Defines.h + +Defines.h Node32->Node34 - - + + Node35->Node4 - - + + Node35->Node7 - - + + Node35->Node15 - - + + Node35->Node16 - - + + Node35->Node23 - - + + Node35->Node24 - - + + Node35->Node28 - - + + Node35->Node36 - - + + Node36->Node6 - - + + Node36->Node7 - - + + Node36->Node8 - - + + Node36->Node15 - - + + Node36->Node27 - - + + Node37 - -stack + +stack Node36->Node37 - - + + Node38->Node5 - - + + Node38->Node8 - - + + Node38->Node14 - - + + Node39->Node16 - - + + Node39->Node17 - - + + Node40 - -algorithm + +algorithm Node39->Node40 - - + + Node41->Node14 - - + + Node41->Node16 - - + + Node41->Node18 - - + + Node41->Node20 - - + + Node41->Node24 - - + + Node41->Node28 - - + + Node41->Node30 - - + + Node42->Node8 - - + + Node42->Node14 - - + + Node42->Node16 - - + + Node42->Node18 - - + + Node42->Node20 - - + + diff --git a/docs/StageState_8h.html b/docs/StageState_8h.html index b75098c0..b1365509 100644 --- a/docs/StageState_8h.html +++ b/docs/StageState_8h.html @@ -126,7 +126,7 @@ diff --git a/docs/StateData_8h.html b/docs/StateData_8h.html index cc87efa2..52c10b9c 100644 --- a/docs/StateData_8h.html +++ b/docs/StateData_8h.html @@ -130,7 +130,7 @@

Definições dos tipos

diff --git a/docs/State_8cpp.html b/docs/State_8cpp.html index b1d64d81..98f9fbb7 100644 --- a/docs/State_8cpp.html +++ b/docs/State_8cpp.html @@ -101,7 +101,7 @@ diff --git a/docs/State_8h.html b/docs/State_8h.html index e7bd3eab..2adced74 100644 --- a/docs/State_8h.html +++ b/docs/State_8h.html @@ -118,7 +118,7 @@ diff --git a/docs/Text_8cpp.html b/docs/Text_8cpp.html index a9cca9e7..afc29c3a 100644 --- a/docs/Text_8cpp.html +++ b/docs/Text_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Text_8h.html b/docs/Text_8h.html index 807d7196..d649c0b2 100644 --- a/docs/Text_8h.html +++ b/docs/Text_8h.html @@ -247,7 +247,7 @@

Enumerações

diff --git a/docs/TileMap_8cpp.html b/docs/TileMap_8cpp.html index 8b09dea7..dfd40a7a 100644 --- a/docs/TileMap_8cpp.html +++ b/docs/TileMap_8cpp.html @@ -127,7 +127,7 @@

Definições e macros

diff --git a/docs/TileMap_8h.html b/docs/TileMap_8h.html index d146f7ad..4850899a 100644 --- a/docs/TileMap_8h.html +++ b/docs/TileMap_8h.html @@ -165,7 +165,7 @@

Definições e macros

diff --git a/docs/Tileset_8cpp.html b/docs/Tileset_8cpp.html index cbcdc5b0..855818e1 100644 --- a/docs/Tileset_8cpp.html +++ b/docs/Tileset_8cpp.html @@ -123,7 +123,7 @@

Definições e macros

diff --git a/docs/Tileset_8h.html b/docs/Tileset_8h.html index 380acbc4..da16c946 100644 --- a/docs/Tileset_8h.html +++ b/docs/Tileset_8h.html @@ -115,7 +115,7 @@ diff --git a/docs/Timer_8cpp.html b/docs/Timer_8cpp.html index 8aa30ea0..2b6ce430 100644 --- a/docs/Timer_8cpp.html +++ b/docs/Timer_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Timer_8h.html b/docs/Timer_8h.html index c7ada54c..d52390d8 100644 --- a/docs/Timer_8h.html +++ b/docs/Timer_8h.html @@ -107,7 +107,7 @@ diff --git a/docs/TitleState_8cpp.html b/docs/TitleState_8cpp.html index e8802951..666697a4 100644 --- a/docs/TitleState_8cpp.html +++ b/docs/TitleState_8cpp.html @@ -103,7 +103,7 @@ diff --git a/docs/TitleState_8h.html b/docs/TitleState_8h.html index 0e90fb5d..bed2f6ad 100644 --- a/docs/TitleState_8h.html +++ b/docs/TitleState_8h.html @@ -115,7 +115,7 @@ diff --git a/docs/Tower_8cpp.html b/docs/Tower_8cpp.html index f98f3977..2bfd2046 100644 --- a/docs/Tower_8cpp.html +++ b/docs/Tower_8cpp.html @@ -123,7 +123,7 @@

Definições dos tipos

diff --git a/docs/Tower_8h.html b/docs/Tower_8h.html index d1c7c04c..645b4709 100644 --- a/docs/Tower_8h.html +++ b/docs/Tower_8h.html @@ -150,7 +150,7 @@

Definições e macros

diff --git a/docs/Vec2_8cpp.html b/docs/Vec2_8cpp.html index 85ef151b..40fa8455 100644 --- a/docs/Vec2_8cpp.html +++ b/docs/Vec2_8cpp.html @@ -101,7 +101,7 @@ diff --git a/docs/Vec2_8h.html b/docs/Vec2_8h.html index b209aaf0..66af3cbd 100644 --- a/docs/Vec2_8h.html +++ b/docs/Vec2_8h.html @@ -147,7 +147,7 @@

Definições e macros

diff --git a/docs/Vec2_8h__dep__incl.map b/docs/Vec2_8h__dep__incl.map index c5218574..54840fed 100644 --- a/docs/Vec2_8h__dep__incl.map +++ b/docs/Vec2_8h__dep__incl.map @@ -37,7 +37,7 @@ - + diff --git a/docs/Vec2_8h__dep__incl.md5 b/docs/Vec2_8h__dep__incl.md5 index 3fb3bc29..49c5be09 100644 --- a/docs/Vec2_8h__dep__incl.md5 +++ b/docs/Vec2_8h__dep__incl.md5 @@ -1 +1 @@ -aed687378a0309a8f3678fb4c0d6633a \ No newline at end of file +03a0e3fec453631e4c1021663c00a774 \ No newline at end of file diff --git a/docs/Vec2_8h__dep__incl.svg b/docs/Vec2_8h__dep__incl.svg index 8572648c..b9b7a524 100644 --- a/docs/Vec2_8h__dep__incl.svg +++ b/docs/Vec2_8h__dep__incl.svg @@ -667,8 +667,8 @@ Node30->Node15 - - + + Node30->Node29 @@ -695,8 +695,8 @@ Node32->Node15 - - + + Node32->Node17 @@ -710,9 +710,9 @@ Node34 - - -Engine/src/HItPoints.cpp + + +Engine/src/HitPoints.cpp @@ -1018,8 +1018,8 @@ Node48->Node15 - - + + diff --git a/docs/WaveData_8cpp.html b/docs/WaveData_8cpp.html index 0e1bab01..c92098e5 100644 --- a/docs/WaveData_8cpp.html +++ b/docs/WaveData_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/WaveData_8h.html b/docs/WaveData_8h.html index 631e2570..2821d6b9 100644 --- a/docs/WaveData_8h.html +++ b/docs/WaveData_8h.html @@ -121,7 +121,7 @@ diff --git a/docs/WaveManager_8cpp.html b/docs/WaveManager_8cpp.html index d287cf29..99d95f2c 100644 --- a/docs/WaveManager_8cpp.html +++ b/docs/WaveManager_8cpp.html @@ -127,7 +127,7 @@

Definições e macros

diff --git a/docs/WaveManager_8h.html b/docs/WaveManager_8h.html index 0466ba61..2acd72e6 100644 --- a/docs/WaveManager_8h.html +++ b/docs/WaveManager_8h.html @@ -120,7 +120,7 @@ diff --git a/docs/annotated.html b/docs/annotated.html index a908ce75..6ac55978 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -130,7 +130,7 @@ diff --git a/docs/classAIGoDown-members.html b/docs/classAIGoDown-members.html index 79dd645e..b8ac8971 100644 --- a/docs/classAIGoDown-members.html +++ b/docs/classAIGoDown-members.html @@ -98,7 +98,7 @@ diff --git a/docs/classAIGoDown.html b/docs/classAIGoDown.html index a6ca3727..8c9f6e7e 100644 --- a/docs/classAIGoDown.html +++ b/docs/classAIGoDown.html @@ -264,7 +264,7 @@

Atributos

diff --git a/docs/classActionManager-members.html b/docs/classActionManager-members.html index 9f251095..78a6bbba 100644 --- a/docs/classActionManager-members.html +++ b/docs/classActionManager-members.html @@ -102,7 +102,7 @@ diff --git a/docs/classActionManager.html b/docs/classActionManager.html index f79ac4ff..56b970bc 100644 --- a/docs/classActionManager.html +++ b/docs/classActionManager.html @@ -334,7 +334,7 @@

Métodos

diff --git a/docs/classAnimation-members.html b/docs/classAnimation-members.html index 8c1bdce6..166e3f68 100644 --- a/docs/classAnimation-members.html +++ b/docs/classAnimation-members.html @@ -113,7 +113,7 @@ diff --git a/docs/classAnimation.html b/docs/classAnimation.html index f67afa78..7fa8b7f5 100644 --- a/docs/classAnimation.html +++ b/docs/classAnimation.html @@ -532,7 +532,7 @@

Atributos

diff --git a/docs/classCamera-members.html b/docs/classCamera-members.html index cc0e692b..fd07a329 100644 --- a/docs/classCamera-members.html +++ b/docs/classCamera-members.html @@ -91,36 +91,38 @@

Esta é a lista de todos os membros de Camera, incluindo os membros herdados.

- - + + - - - - + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + +
Camera()Cameraprivate
currentSpeedCameraprivatestatic
currentZoomCameraprivatestatic
currentLogZoomCameraprivatestatic
currentSpeedCameraprivatestatic
focusCameraprivatestatic
Follow(GameObject *newFocus)Camerastatic
ForceZoom(float newZoom)Camerastatic
GetMaxSpeed(void)Camerastatic
GetMinSpeed(void)Camerastatic
GetZoom(void)Camerastatic
ForceLinearZoom(float newZoom)Camerastatic
ForceLogZoom(float newZoom)Camerastatic
GetLinearZoom(void)Camerastatic
GetLogZoom(void)Camerastatic
GetMaxSpeed(void)Camerastatic
GetMinSpeed(void)Camerastatic
logZoomSpeedCameraprivatestatic
maxLogZoomCameraprivatestatic
maxSpeedCameraprivatestatic
maxZoomCameraprivatestatic
minLogZoomCameraprivatestatic
minSpeedCameraprivatestatic
minZoomCameraprivatestatic
posCamerastatic
ScreenToWorld(Vec2 screen)Camerastatic
ScreenToWorld(Rect screen)Camerastatic
SetSpeedLimits(float minSpeed=0, float maxSpeed=0)Camerastatic
SetZoomable(bool zoomable)Camerastatic
SetZoomLimits(float minZoom=0, float maxZoom=0)Camerastatic
SetZoomSpeed(float newZoomSpeed)Camerastatic
Unfollow(void)Camerastatic
Update(float dt)Camerastatic
WorldToScreen(Vec2 world)Camerastatic
WorldToScreen(Rect world)Camerastatic
Zoom(float deltaZoom)Camerastatic
zoomFixedCameraprivatestatic
zoomSpeedCameraprivatestatic
posCamerastatic
ScreenToWorld(Vec2 screen)Camerastatic
ScreenToWorld(Rect screen)Camerastatic
SetSpeedLimits(float minSpeed=CAMERA_DEFAULT_MIN_SPEED, float maxSpeed=CAMERA_DEFAULT_MAX_SPEED)Camerastatic
SetZoomable(bool zoomable)Camerastatic
SetZoomLimits(float minZoom=CAMERA_DEFAULT_MIN_LOG_ZOOM, float maxZoom=CAMERA_DEFAULT_MAX_LOG_ZOOM)Camerastatic
SetZoomSpeed(float newZoomSpeed)Camerastatic
Unfollow(void)Camerastatic
Update(float dt)Camerastatic
WorldToScreen(Vec2 world)Camerastatic
WorldToScreen(Rect world)Camerastatic
Zoom(float deltaZoom)Camerastatic
zoomFixedCameraprivatestatic
diff --git a/docs/classCamera.html b/docs/classCamera.html index b17c5101..b45389fd 100644 --- a/docs/classCamera.html +++ b/docs/classCamera.html @@ -101,7 +101,7 @@
Diagrama de colaboração para Camera:
-
+
[legenda]
@@ -116,24 +116,30 @@ - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + @@ -172,16 +178,16 @@ Atributos Privados Estáticos - - - - - - + + + + + + - - + + @@ -195,8 +201,9 @@
  • Zoom travado
  • Zoom atual
  • Velocidade de zoom
  • -
  • Zoom mínimo e máximo
  • +
  • Zoom mínimo e máximo
  • +

    O zoom é armazenado internamente de forma logarítmica para permitir um comportamento linear nas suas velocidades de zoom e movimentação da câmera, que dependem diretamente do nível atual de zoom. A base do zoom é representado em CAMERA_LOG_ZOOM_BASE e indica que, um zoom de 2, representa multiplicar as sprites por CAMERA_LOG_ZOOM_BASE^(2). Já um zoom de -2 representa CAMERA_LOG_ZOOM_BASE^(-2).

    Construtores & Destrutores

    @@ -258,7 +265,7 @@

    Métodos

    - +
    static void Update (float dt)
     Atualiza o estado da câmera. Mais...
     
    static void ForceZoom (float newZoom)
     Força um valor para o zoom. Mais...
     
    static void ForceLinearZoom (float newZoom)
     Força um valor para o zoom. Mais...
     
    static void ForceLogZoom (float newZoom)
     Força um valor para o zoom. Mais...
     
    static void SetZoomable (bool zoomable)
     Trava ou destrava o zoom. Mais...
     
    static void Zoom (float deltaZoom)
     Altera o zoom corrente. Mais...
     
    static void SetZoomLimits (float minZoom=0, float maxZoom=0)
     Estabelece os limites superior e inferior do zoom. Mais...
     
    static float GetZoom (void)
     Informa o valor do zoom corrente. Mais...
     
    static void SetSpeedLimits (float minSpeed=0, float maxSpeed=0)
     Estabelece os limites superior e inferior da velocidade da câmera. Mais...
     
    static void SetZoomLimits (float minZoom=CAMERA_DEFAULT_MIN_LOG_ZOOM, float maxZoom=CAMERA_DEFAULT_MAX_LOG_ZOOM)
     Estabelece os limites superior e inferior do zoom. Mais...
     
    static float GetLinearZoom (void)
     Informa o valor do zoom corrente. Mais...
     
    static float GetLogZoom (void)
     Informa o valor do zoom corrente na escala logarítmica. Mais...
     
    static void SetSpeedLimits (float minSpeed=CAMERA_DEFAULT_MIN_SPEED, float maxSpeed=CAMERA_DEFAULT_MAX_SPEED)
     Estabelece os limites superior e inferior da velocidade da câmera. Mais...
     
    static float GetMinSpeed (void)
     Retorna a velocidade mínima da câmera. Mais...
     
    static GameObjectfocus = nullptr
     
    static float currentZoom = 1.0
     
    static float minZoom = CAMERA_DEFAULT_MIN_ZOOM
     
    static float maxZoom = CAMERA_DEFAULT_MAX_ZOOM
     
    static float currentLogZoom = 0.0
     
    static float minLogZoom = CAMERA_DEFAULT_MIN_LOG_ZOOM
     
    static float maxLogZoom = CAMERA_DEFAULT_MAX_LOG_ZOOM
     
    static bool zoomFixed = !CAMERA_DEFAULT_ZOOMABLE
     
    static float zoomSpeed = CAMERA_DEFAULT_ZOOM_SPEED
     
    static float logZoomSpeed = CAMERA_DEFAULT_LOG_ZOOM_SPEED
     
    static float minSpeed = CAMERA_DEFAULT_MIN_SPEED
     
    static float maxSpeed = CAMERA_DEFAULT_MAX_SPEED
    @@ -266,7 +273,7 @@

    Métodos

    - + @@ -287,11 +294,11 @@

    Métodos

    void Camera::ForceZoom void Camera::ForceLinearZoom ( float  newZoom)
    -

    O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será atribuído ao currentZoom.,

    +

    O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será convertido para a escala logarítmica e atribuído ao currentLogZoom.

    - +
    @@ -299,7 +306,40 @@

    Métodos

    + + +
    - + + + + + + +
    float Camera::GetMaxSpeed void Camera::ForceLogZoom (float newZoom)
    +
    +static
    +
    + +

    Força um valor para o zoom.

    +
    Parâmetros
    + + +
    newZoomnovo valor para o Zoom
    +
    +
    +

    O valor informado se torna o zoom corrente. O novo valor do zoom pode extrapolar os limites existentes. Esse valor, mesmo que fora dos limites, será atribuído ao currentLogZoom.

    + +
    +
    + +
    +
    + + +
    + + + @@ -313,12 +353,12 @@

    Métodos

    float Camera::GetLinearZoom ( void  )
    -

    Retorna a velocidade máxima da câmera.

    -

    O valor máximo é a velocidade que a câmera vai se mover quando estiver com o mínimo de zoom possível, ou seja, o mais afastado possível.

    +

    Informa o valor do zoom corrente.

    +

    Se o valor for 1.0 significa que nenhum zoom está sendo aplicado. Se for maior que 1.0 significa que as imagens devem ser ampliadas. Se for menor que 1.0 significa que as imagens devem ser reduzidas.

    - +
    @@ -326,7 +366,7 @@

    Métodos

    - + @@ -340,12 +380,12 @@

    Métodos

    float Camera::GetMinSpeed float Camera::GetLogZoom ( void  )
    -

    Retorna a velocidade mínima da câmera.

    -

    O valor mínimo é a velocidade que a câmera vai se mover quando estiver com o máximo de zoom possível, ou seja, o mais próximo possível.

    +

    Informa o valor do zoom corrente na escala logarítmica.

    +

    Se o valor for 0.0 significa que nenhum zoom está sendo aplicado. Se for maior que 0.0 significa que as imagens devem ser ampliadas. Se for menor que 0.0 significa que as imagens devem ser reduzidas.

    - +
    @@ -353,7 +393,7 @@

    Métodos

    - + @@ -367,8 +407,35 @@

    Métodos

    float Camera::GetZoom float Camera::GetMaxSpeed ( void  )
    -

    Informa o valor do zoom corrente.

    -

    Se o valor for 1.0 significa que nenhum zoom está sendo aplicado. Se for maior que 1.0 significa que as imagens devem ser ampliadas. Se for menor que 1.0 significa que as imagens devem ser reduzidas.

    +

    Retorna a velocidade máxima da câmera.

    +

    O valor máximo é a velocidade que a câmera vai se mover quando estiver com o mínimo de zoom possível, ou seja, o mais afastado possível.

    + +
    + + +
    +
    + + + + + +
    + + + + + + + + +
    float Camera::GetMinSpeed (void )
    +
    +static
    +
    + +

    Retorna a velocidade mínima da câmera.

    +

    O valor mínimo é a velocidade que a câmera vai se mover quando estiver com o máximo de zoom possível, ou seja, o mais próximo possível.

    @@ -440,7 +507,7 @@

    Métodos

    - +
    @@ -451,13 +518,13 @@

    Métodos

    - + - + @@ -480,7 +547,7 @@

    Métodos

    void Camera::SetSpeedLimits ( float minSpeed = 0, minSpeed = CAMERA_DEFAULT_MIN_SPEED,
    float maxSpeed = 0 maxSpeed = CAMERA_DEFAULT_MAX_SPEED 
    -

    Se o valor de minSpeed ou maxSpeed for zero, o valor default será atribuído no lugar.

    +

    Se o valor de minSpeed ou maxSpeed não forem fornecidos, o valor default será atribuído no lugar.

    @@ -517,7 +584,7 @@

    Métodos

    - +
    @@ -528,13 +595,13 @@

    Métodos

    - + - + @@ -557,7 +624,7 @@

    Métodos

    void Camera::SetZoomLimits ( float minZoom = 0, minZoom = CAMERA_DEFAULT_MIN_LOG_ZOOM,
    float maxZoom = 0 maxZoom = CAMERA_DEFAULT_MAX_LOG_ZOOM 
    -

    Se o valor de minZoom ou maxZoom for zero, o valor default será atribuído no lugar.

    +

    Se o valor de minZoom ou maxZoom não forem fornecidos, o valor default será atribuído no lugar.

    @@ -765,12 +832,12 @@

    Métodos

    -

    O zoom corrente é alterado linearmente em deltaZoom*zoomSpeed. Só tem efeito se o valor de zoomFixed for falso. Se o novo valor para o zoom extrapolar o limite superior, o valor do limite superior será atribuído ao currentZoom. Se o novo valor para o zoom extrapolar o limite inferior, o valor do limite inferior será atribuído ao currentZoom.

    +

    O zoom corrente é alterado logaritmicamente em deltaZoom*logZoomSpeed. Só tem efeito se o valor de zoomFixed for falso. Se o novo valor para o zoom extrapolar o limite superior, o valor do limite superior será usado. Se o novo valor para o zoom extrapolar o limite inferior, o valor do limite inferior será usado. Também ajusta a posição da câmera para que o ponto onde o mouse estava continue no mesmo lugar.

    Atributos

    - +
    @@ -778,7 +845,7 @@

    Atributos

    @@ -787,11 +854,11 @@

    Atributos

    - +
    float Camera::currentSpeed = CAMERA_DEFAULT_MIN_SPEEDfloat Camera::currentLogZoom = 0.0
    -

    Armazena a velocidade atual de movimento da câmera quando não está focalizada em nenhum objeto.

    +

    Armazena o valor do zoom atual, informando em quantas vezes os objetos devem ser ampliados. Ele deve estar estre o minZoom e o maxZoom, a não ser que o método ForceZoom seja usado. Os métodos Zoom e ForceZoom alteram seu valor.

    - +
    @@ -799,7 +866,7 @@

    Atributos

    @@ -808,7 +875,7 @@

    Atributos

    - +
    float Camera::currentZoom = 1.0float Camera::currentSpeed = CAMERA_DEFAULT_MIN_SPEED
    -

    Armazena o valor do zoom atual, informando em quantas vezes os objetos devem ser ampliados. Ele deve estar estre o minZoom e o maxZoom, a não ser que o método ForceZoom seja usado. Os métodos Zoom e ForceZoom alteram seu valor.

    +

    Armazena a velocidade atual de movimento da câmera quando não está focalizada em nenhum objeto.

    @@ -833,7 +900,7 @@

    Atributos

    - +
    @@ -841,7 +908,7 @@

    Atributos

    @@ -850,11 +917,11 @@

    Atributos

    - +
    float Camera::maxSpeed = CAMERA_DEFAULT_MAX_SPEEDfloat Camera::logZoomSpeed = CAMERA_DEFAULT_LOG_ZOOM_SPEED
    -

    Armazena o valor máximo da velocidade da câmera.

    +

    Armazena a velocidade com a qual o zoom deve ocorrer. O argumento do método Zoom é multiplicado por esse valor para depois ser somado ao currentZoom.

    - +
    @@ -862,7 +929,7 @@

    Atributos

    @@ -875,7 +942,7 @@

    Atributos

    - +
    - +
    float Camera::maxZoom = CAMERA_DEFAULT_MAX_ZOOMfloat Camera::maxLogZoom = CAMERA_DEFAULT_MAX_LOG_ZOOM
    @@ -883,7 +950,7 @@

    Atributos

    @@ -892,11 +959,11 @@

    Atributos

    - +
    float Camera::minSpeed = CAMERA_DEFAULT_MIN_SPEEDfloat Camera::maxSpeed = CAMERA_DEFAULT_MAX_SPEED
    -

    Armazena o valor mínimo da velocidade da câmera.

    +

    Armazena o valor máximo da velocidade da câmera.

    - +
    @@ -904,7 +971,7 @@

    Atributos

    @@ -917,7 +984,7 @@

    Atributos

    - +
    - +
    float Camera::minZoom = CAMERA_DEFAULT_MIN_ZOOMfloat Camera::minLogZoom = CAMERA_DEFAULT_MIN_LOG_ZOOM
    @@ -925,23 +992,20 @@

    Atributos

    +staticprivate
    - +
    Vec2 Camera::pos = Vec2(0,0)float Camera::minSpeed = CAMERA_DEFAULT_MIN_SPEED
    -static
    - -

    Ponto de início do que deve ser exibido na tela.

    -
    Futuras Atividades:
    Verificar viabilidade de tornar privado.
    -

    Contém a informação do ponto no jogo que corresponde ao (0,0) da janela do jogo.

    +

    Armazena o valor mínimo da velocidade da câmera.

    - +
    @@ -949,20 +1013,23 @@

    Atributos

    +static
    - +
    bool Camera::zoomFixed = !CAMERA_DEFAULT_ZOOMABLEVec2 Camera::pos = Vec2(0,0)
    -staticprivate
    -

    Se for verdadeiro, o zoom não será alterado pelo método Zoom. Caso contrário o método Zoom pode mudar o valor corrente do zoom. É alterado pelo método SetZoomable.

    + +

    Ponto de início do que deve ser exibido na tela.

    +
    Futuras Atividades:
    Verificar viabilidade de tornar privado.
    +

    Contém a informação do ponto no jogo que corresponde ao (0,0) da janela do jogo.

    - +
    @@ -970,7 +1037,7 @@

    Atributos

    @@ -979,7 +1046,7 @@

    Atributos

    - +
    float Camera::zoomSpeed = CAMERA_DEFAULT_ZOOM_SPEEDbool Camera::zoomFixed = !CAMERA_DEFAULT_ZOOMABLE
    -

    Armazena a velocidade com a qual o zoom deve ocorrer. O argumento do método Zoom é multiplicado por esse valor para depois ser somado ao currentZoom.

    +

    Se for verdadeiro, o zoom não será alterado pelo método Zoom. Caso contrário o método Zoom pode mudar o valor corrente do zoom. É alterado pelo método SetZoomable.

    @@ -990,7 +1057,7 @@

    Atributos

    diff --git a/docs/classCamera__coll__graph.map b/docs/classCamera__coll__graph.map index 4d27e2c7..9456a9c1 100644 --- a/docs/classCamera__coll__graph.map +++ b/docs/classCamera__coll__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classCamera__coll__graph.md5 b/docs/classCamera__coll__graph.md5 index f2c332b6..24f959a7 100644 --- a/docs/classCamera__coll__graph.md5 +++ b/docs/classCamera__coll__graph.md5 @@ -1 +1 @@ -4dd9e0d907b3519dbbffb15004e51d6e \ No newline at end of file +fe2f730ac3a66045eb78e8bcd2a9de58 \ No newline at end of file diff --git a/docs/classCamera__coll__graph.svg b/docs/classCamera__coll__graph.svg index 2ea8a618..5103c36e 100644 --- a/docs/classCamera__coll__graph.svg +++ b/docs/classCamera__coll__graph.svg @@ -4,124 +4,124 @@ - + Camera - + Node1 - -Camera + +Camera Node2 - -Vec2 + +Vec2 Node2->Node1 - - - pos + + + pos Node3 - -float + +float Node3->Node1 - - - zoomSpeed -minSpeed -maxSpeed -minZoom -currentSpeed -maxZoom -currentZoom + + + minLogZoom +minSpeed +maxSpeed +logZoomSpeed +currentSpeed +maxLogZoom +currentLogZoom Node3->Node2 - - - x -y + + + x +y Node4 - -GameObject + +GameObject Node3->Node4 - - - rotation + + + rotation Node5 - -Rect + +Rect Node3->Node5 - - - w -x -h -y + + + w +x +h +y Node4->Node1 - - - focus + + + focus Node5->Node4 - - - box + + + box Node6 - -bool + +bool Node6->Node1 - - - zoomFixed + + + zoomFixed Node6->Node4 - - - dead + + + dead Node7 - -vector< Component * > + +vector< Component * > Node7->Node4 - - - components + + + components diff --git a/docs/classCollision-members.html b/docs/classCollision-members.html index 14466731..6eb1e9b2 100644 --- a/docs/classCollision-members.html +++ b/docs/classCollision-members.html @@ -98,7 +98,7 @@
    diff --git a/docs/classCollision.html b/docs/classCollision.html index 413da945..e7c436fa 100644 --- a/docs/classCollision.html +++ b/docs/classCollision.html @@ -309,7 +309,7 @@
    diff --git a/docs/classComponent-members.html b/docs/classComponent-members.html index b2548801..e3f04ab6 100644 --- a/docs/classComponent-members.html +++ b/docs/classComponent-members.html @@ -96,7 +96,7 @@
    diff --git a/docs/classComponent.html b/docs/classComponent.html index 3b4bebc1..6cabb7e6 100644 --- a/docs/classComponent.html +++ b/docs/classComponent.html @@ -232,7 +232,7 @@

    Métodos

    diff --git a/docs/classDragAndDrop-members.html b/docs/classDragAndDrop-members.html index a087c122..3734c01a 100644 --- a/docs/classDragAndDrop-members.html +++ b/docs/classDragAndDrop-members.html @@ -101,7 +101,7 @@
    diff --git a/docs/classDragAndDrop.html b/docs/classDragAndDrop.html index 469f7be1..74104fad 100644 --- a/docs/classDragAndDrop.html +++ b/docs/classDragAndDrop.html @@ -364,7 +364,7 @@

    Atributos

    diff --git a/docs/classEndState-members.html b/docs/classEndState-members.html index 17b2ef24..bf19c95d 100644 --- a/docs/classEndState-members.html +++ b/docs/classEndState-members.html @@ -111,7 +111,7 @@ diff --git a/docs/classEndState.html b/docs/classEndState.html index 4294b4b9..9bcf6d49 100644 --- a/docs/classEndState.html +++ b/docs/classEndState.html @@ -371,7 +371,7 @@

    Atributos

    diff --git a/docs/classEndStateData-members.html b/docs/classEndStateData-members.html index a6566974..e62724d0 100644 --- a/docs/classEndStateData-members.html +++ b/docs/classEndStateData-members.html @@ -100,7 +100,7 @@ diff --git a/docs/classEndStateData.html b/docs/classEndStateData.html index f96eb395..be03cf71 100644 --- a/docs/classEndStateData.html +++ b/docs/classEndStateData.html @@ -252,7 +252,7 @@

    Atributos

    diff --git a/docs/classEnemy-members.html b/docs/classEnemy-members.html index d016cfd5..4d694296 100644 --- a/docs/classEnemy-members.html +++ b/docs/classEnemy-members.html @@ -121,7 +121,7 @@ diff --git a/docs/classEnemy.html b/docs/classEnemy.html index 7f9bebb3..3539e793 100644 --- a/docs/classEnemy.html +++ b/docs/classEnemy.html @@ -730,7 +730,7 @@

    Atributos

    diff --git a/docs/classGame-members.html b/docs/classGame-members.html index c0366e1e..5522abb7 100644 --- a/docs/classGame-members.html +++ b/docs/classGame-members.html @@ -128,7 +128,7 @@ diff --git a/docs/classGame.html b/docs/classGame.html index cf29f98a..3ba46ce5 100644 --- a/docs/classGame.html +++ b/docs/classGame.html @@ -1034,7 +1034,7 @@

    Atributos

    diff --git a/docs/classGameObject-members.html b/docs/classGameObject-members.html index f2ff00e0..82289d7e 100644 --- a/docs/classGameObject-members.html +++ b/docs/classGameObject-members.html @@ -108,7 +108,7 @@ diff --git a/docs/classGameObject.html b/docs/classGameObject.html index de076a1d..4e60d9b6 100644 --- a/docs/classGameObject.html +++ b/docs/classGameObject.html @@ -529,7 +529,7 @@

    Atributos

    diff --git a/docs/classGameResources-members.html b/docs/classGameResources-members.html index ce3f6df5..14a443da 100644 --- a/docs/classGameResources-members.html +++ b/docs/classGameResources-members.html @@ -101,7 +101,7 @@ diff --git a/docs/classGameResources.html b/docs/classGameResources.html index 38e41371..1429c9d9 100644 --- a/docs/classGameResources.html +++ b/docs/classGameResources.html @@ -369,7 +369,7 @@

    Atributos

    diff --git a/docs/classHitPoints-members.html b/docs/classHitPoints-members.html index ead87551..51e15547 100644 --- a/docs/classHitPoints-members.html +++ b/docs/classHitPoints-members.html @@ -101,7 +101,7 @@ diff --git a/docs/classHitPoints.html b/docs/classHitPoints.html index 51e0cbfe..6688b009 100644 --- a/docs/classHitPoints.html +++ b/docs/classHitPoints.html @@ -308,12 +308,12 @@

    Atributos


    A documentação para esta classe foi gerada a partir dos seguintes arquivos: diff --git a/docs/classInputManager-members.html b/docs/classInputManager-members.html index 1cf4678c..3723b368 100644 --- a/docs/classInputManager-members.html +++ b/docs/classInputManager-members.html @@ -134,7 +134,7 @@ diff --git a/docs/classInputManager.html b/docs/classInputManager.html index f5e7140c..7c129baa 100644 --- a/docs/classInputManager.html +++ b/docs/classInputManager.html @@ -1181,7 +1181,7 @@

    Atributos

    diff --git a/docs/classMusic-members.html b/docs/classMusic-members.html index 00b739e4..3ca6f47c 100644 --- a/docs/classMusic-members.html +++ b/docs/classMusic-members.html @@ -100,7 +100,7 @@ diff --git a/docs/classMusic.html b/docs/classMusic.html index 9ebc8f0e..00e09a7a 100644 --- a/docs/classMusic.html +++ b/docs/classMusic.html @@ -302,7 +302,7 @@

    Atributos

    diff --git a/docs/classRect-members.html b/docs/classRect-members.html index 41cbc443..a96624cf 100644 --- a/docs/classRect-members.html +++ b/docs/classRect-members.html @@ -107,7 +107,7 @@ diff --git a/docs/classRect.html b/docs/classRect.html index bd62bdfd..cb57b57d 100644 --- a/docs/classRect.html +++ b/docs/classRect.html @@ -427,7 +427,7 @@

    Atributos

    diff --git a/docs/classResources-members.html b/docs/classResources-members.html index 742d4a44..8f9ac11e 100644 --- a/docs/classResources-members.html +++ b/docs/classResources-members.html @@ -113,7 +113,7 @@ diff --git a/docs/classResources.html b/docs/classResources.html index b8d495f9..0f4450a9 100644 --- a/docs/classResources.html +++ b/docs/classResources.html @@ -760,7 +760,7 @@

    Atributos

    diff --git a/docs/classSound-members.html b/docs/classSound-members.html index 5028205b..f86798ef 100644 --- a/docs/classSound-members.html +++ b/docs/classSound-members.html @@ -101,7 +101,7 @@ diff --git a/docs/classSound.html b/docs/classSound.html index df31f116..f5a7f7f1 100644 --- a/docs/classSound.html +++ b/docs/classSound.html @@ -324,7 +324,7 @@

    Atributos

    diff --git a/docs/classSprite-members.html b/docs/classSprite-members.html index 0748edb2..c43dce2b 100644 --- a/docs/classSprite-members.html +++ b/docs/classSprite-members.html @@ -126,7 +126,7 @@ diff --git a/docs/classSprite.html b/docs/classSprite.html index f7dc06e0..39f23c7d 100644 --- a/docs/classSprite.html +++ b/docs/classSprite.html @@ -998,7 +998,7 @@

    Atributos

    diff --git a/docs/classStageState-members.html b/docs/classStageState-members.html index 6c12467f..5e5c9a75 100644 --- a/docs/classStageState-members.html +++ b/docs/classStageState-members.html @@ -118,7 +118,7 @@ diff --git a/docs/classStageState.html b/docs/classStageState.html index d889ad72..8a1dfe74 100644 --- a/docs/classStageState.html +++ b/docs/classStageState.html @@ -524,7 +524,7 @@

    Atributos

    diff --git a/docs/classState-members.html b/docs/classState-members.html index eb607325..3c953bbd 100644 --- a/docs/classState-members.html +++ b/docs/classState-members.html @@ -107,7 +107,7 @@ diff --git a/docs/classState.html b/docs/classState.html index f2553650..ce87cbdd 100644 --- a/docs/classState.html +++ b/docs/classState.html @@ -529,7 +529,7 @@

    Atributos

    diff --git a/docs/classStateData-members.html b/docs/classStateData-members.html index 3d17fb9b..ae117910 100644 --- a/docs/classStateData-members.html +++ b/docs/classStateData-members.html @@ -96,7 +96,7 @@ diff --git a/docs/classStateData.html b/docs/classStateData.html index 785a9691..6f629a6f 100644 --- a/docs/classStateData.html +++ b/docs/classStateData.html @@ -186,7 +186,7 @@

    Atributos

    diff --git a/docs/classText-members.html b/docs/classText-members.html index f6a281fc..19eb09ef 100644 --- a/docs/classText-members.html +++ b/docs/classText-members.html @@ -118,7 +118,7 @@ diff --git a/docs/classText.html b/docs/classText.html index 6589233b..1fb32952 100644 --- a/docs/classText.html +++ b/docs/classText.html @@ -787,7 +787,7 @@

    Atributos

    diff --git a/docs/classTileMap-members.html b/docs/classTileMap-members.html index 95a4153b..ea631e48 100644 --- a/docs/classTileMap-members.html +++ b/docs/classTileMap-members.html @@ -121,7 +121,7 @@ diff --git a/docs/classTileMap.html b/docs/classTileMap.html index e01464ae..fafa046d 100644 --- a/docs/classTileMap.html +++ b/docs/classTileMap.html @@ -991,7 +991,7 @@

    Atributos

    diff --git a/docs/classTileSet-members.html b/docs/classTileSet-members.html index 702594e4..095ef10c 100644 --- a/docs/classTileSet-members.html +++ b/docs/classTileSet-members.html @@ -102,7 +102,7 @@ diff --git a/docs/classTileSet.html b/docs/classTileSet.html index c9c76f84..57d95dd1 100644 --- a/docs/classTileSet.html +++ b/docs/classTileSet.html @@ -375,7 +375,7 @@

    Atributos

    diff --git a/docs/classTimer-members.html b/docs/classTimer-members.html index 018eb87b..f42ab50a 100644 --- a/docs/classTimer-members.html +++ b/docs/classTimer-members.html @@ -98,7 +98,7 @@ diff --git a/docs/classTimer.html b/docs/classTimer.html index 0a3880b3..a68cca26 100644 --- a/docs/classTimer.html +++ b/docs/classTimer.html @@ -239,7 +239,7 @@

    Atributos

    diff --git a/docs/classTitleState-members.html b/docs/classTitleState-members.html index 3e5b808c..4943a135 100644 --- a/docs/classTitleState-members.html +++ b/docs/classTitleState-members.html @@ -109,7 +109,7 @@ diff --git a/docs/classTitleState.html b/docs/classTitleState.html index ac16b8f0..b042f01e 100644 --- a/docs/classTitleState.html +++ b/docs/classTitleState.html @@ -330,7 +330,7 @@

    Atributos

    diff --git a/docs/classTower-members.html b/docs/classTower-members.html index cc4ce3fb..d2f3756d 100644 --- a/docs/classTower-members.html +++ b/docs/classTower-members.html @@ -121,7 +121,7 @@ diff --git a/docs/classTower.html b/docs/classTower.html index c888981e..4ad2cf62 100644 --- a/docs/classTower.html +++ b/docs/classTower.html @@ -566,7 +566,7 @@

    Atributos

    diff --git a/docs/classVec2-members.html b/docs/classVec2-members.html index 3f61a5c0..e4b99d91 100644 --- a/docs/classVec2-members.html +++ b/docs/classVec2-members.html @@ -115,7 +115,7 @@ diff --git a/docs/classVec2.html b/docs/classVec2.html index ca49d273..a62d0fc0 100644 --- a/docs/classVec2.html +++ b/docs/classVec2.html @@ -648,7 +648,7 @@

    Atributos

    diff --git a/docs/classWaveManager-members.html b/docs/classWaveManager-members.html index 18907ddc..2905a15a 100644 --- a/docs/classWaveManager-members.html +++ b/docs/classWaveManager-members.html @@ -118,7 +118,7 @@ diff --git a/docs/classWaveManager.html b/docs/classWaveManager.html index 8e4779cf..272f68bc 100644 --- a/docs/classWaveManager.html +++ b/docs/classWaveManager.html @@ -763,7 +763,7 @@

    Atributos

    diff --git a/docs/classes.html b/docs/classes.html index 0210f497..812bb177 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -123,7 +123,7 @@ diff --git a/docs/dir_000002_000001.html b/docs/dir_000002_000001.html index 1484927b..1dfd7aec 100644 --- a/docs/dir_000002_000001.html +++ b/docs/dir_000002_000001.html @@ -79,10 +79,10 @@ +

    Relação src → include

    Arquivo em Engine/srcInclui arquivo em Engine/include
    ActionManager.cppActionManager.h
    AIGoDown.cppAIGoDown.h
    Animation.cppAnimation.h
    Animation.cppCamera.h
    Camera.cppCamera.h
    Camera.cppError.h
    Camera.cppGame.h
    Camera.cppInputManager.h
    Color.cppColor.h
    Component.cppComponent.h
    DragAndDrop.cppCamera.h
    DragAndDrop.cppDragAndDrop.h
    DragAndDrop.cppError.h
    DragAndDrop.cppInputManager.h
    Game.cppError.h
    Game.cppGame.h
    Game.cppResources.h
    GameObject.cppCamera.h
    GameObject.cppError.h
    GameObject.cppGameObject.h
    HitPoints.cppHitPoints.h
    InputManager.cppError.h
    InputManager.cppInputManager.h
    Music.cppMusic.h
    Rect.cppRect.h
    Resources.cppError.h
    Resources.cppGame.h
    Resources.cppResources.h
    Sound.cppResources.h
    Sound.cppSound.h
    Sprite.cppCamera.h
    Sprite.cppError.h
    Sprite.cppGame.h
    Sprite.cppResources.h
    Sprite.cppSprite.h
    State.cppCamera.h
    State.cppError.h
    State.cppState.h
    Text.cppText.h
    TileMap.cppCamera.h
    TileMap.cppError.h
    TileMap.cppInputManager.h
    TileMap.cppTileMap.h
    Tileset.cppCamera.h
    Tileset.cppError.h
    Tileset.cppGame.h
    Tileset.cppTileset.h
    Timer.cppTimer.h
    Vec2.cppError.h
    Vec2.cppVec2.h
    diff --git a/docs/dir_000004_000000.html b/docs/dir_000004_000000.html index caf392d0..7ee26163 100644 --- a/docs/dir_000004_000000.html +++ b/docs/dir_000004_000000.html @@ -82,7 +82,7 @@

    Relação include → Engine

    Arquivo em Game/includeInclui arquivo em Engine
    EndState.hinclude / GameObject.h
    EndState.hinclude / InputManager.h
    EndState.hinclude / Music.h
    EndState.hinclude / Sprite.h
    EndState.hinclude / Text.h
    EndStateData.hinclude / StateData.h
    Enemy.hinclude / Error.h
    Enemy.hinclude / GameObject.h
    Enemy.hinclude / Rect.h
    Enemy.hinclude / Sprite.h
    Enemy.hinclude / TileMap.h
    Enemy.hinclude / Timer.h
    StageState.hinclude / ActionManager.h
    StageState.hinclude / DragAndDrop.h
    StageState.hinclude / GameObject.h
    StageState.hinclude / InputManager.h
    StageState.hinclude / Music.h
    StageState.hinclude / Sprite.h
    StageState.hinclude / State.h
    StageState.hinclude / TileMap.h
    StageState.hinclude / Tileset.h
    StageState.hinclude / Timer.h
    TitleState.hinclude / ActionManager.h
    TitleState.hinclude / Sprite.h
    TitleState.hinclude / State.h
    Tower.hinclude / GameObject.h
    Tower.hinclude / Rect.h
    Tower.hinclude / Sprite.h
    Tower.hinclude / TileMap.h
    Tower.hinclude / Vec2.h
    WaveData.hinclude / Error.h
    WaveManager.hinclude / Component.h
    WaveManager.hinclude / Error.h
    WaveManager.hinclude / GameObject.h
    WaveManager.hinclude / TileMap.h
    WaveManager.hinclude / Timer.h
    diff --git a/docs/dir_000005_000000.html b/docs/dir_000005_000000.html index f75f79df..bad59245 100644 --- a/docs/dir_000005_000000.html +++ b/docs/dir_000005_000000.html @@ -79,10 +79,10 @@ +

    Relação src → Engine

    Arquivo em Game/srcInclui arquivo em Engine
    EndState.cppinclude / Camera.h
    EndStateData.cppinclude / StateData.h
    Enemy.cppinclude / AIGoDown.h
    Enemy.cppinclude / Camera.h
    Enemy.cppinclude / Error.h
    Enemy.cppinclude / HitPoints.h
    GameResources.cppinclude / Error.h
    main.cppinclude / Game.h
    StageState.cppinclude / Camera.h
    StageState.cppinclude / Collision.h
    StageState.cppinclude / Error.h
    StageState.cppinclude / Game.h
    StageState.cppinclude / SDL_include.h
    TitleState.cppinclude / Camera.h
    TitleState.cppinclude / Game.h
    TitleState.cppinclude / InputManager.h
    Tower.cppinclude / Camera.h
    Tower.cppinclude / DragAndDrop.h
    Tower.cppinclude / Error.h
    WaveManager.cppinclude / Error.h
    WaveManager.cppinclude / Game.h
    WaveManager.cppinclude / InputManager.h
    WaveManager.cppinclude / TileMap.h
    WaveManager.cppinclude / Vec2.h
    diff --git a/docs/dir_000005_000004.html b/docs/dir_000005_000004.html index 7f0eeb15..3360a667 100644 --- a/docs/dir_000005_000004.html +++ b/docs/dir_000005_000004.html @@ -82,7 +82,7 @@

    Relação src → include

    Arquivo em Game/srcInclui arquivo em Game/include
    EndState.cppEndState.h
    EndStateData.cppDefines.h
    Enemy.cppEnemy.h
    GameResources.cppGameResources.h
    main.cppTitleState.h
    StageState.cppEndStateData.h
    StageState.cppEnemy.h
    StageState.cppStageState.h
    StageState.cppTower.h
    TitleState.cppStageState.h
    TitleState.cppTitleState.h
    Tower.cppTower.h
    WaveData.cppWaveData.h
    WaveManager.cppEnemy.h
    WaveManager.cppGameResources.h
    WaveManager.cppWaveManager.h
    diff --git a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html index 35d4b889..7a34bec4 100644 --- a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html +++ b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html @@ -100,7 +100,7 @@ diff --git a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html index 02c5046f..43b9c3b8 100644 --- a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html +++ b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html @@ -150,7 +150,7 @@ diff --git a/docs/dir_a56613a6b795b5624452287469afc550.html b/docs/dir_a56613a6b795b5624452287469afc550.html index 1ae9ca2f..08c39320 100644 --- a/docs/dir_a56613a6b795b5624452287469afc550.html +++ b/docs/dir_a56613a6b795b5624452287469afc550.html @@ -116,7 +116,7 @@ diff --git a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html index 7925a914..815a4f53 100644 --- a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html +++ b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html @@ -110,7 +110,7 @@   arquivo  GameObject.cpp   -arquivo  HItPoints.cpp +arquivo  HitPoints.cpp   arquivo  InputManager.cpp   @@ -140,7 +140,7 @@ diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1.html b/docs/dir_c33286056d2acf479cd8641ef845fec1.html index 749a3737..066638b3 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1.html +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1.html @@ -100,7 +100,7 @@ diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.map b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.map index d75bf877..41030ec4 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.map +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.map @@ -4,6 +4,6 @@ - + diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.md5 b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.md5 index e71882df..a766d63a 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.md5 +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.md5 @@ -1 +1 @@ -9205bfe8d33d7ae57ebd17c3af64bc56 \ No newline at end of file +e969647e27bfff5d21f08600171d534b \ No newline at end of file diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg index 64dccaf9..eb431ed5 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg @@ -65,8 +65,8 @@ dir_d858f423bf5825f9a3db826b6a54a3cc->dir_0b6ee6e7e9547e675db4add2e5de97da - -23 + +24 diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html index 35ac9066..b7726ffd 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html @@ -116,7 +116,7 @@ diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.map b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.map index b51235de..c8c97c6f 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.map +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.map @@ -1,7 +1,7 @@ - + diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.md5 b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.md5 index 54281e41..e363a350 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.md5 +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.md5 @@ -1 +1 @@ -2b4069ee056a4ad8d3f18a9ebcecf7bc \ No newline at end of file +aae8eead0916ff80dfbb30ceeb0645e4 \ No newline at end of file diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg index 730d8315..0e3bee14 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg @@ -36,8 +36,8 @@ dir_d858f423bf5825f9a3db826b6a54a3cc->dir_0b6ee6e7e9547e675db4add2e5de97da - -23 + +24 diff --git a/docs/files.html b/docs/files.html index 83f8f968..9457ca46 100644 --- a/docs/files.html +++ b/docs/files.html @@ -126,7 +126,7 @@  DragAndDrop.cpp  Game.cpp  GameObject.cpp - HItPoints.cpp + HitPoints.cpp  InputManager.cpp  Music.cpp  Rect.cpp @@ -167,7 +167,7 @@ diff --git a/docs/functions.html b/docs/functions.html index 28476703..519bf386 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -160,7 +160,7 @@

    - a -

      diff --git a/docs/functions_b.html b/docs/functions_b.html index fa96d399..10a4a0af 100644 --- a/docs/functions_b.html +++ b/docs/functions_b.html @@ -158,7 +158,7 @@

      - b -

        diff --git a/docs/functions_c.html b/docs/functions_c.html index a96ff100..fe128088 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -204,17 +204,17 @@

        - c -

        diff --git a/docs/functions_d.html b/docs/functions_d.html index 42b9e18c..ab5f428a 100644 --- a/docs/functions_d.html +++ b/docs/functions_d.html @@ -158,7 +158,7 @@

        - d -

          diff --git a/docs/functions_e.html b/docs/functions_e.html index f454de2a..6f70ceeb 100644 --- a/docs/functions_e.html +++ b/docs/functions_e.html @@ -178,7 +178,7 @@

          - e -

            diff --git a/docs/functions_enum.html b/docs/functions_enum.html index 8fef47b6..83ca5ca5 100644 --- a/docs/functions_enum.html +++ b/docs/functions_enum.html @@ -101,7 +101,7 @@ diff --git a/docs/functions_eval.html b/docs/functions_eval.html index 7434d96a..4a09fc23 100644 --- a/docs/functions_eval.html +++ b/docs/functions_eval.html @@ -113,7 +113,7 @@ diff --git a/docs/functions_f.html b/docs/functions_f.html index 43a77973..40f82f6f 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -144,15 +144,18 @@

            - f -

            • fontTable : Resources
            • +
            • ForceLinearZoom() +: Camera +
            • +
            • ForceLogZoom() +: Camera +
            • ForceMusicVolume() : Resources
            • ForceSoundVolume() : Resources
            • -
            • ForceZoom() -: Camera -
            • frameCount : Sprite
            • @@ -172,7 +175,7 @@

              - f -

                diff --git a/docs/functions_func.html b/docs/functions_func.html index 6146368f..26b49692 100644 --- a/docs/functions_func.html +++ b/docs/functions_func.html @@ -149,7 +149,7 @@

                - a -

                  diff --git a/docs/functions_func_b.html b/docs/functions_func_b.html index b00dd356..b5484f76 100644 --- a/docs/functions_func_b.html +++ b/docs/functions_func_b.html @@ -134,7 +134,7 @@

                  - b -

                    diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html index 17197591..308a1660 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -164,7 +164,7 @@

                    - c -

                      diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index 387b12f5..e8bb9f24 100644 --- a/docs/functions_func_d.html +++ b/docs/functions_func_d.html @@ -143,7 +143,7 @@

                      - d -

                        diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html index 9f1475fc..50551cb2 100644 --- a/docs/functions_func_e.html +++ b/docs/functions_func_e.html @@ -149,7 +149,7 @@

                        - e -

                          diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html index e596da0b..a2c19a47 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -127,15 +127,18 @@

                          - f -

                          • Follow() : Camera
                          • +
                          • ForceLinearZoom() +: Camera +
                          • +
                          • ForceLogZoom() +: Camera +
                          • ForceMusicVolume() : Resources
                          • ForceSoundVolume() : Resources
                          • -
                          • ForceZoom() -: Camera -
                          • FromPolarCoord() : Vec2
                          • @@ -143,7 +146,7 @@

                            - f -

                              diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index 4308124d..7e9596a8 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -180,6 +180,12 @@

                              - g -

                              • GetLifesLeft() : WaveManager
                              • +
                              • GetLinearZoom() +: Camera +
                              • +
                              • GetLogZoom() +: Camera +
                              • GetMaxFramerate() : Game
                              • @@ -256,14 +262,11 @@

                                - g -

                                diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index cc15e044..092f3d65 100644 --- a/docs/functions_func_h.html +++ b/docs/functions_func_h.html @@ -131,7 +131,7 @@

                                - h -

                                  diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html index 6e3e3566..4d812196 100644 --- a/docs/functions_func_i.html +++ b/docs/functions_func_i.html @@ -197,7 +197,7 @@

                                  - i -

                                    diff --git a/docs/functions_func_k.html b/docs/functions_func_k.html index af0f16f3..3d6f590d 100644 --- a/docs/functions_func_k.html +++ b/docs/functions_func_k.html @@ -134,7 +134,7 @@

                                    - k -

                                      diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html index fdded572..1da0953a 100644 --- a/docs/functions_func_l.html +++ b/docs/functions_func_l.html @@ -140,7 +140,7 @@

                                      - l -

                                        diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html index c580696d..cd513c39 100644 --- a/docs/functions_func_m.html +++ b/docs/functions_func_m.html @@ -149,7 +149,7 @@

                                        - m -

                                          diff --git a/docs/functions_func_n.html b/docs/functions_func_n.html index fb2e1d3a..9777418c 100644 --- a/docs/functions_func_n.html +++ b/docs/functions_func_n.html @@ -146,7 +146,7 @@

                                          - n -

                                            diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html index f5e34da8..27bf6547 100644 --- a/docs/functions_func_o.html +++ b/docs/functions_func_o.html @@ -167,7 +167,7 @@

                                            - o -

                                              diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html index ac43a949..5a2a5a8a 100644 --- a/docs/functions_func_p.html +++ b/docs/functions_func_p.html @@ -144,7 +144,7 @@

                                              - p -

                                                diff --git a/docs/functions_func_q.html b/docs/functions_func_q.html index 5546953f..b761f3ea 100644 --- a/docs/functions_func_q.html +++ b/docs/functions_func_q.html @@ -132,7 +132,7 @@

                                                - q -

                                                  diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html index 4e26c14d..244ff6d4 100644 --- a/docs/functions_func_r.html +++ b/docs/functions_func_r.html @@ -197,7 +197,7 @@

                                                  - r -

                                                    diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index d56512eb..308d70bc 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -170,7 +170,7 @@

                                                    - s -

                                                      : Sprite
                                                    • SetSpeedLimits() -: Camera +: Camera
                                                    • SetStrobeFrequency() : Text @@ -209,7 +209,7 @@

                                                      - s -

                                                        : Camera
                                                      • SetZoomLimits() -: Camera +: Camera
                                                      • SetZoomSpeed() : Camera @@ -246,7 +246,7 @@

                                                        - s -

                                                          diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index 36af7889..1e94a63f 100644 --- a/docs/functions_func_t.html +++ b/docs/functions_func_t.html @@ -146,7 +146,7 @@

                                                          - t -

                                                            diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html index 4e04d3bf..f4271dc4 100644 --- a/docs/functions_func_u.html +++ b/docs/functions_func_u.html @@ -160,7 +160,7 @@

                                                            - u -

                                                              diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html index ad11dc0c..353a97c2 100644 --- a/docs/functions_func_v.html +++ b/docs/functions_func_v.html @@ -131,7 +131,7 @@

                                                              - v -

                                                                diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html index e33524dc..f2c0c7d7 100644 --- a/docs/functions_func_w.html +++ b/docs/functions_func_w.html @@ -134,7 +134,7 @@

                                                                - w -

                                                                  diff --git a/docs/functions_func_z.html b/docs/functions_func_z.html index c5342986..fc5f8b9d 100644 --- a/docs/functions_func_z.html +++ b/docs/functions_func_z.html @@ -131,7 +131,7 @@

                                                                  - z -

                                                                    diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html index 7b4a5ed0..5d1eead7 100644 --- a/docs/functions_func_~.html +++ b/docs/functions_func_~.html @@ -164,7 +164,7 @@

                                                                    - ~ -

                                                                      diff --git a/docs/functions_g.html b/docs/functions_g.html index d736507d..8f3fca14 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -188,6 +188,12 @@

                                                                      - g -

                                                                      • GetLifesLeft() : WaveManager
                                                                      • +
                                                                      • GetLinearZoom() +: Camera +
                                                                      • +
                                                                      • GetLogZoom() +: Camera +
                                                                      • GetMaxFramerate() : Game
                                                                      • @@ -264,14 +270,11 @@

                                                                        - g -

                                                                        diff --git a/docs/functions_h.html b/docs/functions_h.html index 6808ae0a..a9a63201 100644 --- a/docs/functions_h.html +++ b/docs/functions_h.html @@ -154,7 +154,7 @@

                                                                        - h -

                                                                          diff --git a/docs/functions_i.html b/docs/functions_i.html index c1f3e0ce..7824d3f0 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -220,7 +220,7 @@

                                                                          - i -

                                                                            diff --git a/docs/functions_k.html b/docs/functions_k.html index a33f9387..fb62a197 100644 --- a/docs/functions_k.html +++ b/docs/functions_k.html @@ -142,7 +142,7 @@

                                                                            - k -

                                                                              diff --git a/docs/functions_l.html b/docs/functions_l.html index af71d4b9..044b4310 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -141,11 +141,14 @@

                                                                              - l -

                                                                              diff --git a/docs/functions_m.html b/docs/functions_m.html index 55693da1..e526b8aa 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -144,27 +144,27 @@

                                                                              - m -

                                                                              • maxFramerate : Game
                                                                              • +
                                                                              • maxLogZoom +: Camera +
                                                                              • maxNumberOfEnemiesInSpawnPoint : WaveManager
                                                                              • maxSpeed : Camera
                                                                              • -
                                                                              • maxZoom -: Camera -
                                                                              • MEDICINE : Tower
                                                                              • MemberMult() : Vec2
                                                                              • +
                                                                              • minLogZoom +: Camera +
                                                                              • minSpeed : Camera
                                                                              • -
                                                                              • minZoom -: Camera -
                                                                              • MousePress() : InputManager
                                                                              • @@ -212,7 +212,7 @@

                                                                                - m -

                                                                                  diff --git a/docs/functions_n.html b/docs/functions_n.html index 6b710d3d..43cc9bda 100644 --- a/docs/functions_n.html +++ b/docs/functions_n.html @@ -157,7 +157,7 @@

                                                                                  - n -

                                                                                    diff --git a/docs/functions_o.html b/docs/functions_o.html index b35d1f6d..cdc156b7 100644 --- a/docs/functions_o.html +++ b/docs/functions_o.html @@ -175,7 +175,7 @@

                                                                                    - o -

                                                                                      diff --git a/docs/functions_p.html b/docs/functions_p.html index 15f89311..b99be848 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -164,7 +164,7 @@

                                                                                      - p -

                                                                                        diff --git a/docs/functions_q.html b/docs/functions_q.html index d12cf7cf..8690cabf 100644 --- a/docs/functions_q.html +++ b/docs/functions_q.html @@ -145,7 +145,7 @@

                                                                                        - q -

                                                                                          diff --git a/docs/functions_r.html b/docs/functions_r.html index 1a91c7da..83b0b2f9 100644 --- a/docs/functions_r.html +++ b/docs/functions_r.html @@ -214,7 +214,7 @@

                                                                                          - r -

                                                                                            diff --git a/docs/functions_s.html b/docs/functions_s.html index 43d2b100..740c3784 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -140,13 +140,11 @@

                                                                                            - s -

                                                                                            • scaleY : EnemyData +, Sprite
                                                                                            • ScaleY() : Sprite
                                                                                            • -
                                                                                            • scaleY -: Sprite -
                                                                                            • ScreenToWorld() : Camera
                                                                                            • @@ -184,7 +182,7 @@

                                                                                              - s -

                                                                                                : Sprite
                                                                                              • SetSpeedLimits() -: Camera +: Camera
                                                                                              • SetStrobeFrequency() : Text @@ -223,7 +221,7 @@

                                                                                                - s -

                                                                                                  : Camera
                                                                                                • SetZoomLimits() -: Camera +: Camera
                                                                                                • SetZoomSpeed() : Camera @@ -309,7 +307,7 @@

                                                                                                  - s -

                                                                                                    diff --git a/docs/functions_t.html b/docs/functions_t.html index a830536a..a0637243 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -126,12 +126,12 @@
                                                                                                    Esta é a lista de todos os membros de classes com referências para a classe a que pertencem:

                                                                                                    - t -

                                                                                                      -
                                                                                                    • text -: Text -
                                                                                                    • Text() : Text
                                                                                                    • +
                                                                                                    • text +: Text +
                                                                                                    • textTime : Text
                                                                                                    • @@ -158,13 +158,11 @@

                                                                                                      - t -

                                                                                                      • tileSet : StageState , TileMap +, TileSet
                                                                                                      • TileSet() : TileSet
                                                                                                      • -
                                                                                                      • tileSet -: TileSet -
                                                                                                      • tileWidth : TileSet
                                                                                                      • @@ -193,7 +191,7 @@

                                                                                                        - t -

                                                                                                          : Tower
                                                                                                        • TowerType -: Tower +: Tower
                                                                                                        • type : Enemy @@ -202,7 +200,7 @@

                                                                                                          - t -

                                                                                                            diff --git a/docs/functions_type.html b/docs/functions_type.html index 0991ae53..59947cff 100644 --- a/docs/functions_type.html +++ b/docs/functions_type.html @@ -101,7 +101,7 @@ diff --git a/docs/functions_u.html b/docs/functions_u.html index 97059945..569a4d01 100644 --- a/docs/functions_u.html +++ b/docs/functions_u.html @@ -165,7 +165,7 @@

                                                                                                            - u -

                                                                                                              diff --git a/docs/functions_v.html b/docs/functions_v.html index 93ac8e28..d00fdfa4 100644 --- a/docs/functions_v.html +++ b/docs/functions_v.html @@ -133,7 +133,7 @@

                                                                                                              - v -

                                                                                                                diff --git a/docs/functions_vars.html b/docs/functions_vars.html index 0686d728..648a6aa4 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -199,12 +199,12 @@

                                                                                                                - c -

                                                                                                                @@ -356,6 +356,9 @@

                                                                                                                - l -

                                                                                                                @@ -372,21 +375,21 @@

                                                                                                                - m -

                                                                                                                • maxFramerate : Game
                                                                                                                • +
                                                                                                                • maxLogZoom +: Camera +
                                                                                                                • maxNumberOfEnemiesInSpawnPoint : WaveManager
                                                                                                                • maxSpeed : Camera
                                                                                                                • -
                                                                                                                • maxZoom -: Camera +
                                                                                                                • minLogZoom +: Camera
                                                                                                                • minSpeed : Camera
                                                                                                                • -
                                                                                                                • minZoom -: Camera -
                                                                                                                • mouseScroolState : InputManager
                                                                                                                • @@ -668,14 +671,11 @@

                                                                                                                  - z -

                                                                                                                  diff --git a/docs/functions_w.html b/docs/functions_w.html index 2d9c2c46..0e37c909 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -167,13 +167,13 @@

                                                                                                                  - w -

                                                                                                                  diff --git a/docs/functions_x.html b/docs/functions_x.html index aff438db..5828113e 100644 --- a/docs/functions_x.html +++ b/docs/functions_x.html @@ -134,7 +134,7 @@

                                                                                                                  - x -

                                                                                                                    diff --git a/docs/functions_y.html b/docs/functions_y.html index 477e7ee1..83827edd 100644 --- a/docs/functions_y.html +++ b/docs/functions_y.html @@ -134,7 +134,7 @@

                                                                                                                    - y -

                                                                                                                      diff --git a/docs/functions_z.html b/docs/functions_z.html index 21ae14af..d5d356fa 100644 --- a/docs/functions_z.html +++ b/docs/functions_z.html @@ -132,14 +132,11 @@

                                                                                                                      - z -

                                                                                                                      diff --git a/docs/functions_~.html b/docs/functions_~.html index a081580f..c746e459 100644 --- a/docs/functions_~.html +++ b/docs/functions_~.html @@ -166,7 +166,7 @@

                                                                                                                      - ~ -

                                                                                                                        diff --git a/docs/globals.html b/docs/globals.html index 4f15dccb..a40a030e 100644 --- a/docs/globals.html +++ b/docs/globals.html @@ -162,26 +162,29 @@

                                                                                                                        - c -

                                                                                                                        • CAM_START_ZOOM : StageState.cpp
                                                                                                                        • +
                                                                                                                        • CAMERA_DEFAULT_LOG_ZOOM_SPEED +: Camera.h +
                                                                                                                        • +
                                                                                                                        • CAMERA_DEFAULT_MAX_LOG_ZOOM +: Camera.h +
                                                                                                                        • CAMERA_DEFAULT_MAX_SPEED : Camera.h
                                                                                                                        • -
                                                                                                                        • CAMERA_DEFAULT_MAX_ZOOM -: Camera.h +
                                                                                                                        • CAMERA_DEFAULT_MIN_LOG_ZOOM +: Camera.h
                                                                                                                        • CAMERA_DEFAULT_MIN_SPEED : Camera.h
                                                                                                                        • -
                                                                                                                        • CAMERA_DEFAULT_MIN_ZOOM -: Camera.h -
                                                                                                                        • -
                                                                                                                        • CAMERA_DEFAULT_ZOOM_SPEED -: Camera.h +
                                                                                                                        • CAMERA_DEFAULT_MOVE_SPEED +: Camera.h
                                                                                                                        • CAMERA_DEFAULT_ZOOMABLE : Camera.h
                                                                                                                        • -
                                                                                                                        • CAMERA_MOVE_SPEED -: Camera.cpp +
                                                                                                                        • CAMERA_LOG_ZOOM_BASE +: Camera.h
                                                                                                                        • CHECK_SDL_ERROR : Error.h @@ -302,36 +305,38 @@

                                                                                                                          - i -

                                                                                                                            : Game.h , GameObject.h , Sprite.h +, StageState.cpp , InputManager.h -, Resources.h , Text.h +, Resources.h , Sound.h , Music.h , Rect.h , Vec2.h
                                                                                                                          • INCLUDE_SDL_IMAGE -: Rect.h +: Game.h , GameObject.h , InputManager.h , Music.h +, Rect.h , Resources.h -, Game.h , Sound.h , Sprite.h , Text.h +, StageState.cpp
                                                                                                                          • INCLUDE_SDL_MIXER -: Game.h +: Resources.h , Music.h -, Resources.h , Sound.h +, Game.h , Text.h
                                                                                                                          • INCLUDE_SDL_TTF -: Text.h -, Game.h +: Game.h , Resources.h +, Text.h
                                                                                                                          • INITIAL_FRAMERATE : Game.h @@ -530,7 +535,7 @@

                                                                                                                            - w -

                                                                                                                              diff --git a/docs/globals_defs.html b/docs/globals_defs.html index f3a4dd6e..48385456 100644 --- a/docs/globals_defs.html +++ b/docs/globals_defs.html @@ -148,26 +148,29 @@

                                                                                                                              - c -

                                                                                                                              • CAM_START_ZOOM : StageState.cpp
                                                                                                                              • +
                                                                                                                              • CAMERA_DEFAULT_LOG_ZOOM_SPEED +: Camera.h +
                                                                                                                              • +
                                                                                                                              • CAMERA_DEFAULT_MAX_LOG_ZOOM +: Camera.h +
                                                                                                                              • CAMERA_DEFAULT_MAX_SPEED : Camera.h
                                                                                                                              • -
                                                                                                                              • CAMERA_DEFAULT_MAX_ZOOM -: Camera.h +
                                                                                                                              • CAMERA_DEFAULT_MIN_LOG_ZOOM +: Camera.h
                                                                                                                              • CAMERA_DEFAULT_MIN_SPEED : Camera.h
                                                                                                                              • -
                                                                                                                              • CAMERA_DEFAULT_MIN_ZOOM -: Camera.h -
                                                                                                                              • -
                                                                                                                              • CAMERA_DEFAULT_ZOOM_SPEED -: Camera.h +
                                                                                                                              • CAMERA_DEFAULT_MOVE_SPEED +: Camera.h
                                                                                                                              • CAMERA_DEFAULT_ZOOMABLE : Camera.h
                                                                                                                              • -
                                                                                                                              • CAMERA_MOVE_SPEED -: Camera.cpp +
                                                                                                                              • CAMERA_LOG_ZOOM_BASE +: Camera.h
                                                                                                                              • CHECK_SDL_ERROR : Error.h @@ -271,17 +274,19 @@

                                                                                                                                - i -

                                                                                                                                  , Sprite.h , Text.h , Vec2.h +, StageState.cpp
                                                                                                                                • INCLUDE_SDL_IMAGE -: Game.h -, GameObject.h -, InputManager.h -, Music.h +: Music.h , Rect.h , Resources.h -, Sound.h +, InputManager.h , Sprite.h , Text.h +, StageState.cpp +, Sound.h +, Game.h +, GameObject.h
                                                                                                                                • INCLUDE_SDL_MIXER : Game.h @@ -452,7 +457,7 @@

                                                                                                                                  - w -

                                                                                                                                    diff --git a/docs/globals_enum.html b/docs/globals_enum.html index 5474ef46..9241ef2b 100644 --- a/docs/globals_enum.html +++ b/docs/globals_enum.html @@ -105,7 +105,7 @@ diff --git a/docs/globals_eval.html b/docs/globals_eval.html index b7cbf6f3..9f715506 100644 --- a/docs/globals_eval.html +++ b/docs/globals_eval.html @@ -144,7 +144,7 @@ diff --git a/docs/globals_func.html b/docs/globals_func.html index 603ea1d6..9f1f06c6 100644 --- a/docs/globals_func.html +++ b/docs/globals_func.html @@ -99,7 +99,7 @@ diff --git a/docs/globals_type.html b/docs/globals_type.html index 5b5f037d..7f5f1282 100644 --- a/docs/globals_type.html +++ b/docs/globals_type.html @@ -104,7 +104,7 @@ diff --git a/docs/graph_legend.html b/docs/graph_legend.html index 331404c1..ca0b8c48 100644 --- a/docs/graph_legend.html +++ b/docs/graph_legend.html @@ -138,7 +138,7 @@ diff --git a/docs/hierarchy.html b/docs/hierarchy.html index 8b8c4e10..f8a4c23f 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -133,7 +133,7 @@ diff --git a/docs/index.html b/docs/index.html index 68d66a1b..5b76c0c7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,7 +82,7 @@ diff --git a/docs/inherits.html b/docs/inherits.html index f9d1f17e..55ffe20e 100644 --- a/docs/inherits.html +++ b/docs/inherits.html @@ -144,7 +144,7 @@ diff --git a/docs/main_8cpp.html b/docs/main_8cpp.html index ca2563f2..9e884bfe 100644 --- a/docs/main_8cpp.html +++ b/docs/main_8cpp.html @@ -136,7 +136,7 @@

                                                                                                                                    Funções

                                                                                                                                    diff --git a/docs/md_README.html b/docs/md_README.html index f2c24bdb..dde58d76 100644 --- a/docs/md_README.html +++ b/docs/md_README.html @@ -104,7 +104,7 @@ diff --git a/docs/pages.html b/docs/pages.html index be8af4c0..253c9522 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -88,7 +88,7 @@ diff --git a/docs/search/all_12.js b/docs/search/all_12.js index e8ae3a06..85dc0f9a 100644 --- a/docs/search/all_12.js +++ b/docs/search/all_12.js @@ -2,7 +2,7 @@ var searchData= [ ['scale',['Scale',['../classSprite.html#aa8b31cd4deebedbbdf8ca3923a3064c6',1,'Sprite']]], ['scalex',['ScaleX',['../classSprite.html#a42b3a6ed82560c5b97085cc127984cf4',1,'Sprite::ScaleX(float scale)'],['../classSprite.html#af76ca5d25866a3107bcec1d2e59f8bcb',1,'Sprite::scaleX()'],['../structEnemyData.html#a447a70a22f5667bc3ecab7e0f5c7bc9b',1,'EnemyData::scaleX()']]], - ['scaley',['ScaleY',['../classSprite.html#ad4a9b4df6061cf7391403a4d03286ff0',1,'Sprite::ScaleY(float scale)'],['../classSprite.html#ac4085b0144253c09bc94151a53079104',1,'Sprite::scaleY()'],['../structEnemyData.html#ab136e582c7c3e146e74b5b88ac692b74',1,'EnemyData::scaleY()']]], + ['scaley',['scaleY',['../classSprite.html#ac4085b0144253c09bc94151a53079104',1,'Sprite::scaleY()'],['../structEnemyData.html#ab136e582c7c3e146e74b5b88ac692b74',1,'EnemyData::scaleY()'],['../classSprite.html#ad4a9b4df6061cf7391403a4d03286ff0',1,'Sprite::ScaleY()']]], ['screentoworld',['ScreenToWorld',['../classCamera.html#ae9052ebbd6df7d3f72d535c6eb359aa6',1,'Camera::ScreenToWorld(Vec2 screen)'],['../classCamera.html#aea71faffba129d596f80d3ccc7a3e647',1,'Camera::ScreenToWorld(Rect screen)']]], ['sdl_5fassert',['SDL_ASSERT',['../Error_8h.html#a5e03114cdb9780c937e89ed7cb527ae1',1,'Error.h']]], ['sdl_5finclude_2eh',['SDL_include.h',['../SDL__include_8h.html',1,'']]], @@ -17,7 +17,7 @@ var searchData= ['setscale',['SetScale',['../classSprite.html#a54d18a18383575b04f397f5bec3113d0',1,'Sprite']]], ['setscalex',['SetScaleX',['../classSprite.html#aad7bb29fc017ac2197dffec177c17e15',1,'Sprite']]], ['setscaley',['SetScaleY',['../classSprite.html#a2853ee7687dc906b9be791d197a1b1b6',1,'Sprite']]], - ['setspeedlimits',['SetSpeedLimits',['../classCamera.html#a3d684757002c3096682f377261a6bb75',1,'Camera']]], + ['setspeedlimits',['SetSpeedLimits',['../classCamera.html#aa8651dfe508e12604bb9a10226bbfcdd',1,'Camera']]], ['setstrobefrequency',['SetStrobeFrequency',['../classText.html#a8170b3d5b99bca8ef161794c226841f2',1,'Text']]], ['setstyle',['SetStyle',['../classText.html#acd7cd539df681365587e86144cc3c352',1,'Text']]], ['settext',['SetText',['../classText.html#abffaafcd871424690014ca0a74c45989',1,'Text']]], @@ -30,7 +30,7 @@ var searchData= ['setwindowfullscreen',['SetWindowFullscreen',['../classGame.html#ae4842fd1cad26b54b7d505c34c34bb01',1,'Game']]], ['setwindowmaximized',['SetWindowMaximized',['../classGame.html#a9d16244451244e69aa2bdc5839cadb9f',1,'Game']]], ['setzoomable',['SetZoomable',['../classCamera.html#a3912a07e55bb225146fdaedb333c4452',1,'Camera']]], - ['setzoomlimits',['SetZoomLimits',['../classCamera.html#aa320e33bcbe395cdad9f63887ea15689',1,'Camera']]], + ['setzoomlimits',['SetZoomLimits',['../classCamera.html#a51ddbb2a2da01b556b61c5f418a9377e',1,'Camera']]], ['setzoomspeed',['SetZoomSpeed',['../classCamera.html#a4373a9b1baa7b98e4fe5859e0645baed',1,'Camera']]], ['shared',['SHARED',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a9c46e16a4ab019339596acadeefc8c53',1,'Text.h']]], ['showcollisioninfo',['ShowCollisionInfo',['../classTileMap.html#a31b1607f50b08cf2c49c71a8478ec07d',1,'TileMap']]], diff --git a/docs/search/all_13.js b/docs/search/all_13.js index 5955a169..0cf03ece 100644 --- a/docs/search/all_13.js +++ b/docs/search/all_13.js @@ -1,7 +1,7 @@ var searchData= [ ['temp_5freport_5fi_5fwas_5fhere',['TEMP_REPORT_I_WAS_HERE',['../Error_8h.html#a460a42aaa4200700dfb4a73f852e93b8',1,'Error.h']]], - ['text',['Text',['../classText.html',1,'Text'],['../classText.html#a7da8331e2da684bb0485a3ee7893b415',1,'Text::text()'],['../classText.html#aa8407cc951fc6848de89878339e6623b',1,'Text::Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, bool isStrobing=false, int x=0, int y=0)']]], + ['text',['Text',['../classText.html',1,'Text'],['../classText.html#aa8407cc951fc6848de89878339e6623b',1,'Text::Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, bool isStrobing=false, int x=0, int y=0)'],['../classText.html#a7da8331e2da684bb0485a3ee7893b415',1,'Text::text()']]], ['text_2ecpp',['Text.cpp',['../Text_8cpp.html',1,'']]], ['text_2eh',['Text.h',['../Text_8h.html',1,'']]], ['text_5ffrequency',['TEXT_FREQUENCY',['../Text_8h.html#a51c895f669b6bbf3a538dd9b2f987549',1,'Text.h']]], @@ -10,11 +10,11 @@ var searchData= ['texture',['texture',['../classSprite.html#a9f90b14f1a69209da8babfa6745dc1fe',1,'Sprite::texture()'],['../classText.html#aea2a82ef1d8b4d448b6b3e524bce2cc2',1,'Text::texture()']]], ['tile_5fvazio',['TILE_VAZIO',['../TileMap_8h.html#ac02aac1b0a1bc1430a2bf4a3cd4ab7bf',1,'TileMap.h']]], ['tileheight',['tileHeight',['../classTileSet.html#a9409211e1c5560f969b737714be977c0',1,'TileSet']]], - ['tilemap',['TileMap',['../classTileMap.html',1,'TileMap'],['../classDragAndDrop.html#a01c58a8cb41b8a635d1e1d4baf8abd00',1,'DragAndDrop::tileMap()'],['../classStageState.html#a194fde9f9ee450e63a6f1c94a79f6fc6',1,'StageState::tileMap()'],['../classWaveManager.html#a86c79df82bf76a105a472c879ee91aa9',1,'WaveManager::tileMap()'],['../classTileMap.html#acf6fe3a182047153ec9c25fadc55056c',1,'TileMap::TileMap()']]], + ['tilemap',['TileMap',['../classTileMap.html',1,'TileMap'],['../classTileMap.html#acf6fe3a182047153ec9c25fadc55056c',1,'TileMap::TileMap()'],['../classDragAndDrop.html#a01c58a8cb41b8a635d1e1d4baf8abd00',1,'DragAndDrop::tileMap()'],['../classStageState.html#a194fde9f9ee450e63a6f1c94a79f6fc6',1,'StageState::tileMap()'],['../classWaveManager.html#a86c79df82bf76a105a472c879ee91aa9',1,'WaveManager::tileMap()']]], ['tilemap_2ecpp',['TileMap.cpp',['../TileMap_8cpp.html',1,'']]], ['tilemap_2eh',['TileMap.h',['../TileMap_8h.html',1,'']]], ['tilematrix',['tileMatrix',['../classTileMap.html#ac1d3ce0587c4e615682b71fd96295e0e',1,'TileMap']]], - ['tileset',['TileSet',['../classTileSet.html',1,'TileSet'],['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet::TileSet()'],['../classTileMap.html#a24b2ea7aecfd795f1e13dfa9b0b3cb76',1,'TileMap::tileSet()'],['../classTileSet.html#adbd7ac102ce306e4f367c32cfa576979',1,'TileSet::tileSet()'],['../classStageState.html#ac1ef17645d0585767eaf96693a88d9bb',1,'StageState::tileSet()']]], + ['tileset',['TileSet',['../classTileSet.html',1,'TileSet'],['../classTileMap.html#a24b2ea7aecfd795f1e13dfa9b0b3cb76',1,'TileMap::tileSet()'],['../classTileSet.html#adbd7ac102ce306e4f367c32cfa576979',1,'TileSet::tileSet()'],['../classStageState.html#ac1ef17645d0585767eaf96693a88d9bb',1,'StageState::tileSet()'],['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet::TileSet()']]], ['tileset_2ecpp',['Tileset.cpp',['../Tileset_8cpp.html',1,'']]], ['tileset_2eh',['Tileset.h',['../Tileset_8h.html',1,'']]], ['tilewidth',['tileWidth',['../classTileSet.html#a9ba9087a6da877f78af6cdf9afb0af7c',1,'TileSet']]], diff --git a/docs/search/all_16.js b/docs/search/all_16.js index cdd94a3f..fb2827dc 100644 --- a/docs/search/all_16.js +++ b/docs/search/all_16.js @@ -10,7 +10,7 @@ var searchData= ['wavedata_2eh',['WaveData.h',['../WaveData_8h.html',1,'']]], ['wavedatamap',['waveDataMap',['../classGameResources.html#a450f1229702f5786f88d491641448177',1,'GameResources']]], ['waveindex',['waveIndex',['../classWaveManager.html#aa7a730d790a379589b8366b8652d67ef',1,'WaveManager']]], - ['wavemanager',['WaveManager',['../classWaveManager.html',1,'WaveManager'],['../classWaveManager.html#abeaaac097df73bdd816db74c00bc203e',1,'WaveManager::WaveManager()'],['../classStageState.html#a1d71967fc11fcd13f5678f69b7b05088',1,'StageState::waveManager()']]], + ['wavemanager',['WaveManager',['../classWaveManager.html',1,'WaveManager'],['../classStageState.html#a1d71967fc11fcd13f5678f69b7b05088',1,'StageState::waveManager()'],['../classWaveManager.html#abeaaac097df73bdd816db74c00bc203e',1,'WaveManager::WaveManager()']]], ['wavemanager_2ecpp',['WaveManager.cpp',['../WaveManager_8cpp.html',1,'']]], ['wavemanager_2eh',['WaveManager.h',['../WaveManager_8h.html',1,'']]], ['wavename',['waveName',['../structWaveData.html#a763662257fce043d8f04dbbe300431c4',1,'WaveData']]], diff --git a/docs/search/all_19.js b/docs/search/all_19.js index e88c80fd..8028ca36 100644 --- a/docs/search/all_19.js +++ b/docs/search/all_19.js @@ -1,6 +1,5 @@ var searchData= [ ['zoom',['Zoom',['../classCamera.html#ad6638a961e2fefbe69d4d7d0a0591fb6',1,'Camera']]], - ['zoomfixed',['zoomFixed',['../classCamera.html#a7f235a90f57567a0012ed8f4a52634ce',1,'Camera']]], - ['zoomspeed',['zoomSpeed',['../classCamera.html#a7ec8dd2dcb2c3446ba88ad30e2e195d9',1,'Camera']]] + ['zoomfixed',['zoomFixed',['../classCamera.html#a7f235a90f57567a0012ed8f4a52634ce',1,'Camera']]] ]; diff --git a/docs/search/all_2.js b/docs/search/all_2.js index 8cf5ac4c..72ed0336 100644 --- a/docs/search/all_2.js +++ b/docs/search/all_2.js @@ -8,13 +8,14 @@ var searchData= ['camera',['Camera',['../classCamera.html',1,'Camera'],['../classCamera.html#a01f94c3543f56ede7af49dc778f19331',1,'Camera::Camera()']]], ['camera_2ecpp',['Camera.cpp',['../Camera_8cpp.html',1,'']]], ['camera_2eh',['Camera.h',['../Camera_8h.html',1,'']]], + ['camera_5fdefault_5flog_5fzoom_5fspeed',['CAMERA_DEFAULT_LOG_ZOOM_SPEED',['../Camera_8h.html#a4f4942942946c042ce8919a4b7c38221',1,'Camera.h']]], + ['camera_5fdefault_5fmax_5flog_5fzoom',['CAMERA_DEFAULT_MAX_LOG_ZOOM',['../Camera_8h.html#a179a295792474b05a0e3a1830cefb1e2',1,'Camera.h']]], ['camera_5fdefault_5fmax_5fspeed',['CAMERA_DEFAULT_MAX_SPEED',['../Camera_8h.html#a19d3d4210908d99006705889d4f28013',1,'Camera.h']]], - ['camera_5fdefault_5fmax_5fzoom',['CAMERA_DEFAULT_MAX_ZOOM',['../Camera_8h.html#a53a75501f4f47ca972ec050b09df05a3',1,'Camera.h']]], + ['camera_5fdefault_5fmin_5flog_5fzoom',['CAMERA_DEFAULT_MIN_LOG_ZOOM',['../Camera_8h.html#ae068ea883cb5b930d0f3555487741d91',1,'Camera.h']]], ['camera_5fdefault_5fmin_5fspeed',['CAMERA_DEFAULT_MIN_SPEED',['../Camera_8h.html#a9569da4751beb571c5d04147a012b7fc',1,'Camera.h']]], - ['camera_5fdefault_5fmin_5fzoom',['CAMERA_DEFAULT_MIN_ZOOM',['../Camera_8h.html#a00bdac33db330ffa8021dc36c85506fe',1,'Camera.h']]], - ['camera_5fdefault_5fzoom_5fspeed',['CAMERA_DEFAULT_ZOOM_SPEED',['../Camera_8h.html#a896eaf751ce7e99c97bfaa76ca33f150',1,'Camera.h']]], + ['camera_5fdefault_5fmove_5fspeed',['CAMERA_DEFAULT_MOVE_SPEED',['../Camera_8h.html#a5ca33a5a1f6e4c62b0c2ee3ddedd62f6',1,'Camera.h']]], ['camera_5fdefault_5fzoomable',['CAMERA_DEFAULT_ZOOMABLE',['../Camera_8h.html#a719f5e3a817ca056a76495044f676277',1,'Camera.h']]], - ['camera_5fmove_5fspeed',['CAMERA_MOVE_SPEED',['../Camera_8cpp.html#a6962606bd42615342e6dc4ab58ad5cd4',1,'Camera.cpp']]], + ['camera_5flog_5fzoom_5fbase',['CAMERA_LOG_ZOOM_BASE',['../Camera_8h.html#a8f5f1d7f35d411e2df78d37e8c6e4460',1,'Camera.h']]], ['capframerate',['capFramerate',['../classGame.html#a9c4d90234bc5a4ca540b09d8a534ece1',1,'Game']]], ['center',['Center',['../classRect.html#ac42ead7988bf077364ce61231980bff2',1,'Rect']]], ['changemusicvolume',['ChangeMusicVolume',['../classResources.html#a1655776bc711f51ad1234d002c1919cd',1,'Resources']]], @@ -51,6 +52,6 @@ var searchData= ['controllerupdate',['controllerUpdate',['../classInputManager.html#a53817858b539f080e0cebad2b03cc0d2',1,'InputManager']]], ['conversao_5fgraus_5fradianos',['CONVERSAO_GRAUS_RADIANOS',['../Error_8h.html#ad7ac4f59c7725b4921af49f74536de8c',1,'Error.h']]], ['currentframe',['currentFrame',['../classSprite.html#a556cfc67b1b98691aa2e5b41f076fded',1,'Sprite']]], - ['currentspeed',['currentSpeed',['../classCamera.html#a6649a58e8ca32d16710bc01300df49fe',1,'Camera']]], - ['currentzoom',['currentZoom',['../classCamera.html#ac867d6d379c0d052ae65d57c7c313970',1,'Camera']]] + ['currentlogzoom',['currentLogZoom',['../classCamera.html#a1e954aeda32920bf73cfa4fac8ca6f94',1,'Camera']]], + ['currentspeed',['currentSpeed',['../classCamera.html#a6649a58e8ca32d16710bc01300df49fe',1,'Camera']]] ]; diff --git a/docs/search/all_5.js b/docs/search/all_5.js index cb6bc910..b9d1ca77 100644 --- a/docs/search/all_5.js +++ b/docs/search/all_5.js @@ -7,9 +7,10 @@ var searchData= ['fontfile',['fontFile',['../classText.html#aaae1164cbb6c2ce3f13e07973c74ed9a',1,'Text']]], ['fontsize',['fontSize',['../classText.html#af1b0c4c5d94f1a5338398f37e7b9ebbe',1,'Text']]], ['fonttable',['fontTable',['../classResources.html#ab3665e0c725cd7f4dbf65b128f87d0d5',1,'Resources']]], + ['forcelinearzoom',['ForceLinearZoom',['../classCamera.html#a762fab54ead424c45d0c80a71a285065',1,'Camera']]], + ['forcelogzoom',['ForceLogZoom',['../classCamera.html#a18fdd7c5f8e3d0a03e6caad30973e62b',1,'Camera']]], ['forcemusicvolume',['ForceMusicVolume',['../classResources.html#aa097a6e4c87ac8ab428aad580bd280a7',1,'Resources']]], ['forcesoundvolume',['ForceSoundVolume',['../classResources.html#a361dba49cfa4f8bca3da33a5e2aa5086',1,'Resources']]], - ['forcezoom',['ForceZoom',['../classCamera.html#a7dc4b1fd7f5e03ffb25d306fe81ee4c0',1,'Camera']]], ['framecount',['frameCount',['../classSprite.html#a8dc8d5c9530bad6113d37fe5e53e4668',1,'Sprite']]], ['frameduration',['frameDuration',['../classGame.html#a58b6a6566386b3e42c9ab72dc2188b4b',1,'Game']]], ['framestart',['frameStart',['../classGame.html#af21b5344d8b7796d5f425bdbe37a6c82',1,'Game']]], diff --git a/docs/search/all_6.js b/docs/search/all_6.js index 3269c375..571ea853 100644 --- a/docs/search/all_6.js +++ b/docs/search/all_6.js @@ -27,6 +27,8 @@ var searchData= ['getimage',['GetImage',['../classResources.html#a557aa346c974a8bce80017dbabd653d9',1,'Resources']]], ['getinstance',['GetInstance',['../classGame.html#a25d213802ed39215e3ab2cb04edf46c8',1,'Game::GetInstance()'],['../classInputManager.html#a1f095ed502f0bd09390d05cdc0acdcd9',1,'InputManager::GetInstance()']]], ['getlifesleft',['GetLifesLeft',['../classWaveManager.html#a1409142aba1b106a0c2826ca2cbb97a7',1,'WaveManager']]], + ['getlinearzoom',['GetLinearZoom',['../classCamera.html#a39817db4b58c96f1cd989e8abf2a9451',1,'Camera']]], + ['getlogzoom',['GetLogZoom',['../classCamera.html#a7a91a7e6210714a5d079d3f4f0addc49',1,'Camera']]], ['getmaxframerate',['GetMaxFramerate',['../classGame.html#aafc542fc5f826d2eed771c8bd75d6930',1,'Game']]], ['getmaxspeed',['GetMaxSpeed',['../classCamera.html#a58085208a970a15b8bb1d8edee343ad0',1,'Camera']]], ['getminspeed',['GetMinSpeed',['../classCamera.html#a4824e13cac9ebd8f79abbae248a2b614',1,'Camera']]], @@ -50,6 +52,5 @@ var searchData= ['getwindowdimensions',['GetWindowDimensions',['../classGame.html#adbeb87bbabcc73f936e149c2d83d9d33',1,'Game']]], ['getwindowfullscreen',['GetWindowFullscreen',['../classGame.html#ab578fc018939b5c1fe15b993856828ad',1,'Game']]], ['getwindowmaximized',['GetWindowMaximized',['../classGame.html#a73b7de2577d86f15887e091330513dc2',1,'Game']]], - ['getworldrenderedrect',['GetWorldRenderedRect',['../classAnimation.html#a0c0ff21f388105a5ed1560de9071f895',1,'Animation::GetWorldRenderedRect()'],['../classGameObject.html#a6144b71795035bd65b81ed36abc19638',1,'GameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]], - ['getzoom',['GetZoom',['../classCamera.html#af6fe062fcf5e1e31224d4dd9f6cafa51',1,'Camera']]] + ['getworldrenderedrect',['GetWorldRenderedRect',['../classAnimation.html#a0c0ff21f388105a5ed1560de9071f895',1,'Animation::GetWorldRenderedRect()'],['../classGameObject.html#a6144b71795035bd65b81ed36abc19638',1,'GameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]] ]; diff --git a/docs/search/all_7.js b/docs/search/all_7.js index 909ebe40..8acdf746 100644 --- a/docs/search/all_7.js +++ b/docs/search/all_7.js @@ -8,7 +8,7 @@ var searchData= ['highlight',['HIGHLIGHT',['../Sprite_8cpp.html#ab814d2aa388b74d504673d0068cab196',1,'HIGHLIGHT(): Sprite.cpp'],['../Tileset_8cpp.html#ab814d2aa388b74d504673d0068cab196',1,'HIGHLIGHT(): Tileset.cpp']]], ['hit_5fpoints',['HIT_POINTS',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a1c285fd3d6debf0339a8c8564d5abaeb',1,'ComponentType.h']]], ['hitpoints',['HitPoints',['../classHitPoints.html',1,'HitPoints'],['../classTower.html#a0abb3e35e3d258ee29977075df34cab4',1,'Tower::hitpoints()'],['../classHitPoints.html#a0a1d7b160b586f2a971cf6ca51d6c4e7',1,'HitPoints::HitPoints()']]], - ['hitpoints_2ecpp',['HItPoints.cpp',['../HItPoints_8cpp.html',1,'']]], + ['hitpoints_2ecpp',['HitPoints.cpp',['../HitPoints_8cpp.html',1,'']]], ['hitpoints_2eh',['HitPoints.h',['../HitPoints_8h.html',1,'']]], ['hostile',['HOSTILE',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea5e344b55f70ed8001ac9e7bb5d226851',1,'Enemy.h']]], ['hp',['hp',['../classHitPoints.html#a6d470de7a4934c51ab0983b4dcf7f21a',1,'HitPoints']]] diff --git a/docs/search/all_8.js b/docs/search/all_8.js index a0ae6640..41a72ed9 100644 --- a/docs/search/all_8.js +++ b/docs/search/all_8.js @@ -2,8 +2,8 @@ var searchData= [ ['imagetable',['imageTable',['../classResources.html#abb18128c6fd91ee3afe41c1947c42b02',1,'Resources']]], ['inclination',['Inclination',['../classVec2.html#a416d5d762750e1392139242fdcedb952',1,'Vec2::Inclination(void) const '],['../classVec2.html#afdc96d9f65aa822008b9cabc1f571747',1,'Vec2::Inclination(Vec2 const &b) const ']]], - ['include_5fsdl',['INCLUDE_SDL',['../Game_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Game.h'],['../GameObject_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): GameObject.h'],['../InputManager_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): InputManager.h'],['../Music_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Music.h'],['../Rect_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Rect.h'],['../Resources_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Resources.h'],['../Sound_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sound.h'],['../Sprite_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sprite.h'],['../Text_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Text.h'],['../Vec2_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Vec2.h']]], - ['include_5fsdl_5fimage',['INCLUDE_SDL_IMAGE',['../Game_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Game.h'],['../GameObject_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): GameObject.h'],['../InputManager_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): InputManager.h'],['../Music_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Music.h'],['../Rect_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Rect.h'],['../Resources_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Resources.h'],['../Sound_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sound.h'],['../Sprite_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sprite.h'],['../Text_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Text.h']]], + ['include_5fsdl',['INCLUDE_SDL',['../Game_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Game.h'],['../GameObject_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): GameObject.h'],['../InputManager_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): InputManager.h'],['../Music_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Music.h'],['../Rect_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Rect.h'],['../Resources_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Resources.h'],['../Sound_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sound.h'],['../Sprite_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sprite.h'],['../Text_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Text.h'],['../Vec2_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Vec2.h'],['../StageState_8cpp.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): StageState.cpp']]], + ['include_5fsdl_5fimage',['INCLUDE_SDL_IMAGE',['../Game_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Game.h'],['../GameObject_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): GameObject.h'],['../InputManager_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): InputManager.h'],['../Music_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Music.h'],['../Rect_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Rect.h'],['../Resources_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Resources.h'],['../Sound_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sound.h'],['../Sprite_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sprite.h'],['../Text_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Text.h'],['../StageState_8cpp.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): StageState.cpp']]], ['include_5fsdl_5fmixer',['INCLUDE_SDL_MIXER',['../Game_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Game.h'],['../Music_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Music.h'],['../Resources_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Resources.h'],['../Sound_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Sound.h'],['../Text_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Text.h']]], ['include_5fsdl_5fttf',['INCLUDE_SDL_TTF',['../Game_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Game.h'],['../Resources_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Resources.h'],['../Text_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Text.h']]], ['initial_5fframerate',['INITIAL_FRAMERATE',['../Game_8h.html#a3318188045b827a2e08aa1935eb8ff24',1,'Game.h']]], diff --git a/docs/search/all_b.js b/docs/search/all_b.js index f641d8ed..6a08c6f3 100644 --- a/docs/search/all_b.js +++ b/docs/search/all_b.js @@ -10,5 +10,6 @@ var searchData= ['lifes',['lifes',['../classStateData.html#a4cfaba2a0f99c715f37607b068617210',1,'StateData']]], ['limitframerate',['LimitFramerate',['../classGame.html#a3fb091ff0a082d2652a98fee63c62b83',1,'Game']]], ['load',['Load',['../classTileMap.html#a57d5a9e280c52b74e8e1f0c3a2c876b7',1,'TileMap']]], + ['logzoomspeed',['logZoomSpeed',['../classCamera.html#ab9c22201b3c224e7c0f6e7a6733c33ff',1,'Camera']]], ['lista_20de_20futuras_20atividades',['Lista de Futuras Atividades',['../todo.html',1,'']]] ]; diff --git a/docs/search/all_c.js b/docs/search/all_c.js index 8bdd6948..49350e66 100644 --- a/docs/search/all_c.js +++ b/docs/search/all_c.js @@ -9,15 +9,15 @@ var searchData= ['mapwidth',['mapWidth',['../classTileMap.html#ae2361e840eacaebbbbc91541ded00655',1,'TileMap']]], ['margem_5ferro_5fcomparacao',['MARGEM_ERRO_COMPARACAO',['../Vec2_8h.html#a1759b83db156ac7ed195b3e04757ee14',1,'Vec2.h']]], ['maxframerate',['maxFramerate',['../classGame.html#a5424a424548c7bdb04de05c5c836002d',1,'Game']]], + ['maxlogzoom',['maxLogZoom',['../classCamera.html#af7e88a28816f95f04e96417cd156cabb',1,'Camera']]], ['maxnumberofenemiesinspawnpoint',['maxNumberOfEnemiesInSpawnPoint',['../classWaveManager.html#a64c49de73005706f16187749699f9d0a',1,'WaveManager']]], ['maxspeed',['maxSpeed',['../classCamera.html#a1f02ea6332c710065fa256ed52acd6f1',1,'Camera']]], - ['maxzoom',['maxZoom',['../classCamera.html#af418b7887d39c773d73cb179c497a8da',1,'Camera']]], ['medicine',['MEDICINE',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174ac31db47fbddcd21f0f823dfb4d8e58de',1,'Tower']]], ['membermult',['MemberMult',['../classVec2.html#a0af80a4efc933b61b2885a815a15a77f',1,'Vec2']]], ['middle_5fmouse_5fbutton',['MIDDLE_MOUSE_BUTTON',['../InputManager_8h.html#a0f26b1a0dee82337d947288c4ebcee16',1,'InputManager.h']]], ['min_5ftime_5fshown',['MIN_TIME_SHOWN',['../Text_8h.html#ae0001748c8e43f9667011d62636fb7a0',1,'Text.h']]], + ['minlogzoom',['minLogZoom',['../classCamera.html#aaa2f4cf2d33d02125df97ead5904b192',1,'Camera']]], ['minspeed',['minSpeed',['../classCamera.html#a6c5fe02b8b21a7c9784f970f08b4864a',1,'Camera']]], - ['minzoom',['minZoom',['../classCamera.html#a65d5a8e5533b568224d9fc488bfdcb28',1,'Camera']]], ['mixer_5fchuck_5fsize',['MIXER_CHUCK_SIZE',['../Game_8h.html#aa464e7a29fa5110de8238c0cfb4458a2',1,'Game.h']]], ['mousepress',['MousePress',['../classInputManager.html#ad07e913718fc94601dfccb5c3a6fb0ae',1,'InputManager']]], ['mouserelease',['MouseRelease',['../classInputManager.html#a0056b265c8790bf862f6bff283349985',1,'InputManager']]], diff --git a/docs/search/defines_2.js b/docs/search/defines_2.js index fedb2123..94c9791c 100644 --- a/docs/search/defines_2.js +++ b/docs/search/defines_2.js @@ -3,13 +3,14 @@ var searchData= ['cam_5fstart_5fx',['CAM_START_X',['../StageState_8cpp.html#a58f35e25c13bb24aa54a987cd1ce803d',1,'StageState.cpp']]], ['cam_5fstart_5fy',['CAM_START_Y',['../StageState_8cpp.html#a23bfb27612786648f85c1d4e8268178b',1,'StageState.cpp']]], ['cam_5fstart_5fzoom',['CAM_START_ZOOM',['../StageState_8cpp.html#a3f9c38f1221c38679673d781cbefada8',1,'StageState.cpp']]], + ['camera_5fdefault_5flog_5fzoom_5fspeed',['CAMERA_DEFAULT_LOG_ZOOM_SPEED',['../Camera_8h.html#a4f4942942946c042ce8919a4b7c38221',1,'Camera.h']]], + ['camera_5fdefault_5fmax_5flog_5fzoom',['CAMERA_DEFAULT_MAX_LOG_ZOOM',['../Camera_8h.html#a179a295792474b05a0e3a1830cefb1e2',1,'Camera.h']]], ['camera_5fdefault_5fmax_5fspeed',['CAMERA_DEFAULT_MAX_SPEED',['../Camera_8h.html#a19d3d4210908d99006705889d4f28013',1,'Camera.h']]], - ['camera_5fdefault_5fmax_5fzoom',['CAMERA_DEFAULT_MAX_ZOOM',['../Camera_8h.html#a53a75501f4f47ca972ec050b09df05a3',1,'Camera.h']]], + ['camera_5fdefault_5fmin_5flog_5fzoom',['CAMERA_DEFAULT_MIN_LOG_ZOOM',['../Camera_8h.html#ae068ea883cb5b930d0f3555487741d91',1,'Camera.h']]], ['camera_5fdefault_5fmin_5fspeed',['CAMERA_DEFAULT_MIN_SPEED',['../Camera_8h.html#a9569da4751beb571c5d04147a012b7fc',1,'Camera.h']]], - ['camera_5fdefault_5fmin_5fzoom',['CAMERA_DEFAULT_MIN_ZOOM',['../Camera_8h.html#a00bdac33db330ffa8021dc36c85506fe',1,'Camera.h']]], - ['camera_5fdefault_5fzoom_5fspeed',['CAMERA_DEFAULT_ZOOM_SPEED',['../Camera_8h.html#a896eaf751ce7e99c97bfaa76ca33f150',1,'Camera.h']]], + ['camera_5fdefault_5fmove_5fspeed',['CAMERA_DEFAULT_MOVE_SPEED',['../Camera_8h.html#a5ca33a5a1f6e4c62b0c2ee3ddedd62f6',1,'Camera.h']]], ['camera_5fdefault_5fzoomable',['CAMERA_DEFAULT_ZOOMABLE',['../Camera_8h.html#a719f5e3a817ca056a76495044f676277',1,'Camera.h']]], - ['camera_5fmove_5fspeed',['CAMERA_MOVE_SPEED',['../Camera_8cpp.html#a6962606bd42615342e6dc4ab58ad5cd4',1,'Camera.cpp']]], + ['camera_5flog_5fzoom_5fbase',['CAMERA_LOG_ZOOM_BASE',['../Camera_8h.html#a8f5f1d7f35d411e2df78d37e8c6e4460',1,'Camera.h']]], ['check_5fsdl_5ferror',['CHECK_SDL_ERROR',['../Error_8h.html#ae8a1602ad06ce181163389d874118387',1,'Error.h']]], ['collision_5flayer',['COLLISION_LAYER',['../TileMap_8h.html#a22d205877ba623d755a2c7306a45170a',1,'TileMap.h']]], ['color_5fmodulation',['COLOR_MODULATION',['../Sprite_8h.html#af80a45759a911ffaa1db89816b1820ee',1,'Sprite.h']]], diff --git a/docs/search/defines_8.js b/docs/search/defines_8.js index b5d8514d..930bb762 100644 --- a/docs/search/defines_8.js +++ b/docs/search/defines_8.js @@ -1,7 +1,7 @@ var searchData= [ - ['include_5fsdl',['INCLUDE_SDL',['../Game_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Game.h'],['../GameObject_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): GameObject.h'],['../InputManager_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): InputManager.h'],['../Music_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Music.h'],['../Rect_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Rect.h'],['../Resources_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Resources.h'],['../Sound_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sound.h'],['../Sprite_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sprite.h'],['../Text_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Text.h'],['../Vec2_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Vec2.h']]], - ['include_5fsdl_5fimage',['INCLUDE_SDL_IMAGE',['../Game_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Game.h'],['../GameObject_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): GameObject.h'],['../InputManager_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): InputManager.h'],['../Music_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Music.h'],['../Rect_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Rect.h'],['../Resources_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Resources.h'],['../Sound_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sound.h'],['../Sprite_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sprite.h'],['../Text_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Text.h']]], + ['include_5fsdl',['INCLUDE_SDL',['../Game_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Game.h'],['../GameObject_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): GameObject.h'],['../InputManager_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): InputManager.h'],['../Music_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Music.h'],['../Rect_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Rect.h'],['../Resources_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Resources.h'],['../Sound_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sound.h'],['../Sprite_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Sprite.h'],['../Text_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Text.h'],['../Vec2_8h.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): Vec2.h'],['../StageState_8cpp.html#a440753f5afc6c6c9674481b90a08d5bb',1,'INCLUDE_SDL(): StageState.cpp']]], + ['include_5fsdl_5fimage',['INCLUDE_SDL_IMAGE',['../Game_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Game.h'],['../GameObject_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): GameObject.h'],['../InputManager_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): InputManager.h'],['../Music_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Music.h'],['../Rect_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Rect.h'],['../Resources_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Resources.h'],['../Sound_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sound.h'],['../Sprite_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Sprite.h'],['../Text_8h.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): Text.h'],['../StageState_8cpp.html#a178a233c88ab10d88d20403c843b5dd7',1,'INCLUDE_SDL_IMAGE(): StageState.cpp']]], ['include_5fsdl_5fmixer',['INCLUDE_SDL_MIXER',['../Game_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Game.h'],['../Music_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Music.h'],['../Resources_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Resources.h'],['../Sound_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Sound.h'],['../Text_8h.html#a97021a36b60f3b6c59f6408ff4ebc0d0',1,'INCLUDE_SDL_MIXER(): Text.h']]], ['include_5fsdl_5fttf',['INCLUDE_SDL_TTF',['../Game_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Game.h'],['../Resources_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Resources.h'],['../Text_8h.html#aad46f7f4765b889de5a07dd2d8aaa2e5',1,'INCLUDE_SDL_TTF(): Text.h']]], ['initial_5fframerate',['INITIAL_FRAMERATE',['../Game_8h.html#a3318188045b827a2e08aa1935eb8ff24',1,'Game.h']]], diff --git a/docs/search/files_5.js b/docs/search/files_5.js index 1a77ea8d..f99211ea 100644 --- a/docs/search/files_5.js +++ b/docs/search/files_5.js @@ -1,5 +1,5 @@ var searchData= [ - ['hitpoints_2ecpp',['HItPoints.cpp',['../HItPoints_8cpp.html',1,'']]], + ['hitpoints_2ecpp',['HitPoints.cpp',['../HitPoints_8cpp.html',1,'']]], ['hitpoints_2eh',['HitPoints.h',['../HitPoints_8h.html',1,'']]] ]; diff --git a/docs/search/functions_11.js b/docs/search/functions_11.js index 57dc2cb2..cc06ad78 100644 --- a/docs/search/functions_11.js +++ b/docs/search/functions_11.js @@ -15,7 +15,7 @@ var searchData= ['setscale',['SetScale',['../classSprite.html#a54d18a18383575b04f397f5bec3113d0',1,'Sprite']]], ['setscalex',['SetScaleX',['../classSprite.html#aad7bb29fc017ac2197dffec177c17e15',1,'Sprite']]], ['setscaley',['SetScaleY',['../classSprite.html#a2853ee7687dc906b9be791d197a1b1b6',1,'Sprite']]], - ['setspeedlimits',['SetSpeedLimits',['../classCamera.html#a3d684757002c3096682f377261a6bb75',1,'Camera']]], + ['setspeedlimits',['SetSpeedLimits',['../classCamera.html#aa8651dfe508e12604bb9a10226bbfcdd',1,'Camera']]], ['setstrobefrequency',['SetStrobeFrequency',['../classText.html#a8170b3d5b99bca8ef161794c226841f2',1,'Text']]], ['setstyle',['SetStyle',['../classText.html#acd7cd539df681365587e86144cc3c352',1,'Text']]], ['settext',['SetText',['../classText.html#abffaafcd871424690014ca0a74c45989',1,'Text']]], @@ -28,7 +28,7 @@ var searchData= ['setwindowfullscreen',['SetWindowFullscreen',['../classGame.html#ae4842fd1cad26b54b7d505c34c34bb01',1,'Game']]], ['setwindowmaximized',['SetWindowMaximized',['../classGame.html#a9d16244451244e69aa2bdc5839cadb9f',1,'Game']]], ['setzoomable',['SetZoomable',['../classCamera.html#a3912a07e55bb225146fdaedb333c4452',1,'Camera']]], - ['setzoomlimits',['SetZoomLimits',['../classCamera.html#aa320e33bcbe395cdad9f63887ea15689',1,'Camera']]], + ['setzoomlimits',['SetZoomLimits',['../classCamera.html#a51ddbb2a2da01b556b61c5f418a9377e',1,'Camera']]], ['setzoomspeed',['SetZoomSpeed',['../classCamera.html#a4373a9b1baa7b98e4fe5859e0645baed',1,'Camera']]], ['showcollisioninfo',['ShowCollisionInfo',['../classTileMap.html#a31b1607f50b08cf2c49c71a8478ec07d',1,'TileMap']]], ['sound',['Sound',['../classSound.html#a539c205cdf06fe2c621fd77c37bcfac9',1,'Sound::Sound()'],['../classSound.html#af2c277cdc12b7df1de53e5b855e4f09c',1,'Sound::Sound(string file)']]], diff --git a/docs/search/functions_5.js b/docs/search/functions_5.js index 7c40633e..163e4527 100644 --- a/docs/search/functions_5.js +++ b/docs/search/functions_5.js @@ -1,8 +1,9 @@ var searchData= [ ['follow',['Follow',['../classCamera.html#a4290d7e4815d2e0726d88b743d44e8df',1,'Camera']]], + ['forcelinearzoom',['ForceLinearZoom',['../classCamera.html#a762fab54ead424c45d0c80a71a285065',1,'Camera']]], + ['forcelogzoom',['ForceLogZoom',['../classCamera.html#a18fdd7c5f8e3d0a03e6caad30973e62b',1,'Camera']]], ['forcemusicvolume',['ForceMusicVolume',['../classResources.html#aa097a6e4c87ac8ab428aad580bd280a7',1,'Resources']]], ['forcesoundvolume',['ForceSoundVolume',['../classResources.html#a361dba49cfa4f8bca3da33a5e2aa5086',1,'Resources']]], - ['forcezoom',['ForceZoom',['../classCamera.html#a7dc4b1fd7f5e03ffb25d306fe81ee4c0',1,'Camera']]], ['frompolarcoord',['FromPolarCoord',['../classVec2.html#ac794548df48539be24dd1e8ebebf8038',1,'Vec2']]] ]; diff --git a/docs/search/functions_6.js b/docs/search/functions_6.js index 91910ff2..d8699d43 100644 --- a/docs/search/functions_6.js +++ b/docs/search/functions_6.js @@ -18,6 +18,8 @@ var searchData= ['getimage',['GetImage',['../classResources.html#a557aa346c974a8bce80017dbabd653d9',1,'Resources']]], ['getinstance',['GetInstance',['../classGame.html#a25d213802ed39215e3ab2cb04edf46c8',1,'Game::GetInstance()'],['../classInputManager.html#a1f095ed502f0bd09390d05cdc0acdcd9',1,'InputManager::GetInstance()']]], ['getlifesleft',['GetLifesLeft',['../classWaveManager.html#a1409142aba1b106a0c2826ca2cbb97a7',1,'WaveManager']]], + ['getlinearzoom',['GetLinearZoom',['../classCamera.html#a39817db4b58c96f1cd989e8abf2a9451',1,'Camera']]], + ['getlogzoom',['GetLogZoom',['../classCamera.html#a7a91a7e6210714a5d079d3f4f0addc49',1,'Camera']]], ['getmaxframerate',['GetMaxFramerate',['../classGame.html#aafc542fc5f826d2eed771c8bd75d6930',1,'Game']]], ['getmaxspeed',['GetMaxSpeed',['../classCamera.html#a58085208a970a15b8bb1d8edee343ad0',1,'Camera']]], ['getminspeed',['GetMinSpeed',['../classCamera.html#a4824e13cac9ebd8f79abbae248a2b614',1,'Camera']]], @@ -41,6 +43,5 @@ var searchData= ['getwindowdimensions',['GetWindowDimensions',['../classGame.html#adbeb87bbabcc73f936e149c2d83d9d33',1,'Game']]], ['getwindowfullscreen',['GetWindowFullscreen',['../classGame.html#ab578fc018939b5c1fe15b993856828ad',1,'Game']]], ['getwindowmaximized',['GetWindowMaximized',['../classGame.html#a73b7de2577d86f15887e091330513dc2',1,'Game']]], - ['getworldrenderedrect',['GetWorldRenderedRect',['../classAnimation.html#a0c0ff21f388105a5ed1560de9071f895',1,'Animation::GetWorldRenderedRect()'],['../classGameObject.html#a6144b71795035bd65b81ed36abc19638',1,'GameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]], - ['getzoom',['GetZoom',['../classCamera.html#af6fe062fcf5e1e31224d4dd9f6cafa51',1,'Camera']]] + ['getworldrenderedrect',['GetWorldRenderedRect',['../classAnimation.html#a0c0ff21f388105a5ed1560de9071f895',1,'Animation::GetWorldRenderedRect()'],['../classGameObject.html#a6144b71795035bd65b81ed36abc19638',1,'GameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]] ]; diff --git a/docs/search/variables_17.js b/docs/search/variables_17.js index c0bc2681..9c394233 100644 --- a/docs/search/variables_17.js +++ b/docs/search/variables_17.js @@ -1,5 +1,4 @@ var searchData= [ - ['zoomfixed',['zoomFixed',['../classCamera.html#a7f235a90f57567a0012ed8f4a52634ce',1,'Camera']]], - ['zoomspeed',['zoomSpeed',['../classCamera.html#a7ec8dd2dcb2c3446ba88ad30e2e195d9',1,'Camera']]] + ['zoomfixed',['zoomFixed',['../classCamera.html#a7f235a90f57567a0012ed8f4a52634ce',1,'Camera']]] ]; diff --git a/docs/search/variables_2.js b/docs/search/variables_2.js index 94dcee48..8189dbfa 100644 --- a/docs/search/variables_2.js +++ b/docs/search/variables_2.js @@ -13,6 +13,6 @@ var searchData= ['controllerstickupdate',['controllerStickUpdate',['../classInputManager.html#a5e6ccd1ed40908fa5663445ae9fb622d',1,'InputManager']]], ['controllerupdate',['controllerUpdate',['../classInputManager.html#a53817858b539f080e0cebad2b03cc0d2',1,'InputManager']]], ['currentframe',['currentFrame',['../classSprite.html#a556cfc67b1b98691aa2e5b41f076fded',1,'Sprite']]], - ['currentspeed',['currentSpeed',['../classCamera.html#a6649a58e8ca32d16710bc01300df49fe',1,'Camera']]], - ['currentzoom',['currentZoom',['../classCamera.html#ac867d6d379c0d052ae65d57c7c313970',1,'Camera']]] + ['currentlogzoom',['currentLogZoom',['../classCamera.html#a1e954aeda32920bf73cfa4fac8ca6f94',1,'Camera']]], + ['currentspeed',['currentSpeed',['../classCamera.html#a6649a58e8ca32d16710bc01300df49fe',1,'Camera']]] ]; diff --git a/docs/search/variables_a.js b/docs/search/variables_a.js index 0c2e0aae..091edd70 100644 --- a/docs/search/variables_a.js +++ b/docs/search/variables_a.js @@ -1,4 +1,5 @@ var searchData= [ - ['lifes',['lifes',['../classStateData.html#a4cfaba2a0f99c715f37607b068617210',1,'StateData']]] + ['lifes',['lifes',['../classStateData.html#a4cfaba2a0f99c715f37607b068617210',1,'StateData']]], + ['logzoomspeed',['logZoomSpeed',['../classCamera.html#ab9c22201b3c224e7c0f6e7a6733c33ff',1,'Camera']]] ]; diff --git a/docs/search/variables_b.js b/docs/search/variables_b.js index 2289c436..3b6c9809 100644 --- a/docs/search/variables_b.js +++ b/docs/search/variables_b.js @@ -4,11 +4,11 @@ var searchData= ['mapheight',['mapHeight',['../classTileMap.html#a8fec89ca278b51de7f3e38831d9fb161',1,'TileMap']]], ['mapwidth',['mapWidth',['../classTileMap.html#ae2361e840eacaebbbbc91541ded00655',1,'TileMap']]], ['maxframerate',['maxFramerate',['../classGame.html#a5424a424548c7bdb04de05c5c836002d',1,'Game']]], + ['maxlogzoom',['maxLogZoom',['../classCamera.html#af7e88a28816f95f04e96417cd156cabb',1,'Camera']]], ['maxnumberofenemiesinspawnpoint',['maxNumberOfEnemiesInSpawnPoint',['../classWaveManager.html#a64c49de73005706f16187749699f9d0a',1,'WaveManager']]], ['maxspeed',['maxSpeed',['../classCamera.html#a1f02ea6332c710065fa256ed52acd6f1',1,'Camera']]], - ['maxzoom',['maxZoom',['../classCamera.html#af418b7887d39c773d73cb179c497a8da',1,'Camera']]], + ['minlogzoom',['minLogZoom',['../classCamera.html#aaa2f4cf2d33d02125df97ead5904b192',1,'Camera']]], ['minspeed',['minSpeed',['../classCamera.html#a6c5fe02b8b21a7c9784f970f08b4864a',1,'Camera']]], - ['minzoom',['minZoom',['../classCamera.html#a65d5a8e5533b568224d9fc488bfdcb28',1,'Camera']]], ['mousescroolstate',['mouseScroolState',['../classInputManager.html#a9c9d5ed1da1b205d9311ec4a9bab06ea',1,'InputManager']]], ['mousescroolupdate',['mouseScroolUpdate',['../classInputManager.html#a646fc44d21853e1354aaacc6a27e79ca',1,'InputManager']]], ['mousestate',['mouseState',['../classInputManager.html#af0f48b36a7d8e0f2c0b24057143b29c7',1,'InputManager']]], diff --git a/docs/structColor-members.html b/docs/structColor-members.html index 1a24645d..803c283a 100644 --- a/docs/structColor-members.html +++ b/docs/structColor-members.html @@ -97,7 +97,7 @@ diff --git a/docs/structColor.html b/docs/structColor.html index 29236d50..c8bb8451 100644 --- a/docs/structColor.html +++ b/docs/structColor.html @@ -212,7 +212,7 @@

                                                                                                                                    Atributos

                                                                                                                                    diff --git a/docs/structEnemyData-members.html b/docs/structEnemyData-members.html index 392eaba3..a11847e3 100644 --- a/docs/structEnemyData-members.html +++ b/docs/structEnemyData-members.html @@ -99,7 +99,7 @@ diff --git a/docs/structEnemyData.html b/docs/structEnemyData.html index ddb6550d..e7abf5b0 100644 --- a/docs/structEnemyData.html +++ b/docs/structEnemyData.html @@ -238,7 +238,7 @@

                                                                                                                                    Atributos

                                                                                                                                    diff --git a/docs/structEnemySpawnData-members.html b/docs/structEnemySpawnData-members.html index 6ca64013..4b44b7b8 100644 --- a/docs/structEnemySpawnData-members.html +++ b/docs/structEnemySpawnData-members.html @@ -98,7 +98,7 @@ diff --git a/docs/structEnemySpawnData.html b/docs/structEnemySpawnData.html index 0d2ad8a0..9e823c94 100644 --- a/docs/structEnemySpawnData.html +++ b/docs/structEnemySpawnData.html @@ -218,7 +218,7 @@

                                                                                                                                    Atributos

                                                                                                                                    diff --git a/docs/structSpawnPointData-members.html b/docs/structSpawnPointData-members.html index 2de4e1a3..4c57d2c9 100644 --- a/docs/structSpawnPointData-members.html +++ b/docs/structSpawnPointData-members.html @@ -94,7 +94,7 @@ diff --git a/docs/structSpawnPointData.html b/docs/structSpawnPointData.html index 47ad9376..d7acc7c4 100644 --- a/docs/structSpawnPointData.html +++ b/docs/structSpawnPointData.html @@ -123,7 +123,7 @@

                                                                                                                                    Atributos

                                                                                                                                    diff --git a/docs/structWaveData-members.html b/docs/structWaveData-members.html index 64a9a167..6a682d84 100644 --- a/docs/structWaveData-members.html +++ b/docs/structWaveData-members.html @@ -95,7 +95,7 @@ diff --git a/docs/structWaveData.html b/docs/structWaveData.html index fa179990..ded2782f 100644 --- a/docs/structWaveData.html +++ b/docs/structWaveData.html @@ -137,7 +137,7 @@

                                                                                                                                    Atributos

                                                                                                                                    diff --git a/docs/todo.html b/docs/todo.html index b18d90fa..d4dbffaf 100644 --- a/docs/todo.html +++ b/docs/todo.html @@ -138,7 +138,7 @@ diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db index c116c974..04c74d74 100644 Binary files a/doxygen_sqlite3.db and b/doxygen_sqlite3.db differ