From 53974e1f6a692f7d40aaf98678f5566990ad807a Mon Sep 17 00:00:00 2001 From: VitorSDDF Date: Tue, 20 Jun 2017 20:46:44 -0300 Subject: [PATCH 1/2] Drag and drop com redrag implementado (#66) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * drag and drog com redrag implementado * Documentação atualizada! * Corrigido bug de o Face criado não ser adicionado na lista de GameObjects * Removido linhas excessivas * Encontrados possíveis fontes para o problema do redreag não estar funcionando, mas problema persiste * Corrigido erro de compilação, drag and drop continua não funcionando. * Conserta detecção do mouse IT'S ALIVE! * limpando posição no tilemap de colisão e na colisão de objetos após redrag * correção de erros redrag * Dessa vez o drag and drop foi resolvido. Nisso melhorado a pereformance da remoção de gameObject do tileMap de O(n) para O(1), através do uso eficiente da arquitetura do jogo. * Documentado TileMap::GetGO * Documentação gerada! * Resolvido o problema do botão 'e' no Update do StageState, falta resolver o do botão direito * Merge completo * nada * Errro no drag.Ao clicar em qualquer lugar do tilemap todas as torres sao selecionadas * Emfim feito. * Resolvido warning durante a compilação devido a inicialização de atributos na ordem errada na initializer list. * Corrigido erro no padrão de codificação(uso de espaço ao invés de tab) no SDL_inlucde * Resolvido parte do conflito * Resolvido parte dos conflitos. * Corrigido mais alguns erros de compilação relativos à problema de merge, mas há outros * Corrigido alguns problemas de compilação causados pelo tileMap ter deixado de ser um ponteiro * Colocado para compilar, mas tem erros em tempo de execução. * Identificado problema de memória no WaveManager::update. Que pode aleatoriamente pode ocasionar seg fault. Isso é ocasiona pela lógica achar que * Tentando bolar uma estratégia legal para o spawn de inimigos * Corrige erros de compilação Está compilando e executando, mas crasha assim que entra no StateStage * Padroniza parametrização de GameObject::Enemy::RequestDelete * Removido arquivos desnecessários * Tentando acertar uma lógica de spawn de inimigos que não cause leituras erradas na memória. A lógica não está performática, mas já está melhor que a anterior. * Trocados todos os acessos ao vector do operator[] por at(), que faz bound checking. O que está identificando o erro de acesso da memória sem precisar do valgrind * Aparentemente o erro de acessos errados à memória no WaveManager foram corrigidos * Remove parametro inutil * Corrigido os inimigos não estarem sendo renderizados. É por causa que quando fizemos o GameObject deixar de ser virtual nós só deveríamo fazer com que seu métodos deixassem de ser virtuais puros, mas na verdade ele deixaram até de ser virtuais. Isso fez com que as chamadas ao método Render fosse apenas do GameObject, sem chama a implementação desse método nos filhos * Colocado mensagens de debug temporárias como permanantes. Removido método SpawnEnemy do StageState, pois quem deve spawnnar esses inimigos é o WaveManager * Corrigido erro do redrag, estávamos apenas chamando a sobrecarga errada. Aproveitado oprtunidade para cria o atibuto booleano Redrag no DragAndDrop, para diferenciar um drag de um redrag * Corrigido warnings que havia por causa de variável não usada e comparação de inteiros com sinal e inteiros sem sinal * Documentado alguns detalhes. * Documentação gerada! * Renomeado arquivo com typo --- Engine/include/Component.h | 15 +- Engine/include/ComponentType.h | 19 + Engine/include/DragAndDrop.h | 8 +- Engine/include/GameObject.h | 30 +- Engine/include/InputManager.h | 35 +- Engine/include/SDL_include.h | 130 +- Engine/include/TileMap.h | 28 + Engine/include/emptyGameObject.h | 8 - Engine/src/DragAndDrop.cpp | 24 +- Engine/src/GameObject.cpp | 49 +- Engine/src/{HItPoints.cpp => HitPoints.cpp} | 0 Engine/src/InputManager.cpp | 42 +- Engine/src/State.cpp | 3 +- Engine/src/TileMap.cpp | 63 +- EngineIDJ.files | 88 +- Game/include/EmptyGameObject.h | 24 - Game/include/Enemy.h | 14 +- Game/include/StageState.h | 6 +- Game/include/Tower.h | 2 +- Game/include/WaveManager.h | 6 +- Game/src/Enemy.cpp | 5 +- Game/src/StageState.cpp | 37 +- Game/src/Tower.cpp | 3 +- Game/src/WaveManager.cpp | 67 +- assets/wave&enemyData.txt | 8 +- docs/AIGoDown_8cpp.html | 11 +- docs/AIGoDown_8cpp__incl.map | 13 +- docs/AIGoDown_8cpp__incl.md5 | 2 +- docs/AIGoDown_8cpp__incl.svg | 182 +- docs/AIGoDown_8h.html | 14 +- docs/AIGoDown_8h__dep__incl.map | 4 +- docs/AIGoDown_8h__dep__incl.md5 | 2 +- docs/AIGoDown_8h__dep__incl.svg | 28 +- docs/AIGoDown_8h__incl.map | 11 +- docs/AIGoDown_8h__incl.md5 | 2 +- docs/AIGoDown_8h__incl.svg | 174 +- docs/ActionManager_8cpp.html | 11 +- docs/ActionManager_8cpp__incl.map | 4 +- docs/ActionManager_8cpp__incl.md5 | 2 +- docs/ActionManager_8cpp__incl.svg | 2 +- docs/ActionManager_8h.html | 14 +- docs/ActionManager_8h__dep__incl.map | 35 +- docs/ActionManager_8h__dep__incl.md5 | 2 +- docs/ActionManager_8h__dep__incl.svg | 273 +-- docs/ActionManager_8h__incl.map | 4 +- docs/ActionManager_8h__incl.md5 | 2 +- docs/ActionManager_8h__incl.svg | 2 +- docs/Animation_8cpp.html | 11 +- docs/Animation_8cpp__incl.map | 25 +- docs/Animation_8cpp__incl.md5 | 2 +- docs/Animation_8cpp__incl.svg | 368 +++-- docs/Animation_8h.html | 14 +- docs/Animation_8h__dep__incl.map | 2 +- docs/Animation_8h__dep__incl.md5 | 2 +- docs/Animation_8h__dep__incl.svg | 20 +- docs/Animation_8h__incl.map | 19 +- docs/Animation_8h__incl.md5 | 2 +- docs/Animation_8h__incl.svg | 296 ++-- docs/Camera_8cpp.html | 11 +- docs/Camera_8cpp__incl.map | 25 +- docs/Camera_8cpp__incl.md5 | 2 +- docs/Camera_8cpp__incl.svg | 466 +++--- docs/Camera_8h.html | 14 +- docs/Camera_8h__dep__incl.map | 19 +- docs/Camera_8h__dep__incl.md5 | 2 +- docs/Camera_8h__dep__incl.svg | 127 +- docs/Camera_8h__incl.map | 15 +- docs/Camera_8h__incl.md5 | 2 +- docs/Camera_8h__incl.svg | 232 +-- docs/Collision_8h.html | 14 +- docs/Collision_8h__dep__incl.md5 | 2 +- docs/Collision_8h__dep__incl.svg | 2 +- docs/Collision_8h__incl.map | 6 +- docs/Collision_8h__incl.md5 | 2 +- docs/Collision_8h__incl.svg | 54 +- docs/Color_8cpp.html | 11 +- docs/Color_8cpp__incl.md5 | 2 +- docs/Color_8cpp__incl.svg | 2 +- docs/Color_8h.html | 11 +- docs/Color_8h__dep__incl.map | 56 +- docs/Color_8h__dep__incl.md5 | 2 +- docs/Color_8h__dep__incl.svg | 445 ++--- ...meObject_8h.html => ComponentType_8h.html} | 70 +- docs/ComponentType_8h__dep__incl.map | 42 + docs/ComponentType_8h__dep__incl.md5 | 1 + docs/ComponentType_8h__dep__incl.svg | 739 +++++++++ docs/Component_8cpp.html | 11 +- docs/Component_8cpp__incl.map | 11 +- docs/Component_8cpp__incl.md5 | 2 +- docs/Component_8cpp__incl.svg | 174 +- docs/Component_8h.html | 65 +- docs/Component_8h__dep__incl.map | 79 +- docs/Component_8h__dep__incl.md5 | 2 +- docs/Component_8h__dep__incl.svg | 900 +++++----- docs/Component_8h__incl.map | 9 +- docs/Component_8h__incl.md5 | 2 +- docs/Component_8h__incl.svg | 166 +- docs/Defines_8h.html | 11 +- docs/Defines_8h__dep__incl.map | 14 +- docs/Defines_8h__dep__incl.md5 | 2 +- docs/Defines_8h__dep__incl.svg | 76 +- docs/DragAndDrop_8cpp.html | 11 +- docs/DragAndDrop_8cpp__incl.map | 29 +- docs/DragAndDrop_8cpp__incl.md5 | 2 +- docs/DragAndDrop_8cpp__incl.svg | 506 +++--- docs/DragAndDrop_8h.html | 14 +- docs/DragAndDrop_8h__dep__incl.map | 7 +- docs/DragAndDrop_8h__dep__incl.md5 | 2 +- docs/DragAndDrop_8h__dep__incl.svg | 102 +- docs/DragAndDrop_8h__incl.map | 21 +- docs/DragAndDrop_8h__incl.md5 | 2 +- docs/DragAndDrop_8h__incl.svg | 378 +++-- docs/EmptyGameObject_8h.html | 120 -- docs/EmptyGameObject_8h__dep__incl.map | 7 - docs/EmptyGameObject_8h__dep__incl.md5 | 1 - docs/EmptyGameObject_8h__dep__incl.svg | 88 - docs/EmptyGameObject_8h__incl.map | 7 - docs/EmptyGameObject_8h__incl.md5 | 1 - docs/EmptyGameObject_8h__incl.svg | 143 -- docs/EndStateData_8cpp.html | 11 +- docs/EndStateData_8cpp__incl.map | 4 +- docs/EndStateData_8cpp__incl.md5 | 2 +- docs/EndStateData_8cpp__incl.svg | 28 +- docs/EndStateData_8h.html | 14 +- docs/EndStateData_8h__dep__incl.map | 10 +- docs/EndStateData_8h__dep__incl.md5 | 2 +- docs/EndStateData_8h__dep__incl.svg | 60 +- docs/EndStateData_8h__incl.map | 4 +- docs/EndStateData_8h__incl.md5 | 2 +- docs/EndStateData_8h__incl.svg | 28 +- docs/EndState_8cpp.html | 11 +- docs/EndState_8cpp__incl.map | 55 +- docs/EndState_8cpp__incl.md5 | 2 +- docs/EndState_8cpp__incl.svg | 1096 ++++++------ docs/EndState_8h.html | 14 +- docs/EndState_8h__dep__incl.md5 | 2 +- docs/EndState_8h__dep__incl.svg | 2 +- docs/EndState_8h__incl.map | 51 +- docs/EndState_8h__incl.md5 | 2 +- docs/EndState_8h__incl.svg | 1036 ++++++------ docs/Enemy_8cpp.html | 32 +- docs/Enemy_8cpp__incl.map | 37 +- docs/Enemy_8cpp__incl.md5 | 2 +- docs/Enemy_8cpp__incl.svg | 629 +++---- docs/Enemy_8h.html | 28 +- docs/Enemy_8h__dep__incl.map | 10 +- docs/Enemy_8h__dep__incl.md5 | 2 +- docs/Enemy_8h__dep__incl.svg | 56 +- docs/Enemy_8h__incl.map | 27 +- docs/Enemy_8h__incl.md5 | 2 +- docs/Enemy_8h__incl.svg | 489 +++--- docs/Error_8h.html | 14 +- docs/Error_8h__dep__incl.map | 56 +- docs/Error_8h__dep__incl.md5 | 2 +- docs/Error_8h__dep__incl.svg | 431 ++--- docs/Error_8h__incl.md5 | 2 +- docs/Error_8h__incl.svg | 2 +- docs/GameObject_8cpp.html | 13 +- docs/GameObject_8cpp__incl.map | 15 +- docs/GameObject_8cpp__incl.md5 | 2 +- docs/GameObject_8cpp__incl.svg | 258 ++- docs/GameObject_8h.html | 15 +- docs/GameObject_8h__dep__incl.map | 79 +- docs/GameObject_8h__dep__incl.md5 | 2 +- docs/GameObject_8h__dep__incl.svg | 928 ++++++----- docs/GameObject_8h__incl.map | 9 +- docs/GameObject_8h__incl.md5 | 2 +- docs/GameObject_8h__incl.svg | 136 +- docs/GameResources_8cpp.html | 11 +- docs/GameResources_8cpp__incl.map | 31 +- docs/GameResources_8cpp__incl.md5 | 2 +- docs/GameResources_8cpp__incl.svg | 557 ++++--- docs/GameResources_8h.html | 14 +- docs/GameResources_8h__dep__incl.map | 4 +- docs/GameResources_8h__dep__incl.md5 | 2 +- docs/GameResources_8h__dep__incl.svg | 28 +- docs/GameResources_8h__incl.map | 29 +- docs/GameResources_8h__incl.md5 | 2 +- docs/GameResources_8h__incl.svg | 505 +++--- docs/Game_8cpp.html | 11 +- docs/Game_8cpp__incl.map | 21 +- docs/Game_8cpp__incl.md5 | 2 +- docs/Game_8cpp__incl.svg | 322 ++-- docs/Game_8h.html | 14 +- docs/Game_8h__dep__incl.map | 4 +- docs/Game_8h__dep__incl.md5 | 2 +- docs/Game_8h__dep__incl.svg | 6 +- docs/Game_8h__incl.map | 17 +- docs/Game_8h__incl.md5 | 2 +- docs/Game_8h__incl.svg | 242 +-- docs/HItPoints_8cpp.html | 11 +- docs/HItPoints_8cpp__incl.map | 19 +- docs/HItPoints_8cpp__incl.md5 | 2 +- docs/HItPoints_8cpp__incl.svg | 320 ++-- docs/HitPoints_8h.html | 14 +- docs/HitPoints_8h__dep__incl.map | 2 +- docs/HitPoints_8h__dep__incl.md5 | 2 +- docs/HitPoints_8h__dep__incl.svg | 2 +- docs/HitPoints_8h__incl.map | 17 +- docs/HitPoints_8h__incl.md5 | 2 +- docs/HitPoints_8h__incl.svg | 312 ++-- docs/InputManager_8cpp.html | 11 +- docs/InputManager_8cpp__incl.map | 4 +- docs/InputManager_8cpp__incl.md5 | 2 +- docs/InputManager_8cpp__incl.svg | 2 +- docs/InputManager_8h.html | 14 +- docs/InputManager_8h__dep__incl.map | 83 +- docs/InputManager_8h__dep__incl.md5 | 2 +- docs/InputManager_8h__dep__incl.svg | 1086 ++++++------ docs/InputManager_8h__incl.map | 2 +- docs/InputManager_8h__incl.md5 | 2 +- docs/InputManager_8h__incl.svg | 2 +- docs/Music_8cpp.html | 11 +- docs/Music_8cpp__incl.map | 4 +- docs/Music_8cpp__incl.md5 | 2 +- docs/Music_8cpp__incl.svg | 2 +- docs/Music_8h.html | 14 +- docs/Music_8h__dep__incl.map | 12 +- docs/Music_8h__dep__incl.md5 | 2 +- docs/Music_8h__dep__incl.svg | 68 +- docs/Music_8h__incl.map | 4 +- docs/Music_8h__incl.md5 | 2 +- docs/Music_8h__incl.svg | 2 +- docs/README_8md.html | 8 +- docs/Rect_8cpp.html | 11 +- docs/Rect_8cpp__incl.map | 2 +- docs/Rect_8cpp__incl.md5 | 2 +- docs/Rect_8cpp__incl.svg | 2 +- docs/Rect_8h.html | 14 +- docs/Rect_8h__dep__incl.map | 89 +- docs/Rect_8h__dep__incl.md5 | 2 +- docs/Rect_8h__dep__incl.svg | 1149 +++++++------ docs/Rect_8h__incl.map | 2 +- docs/Rect_8h__incl.md5 | 2 +- docs/Rect_8h__incl.svg | 2 +- docs/Resources_8cpp.html | 11 +- docs/Resources_8cpp__incl.map | 21 +- docs/Resources_8cpp__incl.md5 | 2 +- docs/Resources_8cpp__incl.svg | 278 ++-- docs/Resources_8h.html | 14 +- docs/Resources_8h__dep__incl.map | 38 +- docs/Resources_8h__dep__incl.md5 | 2 +- docs/Resources_8h__dep__incl.svg | 228 +-- docs/Resources_8h__incl.md5 | 2 +- docs/Resources_8h__incl.svg | 2 +- docs/SDL__include_8h.html | 11 +- docs/SDL__include_8h__dep__incl.map | 98 +- docs/SDL__include_8h__dep__incl.md5 | 2 +- docs/SDL__include_8h__dep__incl.svg | 1468 ++++++++--------- docs/Sound_8cpp.html | 11 +- docs/Sound_8cpp__incl.map | 2 +- docs/Sound_8cpp__incl.md5 | 2 +- docs/Sound_8cpp__incl.svg | 8 +- docs/Sound_8h.html | 14 +- docs/Sound_8h__dep__incl.map | 2 +- docs/Sound_8h__dep__incl.md5 | 2 +- docs/Sound_8h__dep__incl.svg | 20 +- docs/Sound_8h__incl.md5 | 2 +- docs/Sound_8h__incl.svg | 8 +- docs/Sprite_8cpp.html | 11 +- docs/Sprite_8cpp__incl.map | 29 +- docs/Sprite_8cpp__incl.md5 | 2 +- docs/Sprite_8cpp__incl.svg | 462 +++--- docs/Sprite_8h.html | 14 +- docs/Sprite_8h__dep__incl.map | 52 +- docs/Sprite_8h__dep__incl.md5 | 2 +- docs/Sprite_8h__dep__incl.svg | 427 ++--- docs/Sprite_8h__incl.map | 4 +- docs/Sprite_8h__incl.md5 | 2 +- docs/Sprite_8h__incl.svg | 2 +- docs/StageState_8cpp.html | 11 +- docs/StageState_8cpp__incl.map | 61 +- docs/StageState_8cpp__incl.md5 | 2 +- docs/StageState_8cpp__incl.svg | 1327 +++++++-------- docs/StageState_8h.html | 16 +- docs/StageState_8h__dep__incl.map | 2 +- docs/StageState_8h__dep__incl.md5 | 2 +- docs/StageState_8h__dep__incl.svg | 8 +- docs/StageState_8h__incl.map | 51 +- docs/StageState_8h__incl.md5 | 2 +- docs/StageState_8h__incl.svg | 1046 ++++++------ docs/StateData_8h.html | 11 +- docs/StateData_8h__dep__incl.map | 14 +- docs/StateData_8h__dep__incl.md5 | 2 +- docs/StateData_8h__dep__incl.svg | 76 +- docs/State_8cpp.html | 12 +- docs/State_8cpp__incl.map | 22 +- docs/State_8cpp__incl.md5 | 2 +- docs/State_8cpp__incl.svg | 303 ++-- docs/State_8h.html | 14 +- docs/State_8h__dep__incl.map | 10 +- docs/State_8h__dep__incl.md5 | 2 +- docs/State_8h__dep__incl.svg | 16 +- docs/State_8h__incl.map | 13 +- docs/State_8h__incl.md5 | 2 +- docs/State_8h__incl.svg | 204 +-- docs/Text_8cpp.html | 11 +- docs/Text_8cpp__incl.map | 25 +- docs/Text_8cpp__incl.md5 | 2 +- docs/Text_8cpp__incl.svg | 314 ++-- docs/Text_8h.html | 14 +- docs/Text_8h__dep__incl.map | 4 +- docs/Text_8h__dep__incl.md5 | 2 +- docs/Text_8h__dep__incl.svg | 2 +- docs/Text_8h__incl.map | 23 +- docs/Text_8h__incl.md5 | 2 +- docs/Text_8h__incl.svg | 306 ++-- docs/TileMap_8cpp.html | 11 +- docs/TileMap_8cpp__incl.map | 27 +- docs/TileMap_8cpp__incl.md5 | 2 +- docs/TileMap_8cpp__incl.svg | 480 +++--- docs/TileMap_8h.html | 14 +- docs/TileMap_8h__dep__incl.map | 32 +- docs/TileMap_8h__dep__incl.md5 | 2 +- docs/TileMap_8h__dep__incl.svg | 285 ++-- docs/TileMap_8h__incl.map | 19 +- docs/TileMap_8h__incl.md5 | 2 +- docs/TileMap_8h__incl.svg | 314 ++-- docs/Tileset_8cpp.html | 11 +- docs/Tileset_8cpp__incl.map | 31 +- docs/Tileset_8cpp__incl.md5 | 2 +- docs/Tileset_8cpp__incl.svg | 362 ++-- docs/Tileset_8h.html | 14 +- docs/Tileset_8h__dep__incl.map | 36 +- docs/Tileset_8h__dep__incl.md5 | 2 +- docs/Tileset_8h__dep__incl.svg | 313 ++-- docs/Tileset_8h__incl.map | 12 +- docs/Tileset_8h__incl.md5 | 2 +- docs/Tileset_8h__incl.svg | 120 +- docs/Timer_8cpp.html | 11 +- docs/Timer_8cpp__incl.md5 | 2 +- docs/Timer_8cpp__incl.svg | 2 +- docs/Timer_8h.html | 11 +- docs/Timer_8h__dep__incl.map | 14 +- docs/Timer_8h__dep__incl.md5 | 2 +- docs/Timer_8h__dep__incl.svg | 12 +- docs/TitleState_8cpp.html | 11 +- docs/TitleState_8cpp__incl.map | 53 +- docs/TitleState_8cpp__incl.md5 | 2 +- docs/TitleState_8cpp__incl.svg | 1038 ++++++------ docs/TitleState_8h.html | 14 +- docs/TitleState_8h__dep__incl.map | 4 +- docs/TitleState_8h__dep__incl.md5 | 2 +- docs/TitleState_8h__dep__incl.svg | 8 +- docs/TitleState_8h__incl.map | 23 +- docs/TitleState_8h__incl.md5 | 2 +- docs/TitleState_8h__incl.svg | 238 +-- docs/Tower_8cpp.html | 11 +- docs/Tower_8cpp__incl.map | 31 +- docs/Tower_8cpp__incl.md5 | 2 +- docs/Tower_8cpp__incl.svg | 550 +++--- docs/Tower_8h.html | 14 +- docs/Tower_8h__dep__incl.md5 | 2 +- docs/Tower_8h__dep__incl.svg | 2 +- docs/Tower_8h__incl.map | 21 +- docs/Tower_8h__incl.md5 | 2 +- docs/Tower_8h__incl.svg | 398 ++--- docs/Vec2_8cpp.html | 11 +- docs/Vec2_8cpp__incl.md5 | 2 +- docs/Vec2_8cpp__incl.svg | 2 +- docs/Vec2_8h.html | 14 +- docs/Vec2_8h__dep__incl.map | 98 +- docs/Vec2_8h__dep__incl.md5 | 2 +- docs/Vec2_8h__dep__incl.svg | 1421 ++++++++-------- docs/Vec2_8h__incl.md5 | 2 +- docs/Vec2_8h__incl.svg | 2 +- docs/WaveData_8cpp.html | 11 +- docs/WaveData_8cpp__incl.map | 4 +- docs/WaveData_8cpp__incl.md5 | 2 +- docs/WaveData_8cpp__incl.svg | 60 +- docs/WaveData_8h.html | 14 +- docs/WaveData_8h__dep__incl.map | 24 +- docs/WaveData_8h__dep__incl.md5 | 2 +- docs/WaveData_8h__dep__incl.svg | 128 +- docs/WaveData_8h__incl.map | 2 +- docs/WaveData_8h__incl.md5 | 2 +- docs/WaveData_8h__incl.svg | 52 +- docs/WaveManager_8cpp.html | 15 +- docs/WaveManager_8cpp__incl.map | 39 +- docs/WaveManager_8cpp__incl.md5 | 2 +- docs/WaveManager_8cpp__incl.svg | 879 +++++----- docs/WaveManager_8h.html | 14 +- docs/WaveManager_8h__dep__incl.map | 2 +- docs/WaveManager_8h__dep__incl.md5 | 2 +- docs/WaveManager_8h__dep__incl.svg | 8 +- docs/WaveManager_8h__incl.map | 27 +- docs/WaveManager_8h__incl.md5 | 2 +- docs/WaveManager_8h__incl.svg | 450 ++--- docs/annotated.html | 66 +- docs/classAIGoDown-members.html | 8 +- docs/classAIGoDown.html | 18 +- docs/classAIGoDown__coll__graph.map | 2 +- docs/classAIGoDown__coll__graph.md5 | 2 +- docs/classAIGoDown__coll__graph.svg | 32 +- docs/classAIGoDown__inherit__graph.map | 2 +- docs/classAIGoDown__inherit__graph.md5 | 2 +- docs/classAIGoDown__inherit__graph.svg | 20 +- docs/classActionManager-members.html | 8 +- docs/classActionManager.html | 8 +- docs/classAnimation-members.html | 33 +- docs/classAnimation.html | 60 +- docs/classAnimation__coll__graph.map | 10 +- docs/classAnimation__coll__graph.md5 | 2 +- docs/classAnimation__coll__graph.svg | 276 ++-- docs/classAnimation__inherit__graph.map | 2 +- docs/classAnimation__inherit__graph.md5 | 2 +- docs/classAnimation__inherit__graph.svg | 20 +- docs/classCamera-members.html | 8 +- docs/classCamera.html | 11 +- docs/classCamera__coll__graph.map | 6 +- docs/classCamera__coll__graph.md5 | 2 +- docs/classCamera__coll__graph.svg | 126 +- docs/classCollision-members.html | 8 +- docs/classCollision.html | 8 +- docs/classComponent-members.html | 8 +- docs/classComponent.html | 15 +- docs/classComponent__inherit__graph.map | 8 +- docs/classComponent__inherit__graph.md5 | 2 +- docs/classComponent__inherit__graph.svg | 44 +- docs/classDragAndDrop-members.html | 23 +- docs/classDragAndDrop.html | 78 +- docs/classDragAndDrop__coll__graph.map | 11 +- docs/classDragAndDrop__coll__graph.md5 | 2 +- docs/classDragAndDrop__coll__graph.svg | 321 ++-- docs/classDragAndDrop__inherit__graph.map | 2 +- docs/classDragAndDrop__inherit__graph.md5 | 2 +- docs/classDragAndDrop__inherit__graph.svg | 2 +- docs/classEmptyGameObject-members.html | 115 -- docs/classEmptyGameObject.html | 433 ----- docs/classEmptyGameObject__coll__graph.map | 4 - docs/classEmptyGameObject__coll__graph.md5 | 1 - docs/classEmptyGameObject__coll__graph.svg | 76 - docs/classEmptyGameObject__inherit__graph.map | 3 - docs/classEmptyGameObject__inherit__graph.md5 | 1 - docs/classEmptyGameObject__inherit__graph.svg | 31 - docs/classEndState-members.html | 8 +- docs/classEndState.html | 14 +- docs/classEndStateData-members.html | 8 +- docs/classEndStateData.html | 14 +- docs/classEndStateData__coll__graph.map | 2 +- docs/classEndStateData__coll__graph.md5 | 2 +- docs/classEndStateData__coll__graph.svg | 44 +- docs/classEndStateData__inherit__graph.map | 2 +- docs/classEndStateData__inherit__graph.md5 | 2 +- docs/classEndStateData__inherit__graph.svg | 2 +- docs/classEndState__coll__graph.map | 14 +- docs/classEndState__coll__graph.md5 | 2 +- docs/classEndState__coll__graph.svg | 288 ++-- docs/classEndState__inherit__graph.map | 2 +- docs/classEndState__inherit__graph.md5 | 2 +- docs/classEndState__inherit__graph.svg | 20 +- docs/classEnemy-members.html | 48 +- docs/classEnemy.html | 85 +- docs/classEnemy__coll__graph.map | 8 +- docs/classEnemy__coll__graph.md5 | 2 +- docs/classEnemy__coll__graph.svg | 290 ++-- docs/classEnemy__inherit__graph.map | 2 +- docs/classEnemy__inherit__graph.md5 | 2 +- docs/classEnemy__inherit__graph.svg | 20 +- docs/classGame-members.html | 8 +- docs/classGame.html | 11 +- docs/classGameObject-members.html | 33 +- docs/classGameObject.html | 212 ++- docs/classGameObject__coll__graph.map | 2 +- docs/classGameObject__coll__graph.md5 | 2 +- docs/classGameObject__coll__graph.svg | 67 +- docs/classGameObject__inherit__graph.map | 8 +- docs/classGameObject__inherit__graph.md5 | 2 +- docs/classGameObject__inherit__graph.svg | 62 +- docs/classGameResources-members.html | 8 +- docs/classGameResources.html | 11 +- docs/classGameResources__coll__graph.md5 | 2 +- docs/classGameResources__coll__graph.svg | 48 +- docs/classGame__coll__graph.map | 6 +- docs/classGame__coll__graph.md5 | 2 +- docs/classGame__coll__graph.svg | 212 +-- docs/classHitPoints-members.html | 8 +- docs/classHitPoints.html | 18 +- docs/classHitPoints__coll__graph.map | 6 +- docs/classHitPoints__coll__graph.md5 | 2 +- docs/classHitPoints__coll__graph.svg | 28 +- docs/classHitPoints__inherit__graph.map | 2 +- docs/classHitPoints__inherit__graph.md5 | 2 +- docs/classHitPoints__inherit__graph.svg | 20 +- docs/classInputManager-members.html | 51 +- docs/classInputManager.html | 104 +- docs/classInputManager__coll__graph.map | 2 +- docs/classInputManager__coll__graph.md5 | 2 +- docs/classInputManager__coll__graph.svg | 112 +- docs/classMusic-members.html | 8 +- docs/classMusic.html | 11 +- docs/classMusic__coll__graph.md5 | 2 +- docs/classMusic__coll__graph.svg | 20 +- docs/classRect-members.html | 8 +- docs/classRect.html | 11 +- docs/classRect__coll__graph.md5 | 2 +- docs/classRect__coll__graph.svg | 2 +- docs/classResources-members.html | 8 +- docs/classResources.html | 11 +- docs/classResources__coll__graph.md5 | 2 +- docs/classResources__coll__graph.svg | 80 +- docs/classSound-members.html | 8 +- docs/classSound.html | 11 +- docs/classSound__coll__graph.md5 | 2 +- docs/classSound__coll__graph.svg | 34 +- docs/classSprite-members.html | 8 +- docs/classSprite.html | 11 +- docs/classSprite__coll__graph.map | 2 +- docs/classSprite__coll__graph.md5 | 2 +- docs/classSprite__coll__graph.svg | 106 +- docs/classStageState-members.html | 33 +- docs/classStageState.html | 52 +- docs/classStageState__coll__graph.map | 27 +- docs/classStageState__coll__graph.md5 | 2 +- docs/classStageState__coll__graph.svg | 799 +++++---- docs/classStageState__inherit__graph.map | 2 +- docs/classStageState__inherit__graph.md5 | 2 +- docs/classStageState__inherit__graph.svg | 20 +- docs/classState-members.html | 8 +- docs/classState.html | 14 +- docs/classStateData-members.html | 8 +- docs/classStateData.html | 14 +- docs/classStateData__coll__graph.md5 | 2 +- docs/classStateData__coll__graph.svg | 24 +- docs/classStateData__inherit__graph.md5 | 2 +- docs/classStateData__inherit__graph.svg | 2 +- docs/classState__coll__graph.md5 | 2 +- docs/classState__coll__graph.svg | 38 +- docs/classState__inherit__graph.map | 6 +- docs/classState__inherit__graph.md5 | 2 +- docs/classState__inherit__graph.svg | 36 +- docs/classText-members.html | 8 +- docs/classText.html | 11 +- docs/classText__coll__graph.map | 4 +- docs/classText__coll__graph.md5 | 2 +- docs/classText__coll__graph.svg | 134 +- docs/classTileMap-members.html | 24 +- docs/classTileMap.html | 121 +- docs/classTileMap__coll__graph.map | 6 +- docs/classTileMap__coll__graph.md5 | 2 +- docs/classTileMap__coll__graph.svg | 178 +- docs/classTileSet-members.html | 8 +- docs/classTileSet.html | 11 +- docs/classTileSet__coll__graph.map | 4 +- docs/classTileSet__coll__graph.md5 | 2 +- docs/classTileSet__coll__graph.svg | 124 +- docs/classTimer-members.html | 8 +- docs/classTimer.html | 11 +- docs/classTimer__coll__graph.md5 | 2 +- docs/classTimer__coll__graph.svg | 24 +- docs/classTitleState-members.html | 8 +- docs/classTitleState.html | 14 +- docs/classTitleState__coll__graph.map | 6 +- docs/classTitleState__coll__graph.md5 | 2 +- docs/classTitleState__coll__graph.svg | 148 +- docs/classTitleState__inherit__graph.map | 2 +- docs/classTitleState__inherit__graph.md5 | 2 +- docs/classTitleState__inherit__graph.svg | 20 +- docs/classTower-members.html | 45 +- docs/classTower.html | 83 +- docs/classTower__coll__graph.map | 8 +- docs/classTower__coll__graph.md5 | 2 +- docs/classTower__coll__graph.svg | 264 +-- docs/classTower__inherit__graph.map | 2 +- docs/classTower__inherit__graph.md5 | 2 +- docs/classTower__inherit__graph.svg | 20 +- docs/classVec2-members.html | 8 +- docs/classVec2.html | 11 +- docs/classVec2__coll__graph.md5 | 2 +- docs/classVec2__coll__graph.svg | 24 +- docs/classWaveManager-members.html | 43 +- docs/classWaveManager.html | 42 +- docs/classWaveManager__coll__graph.map | 12 +- docs/classWaveManager__coll__graph.md5 | 2 +- docs/classWaveManager__coll__graph.svg | 262 +-- docs/classWaveManager__inherit__graph.md5 | 2 +- docs/classWaveManager__inherit__graph.svg | 2 +- docs/classemptyGameObject-members.html | 115 -- docs/classemptyGameObject.html | 194 --- docs/classemptyGameObject__coll__graph.map | 4 - docs/classemptyGameObject__coll__graph.md5 | 1 - docs/classemptyGameObject__coll__graph.svg | 76 - docs/classemptyGameObject__inherit__graph.map | 3 - docs/classemptyGameObject__inherit__graph.md5 | 1 - docs/classemptyGameObject__inherit__graph.svg | 31 - docs/classes.html | 46 +- docs/dir_000002_000001.html | 10 +- docs/dir_000004_000000.html | 10 +- docs/dir_000005_000000.html | 8 +- docs/dir_000005_000004.html | 8 +- .../dir_0b6ee6e7e9547e675db4add2e5de97da.html | 11 +- ...r_0b6ee6e7e9547e675db4add2e5de97da_dep.map | 2 +- ...r_0b6ee6e7e9547e675db4add2e5de97da_dep.md5 | 2 +- ...r_0b6ee6e7e9547e675db4add2e5de97da_dep.svg | 6 +- .../dir_1dfe4a86cee15d5d6902f8c724dcf913.html | 15 +- ...r_1dfe4a86cee15d5d6902f8c724dcf913_dep.svg | 2 +- .../dir_a56613a6b795b5624452287469afc550.html | 13 +- ...r_a56613a6b795b5624452287469afc550_dep.svg | 2 +- .../dir_b6dc9fbf5fd229481ae647194eb362ed.html | 11 +- ...r_b6dc9fbf5fd229481ae647194eb362ed_dep.map | 2 +- ...r_b6dc9fbf5fd229481ae647194eb362ed_dep.md5 | 2 +- ...r_b6dc9fbf5fd229481ae647194eb362ed_dep.svg | 6 +- .../dir_c33286056d2acf479cd8641ef845fec1.html | 11 +- ...r_c33286056d2acf479cd8641ef845fec1_dep.svg | 2 +- .../dir_d858f423bf5825f9a3db826b6a54a3cc.html | 11 +- ...r_d858f423bf5825f9a3db826b6a54a3cc_dep.svg | 2 +- docs/doxygen.css | 2 +- docs/files.html | 53 +- docs/functions.html | 14 +- docs/functions_b.html | 8 +- docs/functions_c.html | 8 +- docs/functions_d.html | 11 +- docs/functions_e.html | 20 +- docs/functions_enum.html | 8 +- docs/functions_eval.html | 8 +- docs/functions_f.html | 8 +- docs/functions_func.html | 11 +- docs/functions_func_b.html | 8 +- docs/functions_func_c.html | 8 +- docs/functions_func_d.html | 10 +- docs/functions_func_e.html | 16 +- docs/functions_func_f.html | 8 +- docs/functions_func_g.html | 14 +- docs/functions_func_h.html | 8 +- docs/functions_func_i.html | 23 +- docs/functions_func_k.html | 8 +- docs/functions_func_l.html | 8 +- docs/functions_func_m.html | 8 +- docs/functions_func_n.html | 11 +- docs/functions_func_o.html | 8 +- docs/functions_func_p.html | 8 +- docs/functions_func_q.html | 8 +- docs/functions_func_r.html | 22 +- docs/functions_func_s.html | 11 +- docs/functions_func_t.html | 10 +- docs/functions_func_u.html | 11 +- docs/functions_func_v.html | 8 +- docs/functions_func_w.html | 8 +- docs/functions_func_z.html | 8 +- docs/functions_func_~.html | 14 +- docs/functions_g.html | 14 +- docs/functions_h.html | 8 +- docs/functions_i.html | 28 +- docs/functions_k.html | 8 +- docs/functions_l.html | 8 +- docs/functions_m.html | 17 +- docs/functions_n.html | 13 +- docs/functions_o.html | 8 +- docs/functions_p.html | 8 +- docs/functions_q.html | 8 +- docs/functions_r.html | 25 +- docs/functions_s.html | 11 +- docs/functions_t.html | 22 +- docs/functions_type.html | 8 +- docs/functions_u.html | 11 +- docs/functions_v.html | 8 +- docs/functions_vars.html | 25 +- docs/functions_w.html | 8 +- docs/functions_x.html | 8 +- docs/functions_y.html | 8 +- docs/functions_z.html | 8 +- docs/functions_~.html | 14 +- docs/globals.html | 25 +- docs/globals_defs.html | 10 +- docs/globals_enum.html | 10 +- docs/globals_eval.html | 20 +- docs/globals_func.html | 8 +- docs/globals_type.html | 9 +- docs/graph_legend.html | 78 +- docs/graph_legend.svg | 82 +- docs/hierarchy.html | 14 +- docs/index.html | 8 +- docs/inherit_graph_0.svg | 2 +- docs/inherit_graph_1.map | 2 +- docs/inherit_graph_1.svg | 12 +- docs/inherit_graph_10.svg | 2 +- docs/inherit_graph_11.map | 2 +- docs/inherit_graph_11.svg | 12 +- docs/inherit_graph_12.svg | 2 +- docs/inherit_graph_13.svg | 2 +- docs/inherit_graph_14.svg | 4 +- docs/inherit_graph_15.svg | 2 +- docs/inherit_graph_16.svg | 4 +- docs/inherit_graph_17.map | 6 +- docs/inherit_graph_17.svg | 32 +- docs/inherit_graph_18.map | 4 +- docs/inherit_graph_18.svg | 20 +- docs/inherit_graph_19.svg | 2 +- docs/inherit_graph_2.svg | 2 +- docs/inherit_graph_20.map | 2 +- docs/inherit_graph_20.svg | 12 +- docs/inherit_graph_21.map | 2 +- docs/inherit_graph_21.svg | 12 +- docs/inherit_graph_22.map | 2 +- docs/inherit_graph_22.svg | 12 +- docs/inherit_graph_23.map | 2 +- docs/inherit_graph_23.svg | 12 +- docs/inherit_graph_24.map | 2 +- docs/inherit_graph_24.svg | 12 +- docs/inherit_graph_3.svg | 2 +- docs/inherit_graph_4.map | 10 +- docs/inherit_graph_4.svg | 44 +- docs/inherit_graph_5.svg | 2 +- docs/inherit_graph_6.svg | 4 +- docs/inherit_graph_7.map | 2 +- docs/inherit_graph_7.svg | 12 +- docs/inherit_graph_8.map | 10 +- docs/inherit_graph_8.md5 | 2 +- docs/inherit_graph_8.svg | 68 +- docs/inherit_graph_9.svg | 2 +- docs/inherits.html | 83 +- docs/main_8cpp.html | 11 +- docs/main_8cpp__incl.map | 27 +- docs/main_8cpp__incl.md5 | 2 +- docs/main_8cpp__incl.svg | 374 +++-- docs/md_README.html | 8 +- docs/pages.html | 8 +- docs/search/all_0.html | 2 +- docs/search/all_0.js | 4 +- docs/search/all_1.html | 2 +- docs/search/all_10.html | 2 +- docs/search/all_11.html | 2 +- docs/search/all_11.js | 7 +- docs/search/all_12.html | 2 +- docs/search/all_12.js | 4 +- docs/search/all_13.html | 2 +- docs/search/all_13.js | 8 +- docs/search/all_14.html | 2 +- docs/search/all_14.js | 4 +- docs/search/all_15.html | 2 +- docs/search/all_16.html | 2 +- docs/search/all_16.js | 2 +- docs/search/all_17.html | 2 +- docs/search/all_18.html | 2 +- docs/search/all_19.html | 2 +- docs/search/all_1a.html | 2 +- docs/search/all_1a.js | 1 - docs/search/all_2.html | 2 +- docs/search/all_2.js | 5 +- docs/search/all_3.html | 2 +- docs/search/all_3.js | 6 +- docs/search/all_4.html | 2 +- docs/search/all_4.js | 4 +- docs/search/all_5.html | 2 +- docs/search/all_6.html | 2 +- docs/search/all_6.js | 3 +- docs/search/all_7.html | 2 +- docs/search/all_7.js | 4 +- docs/search/all_8.html | 2 +- docs/search/all_8.js | 10 +- docs/search/all_9.html | 2 +- docs/search/all_a.html | 2 +- docs/search/all_b.html | 2 +- docs/search/all_c.html | 2 +- docs/search/all_c.js | 1 + docs/search/all_d.html | 2 +- docs/search/all_d.js | 4 +- docs/search/all_e.html | 2 +- docs/search/all_f.html | 2 +- docs/search/classes_0.html | 2 +- docs/search/classes_1.html | 2 +- docs/search/classes_2.html | 2 +- docs/search/classes_3.html | 2 +- docs/search/classes_3.js | 1 - docs/search/classes_4.html | 2 +- docs/search/classes_5.html | 2 +- docs/search/classes_6.html | 2 +- docs/search/classes_7.html | 2 +- docs/search/classes_8.html | 2 +- docs/search/classes_9.html | 2 +- docs/search/classes_a.html | 2 +- docs/search/classes_b.html | 2 +- docs/search/classes_c.html | 2 +- docs/search/defines_0.html | 2 +- docs/search/defines_1.html | 2 +- docs/search/defines_10.html | 2 +- docs/search/defines_11.html | 2 +- docs/search/defines_2.html | 2 +- docs/search/defines_3.html | 2 +- docs/search/defines_4.html | 2 +- docs/search/defines_4.js | 2 +- docs/search/defines_5.html | 2 +- docs/search/defines_6.html | 2 +- docs/search/defines_7.html | 2 +- docs/search/defines_8.html | 2 +- docs/search/defines_9.html | 2 +- docs/search/defines_a.html | 2 +- docs/search/defines_b.html | 2 +- docs/search/defines_c.html | 2 +- docs/search/defines_d.html | 2 +- docs/search/defines_e.html | 2 +- docs/search/defines_f.html | 2 +- docs/search/enums_0.html | 2 +- docs/search/enums_0.js | 2 +- docs/search/enums_1.html | 2 +- docs/search/enums_2.html | 2 +- docs/search/enumvalues_0.html | 2 +- docs/search/enumvalues_0.js | 2 +- docs/search/enumvalues_1.html | 2 +- docs/search/enumvalues_2.html | 2 +- docs/search/enumvalues_2.js | 2 +- docs/search/enumvalues_3.html | 2 +- docs/search/enumvalues_3.js | 2 +- docs/search/enumvalues_4.html | 2 +- docs/search/enumvalues_5.html | 2 +- docs/search/enumvalues_5.js | 2 +- docs/search/enumvalues_6.html | 2 +- docs/search/enumvalues_7.html | 2 +- docs/search/enumvalues_8.html | 2 +- docs/search/enumvalues_9.html | 2 +- docs/search/enumvalues_9.js | 2 +- docs/search/enumvalues_a.html | 2 +- docs/search/enumvalues_a.js | 2 +- docs/search/files_0.html | 2 +- docs/search/files_1.html | 2 +- docs/search/files_1.js | 3 +- docs/search/files_2.html | 2 +- docs/search/files_3.html | 2 +- docs/search/files_3.js | 1 - docs/search/files_4.html | 2 +- docs/search/files_5.html | 2 +- docs/search/files_6.html | 2 +- docs/search/files_7.html | 2 +- docs/search/files_8.html | 2 +- docs/search/files_9.html | 2 +- docs/search/files_a.html | 2 +- docs/search/files_b.html | 2 +- docs/search/files_c.html | 2 +- docs/search/functions_0.html | 2 +- docs/search/functions_0.js | 1 + docs/search/functions_1.html | 2 +- docs/search/functions_10.html | 2 +- docs/search/functions_10.js | 6 +- docs/search/functions_11.html | 2 +- docs/search/functions_11.js | 2 +- docs/search/functions_12.html | 2 +- docs/search/functions_12.js | 2 +- docs/search/functions_13.html | 2 +- docs/search/functions_13.js | 2 +- docs/search/functions_14.html | 2 +- docs/search/functions_15.html | 2 +- docs/search/functions_16.html | 2 +- docs/search/functions_17.html | 2 +- docs/search/functions_17.js | 1 - docs/search/functions_2.html | 2 +- docs/search/functions_3.html | 2 +- docs/search/functions_3.js | 2 +- docs/search/functions_4.html | 2 +- docs/search/functions_4.js | 1 - docs/search/functions_5.html | 2 +- docs/search/functions_6.html | 2 +- docs/search/functions_6.js | 3 +- docs/search/functions_7.html | 2 +- docs/search/functions_8.html | 2 +- docs/search/functions_8.js | 9 +- docs/search/functions_9.html | 2 +- docs/search/functions_a.html | 2 +- docs/search/functions_b.html | 2 +- docs/search/functions_c.html | 2 +- docs/search/functions_c.js | 2 +- docs/search/functions_d.html | 2 +- docs/search/functions_e.html | 2 +- docs/search/functions_f.html | 2 +- docs/search/pages_0.html | 2 +- docs/search/pages_1.html | 2 +- docs/search/typedefs_0.html | 2 +- docs/search/typedefs_1.html | 2 +- docs/search/typedefs_2.html | 2 +- docs/search/typedefs_2.js | 2 +- docs/search/variables_0.html | 2 +- docs/search/variables_0.js | 3 +- docs/search/variables_1.html | 2 +- docs/search/variables_10.html | 2 +- docs/search/variables_10.js | 1 + docs/search/variables_11.html | 2 +- docs/search/variables_12.html | 2 +- docs/search/variables_12.js | 2 +- docs/search/variables_13.html | 2 +- docs/search/variables_14.html | 2 +- docs/search/variables_15.html | 2 +- docs/search/variables_16.html | 2 +- docs/search/variables_17.html | 2 +- docs/search/variables_2.html | 2 +- docs/search/variables_3.html | 2 +- docs/search/variables_3.js | 2 +- docs/search/variables_4.html | 2 +- docs/search/variables_5.html | 2 +- docs/search/variables_6.html | 2 +- docs/search/variables_7.html | 2 +- docs/search/variables_8.html | 2 +- docs/search/variables_8.js | 1 - docs/search/variables_9.html | 2 +- docs/search/variables_a.html | 2 +- docs/search/variables_b.html | 2 +- docs/search/variables_b.js | 1 + docs/search/variables_c.html | 2 +- docs/search/variables_c.js | 2 +- docs/search/variables_d.html | 2 +- docs/search/variables_e.html | 2 +- docs/search/variables_f.html | 2 +- docs/structColor-members.html | 8 +- docs/structColor.html | 11 +- docs/structColor__coll__graph.md5 | 2 +- docs/structColor__coll__graph.svg | 28 +- docs/structEnemyData-members.html | 8 +- docs/structEnemyData.html | 11 +- docs/structEnemyData__coll__graph.md5 | 2 +- docs/structEnemyData__coll__graph.svg | 46 +- docs/structEnemySpawnData-members.html | 8 +- docs/structEnemySpawnData.html | 11 +- docs/structEnemySpawnData__coll__graph.md5 | 2 +- docs/structEnemySpawnData__coll__graph.svg | 28 +- docs/structSpawnPointData-members.html | 8 +- docs/structSpawnPointData.html | 11 +- docs/structSpawnPointData__coll__graph.md5 | 2 +- docs/structSpawnPointData__coll__graph.svg | 24 +- docs/structWaveData-members.html | 8 +- docs/structWaveData.html | 11 +- docs/structWaveData__coll__graph.md5 | 2 +- docs/structWaveData__coll__graph.svg | 34 +- docs/todo.html | 24 +- doxygen_sqlite3.db | Bin 0 -> 260096 bytes 922 files changed, 22411 insertions(+), 21246 deletions(-) create mode 100644 Engine/include/ComponentType.h delete mode 100644 Engine/include/emptyGameObject.h rename Engine/src/{HItPoints.cpp => HitPoints.cpp} (100%) delete mode 100644 Game/include/EmptyGameObject.h rename docs/{emptyGameObject_8h.html => ComponentType_8h.html} (55%) create mode 100644 docs/ComponentType_8h__dep__incl.map create mode 100644 docs/ComponentType_8h__dep__incl.md5 create mode 100644 docs/ComponentType_8h__dep__incl.svg delete mode 100644 docs/EmptyGameObject_8h.html delete mode 100644 docs/EmptyGameObject_8h__dep__incl.map delete mode 100644 docs/EmptyGameObject_8h__dep__incl.md5 delete mode 100644 docs/EmptyGameObject_8h__dep__incl.svg delete mode 100644 docs/EmptyGameObject_8h__incl.map delete mode 100644 docs/EmptyGameObject_8h__incl.md5 delete mode 100644 docs/EmptyGameObject_8h__incl.svg delete mode 100644 docs/classEmptyGameObject-members.html delete mode 100644 docs/classEmptyGameObject.html delete mode 100644 docs/classEmptyGameObject__coll__graph.map delete mode 100644 docs/classEmptyGameObject__coll__graph.md5 delete mode 100644 docs/classEmptyGameObject__coll__graph.svg delete mode 100644 docs/classEmptyGameObject__inherit__graph.map delete mode 100644 docs/classEmptyGameObject__inherit__graph.md5 delete mode 100644 docs/classEmptyGameObject__inherit__graph.svg delete mode 100644 docs/classemptyGameObject-members.html delete mode 100644 docs/classemptyGameObject.html delete mode 100644 docs/classemptyGameObject__coll__graph.map delete mode 100644 docs/classemptyGameObject__coll__graph.md5 delete mode 100644 docs/classemptyGameObject__coll__graph.svg delete mode 100644 docs/classemptyGameObject__inherit__graph.map delete mode 100644 docs/classemptyGameObject__inherit__graph.md5 delete mode 100644 docs/classemptyGameObject__inherit__graph.svg create mode 100644 doxygen_sqlite3.db diff --git a/Engine/include/Component.h b/Engine/include/Component.h index 825e2ba9..1a462808 100644 --- a/Engine/include/Component.h +++ b/Engine/include/Component.h @@ -1,22 +1,9 @@ #ifndef COMPONENT_H #define COMPONENT_H +#include "ComponentType.h" #include "GameObject.h" -/** - \brief Tipos de Componentes - - Enumeração com os tipos de componentes possíveis, usado no método Is que todo componente deve implementar. -*/ -enum ComponentType{ - DRAG_AND_DROP=0, - HIT_POINTS, - AI_GO_DOWN, - WAVE_MANAGER, - SIZE, - COMPONENT_TYPE_SIZE -}; - #ifndef GAME_OBJECT class GameObject; #endif diff --git a/Engine/include/ComponentType.h b/Engine/include/ComponentType.h new file mode 100644 index 00000000..6787c693 --- /dev/null +++ b/Engine/include/ComponentType.h @@ -0,0 +1,19 @@ +#ifndef COMPONENTTYPE_H +#define COMPONENTTYPE_H + +/** + \brief Tipos de Componentes + + Enumeração com os tipos de componentes possíveis, usado no método Is que todo componente deve implementar. + Foi colocado em um arquivo separado por problemas de inclusão circular entre GameObject e Component. +*/ +enum ComponentType{ + DRAG_AND_DROP=0, + HIT_POINTS, + AI_GO_DOWN, + WAVE_MANAGER, + SIZE, + COMPONENT_TYPE_SIZE +}; + +#endif // COMPONENTTYPE_H diff --git a/Engine/include/DragAndDrop.h b/Engine/include/DragAndDrop.h index 48cc9bc6..2b449b52 100644 --- a/Engine/include/DragAndDrop.h +++ b/Engine/include/DragAndDrop.h @@ -14,12 +14,13 @@ class DragAndDrop : public Component{ \brief Construtor. \param map Usado para inserir o objeto no tileMap. \param draggin Informa se o objeto esta sendo arrastado. + \param redrag Verdadeiro se for um redrag, falso caso seja um drag inicial. \param dragOnActionHold Variável não utilizada, tem como objetivo verificar se o arrastar é enquanto o botão da ação é segurado ou se pressiona uma vez para arrastar e outra vez para soltar. \todo Implementar o dragOnActionHold. Instancia o DragAndDrop, informando se o objeto está sendo arrastado. */ - DragAndDrop(TileMap *map, bool dragging= false, bool dragOnActionHold= true); + DragAndDrop(TileMap &map, Vec2 associatedInitialPos, bool redrag= true, bool dragOnActionHold= true); /** \brief Atualiza o estado do objeto em arrasto. \param associated GameObject que possui esse componente. @@ -35,9 +36,10 @@ class DragAndDrop : public Component{ */ bool Is(ComponentType) const; private: - bool isDragging;/**< Indica se o objeto esta sendo arrastado.*/ bool dragOnHold;/**< [Não utilizado no momento] Armazena a informação se o botão deve ser segurado para arrastar, ou apenas pressiona uma vez para arrastar e outra vez para soltar.*/ - TileMap *tileMap;/**< TileMap no qual o GameObject será inserido após o drag.*/ + Vec2 associatedInitialPos;/** #include "Component.h" +#include "ComponentType.h" #include "Rect.h" using std::string; @@ -34,45 +35,57 @@ class GameObject{ Não é virtual, sua implementação inicializa a rotação com o valor zero. Pode ser usado pelos herdeiros. */ GameObject(void); + /** + \brief Adiciona componente a um gameobjet. + \param component componente a ser adicionado. + + */ + void AddComponent(Component* component); + /** + \brief Remove componente a um gameobjet. + \param type tipo do componente a ser adicionado. + + */ + void RemoveComponent(ComponentType type); /** \brief Destrutor Basicamente é para obrigar quem implementar de usar um destrutor. */ - virtual ~GameObject(void); + ~GameObject(void); /** \brief Atualizar estado. \param dt tempo transcorrido desde a última chamada ao método. No corpo método o GameObject deve atualizar seu estado, utilizando o argumento passado e quaisquer outras funcionalidades que necessitar. */ - virtual void Update(float dt)=0; + virtual void Update(float dt); /** \brief Renderiza o GameObject. Esse método deve ter a lógica necessário para ser renderizado na tela. */ - virtual void Render(void)=0; + virtual void Render(void); /** \brief Informa se esse gameObject não precisa mais existir. \return Verdadeiro se esse GameObject não é mais necessário, false caso contrário. Deve ser usado no State que o contém para o eliminar da sua estrutura de manipulação de gameObject e destruí-lo. */ - virtual bool IsDead(void)=0; + bool IsDead(void); /** \brief Solicita que o GameObject seja destruído. Uma vez que esse método é chamado, futuras chamadas ao IsDead devem retornar verdadeiro. */ - virtual void RequestDelete(void)=0; + void RequestDelete(void); /** \brief Notifica Colisão \param other Referência para o gameobject com o qual se colidiu. Deve realizar as ações para tratamento da colisão. */ - virtual void NotifyCollision(GameObject &other)=0; + virtual void NotifyCollision(GameObject &other); /** \brief Informa que tipo de GameObject é. \param type Tipo com o qual quer se verificar que esse GameObject é. @@ -80,17 +93,18 @@ class GameObject{ É usado no tratamento de colisão para que se identifique com quem colidiu. */ - virtual bool Is(string type)=0; + virtual bool Is(string type); /** \brief Obtém Rect informando a posição renderizada da animação. Obtém Rect informando a posição renderizada, computando zoom, escala e posição da câmera. */ - virtual Rect GetWorldRenderedRect(void) const=0; + virtual Rect GetWorldRenderedRect(void) const; Rect box;/**< Posição do GameObject na tela.*/ float rotation;/**< Rotação do GameObject.*/ protected: std::vector components;/**< Vetor de componentes, que provêem funcionalidades adicionais.*/ + bool dead; }; #endif // GAMEOBJECT_H diff --git a/Engine/include/InputManager.h b/Engine/include/InputManager.h index 897588d2..79c13984 100644 --- a/Engine/include/InputManager.h +++ b/Engine/include/InputManager.h @@ -74,10 +74,19 @@ class InputManager { \param key Tecla do teclado cujo o estado é requierido \return Booleano que informa se a tecla está pressionada ou não. - Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for verdadeiro. + Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for verdadeiro e isso ocorrer nesse frame. Caso contrário retorna-se o valor falso. */ bool IsKeyDown(int key) const; + /** + \brief Informa se uma tecla do teclado NÃO está pressionada no momento + \param key Tecla do teclado cujo o estado é requierido + \return Booleano que informa se a tecla está pressionada ou não. + + Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for falso. + Caso contrário retorna-se o valor falso. + */ + bool IsKeyUp(int key) const; /** \brief Informa se um botão do mouse foi pressionado no frame corrente \param key Botão do mouse cujo o estado é requierido @@ -108,6 +117,16 @@ class InputManager { Recomenda-se o uso das macros LEFT_MOUSE_BUTTON, RIGHT_MOUSE_BUTTON e MIDDLE_MOUSE_BUTTON. */ bool IsMouseDown(int button) const; + /** + \brief Informa se um botão do mouse NÃO está pressionada no momento + \param key Botão do mouse cujo o estado é requierido + \return Booleano que informa se o botão está pressionado ou não. + + Retorna verdadeiro se o mouseState do botão for falso. + Caso contrário retorna-se o valor falso. + Recomenda-se o uso das macros LEFT_MOUSE_BUTTON, RIGHT_MOUSE_BUTTON e MIDDLE_MOUSE_BUTTON. + */ + bool IsMouseUp(int button) const; /** \brief Informa se o scroll dp do mouse foi acionado no frame atual \return Booleano que informa se o scroll está em uso ou não. @@ -193,15 +212,25 @@ class InputManager { */ bool IsButtonDown(int button) const; + /** + \brief Informa se um botão do controle está NÃO pressionada no momento + \param button Botão do mouse cujo o estado é requierido + \return Booleano que informa se o botão está pressionado ou não. + + Retorna verdadeiro se o controllerState do botão for falso. + Caso contrário retorna-se o valor falso. + + */ + bool IsButtonUp(int button) const; /** \brief Calcula o deslocamento do sticker esquerdo de um controle - \return Vetor bidimensional que informa se o botão está pressionado ou não. + \return Vetor bidimensional que informa a posição (x,y) do analógico esquerdo. */ Vec2 GetControllerLeftStickState() const; /** \brief Calcula o deslocamento do sticker direito de um controle - \return Vetor bidimensional que informa se o botão está pressionado ou não. + \return Vetor bidimensional que informa a posição (x,y) do analógico direito. */ Vec2 GetControllerRightStickState() const; diff --git a/Engine/include/SDL_include.h b/Engine/include/SDL_include.h index 04a8d2cb..4e571ccb 100644 --- a/Engine/include/SDL_include.h +++ b/Engine/include/SDL_include.h @@ -1,93 +1,93 @@ /************************************************ -* SDL.h * +* SDL.h * *************************************************/ #ifdef INCLUDE_SDL - #ifdef _WIN32 - #include - #elif __APPLE__ - #include "TargetConditionals.h" - #include - //mac - #elif __linux__ - #include - #else - #error "Unknown compiler" - #endif - #undef INCLUDE_SDL + #ifdef _WIN32 + #include + #elif __APPLE__ + #include "TargetConditionals.h" + #include + //mac + #elif __linux__ + #include + #else + #error "Unknown compiler" + #endif + #undef INCLUDE_SDL #endif // INCLUDE_SDL /************************************************ -* SDL_image.h * +* SDL_image.h * *************************************************/ #ifdef INCLUDE_SDL_IMAGE - #ifdef _WIN32 - #include - #elif __APPLE__ - #include "TargetConditionals.h" - #include - //mac - #elif __linux__ - #include - #else - #error "Unknown compiler" - #endif - #undef INCLUDE_SDL_IMAGE + #ifdef _WIN32 + #include + #elif __APPLE__ + #include "TargetConditionals.h" + #include + //mac + #elif __linux__ + #include + #else + #error "Unknown compiler" + #endif + #undef INCLUDE_SDL_IMAGE #endif // INCLUDE_SDL_IMAGE /************************************************ -* SDL_mixer.h * +* SDL_mixer.h * *************************************************/ #ifdef INCLUDE_SDL_MIXER - #ifdef _WIN32 - #include - #elif __APPLE__ - #include "TargetConditionals.h" - #include - //mac - #elif __linux__ - #include - #else - #error "Unknown compiler" - #endif - #undef INCLUDE_SDL_MIXER + #ifdef _WIN32 + #include + #elif __APPLE__ + #include "TargetConditionals.h" + #include + //mac + #elif __linux__ + #include + #else + #error "Unknown compiler" + #endif + #undef INCLUDE_SDL_MIXER #endif // INCLUDE_SDL_MIXER /************************************************ -* SDL_ttf.h * +* SDL_ttf.h * *************************************************/ #ifdef INCLUDE_SDL_TTF - #ifdef _WIN32 - #include - #elif __APPLE__ - #include "TargetConditionals.h" - #include - //mac - #elif __linux__ - #include - #else - #error "Unknown compiler" - #endif - #undef INCLUDE_SDL_TTF + #ifdef _WIN32 + #include + #elif __APPLE__ + #include "TargetConditionals.h" + #include + //mac + #elif __linux__ + #include + #else + #error "Unknown compiler" + #endif + #undef INCLUDE_SDL_TTF #endif // INCLUDE_SDL_TTF /************************************************ -* SDL_net.h * +* SDL_net.h * *************************************************/ #ifdef INCLUDE_SDL_NET - #ifdef _WIN32 - #include - #elif __APPLE__ - #include "TargetConditionals.h" - #include - //mac - #elif __linux__ - #include - #else - #error "Unknown compiler" - #endif - #undef INCLUDE_SDL_NET + #ifdef _WIN32 + #include + #elif __APPLE__ + #include "TargetConditionals.h" + #include + //mac + #elif __linux__ + #include + #else + #error "Unknown compiler" + #endif + #undef INCLUDE_SDL_NET #endif // INCLUDE_SDL_NET diff --git a/Engine/include/TileMap.h b/Engine/include/TileMap.h index c73a18fd..b0fca7e1 100644 --- a/Engine/include/TileMap.h +++ b/Engine/include/TileMap.h @@ -110,6 +110,34 @@ class TileMap{ Atualiza-se o tileMao de colisão para adicionar a informação que tem um GameObject na posição respectiva. */ void InsertGO(GameObject* obj); + /** + \brief Insere GameObjct no tileMap ou o posiciona na posição passada caso não seja possivel + \param obj GameObject a ser inserido no tileMap de GameObjects. + + Utiliza a posição do mouse no momento(que deve ser a mesma do centro do GameObject) para identificar onde o GameObject deve ser colocado no tileMap de GameObjects. Então obj é colocado nessa posição, sua posição é alterada para se encaixar exatamente com o início da posição. + Atualiza-se o tileMao de colisão para adicionar a informação que tem um GameObject na posição respectiva. + */ + void InsertGO(GameObject* obj,Vec2 initialPos); + /** + \brief Remove GameObjct no tileMap + \param position Posição que contém o Gameobject a ser retirado. + + Atualiza-se o tileMap de colisão para adicionar a informação que tem um GameObject na posição respectiva. + */ + void RemoveGO(int position); + /** + \brief Remove GameObjct no tileMap + + Variação do RemoveGO que internamente faz a busca o GameObject que está debaixo do mouse para remover. + Atualiza-se o tileMap de colisão para adicionar a informação que tem um GameObject na posição respectiva. + */ + void RemoveGO(void); + /** + \brief Obtém GameObject de uma determinada posição do tileMap + + Faz-se checagem de limites para saber se a posição desejada existe. + */ + GameObject* GetGO(int index); /** \brief Ativa ou desativa a exibição na tela das informações do tileMap de colisão diff --git a/Engine/include/emptyGameObject.h b/Engine/include/emptyGameObject.h deleted file mode 100644 index 3ef69e5e..00000000 --- a/Engine/include/emptyGameObject.h +++ /dev/null @@ -1,8 +0,0 @@ -class emptyGameObject : public GameObject -{ - public: - emptyGameObject(); - ~emptyGameObject(); - private: - -}; \ No newline at end of file diff --git a/Engine/src/DragAndDrop.cpp b/Engine/src/DragAndDrop.cpp index 2f88fe04..8af86dfc 100644 --- a/Engine/src/DragAndDrop.cpp +++ b/Engine/src/DragAndDrop.cpp @@ -4,20 +4,24 @@ #include "Error.h" #include "InputManager.h" -DragAndDrop::DragAndDrop(TileMap *map, bool dragging, bool dragOnActionHold) - : isDragging(dragging), dragOnHold(dragOnActionHold), tileMap(map) { +DragAndDrop::DragAndDrop(TileMap &map,Vec2 associatedInitialPos, bool redrag, bool dragOnActionHold) + : dragOnHold(dragOnActionHold),associatedInitialPos(associatedInitialPos), tileMap(map), redrag(redrag) { } void DragAndDrop::Update(GameObject &associated, float dt) { InputManager &inputManager= InputManager::GetInstance(); - - - if(isDragging && inputManager.IsMouseDown(RIGHT_MOUSE_BUTTON)) { - Vec2 mousePos = Camera::ScreenToWorld(inputManager.GetMousePos()); - associated.box = mousePos-Vec2(associated.box.w/2, associated.box.h/2); - } else if(inputManager.MouseRelease(RIGHT_MOUSE_BUTTON) && isDragging) { - tileMap->InsertGO(&associated); - isDragging = false; + if(inputManager.IsMouseDown(RIGHT_MOUSE_BUTTON)){ + Vec2 mousePos= inputManager.GetMousePos()*(1/Camera::GetZoom()); + associated.box= mousePos+Camera::pos-Vec2(associated.box.w/2, associated.box.h/2); + } + else if(inputManager.MouseRelease(RIGHT_MOUSE_BUTTON)) { + if(redrag){ + tileMap.InsertGO(&associated, associatedInitialPos); + } + else{ + tileMap.InsertGO(&associated); + } + associated.RemoveComponent(DRAG_AND_DROP); } } diff --git a/Engine/src/GameObject.cpp b/Engine/src/GameObject.cpp index 1687ccfc..8e3a7ec4 100644 --- a/Engine/src/GameObject.cpp +++ b/Engine/src/GameObject.cpp @@ -1,8 +1,55 @@ #include "GameObject.h" +#include "Error.h" +#include "Camera.h" GameObject::~GameObject(){ } -GameObject::GameObject(void): rotation(0.){ +GameObject::GameObject(void): rotation(0.), dead(false){ +} + +void GameObject::Update(float dt){ + for(uint i=0; i < components.size(); i++){ + components[i]->Update(*this, dt); + } +} + +void GameObject::Render(void){ + REPORT_DEBUG("\t GameObject::Render called!"); +} + +bool GameObject::IsDead(void){ + return dead; +} + +void GameObject::RequestDelete(void){ + dead= true; +} + +void GameObject::NotifyCollision(GameObject &other){ + REPORT_DEBUG("\t GameObject::NotifyCollision called!"); +} + +bool GameObject::Is(string type){ + REPORT_DEBUG("\t GameObject::Is called!"); + return ("GameObject" == type); +} + +Rect GameObject::GetWorldRenderedRect(void) const{ + return Camera::WorldToScreen(box); +} + +void GameObject::AddComponent(Component* component){ + components.emplace_back(component); +} + +void GameObject::RemoveComponent(ComponentType type){ + for(unsigned int i = 0;i < components.size();i++){ + if(components[i]->Is(type)){ + delete components[i]; + components.erase(components.begin() + i); + return; + } + } } diff --git a/Engine/src/HItPoints.cpp b/Engine/src/HitPoints.cpp similarity index 100% rename from Engine/src/HItPoints.cpp rename to Engine/src/HitPoints.cpp diff --git a/Engine/src/InputManager.cpp b/Engine/src/InputManager.cpp index 5eeebf57..90bc497f 100644 --- a/Engine/src/InputManager.cpp +++ b/Engine/src/InputManager.cpp @@ -30,13 +30,14 @@ void InputManager::Update(){ } // Se o evento for clique... else if(SDL_MOUSEBUTTONDOWN == event.type){ - mouseState[event.button.button] = true; - mouseUpdate[event.button.button] = updateCounter; + mouseState[event.button.button] = true; + mouseUpdate[event.button.button] = updateCounter; } else if(SDL_MOUSEBUTTONUP == event.type ) { mouseState[event.button.button] = false; + mouseUpdate[event.button.button] = updateCounter; } else if(SDL_MOUSEWHEEL == event.type){ mouseScroolState= Vec2(event.wheel.x, event.wheel.y); @@ -50,6 +51,7 @@ void InputManager::Update(){ } else if(SDL_KEYUP == event.type ){ keyState[event.key.keysym.sym] = false; + keyUpdate[event.key.keysym.sym] = updateCounter; } else if(SDL_CONTROLLERDEVICEADDED == event.type ){ std::cout <<" reconheceu controle" << std::endl; @@ -60,7 +62,6 @@ void InputManager::Update(){ } } else if(SDL_CONTROLLERDEVICEREMOVED == event.type ){ - try{ SDL_GameController *pad = padToController.at(event.cdevice.which); SDL_GameControllerClose(pad); @@ -76,6 +77,7 @@ void InputManager::Update(){ } else if(SDL_CONTROLLERBUTTONUP == event.type ){ controllerState[event.cbutton.button] = false; + controllerUpdate[event.cbutton.button] = updateCounter; } else if(SDL_CONTROLLERAXISMOTION == event.type ){ if(SDL_CONTROLLER_AXIS_TRIGGERLEFT == event.caxis.axis ){ @@ -102,7 +104,7 @@ void InputManager::Update(){ bool InputManager::KeyPress(int key) const{ try{ - return(keyUpdate.at(key) == updateCounter); + return(keyUpdate.at(key) == updateCounter && keyState.at(key)); } catch (const std::out_of_range& oor){ return false; @@ -111,7 +113,7 @@ bool InputManager::KeyPress(int key) const{ bool InputManager::KeyRelease(int key) const{ try{ - return(keyUpdate.at(key) != updateCounter); + return(keyUpdate.at(key) != updateCounter && !keyState.at(key)); } catch (const std::out_of_range& oor){ return false; @@ -127,9 +129,18 @@ bool InputManager::IsKeyDown(int key) const{ } } +bool InputManager::IsKeyUp(int key) const{ + try{ + return(keyState.at(key) == false); + } + catch (const std::out_of_range& oor){ + return false; + } +} + bool InputManager::ButtonPress(int button) const{ try{ - return(controllerUpdate.at(button) == updateCounter); + return(controllerUpdate.at(button) == updateCounter && controllerState.at(button)); } catch (const std::out_of_range& oor){ return false; @@ -138,7 +149,7 @@ bool InputManager::ButtonPress(int button) const{ bool InputManager::ButtonRelease(int button) const{ try{ - return(controllerUpdate.at(button) != updateCounter); + return(controllerUpdate.at(button) != updateCounter && !controllerState.at(button)); } catch (const std::out_of_range& oor){ return false; @@ -154,6 +165,15 @@ bool InputManager::IsButtonDown(int button) const{ } } +bool InputManager::IsButtonUp(int button) const{ + try{ + return(controllerState.at(button) == false); + } + catch (const std::out_of_range& oor){ + return false; + } +} + Vec2 InputManager::GetControllerLeftStickState() const{ return controllerLeftStickState; } @@ -167,17 +187,21 @@ bool InputManager::IsControllerSticking(void) const{ } bool InputManager::MousePress(int button) const{ - return (mouseUpdate[button] == updateCounter); + return (mouseUpdate[button] == updateCounter && mouseState[button]); } bool InputManager::MouseRelease(int button) const{ - return (mouseUpdate[button] != updateCounter); + return (mouseUpdate[button] == updateCounter && !mouseState[button]); } bool InputManager::IsMouseDown(int button) const{ return (true == mouseState[button] ); } +bool InputManager::IsMouseUp(int button) const{ + return (false == mouseState[button] ); +} + int InputManager::GetMouseX() const{ return(mouseX); } diff --git a/Engine/src/State.cpp b/Engine/src/State.cpp index 227455c7..2ec31d8e 100644 --- a/Engine/src/State.cpp +++ b/Engine/src/State.cpp @@ -1,5 +1,5 @@ #include "State.h" - +#include "Error.h" #include "Camera.h" State::State(void) : popRequested(false), quitRequested(false) { @@ -31,6 +31,7 @@ void State::UpdateArray(float dt) { } void State::RenderArray(void) const { + REPORT_I_WAS_HERE; for(unsigned int cont = 0; cont < objectArray.size(); cont++) { objectArray[cont]->Render(); } diff --git a/Engine/src/TileMap.cpp b/Engine/src/TileMap.cpp index 0d84090b..c654695d 100644 --- a/Engine/src/TileMap.cpp +++ b/Engine/src/TileMap.cpp @@ -166,7 +166,6 @@ int TileMap::GetTileMousePos(Vec2 const &mousePos, bool affecteedByZoom, int lay return y*mapWidth+x; } - void TileMap::InsertGO(GameObject* obj) { Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()); int position = GetTileMousePos(mousePos, false, 0); @@ -197,6 +196,61 @@ void TileMap::InsertGO(GameObject* obj) { } } +void TileMap::InsertGO(GameObject* obj,Vec2 initialPos) { + Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()); + int position = GetTileMousePos(mousePos, false, 0); + REPORT_DEBUG("\t position = " << position << "\t of " << mapHeight*mapWidth << " tiles."); + + if(0 > position) { + std::cout << WHERE << "[ERROR] Tried to put the gameObject on an invalid tileMap position." << END_LINE; + //obj->box = initialPos; + return; + } + + int initialTile = GetTileMousePos(initialPos, false, 0); + if(-1 == AtLayer(position, COLLISION_LAYER)) { + REPORT_DEBUG("\tInserting the gameObject at position " << position); + gameObjectMatrix[position] = obj; + tileMatrix[position+(COLLISION_LAYER*mapWidth*mapHeight)] = PAREDE; + + int line = position / GetWidth(); + int column = position % GetWidth(); + obj->box.x = column*tileSet->GetTileWidth(); + obj->box.y = line*tileSet->GetTileHeight(); + RemoveGO(initialTile); + //TODO: aqui ajudar a box para ficar exatamente no tileMap + } + else { + + int line = initialTile / GetWidth(); + int column = initialTile % GetWidth(); + obj->box.x = column*tileSet->GetTileWidth(); + obj->box.y = line*tileSet->GetTileHeight(); + + } +} + +void TileMap::RemoveGO(int position){ + REPORT_I_WAS_HERE; + if(0 == AtLayer(position, COLLISION_LAYER)){ + if(nullptr == gameObjectMatrix[position]){ + REPORT_DEBUG("\t Trying to remove a gameObject where there is none"); + } + REPORT_DEBUG("\tRemoving the gameObject at position " << position); + gameObjectMatrix[position] = nullptr; + tileMatrix[position + (COLLISION_LAYER * mapWidth * mapHeight)] = -1; + } + else{ + REPORT_DEBUG("\ttentado remover objeto de posicao inválida" << std::endl); + } +} + +void TileMap::RemoveGO(void){ + Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()); + int position = GetTileMousePos(mousePos, false, COLLISION_LAYER); + RemoveGO(position); +} + void TileMap::ShowCollisionInfo(bool show) { displayCollisionInfo = show; } @@ -259,7 +313,7 @@ vector>* TileMap::GetSpawnPositions(void) const { } REPORT_I_WAS_HERE; } -#ifdef DEBUG +#if DEBUG std::cout << WHERE << "\tNumero de spawn groups achados: " << (*spawnPoints).size() << END_LINE; for(uint i = 0; i < (*spawnPoints).size(); i++) { std::cout << WHERE << "\tSpawn groups " << i <<" tem tamanho " << (*spawnPoints)[i].size() << END_LINE; @@ -275,3 +329,8 @@ vector>* TileMap::GetSpawnPositions(void) const { Vec2 TileMap::GetTileSize(void) const{ return Vec2(tileSet->GetTileWidth(), tileSet->GetTileHeight()); } + +GameObject* TileMap::GetGO(int index){ + return gameObjectMatrix.at(index); +} + diff --git a/EngineIDJ.files b/EngineIDJ.files index 27bf4064..cfff00b3 100644 --- a/EngineIDJ.files +++ b/EngineIDJ.files @@ -1,4 +1,6 @@ <<<<<<< HEAD +======= +<<<<<<< HEAD <<<<<<< HEAD ======= Game/src/GameResources.cpp @@ -38,7 +40,6 @@ Game/include/EndStateData.h Game/include/EndState.h <<<<<<< HEAD <<<<<<< HEAD -Game/include/EmptyGameObject.h Game/include/Defines.h ======= Game/include/Defines.h @@ -60,7 +61,7 @@ Engine/src/Resources.cpp Engine/src/Rect.cpp Engine/src/Music.cpp Engine/src/InputManager.cpp -Engine/src/HItPoints.cpp +Engine/src/HitPoints.cpp Engine/src/GameObject.cpp Engine/src/Game.cpp Engine/src/DragAndDrop.cpp @@ -100,6 +101,7 @@ Engine/include/Animation.h Engine/include/AIGoDown.h Engine/include/ActionManager.h ======= +>>>>>>> cc3bfc49d98b75ba776e94e4a99e2a7358d33229 Engine/include/ActionManager.h Engine/include/AIGoDown.h Engine/include/Animation.h @@ -107,6 +109,7 @@ Engine/include/Camera.h Engine/include/Collision.h Engine/include/Color.h Engine/include/Component.h +Engine/include/ComponentType.h Engine/include/DragAndDrop.h >>>>>>> bf4e2285b2b341e482bc808a5988dde9e137c701 Engine/include/Error.h @@ -189,15 +192,92 @@ Game/include/Defines.h Game/include/EndState.h Game/include/EndStateData.h Game/include/Enemy.h -Game/include/Face.h +Game/include/GameResources.h Game/include/StageState.h Game/include/TitleState.h +Game/include/Tower.h +Game/include/WaveData.h Game/src/EndState.cpp Game/src/EndStateData.cpp Game/src/Enemy.cpp -Game/src/Face.cpp +Game/src/GameResources.cpp Game/src/main.cpp Game/src/StageState.cpp Game/src/TitleState.cpp +<<<<<<< HEAD +Game/src/Tower.cpp +======= >>>>>>> cc513032ce88dfd3ef4d544a2dbf208300eb5ab0 >>>>>>> bf4e2285b2b341e482bc808a5988dde9e137c701 +>>>>>>> cc3bfc49d98b75ba776e94e4a99e2a7358d33229 +Engine/include/ActionManager.h +Engine/include/AIGoDown.h +Engine/include/Animation.h +Engine/include/Camera.h +Engine/include/Collision.h +Engine/include/Color.h +Engine/include/Component.h +Engine/include/ComponentType.h +Engine/include/DragAndDrop.h +Engine/include/emptyGameObject.h +Engine/include/Error.h +Engine/include/Game.h +Engine/include/GameObject.h +Engine/include/HitPoints.h +Engine/include/InputManager.h +Engine/include/Music.h +Engine/include/Rect.h +Engine/include/Resources.h +Engine/include/SDL_include.h +Engine/include/Sound.h +Engine/include/Sprite.h +Engine/include/State.h +Engine/include/StateData.h +Engine/include/Text.h +Engine/include/TileMap.h +Engine/include/Tileset.h +Engine/include/Timer.h +Engine/include/Vec2.h +Engine/src/ActionManager.cpp +Engine/src/AIGoDown.cpp +Engine/src/Animation.cpp +Engine/src/Camera.cpp +Engine/src/Color.cpp +Engine/src/Component.cpp +Engine/src/DragAndDrop.cpp +Engine/src/Game.cpp +Engine/src/GameObject.cpp +Engine/src/HItPoints.cpp +Engine/src/InputManager.cpp +Engine/src/Music.cpp +Engine/src/Rect.cpp +Engine/src/Resources.cpp +Engine/src/Sound.cpp +Engine/src/Sprite.cpp +Engine/src/State.cpp +Engine/src/Text.cpp +Engine/src/TileMap.cpp +Engine/src/Tileset.cpp +Engine/src/Timer.cpp +Engine/src/Vec2.cpp +Game/include/Defines.h +Game/include/EmptyGameObject.h +Game/include/EndState.h +Game/include/EndStateData.h +Game/include/Enemy.h +Game/include/GameResources.h +Game/include/StageState.h +Game/include/TitleState.h +Game/include/Tower.h +Game/include/WaveData.h +Game/include/WaveManager.h +Game/src/EndState.cpp +Game/src/EndStateData.cpp +Game/src/Enemy.cpp +Game/src/GameResources.cpp +Game/src/main.cpp +Game/src/StageState.cpp +Game/src/TitleState.cpp +Game/src/Tower.cpp +Game/src/WaveData.cpp +Game/src/WaveManager.cpp diff --git a/Game/include/EmptyGameObject.h b/Game/include/EmptyGameObject.h deleted file mode 100644 index e02c44bc..00000000 --- a/Game/include/EmptyGameObject.h +++ /dev/null @@ -1,24 +0,0 @@ -#include "GameObject.h" -#include "Rect.h" - -class EmptyGameObject : public GameObject -{ -public: - EmptyGameObject(){} - ~EmptyGameObject(){} - - - void Update(float dt ){} - void Render(){} - bool IsDead(void){return false;} - void RequestDelete(void){} - - void NotifyCollision(GameObject &other){} - Rect GetWorldRenderedRect(void) const{ - Rect rect; - return rect; - } - bool Is(string type){return "EmptyGameObject" == type;} - - -}; \ No newline at end of file diff --git a/Game/include/Enemy.h b/Game/include/Enemy.h index 28e52a0b..0cd499b2 100644 --- a/Game/include/Enemy.h +++ b/Game/include/Enemy.h @@ -7,11 +7,12 @@ #include "Sprite.h" #include "TileMap.h" #include "Timer.h" +#include "Error.h" #include "WaveData.h" #define BASE_HIT_POINTS 100 #define DIFICULTY_CONSTANT 12 -typedef unsigned int uint; +#define ENEMY_MOVE_SPEED (120.) enum EnemyType{ HOSTILE=0, @@ -40,6 +41,15 @@ class Enemy : public GameObject No momento a position informa o extremo superior esquedo a partir do qual o gameObject será instanciado. */ Enemy(Vec2 position, int life); // calcula vida e velocidade + /** + \brief Construtor + \todo Documentar! + \todo Verificar se está sendo usado. + \param position posição onde o inimigo deve ser instancido. + \param life Quantidade de vida que o inimigo deve ter. + + No momento a position informa o extremo superior esquedo a partir do qual o gameObject será instanciado. + */ Enemy(Vec2 position, int enemyIndex, EnemyData enemyData, uint baseHP, uint endPoint); /** \brief Destrutor @@ -71,7 +81,7 @@ class Enemy : public GameObject Deve fazer o necessário para que futuras chamadas a IsDead retornem verdadeiro. */ - void RequestDelete(); + void RequestDelete(void); /** \brief Notifica evento de colisão. \todo Verificar viabilidade de tratar colisão em componentes. diff --git a/Game/include/StageState.h b/Game/include/StageState.h index d549d8dc..72cf563f 100644 --- a/Game/include/StageState.h +++ b/Game/include/StageState.h @@ -5,6 +5,7 @@ #include #include "ActionManager.h" +#include "DragAndDrop.h" #include "GameObject.h" #include "InputManager.h" #include "Music.h" @@ -14,7 +15,6 @@ #include "Tileset.h" #include "Timer.h" #include "WaveManager.h" -#include "EmptyGameObject.h" using std::vector; class StageState: public State { @@ -32,10 +32,8 @@ class StageState: public State { InputManager &inputManager; Music music; vector> *spawnGroups; - //Timer spawnTimer; - void SpawnEnemy(int tileMapPosition); WaveManager waveManager; - EmptyGameObject nullGameObject; + GameObject nullGameObject; vector waves;//vetor de waves a ser lido no arquivo }; diff --git a/Game/include/Tower.h b/Game/include/Tower.h index 3d2c56d5..312229b8 100644 --- a/Game/include/Tower.h +++ b/Game/include/Tower.h @@ -26,7 +26,7 @@ class Tower : public GameObject{ COMPUTATION } TowerType; - Tower(TowerType, Vec2 pos, Vec2 tileSize, TileMap *tileMap); + Tower(TowerType, Vec2 pos, Vec2 tileSize); void Damage(int damage); void Update(float dt ); diff --git a/Game/include/WaveManager.h b/Game/include/WaveManager.h index 66069ef3..0d747db0 100644 --- a/Game/include/WaveManager.h +++ b/Game/include/WaveManager.h @@ -84,7 +84,7 @@ class WaveManager : public Component { \param baseHP: HP base do inimigo para a wave atual. \param endPoint: posição de destino para aonde o inimigo vai. Lido de WaveData. - */ + */ void SpawnEnemy(int tileMapPosition, int enemyId,uint baseHP, uint endPoint); vector> *spawnGroups;/**, std::vector > > wavesAndEnemysData; /**GetTileMousePos(mousePos, true, 0) << ", cada layer tem " << tileMap->GetHeight()*tileMap->GetHeight() << " tiles." << std::endl; + std::cout << WHERE << "O mouse está no tile " << tileMap.GetTileMousePos(mousePos, true, 0) << ", cada layer tem " << tileMap.GetHeight()*tileMap.GetHeight() << " tiles." << END_LINE; } - if(InputManager::GetInstance().MousePress(RIGHT_MOUSE_BUTTON)) { + if(InputManager::GetInstance().MousePress(RIGHT_MOUSE_BUTTON)){ REPORT_I_WAS_HERE; - Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos())-Vec2(TOWER_LINEAR_SIZE/2, TOWER_LINEAR_SIZE/2);//metade to tamanho da Tower passado abaixo - AddObject( new Tower(static_cast(rand() % TOTAL_TOWER_TYPES), mousePos, Vec2(TOWER_LINEAR_SIZE, TOWER_LINEAR_SIZE), tileMap) ); + Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()); + int position = tileMap.GetTileMousePos(mousePos, false, COLLISION_LAYER); + GameObject *go= tileMap.GetGO(position); + if(nullptr == go){ + std::cout<AddComponent(new DragAndDrop(tileMap,mousePos)); + printf("adicionou drag'n drop\n"); + } } - if(InputManager::GetInstance().KeyPress('e')) { printf("Tower criado\n"); Vec2 mousePos = Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos())-Vec2(TOWER_LINEAR_SIZE/2, TOWER_LINEAR_SIZE/2); - AddObject(new Tower(static_cast(rand() % TOTAL_TOWER_TYPES), mousePos, Vec2(TOWER_LINEAR_SIZE, TOWER_LINEAR_SIZE), tileMap)); + Tower *newTower= new Tower(static_cast(rand() % TOTAL_TOWER_TYPES), mousePos, Vec2(TOWER_LINEAR_SIZE, TOWER_LINEAR_SIZE)); + AddObject(newTower); + tileMap.InsertGO(newTower); } - if(InputManager::GetInstance().KeyPress('=')) { Game &game = Game::GetInstance(); game.SetMaxFramerate(game.GetMaxFramerate()+5); } - if(InputManager::GetInstance().KeyPress('-')) { Game &game = Game::GetInstance(); game.SetMaxFramerate( ( (int64_t)game.GetMaxFramerate() )-5); } - tileMap.ShowCollisionInfo(InputManager::GetInstance().IsKeyDown('g')); - if(InputManager::GetInstance().IsKeyDown('[')){ Resources::ChangeMusicVolume(-STAGE_STATE_DELTA_VOLUME); } - if(InputManager::GetInstance().IsKeyDown(']')){ Resources::ChangeMusicVolume(STAGE_STATE_DELTA_VOLUME); } - if(InputManager::GetInstance().IsKeyDown(',')){ Resources::ChangeSoundVolume(-STAGE_STATE_DELTA_VOLUME); } - if(InputManager::GetInstance().IsKeyDown('.')){ Resources::ChangeSoundVolume(STAGE_STATE_DELTA_VOLUME); } - REPORT_DEBUG("\tFrame rate: " << Game::GetInstance().GetCurrentFramerate() << "/" << Game::GetInstance().GetMaxFramerate()); } @@ -163,11 +164,3 @@ void StageState::Render(void) const { void StageState::Pause(void) {} void StageState::Resume(void) {} - -void StageState::SpawnEnemy(int tileMapPosition){ - Vec2 tileSize= tileMap.GetTileSize(); - Vec2 spawnPosition; - spawnPosition.x= (tileMapPosition%tileMap.GetWidth() ) * tileSize.x; - spawnPosition.y= (tileMapPosition/tileMap.GetWidth() ) * tileSize.y; - objectArray.push_back(unique_ptr(new Enemy(spawnPosition, 1.) ) ); -} diff --git a/Game/src/Tower.cpp b/Game/src/Tower.cpp index 21b0c7b1..dddcfcdc 100644 --- a/Game/src/Tower.cpp +++ b/Game/src/Tower.cpp @@ -6,7 +6,7 @@ typedef unsigned int uint; -Tower::Tower(TowerType type, Vec2 pos, Vec2 tileSize, TileMap *tileMap) +Tower::Tower(TowerType type, Vec2 pos, Vec2 tileSize) : sp(type == TowerType::MEDICINE ? "img/tower/torre_fumaca.png" : type == TowerType::SOCIOLOGY ? "img/tower/torre_fumaca.png" : type == TowerType::ENGINEERING ? "img/tower/torre_fumaca.png" : @@ -23,7 +23,6 @@ Tower::Tower(TowerType type, Vec2 pos, Vec2 tileSize, TileMap *tileMap) sp.alpha = 127*(float)rand()/RAND_MAX+127; box.w = sp.GetWidth(); box.h = sp.GetHeight(); - components.emplace_back( new DragAndDrop(tileMap, true, true) ); } Tower::~Tower() { diff --git a/Game/src/WaveManager.cpp b/Game/src/WaveManager.cpp index 06880fdd..7fd36ef0 100644 --- a/Game/src/WaveManager.cpp +++ b/Game/src/WaveManager.cpp @@ -7,7 +7,7 @@ #include "GameResources.h" #include "Error.h" -#define TIME_BETWEEN_SPAWN (2.) +#define TIME_BETWEEN_SPAWN (0.8) int WaveManager::waveCount = 0; @@ -25,19 +25,24 @@ WaveManager::WaveManager(TileMap& tileMap, string waveFile): tileMap(tileMap) { } WaveManager::~WaveManager(){ - //wavesAndEnemysData.clear(); delete spawnGroups; } void WaveManager::StartWave(){ enemiesLeft=0; + maxNumberOfEnemiesInSpawnPoint=0; + int numberOfEnemiesInSpawnPoint; printf("Wave Start\n"); for (uint i = 0; i < wavesAndEnemysData->first[waveIndex].spawnPointsData.size(); i++){ + numberOfEnemiesInSpawnPoint=0; for (uint j = 0; j < wavesAndEnemysData->first[waveIndex].spawnPointsData[i].enemySpawnData.size(); j++){ enemiesLeft += wavesAndEnemysData->first[waveIndex].spawnPointsData[i].enemySpawnData[j].numberOfEnemies; + numberOfEnemiesInSpawnPoint+= wavesAndEnemysData->first[waveIndex].spawnPointsData[i].enemySpawnData[j].numberOfEnemies; + } + if(numberOfEnemiesInSpawnPoint > maxNumberOfEnemiesInSpawnPoint){ + maxNumberOfEnemiesInSpawnPoint= numberOfEnemiesInSpawnPoint; } } - //printf("\n %d enemiesLeft!!\n", enemiesLeft); waveTotalEnemies = enemiesLeft; enemyIndex = 0; endWave = false; @@ -50,33 +55,68 @@ bool WaveManager::EndWave(){ } void WaveManager::Update(GameObject &associated, float dt){ - int enemyId; WaveData currentWave = wavesAndEnemysData->first[waveIndex]; - //printf("\nwaveIndex:%d enemiesLeft:%d playerLifes:%d time:%.2f " , waveIndex, enemiesLeft, playerLifes, spawnTimer.Get()); if(EndWave()){ if(totalWaves==waveCount){ //Check Game over Condition + //Ao invés de não fazer nada deve-ser informar o fim de jogo return; }else{ + REPORT_I_WAS_HERE; ++waveIndex; StartWave(); } }else{ - if(enemyIndex < waveTotalEnemies){ //check if spawned all enemies from current wave + if(enemyIndex <= maxNumberOfEnemiesInSpawnPoint){ spawnTimer.Update(dt); if(TIME_BETWEEN_SPAWN < spawnTimer.Get()){ // spawn cooldown //spawn 1 enemy at each existing spawn group - for (uint i = 0; i < currentWave.spawnPointsData.size() and enemyIndex < waveTotalEnemies; i++){ - enemyId = currentWave.spawnPointsData[i].enemySpawnData[enemyIndex].enemyIndex;//here - uint baseHP = currentWave.spawnPointsData[i].enemySpawnData[enemyIndex].baseHP; - uint endPoint = currentWave.spawnPointsData[i].enemySpawnData[enemyIndex].endPoint; - int spawnPosition = rand()% ( (*spawnGroups)[i] ).size(); - SpawnEnemy( (*spawnGroups)[i][spawnPosition], enemyId, baseHP, endPoint ); + for (uint i = 0; i < currentWave.spawnPointsData.size(); i++){ + uint enemiesCounter= enemyIndex; + uint indexOfTheEnemyToSpawn=0; + bool breaked= false; + REPORT_I_WAS_HERE; + while(enemiesCounter >= currentWave.spawnPointsData.at(i).enemySpawnData.at(indexOfTheEnemyToSpawn).numberOfEnemies){ + REPORT_I_WAS_HERE; + if(indexOfTheEnemyToSpawn>= currentWave.spawnPointsData.at(i).enemySpawnData.size()){ + REPORT_I_WAS_HERE; + breaked= true; + REPORT_I_WAS_HERE; + break; + } + REPORT_I_WAS_HERE; + enemiesCounter-= currentWave.spawnPointsData.at(i).enemySpawnData.at(indexOfTheEnemyToSpawn).numberOfEnemies; + indexOfTheEnemyToSpawn++; + REPORT_I_WAS_HERE; + if(indexOfTheEnemyToSpawn>= currentWave.spawnPointsData.at(i).enemySpawnData.size()){ + REPORT_I_WAS_HERE; + breaked= true; + REPORT_I_WAS_HERE; + break; + } + REPORT_I_WAS_HERE; + } + if(breaked){ + continue; + } + REPORT_DEBUG("\t indexOfTheEnemyToSpawn= " << indexOfTheEnemyToSpawn); + + EnemySpawnData &enemyToSpawn= currentWave.spawnPointsData.at(i).enemySpawnData.at(indexOfTheEnemyToSpawn); + REPORT_DEBUG("\t enemyIndex= " << enemyToSpawn.enemyIndex); + REPORT_DEBUG("\t baseHP= " << enemyToSpawn.baseHP); + REPORT_DEBUG("\t endPoint= " << enemyToSpawn.endPoint); + int spawnPosition = rand()% ( (*spawnGroups).at(i) ).size(); + SpawnEnemy( (*spawnGroups).at(i).at(spawnPosition), enemyToSpawn.enemyIndex, enemyToSpawn.baseHP, enemyToSpawn.endPoint ); } + REPORT_I_WAS_HERE; spawnTimer.Restart(); + enemyIndex++; } + REPORT_I_WAS_HERE; } + REPORT_I_WAS_HERE; } + REPORT_I_WAS_HERE; if (0 >= enemiesLeft){ endWave = true; } @@ -92,9 +132,6 @@ void WaveManager::SpawnEnemy(int tileMapPosition, int enemyId, uint baseHP, uint spawnPosition.y = (tileMapPosition/tileMap.GetWidth() ) * tileSize.y; Enemy* enemy = new Enemy(spawnPosition, 1.); Game::GetInstance().GetCurrentState().AddObject(enemy); - enemyIndex++; - //printf("\n%d enemies spawned!",enemyIndex+1); - } diff --git a/assets/wave&enemyData.txt b/assets/wave&enemyData.txt index 965170d2..0987ec4b 100644 --- a/assets/wave&enemyData.txt +++ b/assets/wave&enemyData.txt @@ -1,22 +1,22 @@ --ENEMIES-- Marcelo_ladeira QUIMIC - img/enemy/reference_assembled + img/enemy/teste-cor.png 1.0 1.0 Ladeira_Marcelo ART - img/enemy/reference_assembled + img/enemy/teste-cor.png 1.0 1.0 Madeira_ladeira QUIMIC - img/enemy/reference_assembled + img/enemy/teste-cor.png 1.0 1.0 Ladeira_Madeira ART - img/enemy/reference_assembled + img/enemy/teste-cor.png 1.0 1.0 --WAVES-- diff --git a/docs/AIGoDown_8cpp.html b/docs/AIGoDown_8cpp.html index 0b371fcd..e44e19fc 100644 --- a/docs/AIGoDown_8cpp.html +++ b/docs/AIGoDown_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/AIGoDown.cpp @@ -31,7 +31,7 @@ - + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para AIGoDown.cpp:
-
+
+
diff --git a/docs/AIGoDown_8cpp__incl.map b/docs/AIGoDown_8cpp__incl.map index ff5eb3ef..13b981c2 100644 --- a/docs/AIGoDown_8cpp__incl.map +++ b/docs/AIGoDown_8cpp__incl.map @@ -1,8 +1,9 @@ - - - - - - + + + + + + + diff --git a/docs/AIGoDown_8cpp__incl.md5 b/docs/AIGoDown_8cpp__incl.md5 index 46c94631..bab0476f 100644 --- a/docs/AIGoDown_8cpp__incl.md5 +++ b/docs/AIGoDown_8cpp__incl.md5 @@ -1 +1 @@ -d14e930b90fdba4c25874df5d4ab3436 \ No newline at end of file +8ca5faadef912a3ca693f6d39b3997cb \ No newline at end of file diff --git a/docs/AIGoDown_8cpp__incl.svg b/docs/AIGoDown_8cpp__incl.svg index 76c47a09..8ed81212 100644 --- a/docs/AIGoDown_8cpp__incl.svg +++ b/docs/AIGoDown_8cpp__incl.svg @@ -1,151 +1,169 @@ - - + Engine/src/AIGoDown.cpp - + Node1 - -Engine/src/AIGoDown.cpp + +Engine/src/AIGoDown.cpp Node2 - -AIGoDown.h + +AIGoDown.h Node1->Node2 - - + + Node3 - -Component.h + +Component.h Node2->Node3 - - + + Node4 - - -GameObject.h + + +ComponentType.h Node3->Node4 - - - - -Node4->Node3 - - + + Node5 - - -SDL_include.h + + +GameObject.h - -Node4->Node5 - - + +Node3->Node5 + + + + +Node5->Node3 + + + + +Node5->Node4 + + Node6 - -vector + + +SDL_include.h + - -Node4->Node6 - - + + +Node5->Node6 + + Node7 - -memory + +vector - -Node4->Node7 - - + +Node5->Node7 + + Node8 - -string + +memory - -Node4->Node8 - - + +Node5->Node8 + + Node9 - - -Rect.h - - - - -Node4->Node9 - - + +string - -Node9->Node5 - - + +Node5->Node9 + + Node10 - - -Vec2.h + + +Rect.h - -Node9->Node10 - - + +Node5->Node10 + + + + +Node10->Node6 + + Node11 - -cmath - - -Node9->Node11 - - - - -Node10->Node5 - - + + +Vec2.h + + + + +Node10->Node11 + + + + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node6 + + diff --git a/docs/AIGoDown_8h.html b/docs/AIGoDown_8h.html index 6b004ddd..1123dfa8 100644 --- a/docs/AIGoDown_8h.html +++ b/docs/AIGoDown_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/AIGoDown.h @@ -31,7 +31,7 @@ - + @@ -95,12 +95,14 @@
Gráfico de dependência de inclusões para AIGoDown.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -112,9 +114,9 @@ diff --git a/docs/AIGoDown_8h__dep__incl.map b/docs/AIGoDown_8h__dep__incl.map index d81c8acf..daaf4eeb 100644 --- a/docs/AIGoDown_8h__dep__incl.map +++ b/docs/AIGoDown_8h__dep__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/AIGoDown_8h__dep__incl.md5 b/docs/AIGoDown_8h__dep__incl.md5 index 951c02c3..75b7778d 100644 --- a/docs/AIGoDown_8h__dep__incl.md5 +++ b/docs/AIGoDown_8h__dep__incl.md5 @@ -1 +1 @@ -99c9d810bac3ecd44434a0cd1b745ed5 \ No newline at end of file +26b894f2b56c03554c64d1bb019309ec \ No newline at end of file diff --git a/docs/AIGoDown_8h__dep__incl.svg b/docs/AIGoDown_8h__dep__incl.svg index dcf8c3a5..1d98b1e4 100644 --- a/docs/AIGoDown_8h__dep__incl.svg +++ b/docs/AIGoDown_8h__dep__incl.svg @@ -1,44 +1,44 @@ - - + Engine/include/AIGoDown.h - + Node1 - -Engine/include/AIGoDown.h + +Engine/include/AIGoDown.h Node2 - -Engine/src/AIGoDown.cpp + +Engine/src/AIGoDown.cpp Node1->Node2 - - + + Node3 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node1->Node3 - - + + diff --git a/docs/AIGoDown_8h__incl.map b/docs/AIGoDown_8h__incl.map index 5454277b..b261cf4e 100644 --- a/docs/AIGoDown_8h__incl.map +++ b/docs/AIGoDown_8h__incl.map @@ -1,7 +1,8 @@ - - - - - + + + + + + diff --git a/docs/AIGoDown_8h__incl.md5 b/docs/AIGoDown_8h__incl.md5 index 8917823c..cc96b537 100644 --- a/docs/AIGoDown_8h__incl.md5 +++ b/docs/AIGoDown_8h__incl.md5 @@ -1 +1 @@ -64f9cbba09d2f25aec64ddff3b2a5d63 \ No newline at end of file +20ef837f6a3a7427e96892a3727c34f6 \ No newline at end of file diff --git a/docs/AIGoDown_8h__incl.svg b/docs/AIGoDown_8h__incl.svg index cc0d5a08..4e3e4fc9 100644 --- a/docs/AIGoDown_8h__incl.svg +++ b/docs/AIGoDown_8h__incl.svg @@ -1,138 +1,156 @@ - - + Engine/include/AIGoDown.h - + Node1 - -Engine/include/AIGoDown.h + +Engine/include/AIGoDown.h Node2 - -Component.h + +Component.h Node1->Node2 - - + + Node3 - - -GameObject.h + + +ComponentType.h Node2->Node3 - - - - -Node3->Node2 - - + + Node4 - - -SDL_include.h + + +GameObject.h - -Node3->Node4 - - + +Node2->Node4 + + + + +Node4->Node2 + + + + +Node4->Node3 + + Node5 - -vector + + +SDL_include.h + - -Node3->Node5 - - + + +Node4->Node5 + + Node6 - -memory + +vector - -Node3->Node6 - - + +Node4->Node6 + + Node7 - -string + +memory - -Node3->Node7 - - + +Node4->Node7 + + Node8 - - -Rect.h - - - - -Node3->Node8 - - + +string - -Node8->Node4 - - + +Node4->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node4->Node9 + + + + +Node9->Node5 + + Node10 - -cmath - - -Node8->Node10 - - - - -Node9->Node4 - - + + +Vec2.h + + + + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node5 + + diff --git a/docs/ActionManager_8cpp.html b/docs/ActionManager_8cpp.html index 2aca8382..1cdb714e 100644 --- a/docs/ActionManager_8cpp.html +++ b/docs/ActionManager_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/ActionManager.cpp @@ -31,7 +31,7 @@

- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para ActionManager.cpp:
-
+
+
diff --git a/docs/ActionManager_8cpp__incl.map b/docs/ActionManager_8cpp__incl.map index 4f7d0acf..89544362 100644 --- a/docs/ActionManager_8cpp__incl.map +++ b/docs/ActionManager_8cpp__incl.map @@ -1,6 +1,6 @@ - + - + diff --git a/docs/ActionManager_8cpp__incl.md5 b/docs/ActionManager_8cpp__incl.md5 index e4dd2ddc..b84bc474 100644 --- a/docs/ActionManager_8cpp__incl.md5 +++ b/docs/ActionManager_8cpp__incl.md5 @@ -1 +1 @@ -009194979b83ce6327358f4df01a6521 \ No newline at end of file +e3011788cb46025542b763ec34eed8a3 \ No newline at end of file diff --git a/docs/ActionManager_8cpp__incl.svg b/docs/ActionManager_8cpp__incl.svg index bceae7bf..5837c7c7 100644 --- a/docs/ActionManager_8cpp__incl.svg +++ b/docs/ActionManager_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/ActionManager.h @@ -31,7 +31,7 @@ - + @@ -95,12 +95,14 @@
Gráfico de dependência de inclusões para ActionManager.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -111,9 +113,9 @@ diff --git a/docs/ActionManager_8h__dep__incl.map b/docs/ActionManager_8h__dep__incl.map index e6f39e2e..04a6af60 100644 --- a/docs/ActionManager_8h__dep__incl.map +++ b/docs/ActionManager_8h__dep__incl.map @@ -1,20 +1,21 @@ - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/ActionManager_8h__dep__incl.md5 b/docs/ActionManager_8h__dep__incl.md5 index 2628eb72..449ec1b4 100644 --- a/docs/ActionManager_8h__dep__incl.md5 +++ b/docs/ActionManager_8h__dep__incl.md5 @@ -1 +1 @@ -05aeb01a83b94970e3e344e89026c924 \ No newline at end of file +9002b0eb6b7efebaa3db5c5c3693a442 \ No newline at end of file diff --git a/docs/ActionManager_8h__dep__incl.svg b/docs/ActionManager_8h__dep__incl.svg index 7ecd1317..e000bc39 100644 --- a/docs/ActionManager_8h__dep__incl.svg +++ b/docs/ActionManager_8h__dep__incl.svg @@ -1,96 +1,96 @@ - - + Engine/include/ActionManager.h - + Node1 - -Engine/include/ActionManager.h + +Engine/include/ActionManager.h Node2 - -Engine/include/Camera.h + +Engine/include/Camera.h Node1->Node2 - - - - -Node15 - - -Engine/src/ActionManager.cpp - - - - -Node1->Node15 - - + + Node16 - - -Game/include/StageState.h + + +Engine/src/ActionManager.cpp Node1->Node16 - - + + - -Node18 - - -Game/include/TitleState.h + +Node17 + + +Game/include/StageState.h + + + + +Node1->Node17 + + + + +Node19 + + +Game/include/TitleState.h - -Node1->Node18 - - + +Node1->Node19 + + Node3 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node2->Node3 - - + + Node4 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node2->Node4 - - + + Node5 @@ -102,176 +102,189 @@ Node2->Node5 - - + + Node6 - - -Engine/src/Sprite.cpp + + +Engine/src/GameObject.cpp Node2->Node6 - - + + Node7 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node2->Node7 - - + + Node8 - - -Engine/src/TileMap.cpp + + +Engine/src/State.cpp Node2->Node8 - - + + Node9 - - -Engine/src/Tileset.cpp + + +Engine/src/TileMap.cpp Node2->Node9 - - + + Node10 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node2->Node10 - - + + Node11 - - -Game/src/Enemy.cpp + + +Game/src/EndState.cpp Node2->Node11 - - + + Node12 - - -Game/src/StageState.cpp + + +Game/src/Enemy.cpp Node2->Node12 - - + + Node13 - - -Game/src/TitleState.cpp + + +Game/src/StageState.cpp Node2->Node13 - - + + Node14 - - -Game/src/Tower.cpp + + +Game/src/TitleState.cpp Node2->Node14 - - + + - -Node16->Node12 - - + +Node15 + + +Game/src/Tower.cpp + - -Node16->Node13 - - - -Node17 - - -Game/include/EndState.h + +Node2->Node15 + + + + +Node17->Node13 + + + + +Node17->Node14 + + + + +Node18 + + +Game/include/EndState.h - -Node16->Node17 - - + +Node17->Node18 + + - -Node17->Node10 - - + +Node18->Node11 + + - -Node17->Node16 - - + +Node18->Node17 + + - -Node18->Node13 - - + +Node19->Node14 + + - -Node19 - - -Game/src/main.cpp + +Node20 + + +Game/src/main.cpp - -Node18->Node19 - - + +Node19->Node20 + + diff --git a/docs/ActionManager_8h__incl.map b/docs/ActionManager_8h__incl.map index 166f63ec..a052cdd2 100644 --- a/docs/ActionManager_8h__incl.map +++ b/docs/ActionManager_8h__incl.map @@ -1,5 +1,5 @@ - + - + diff --git a/docs/ActionManager_8h__incl.md5 b/docs/ActionManager_8h__incl.md5 index a925ea83..cee7bd91 100644 --- a/docs/ActionManager_8h__incl.md5 +++ b/docs/ActionManager_8h__incl.md5 @@ -1 +1 @@ -79f333d8ed031cebfeb70bfd9efc94af \ No newline at end of file +395ca328475d729dc287900f66d3724f \ No newline at end of file diff --git a/docs/ActionManager_8h__incl.svg b/docs/ActionManager_8h__incl.svg index c06dc1b9..fcf68675 100644 --- a/docs/ActionManager_8h__incl.svg +++ b/docs/ActionManager_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Animation.cpp @@ -31,7 +31,7 @@

- + @@ -94,14 +94,15 @@
Gráfico de dependência de inclusões para Animation.cpp:
-
+
+
diff --git a/docs/Animation_8cpp__incl.map b/docs/Animation_8cpp__incl.map index 63c6f508..4b2d2f2d 100644 --- a/docs/Animation_8cpp__incl.map +++ b/docs/Animation_8cpp__incl.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/Animation_8cpp__incl.md5 b/docs/Animation_8cpp__incl.md5 index 1f5669bf..87759069 100644 --- a/docs/Animation_8cpp__incl.md5 +++ b/docs/Animation_8cpp__incl.md5 @@ -1 +1 @@ -6594ff3d25fc982d994ac819a95d30d2 \ No newline at end of file +312734714af15d448e0f2de9652f5f09 \ No newline at end of file diff --git a/docs/Animation_8cpp__incl.svg b/docs/Animation_8cpp__incl.svg index 55041a24..d498972c 100644 --- a/docs/Animation_8cpp__incl.svg +++ b/docs/Animation_8cpp__incl.svg @@ -1,294 +1,312 @@ - - + Engine/src/Animation.cpp - + Node1 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node2 - -Animation.h + +Animation.h Node1->Node2 - - + + - -Node18 - - -Camera.h + +Node19 + + +Camera.h - -Node1->Node18 - - + +Node1->Node19 + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + - -Node12 - - -Sprite.h + +Node13 + + +Sprite.h - -Node2->Node12 - - + +Node2->Node13 + + - -Node17 - - -Timer.h + +Node18 + + +Timer.h - -Node2->Node17 - - + +Node2->Node18 + + 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 - - -Rect.h + + +ComponentType.h -Node3->Node9 - - - - -Node8->Node3 - - - - -Node9->Node4 - - +Node3->Node9 + + Node10 - - -Vec2.h + + +Rect.h - -Node9->Node10 - - + +Node3->Node10 + + - -Node11 - -cmath + +Node8->Node3 + + - -Node9->Node11 - - + +Node8->Node9 + + Node10->Node4 - - - - -Node12->Node4 - - - - -Node12->Node6 - - - - -Node12->Node7 - - + + - -Node12->Node9 - - - - -Node13 - - -Color.h + +Node11 + + +Vec2.h - -Node12->Node13 - - + +Node10->Node11 + + + + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node4 + + + + +Node13->Node4 + + + + +Node13->Node6 + + + + +Node13->Node7 + + + + +Node13->Node10 + + Node14 - - -InputManager.h + + +Color.h - -Node12->Node14 - - - - -Node14->Node4 - - - - -Node14->Node10 - - + +Node13->Node14 + + Node15 - -unordered_map + + +InputManager.h + - -Node14->Node15 - - - -Node16 - -cstdint + +Node13->Node15 + + - -Node14->Node16 - - + +Node15->Node4 + + - -Node18->Node3 - - + +Node15->Node11 + + + + +Node16 + +unordered_map - -Node18->Node10 - - + +Node15->Node16 + + - -Node19 - - -ActionManager.h + +Node17 + +cstdint + + +Node15->Node17 + + + + +Node19->Node3 + + + + +Node19->Node11 + + + + +Node20 + + +ActionManager.h - -Node18->Node19 - - + +Node19->Node20 + + - -Node19->Node14 - - + +Node20->Node15 + + diff --git a/docs/Animation_8h.html b/docs/Animation_8h.html index f745141c..92f72b78 100644 --- a/docs/Animation_8h.html +++ b/docs/Animation_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Animation.h @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para Animation.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -114,9 +116,9 @@ diff --git a/docs/Animation_8h__dep__incl.map b/docs/Animation_8h__dep__incl.map index 5fc6ac52..2a2c51be 100644 --- a/docs/Animation_8h__dep__incl.map +++ b/docs/Animation_8h__dep__incl.map @@ -1,3 +1,3 @@ - + diff --git a/docs/Animation_8h__dep__incl.md5 b/docs/Animation_8h__dep__incl.md5 index 2859911a..4c1785a7 100644 --- a/docs/Animation_8h__dep__incl.md5 +++ b/docs/Animation_8h__dep__incl.md5 @@ -1 +1 @@ -da140bb90be640ca84bfb7243f343b03 \ No newline at end of file +f6b87ed8cc95eb1168f5097a78826d90 \ No newline at end of file diff --git a/docs/Animation_8h__dep__incl.svg b/docs/Animation_8h__dep__incl.svg index d09ac0a8..22405eb8 100644 --- a/docs/Animation_8h__dep__incl.svg +++ b/docs/Animation_8h__dep__incl.svg @@ -1,31 +1,31 @@ - - + Engine/include/Animation.h - + Node1 - -Engine/include/Animation.h + +Engine/include/Animation.h Node2 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node1->Node2 - - + + diff --git a/docs/Animation_8h__incl.map b/docs/Animation_8h__incl.map index f44bf440..4bd262c6 100644 --- a/docs/Animation_8h__incl.map +++ b/docs/Animation_8h__incl.map @@ -1,11 +1,12 @@ - - - - - - - - - + + + + + + + + + + diff --git a/docs/Animation_8h__incl.md5 b/docs/Animation_8h__incl.md5 index df6bd65a..dada3d82 100644 --- a/docs/Animation_8h__incl.md5 +++ b/docs/Animation_8h__incl.md5 @@ -1 +1 @@ -bdbdfb22235e3b6283d413560fe4fb93 \ No newline at end of file +445d4653b57d92ac12815c65a45f6594 \ No newline at end of file diff --git a/docs/Animation_8h__incl.svg b/docs/Animation_8h__incl.svg index 4b45df19..44b79a92 100644 --- a/docs/Animation_8h__incl.svg +++ b/docs/Animation_8h__incl.svg @@ -1,240 +1,258 @@ - - + Engine/include/Animation.h - + Node1 - -Engine/include/Animation.h + +Engine/include/Animation.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + - -Node11 - - -Sprite.h + +Node12 + + +Sprite.h - -Node1->Node11 - - + +Node1->Node12 + + - -Node16 - - -Timer.h + +Node17 + + +Timer.h - -Node1->Node16 - - + +Node1->Node17 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node7 - -Component.h + +Component.h Node2->Node7 - - + + Node8 - - -Rect.h + + +ComponentType.h -Node2->Node8 - - - - -Node7->Node2 - - - - -Node8->Node3 - - +Node2->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node2->Node9 + + - -Node10 - -cmath + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - - - -Node11->Node3 - - + + - -Node11->Node5 - - - - -Node11->Node6 - - - - -Node11->Node8 - - - - -Node12 - - -Color.h + +Node10 + + +Vec2.h - -Node11->Node12 - - + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node3 + + + + +Node12->Node3 + + + + +Node12->Node5 + + + + +Node12->Node6 + + + + +Node12->Node9 + + Node13 - - -InputManager.h + + +Color.h - -Node11->Node13 - - - - -Node13->Node3 - - - - -Node13->Node9 - - + +Node12->Node13 + + Node14 - -unordered_map + + +InputManager.h + + + + +Node12->Node14 + + + + +Node14->Node3 + + - -Node13->Node14 - - + +Node14->Node10 + + Node15 - -cstdint + +unordered_map + + +Node14->Node15 + + + + +Node16 + +cstdint - -Node13->Node15 - - + +Node14->Node16 + + diff --git a/docs/Camera_8cpp.html b/docs/Camera_8cpp.html index e13dbdd7..0b421946 100644 --- a/docs/Camera_8cpp.html +++ b/docs/Camera_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Camera.cpp @@ -31,7 +31,7 @@

- + @@ -98,7 +98,8 @@
Gráfico de dependência de inclusões para Camera.cpp:
-
+
+

@@ -136,9 +137,9 @@

Definições e macros

diff --git a/docs/Camera_8cpp__incl.map b/docs/Camera_8cpp__incl.map index eb9845e5..d54ea843 100644 --- a/docs/Camera_8cpp__incl.map +++ b/docs/Camera_8cpp__incl.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/Camera_8cpp__incl.md5 b/docs/Camera_8cpp__incl.md5 index 14988194..c7f503d5 100644 --- a/docs/Camera_8cpp__incl.md5 +++ b/docs/Camera_8cpp__incl.md5 @@ -1 +1 @@ -9bd3df5469e56351bd7f651bcfccd185 \ No newline at end of file +6576cd0e9ab8219bcc388bcfdae36038 \ No newline at end of file diff --git a/docs/Camera_8cpp__incl.svg b/docs/Camera_8cpp__incl.svg index d8b5864a..1fec8166 100644 --- a/docs/Camera_8cpp__incl.svg +++ b/docs/Camera_8cpp__incl.svg @@ -1,359 +1,377 @@ - - + Engine/src/Camera.cpp - + Node1 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node2 - -Camera.h + +Camera.h Node1->Node2 - - + + - -Node13 - - -InputManager.h + +Node14 + + +InputManager.h - -Node1->Node13 - - + +Node1->Node14 + + - -Node16 - - -Error.h + +Node17 + + +Error.h - -Node1->Node16 - - + +Node1->Node17 + + - -Node19 - - -Game.h + +Node20 + + +Game.h - -Node1->Node19 - - + +Node1->Node20 + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + - -Node10 - - -Vec2.h + +Node11 + + +Vec2.h - -Node2->Node10 - - + +Node2->Node11 + + - -Node12 - - -ActionManager.h + +Node13 + + +ActionManager.h - -Node2->Node12 - - + +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 - - -Rect.h + + +ComponentType.h -Node3->Node9 - - +Node3->Node9 + + - -Node8->Node3 - - + +Node10 + + +Rect.h + - -Node9->Node4 - - - -Node9->Node10 - - + +Node3->Node10 + + - -Node11 - -cmath + +Node8->Node3 + + - -Node9->Node11 - - + +Node8->Node9 + + Node10->Node4 - - + + - -Node12->Node13 - - + +Node10->Node11 + + - -Node13->Node4 - - + +Node12 + +cmath - -Node13->Node10 - - + +Node10->Node12 + + - -Node14 - -unordered_map + +Node11->Node4 + + -Node13->Node14 - - +Node13->Node14 + + + + +Node14->Node4 + + + + +Node14->Node11 + + Node15 - -cstdint + +unordered_map - -Node13->Node15 - - + +Node14->Node15 + + - -Node17 - -iostream + +Node16 + +cstdint - -Node16->Node17 - - + +Node14->Node16 + + Node18 - -stdlib.h - - -Node16->Node18 - - - - -Node19->Node4 - - - - -Node19->Node7 - - - - -Node19->Node10 - - - - -Node19->Node13 - - + +iostream - -Node20 - -stack + +Node17->Node18 + + - -Node19->Node20 - - + +Node19 + +stdlib.h + + +Node17->Node19 + + + + +Node20->Node4 + + + + +Node20->Node7 + + + + +Node20->Node11 + + + + +Node20->Node14 + + Node21 - - -State.h - + +stack + +Node20->Node21 + + - -Node19->Node21 - - + +Node22 + + +State.h + - -Node21->Node3 - - - -Node21->Node5 - - + +Node20->Node22 + + - -Node21->Node6 - - + +Node22->Node3 + + - -Node21->Node13 - - + +Node22->Node5 + + - -Node22 - - -Resources.h + +Node22->Node6 + + + + +Node22->Node14 + + + + +Node23 + + +Resources.h - -Node21->Node22 - - + +Node22->Node23 + + - -Node22->Node4 - - + +Node23->Node4 + + - -Node22->Node6 - - + +Node23->Node6 + + - -Node22->Node7 - - + +Node23->Node7 + + - -Node22->Node14 - - + +Node23->Node15 + + diff --git a/docs/Camera_8h.html b/docs/Camera_8h.html index dcf04a81..297d25f2 100644 --- a/docs/Camera_8h.html +++ b/docs/Camera_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Camera.h @@ -31,7 +31,7 @@
- + @@ -98,12 +98,14 @@
Gráfico de dependência de inclusões para Camera.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -203,9 +205,9 @@

Definições e macros

diff --git a/docs/Camera_8h__dep__incl.map b/docs/Camera_8h__dep__incl.map index 7460d80d..e414c7ae 100644 --- a/docs/Camera_8h__dep__incl.map +++ b/docs/Camera_8h__dep__incl.map @@ -2,13 +2,14 @@ - - - - - - - - - + + + + + + + + + + diff --git a/docs/Camera_8h__dep__incl.md5 b/docs/Camera_8h__dep__incl.md5 index f8a84c06..9abcc5bb 100644 --- a/docs/Camera_8h__dep__incl.md5 +++ b/docs/Camera_8h__dep__incl.md5 @@ -1 +1 @@ -9f05804d3864bff683fb80f7529f4bad \ No newline at end of file +22c3bfc90324d4656eb1ad234904cfcf \ No newline at end of file diff --git a/docs/Camera_8h__dep__incl.svg b/docs/Camera_8h__dep__incl.svg index 20ece5b6..b62edafc 100644 --- a/docs/Camera_8h__dep__incl.svg +++ b/docs/Camera_8h__dep__incl.svg @@ -1,18 +1,18 @@ - - + Engine/include/Camera.h - + Node1 - -Engine/include/Camera.h + +Engine/include/Camera.h Node2 @@ -24,8 +24,8 @@ Node1->Node2 - - + + Node3 @@ -37,8 +37,8 @@ Node1->Node3 - - + + Node4 @@ -50,125 +50,138 @@ Node1->Node4 - - + + Node5 - - -Engine/src/Sprite.cpp + + +Engine/src/GameObject.cpp Node1->Node5 - - + + Node6 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node1->Node6 - - + + Node7 - - -Engine/src/TileMap.cpp + + +Engine/src/State.cpp Node1->Node7 - - + + Node8 - - -Engine/src/Tileset.cpp + + +Engine/src/TileMap.cpp Node1->Node8 - - + + Node9 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node1->Node9 - - + + Node10 - - -Game/src/Enemy.cpp + + +Game/src/EndState.cpp Node1->Node10 - - + + Node11 - - -Game/src/StageState.cpp + + +Game/src/Enemy.cpp Node1->Node11 - - + + Node12 - - -Game/src/TitleState.cpp + + +Game/src/StageState.cpp Node1->Node12 - - + + Node13 - - -Game/src/Tower.cpp + + +Game/src/TitleState.cpp Node1->Node13 - - + + + + +Node14 + + +Game/src/Tower.cpp + + + + +Node1->Node14 + + diff --git a/docs/Camera_8h__incl.map b/docs/Camera_8h__incl.map index 87a9d371..74536173 100644 --- a/docs/Camera_8h__incl.map +++ b/docs/Camera_8h__incl.map @@ -1,9 +1,10 @@ - - - - - - - + + + + + + + + diff --git a/docs/Camera_8h__incl.md5 b/docs/Camera_8h__incl.md5 index 03971fc7..db429e06 100644 --- a/docs/Camera_8h__incl.md5 +++ b/docs/Camera_8h__incl.md5 @@ -1 +1 @@ -88a05015b6f95c75b59f7b484dd02b70 \ No newline at end of file +174bb7972fa9ebb7213d016f8832165e \ No newline at end of file diff --git a/docs/Camera_8h__incl.svg b/docs/Camera_8h__incl.svg index 7b1f0537..ca461f07 100644 --- a/docs/Camera_8h__incl.svg +++ b/docs/Camera_8h__incl.svg @@ -1,199 +1,217 @@ - - + Engine/include/Camera.h - + Node1 - -Engine/include/Camera.h + +Engine/include/Camera.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + - -Node9 - - -Vec2.h + +Node10 + + +Vec2.h - -Node1->Node9 - - + +Node1->Node10 + + - -Node11 - - -ActionManager.h + +Node12 + + +ActionManager.h - -Node1->Node11 - - + +Node1->Node12 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node7 - -Component.h + +Component.h Node2->Node7 - - + + Node8 - - -Rect.h + + +ComponentType.h -Node2->Node8 - - +Node2->Node8 + + - -Node7->Node2 - - + +Node9 + + +Rect.h + - -Node8->Node3 - - - -Node8->Node9 - - + +Node2->Node9 + + - -Node10 - -cmath + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - - - -Node12 - - -InputManager.h - + + + +Node9->Node10 + + - -Node11->Node12 - - + +Node11 + +cmath - -Node12->Node3 - - + +Node9->Node11 + + - -Node12->Node9 - - + +Node10->Node3 + + Node13 - -unordered_map + + +InputManager.h + + -Node12->Node13 - - +Node12->Node13 + + + + +Node13->Node3 + + + + +Node13->Node10 + + Node14 - -cstdint - - -Node12->Node14 - - + +unordered_map + + +Node13->Node14 + + + + +Node15 + +cstdint + + +Node13->Node15 + + diff --git a/docs/Collision_8h.html b/docs/Collision_8h.html index 3d7be284..9ba7d1d5 100644 --- a/docs/Collision_8h.html +++ b/docs/Collision_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Collision.h @@ -31,7 +31,7 @@
- + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para Collision.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -114,9 +116,9 @@ diff --git a/docs/Collision_8h__dep__incl.md5 b/docs/Collision_8h__dep__incl.md5 index d3c836aa..08b74c34 100644 --- a/docs/Collision_8h__dep__incl.md5 +++ b/docs/Collision_8h__dep__incl.md5 @@ -1 +1 @@ -0595b329e501be975d2f004e9e18d773 \ No newline at end of file +f09f87a4d2787c97385ddd8de4d3f311 \ No newline at end of file diff --git a/docs/Collision_8h__dep__incl.svg b/docs/Collision_8h__dep__incl.svg index 0c6a0c37..9fc570c3 100644 --- a/docs/Collision_8h__dep__incl.svg +++ b/docs/Collision_8h__dep__incl.svg @@ -1,7 +1,7 @@ - - - - + + + diff --git a/docs/Collision_8h__incl.md5 b/docs/Collision_8h__incl.md5 index 5d5f9df0..5f2a398d 100644 --- a/docs/Collision_8h__incl.md5 +++ b/docs/Collision_8h__incl.md5 @@ -1 +1 @@ -98eb9f9524698383c9170937b49cee8c \ No newline at end of file +2482ad394f9abd48c662515abee4ca6f \ No newline at end of file diff --git a/docs/Collision_8h__incl.svg b/docs/Collision_8h__incl.svg index b8c447e6..1a04c397 100644 --- a/docs/Collision_8h__incl.svg +++ b/docs/Collision_8h__incl.svg @@ -1,7 +1,7 @@ - Node1 - -Engine/include/Collision.h + +Engine/include/Collision.h Node2 - -cmath + +cmath Node1->Node2 - - + + Node3 - -algorithm + +algorithm Node1->Node3 - - + + Node4 - -Rect.h + +Rect.h Node1->Node4 - - + + Node4->Node2 - - + + Node5 - -SDL_include.h + +SDL_include.h Node4->Node5 - - + + Node6 - -Vec2.h + +Vec2.h Node4->Node6 - - + + Node6->Node5 - - + + diff --git a/docs/Color_8cpp.html b/docs/Color_8cpp.html index 71750194..bb719d41 100644 --- a/docs/Color_8cpp.html +++ b/docs/Color_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Color.cpp @@ -31,7 +31,7 @@

- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Color.cpp:
-
+
+
diff --git a/docs/Color_8cpp__incl.md5 b/docs/Color_8cpp__incl.md5 index a1a9b3db..1a0833c4 100644 --- a/docs/Color_8cpp__incl.md5 +++ b/docs/Color_8cpp__incl.md5 @@ -1 +1 @@ -3b72c2e9c91d2480a6e27a751b353c69 \ No newline at end of file +baff7a96513fbb22142c32d05a7ee1ea \ No newline at end of file diff --git a/docs/Color_8cpp__incl.svg b/docs/Color_8cpp__incl.svg index b821c410..0534c320 100644 --- a/docs/Color_8cpp__incl.svg +++ b/docs/Color_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Color.h @@ -31,7 +31,7 @@ - + @@ -94,7 +94,8 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -106,9 +107,9 @@ diff --git a/docs/Color_8h__dep__incl.map b/docs/Color_8h__dep__incl.map index 47409bed..a639bf8f 100644 --- a/docs/Color_8h__dep__incl.map +++ b/docs/Color_8h__dep__incl.map @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Color_8h__dep__incl.md5 b/docs/Color_8h__dep__incl.md5 index 68369094..ec93fb99 100644 --- a/docs/Color_8h__dep__incl.md5 +++ b/docs/Color_8h__dep__incl.md5 @@ -1 +1 @@ -4290046fa040ced1cf59f10010e09f60 \ No newline at end of file +8ae7eefbf7e05dd6c311c1137888f47a \ No newline at end of file diff --git a/docs/Color_8h__dep__incl.svg b/docs/Color_8h__dep__incl.svg index ddad2ef4..1cbc2a25 100644 --- a/docs/Color_8h__dep__incl.svg +++ b/docs/Color_8h__dep__incl.svg @@ -1,457 +1,462 @@ - - + Engine/include/Color.h - + Node1 - -Engine/include/Color.h + +Engine/include/Color.h Node2 - -Engine/include/Sprite.h + +Engine/include/Sprite.h Node1->Node2 - - + + Node29 - -Engine/src/Color.cpp + +Engine/src/Color.cpp -Node1->Node29 - - +Node1->Node29 + + Node3 - -Engine/include/Animation.h + +Engine/include/Animation.h Node2->Node3 - - + + Node5 - -Engine/include/Tileset.h + +Engine/include/Tileset.h Node2->Node5 - - + + - -Node11 - - -Game/include/StageState.h + +Node9 + + +Game/include/StageState.h - -Node2->Node11 - - + +Node2->Node9 + + - -Node12 - - -Game/include/EndState.h + +Node10 + + +Game/include/EndState.h - -Node2->Node12 - - + +Node2->Node10 + + Node18 - -Game/include/Enemy.h + +Game/include/Enemy.h -Node2->Node18 - - +Node2->Node18 + + Node22 - -Game/include/Tower.h + +Game/include/Tower.h -Node2->Node22 - - +Node2->Node22 + + Node24 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h -Node2->Node24 - - +Node2->Node24 + + Node26 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp -Node2->Node26 - - +Node2->Node26 + + Node27 - -Game/include/TitleState.h + +Game/include/TitleState.h -Node2->Node27 - - +Node2->Node27 + + Node4 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node3->Node4 - - + + Node6 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node5->Node6 - - + + - -Node5->Node11 - - + +Node5->Node9 + + Node23 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp -Node5->Node23 - - +Node5->Node23 + + Node7 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node6->Node7 - - + + - -Node10 - - -Engine/src/TileMap.cpp - + +Node6->Node9 + + + +Node15 + + +Engine/src/TileMap.cpp + - -Node6->Node10 - - - -Node6->Node11 - - + +Node6->Node15 + + Node16 - -Game/include/WaveManager.h + +Game/include/WaveManager.h -Node6->Node16 - - +Node6->Node16 + + Node17 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp -Node6->Node17 - - +Node6->Node17 + + -Node6->Node18 - - +Node6->Node18 + + -Node6->Node22 - - +Node6->Node22 + + Node8 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node7->Node8 - - - - -Node9 - - -Game/src/Tower.cpp - - + + Node7->Node9 - - - - -Node11->Node12 - - + + Node14 - - -Game/src/StageState.cpp + + +Game/src/Tower.cpp - -Node11->Node14 - - + +Node7->Node14 + + - -Node15 - - -Game/src/TitleState.cpp - + +Node9->Node10 + + + +Node12 + + +Game/src/StageState.cpp + - -Node11->Node15 - - - -Node12->Node11 - - + +Node9->Node12 + + Node13 - - -Game/src/EndState.cpp + + +Game/src/TitleState.cpp + + + + +Node9->Node13 + + + + +Node10->Node9 + + + + +Node11 + + +Game/src/EndState.cpp - -Node12->Node13 - - + +Node10->Node11 + + - -Node16->Node11 - - + +Node16->Node9 + + -Node16->Node17 - - +Node16->Node17 + + - -Node18->Node14 - - + +Node18->Node12 + + -Node18->Node17 - - +Node18->Node17 + + Node19 - -Game/include/GameResources.h + +Game/include/GameResources.h -Node18->Node19 - - +Node18->Node19 + + Node21 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp -Node18->Node21 - - +Node18->Node21 + + -Node19->Node17 - - +Node19->Node17 + + Node20 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp -Node19->Node20 - - +Node19->Node20 + + - -Node22->Node9 - - + +Node22->Node12 + + -Node22->Node14 - - +Node22->Node14 + + -Node24->Node21 - - +Node24->Node21 + + Node25 - -Engine/src/HItPoints.cpp + +Engine/src/HItPoints.cpp -Node24->Node25 - - +Node24->Node25 + + - -Node27->Node15 - - + +Node27->Node13 + + Node28 - -Game/src/main.cpp + +Game/src/main.cpp -Node27->Node28 - - +Node27->Node28 + + diff --git a/docs/emptyGameObject_8h.html b/docs/ComponentType_8h.html similarity index 55% rename from docs/emptyGameObject_8h.html rename to docs/ComponentType_8h.html index 4a4cd0bf..4273a6c5 100644 --- a/docs/emptyGameObject_8h.html +++ b/docs/ComponentType_8h.html @@ -3,8 +3,8 @@ - -Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/emptyGameObject.h + +Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/ComponentType.h @@ -31,7 +31,7 @@

- + @@ -86,23 +86,69 @@
-
Referência do Arquivo emptyGameObject.h
+
Referência do Arquivo ComponentType.h
- - - - +
+Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
+
+
+
+
+

-Componentes

class  emptyGameObject
 
+ + + + +

+Enumerações

enum  ComponentType {
+  DRAG_AND_DROP =0, +HIT_POINTS, +AI_GO_DOWN, +WAVE_MANAGER, +
+  SIZE, +COMPONENT_TYPE_SIZE +
+ }
 Tipos de Componentes. Mais...
 
+

Enumerações

+ +
+
+ + + + +
enum ComponentType
+
+ +

Tipos de Componentes.

+

Enumeração com os tipos de componentes possíveis, usado no método Is que todo componente deve implementar. Foi colocado em um arquivo separado por problemas de inclusão circular entre GameObject e Component.

+ + + + + + +
Valores enumerados
DRAG_AND_DROP  +
HIT_POINTS  +
AI_GO_DOWN  +
WAVE_MANAGER  +
SIZE  +
COMPONENT_TYPE_SIZE  +
+ +
+
diff --git a/docs/ComponentType_8h__dep__incl.map b/docs/ComponentType_8h__dep__incl.map new file mode 100644 index 00000000..bd069b0a --- /dev/null +++ b/docs/ComponentType_8h__dep__incl.map @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/ComponentType_8h__dep__incl.md5 b/docs/ComponentType_8h__dep__incl.md5 new file mode 100644 index 00000000..73833e99 --- /dev/null +++ b/docs/ComponentType_8h__dep__incl.md5 @@ -0,0 +1 @@ +0d8f5c2d4b7804302b202aaf3484fade \ No newline at end of file diff --git a/docs/ComponentType_8h__dep__incl.svg b/docs/ComponentType_8h__dep__incl.svg new file mode 100644 index 00000000..622976cc --- /dev/null +++ b/docs/ComponentType_8h__dep__incl.svg @@ -0,0 +1,739 @@ + + + + + + +Engine/include/ComponentType.h + + +Node1 + +Engine/include/Component +Type.h + + +Node2 + + +Engine/include/Component.h + + + + +Node1->Node2 + + + + +Node6 + + +Engine/include/GameObject.h + + + + +Node1->Node6 + + + + +Node3 + + +Engine/include/AIGoDown.h + + + + +Node2->Node3 + + + + +Node2->Node6 + + + + +Node22 + + +Engine/include/DragAndDrop.h + + + + +Node2->Node22 + + + + +Node25 + + +Game/include/WaveManager.h + + + + +Node2->Node25 + + + + +Node39 + + +Engine/include/HitPoints.h + + + + +Node2->Node39 + + + + +Node41 + + +Engine/src/Component.cpp + + + + +Node2->Node41 + + + + +Node4 + + +Engine/src/AIGoDown.cpp + + + + +Node3->Node4 + + + + +Node5 + + +Game/src/Enemy.cpp + + + + +Node3->Node5 + + + + +Node6->Node2 + + + + +Node7 + + +Engine/include/Animation.h + + + + +Node6->Node7 + + + + +Node9 + + +Engine/include/Camera.h + + + + +Node6->Node9 + + + + +Node12 + + +Engine/src/GameObject.cpp + + + + +Node6->Node12 + + + + +Node21 + + +Engine/include/TileMap.h + + + + +Node6->Node21 + + + + +Node23 + + +Game/include/StageState.h + + + + +Node6->Node23 + + + + +Node24 + + +Game/include/EndState.h + + + + +Node6->Node24 + + + + +Node6->Node25 + + + + +Node27 + + +Game/include/Enemy.h + + + + +Node6->Node27 + + + + +Node30 + + +Game/include/Tower.h + + + + +Node6->Node30 + + + + +Node31 + + +Engine/include/State.h + + + + +Node6->Node31 + + + + +Node8 + + +Engine/src/Animation.cpp + + + + +Node7->Node8 + + + + +Node9->Node5 + + + + +Node9->Node8 + + + + +Node10 + + +Engine/src/Camera.cpp + + + + +Node9->Node10 + + + + +Node11 + + +Engine/src/DragAndDrop.cpp + + + + +Node9->Node11 + + + + +Node9->Node12 + + + + +Node13 + + +Engine/src/Sprite.cpp + + + + +Node9->Node13 + + + + +Node14 + + +Engine/src/State.cpp + + + + +Node9->Node14 + + + + +Node15 + + +Engine/src/TileMap.cpp + + + + +Node9->Node15 + + + + +Node16 + + +Engine/src/Tileset.cpp + + + + +Node9->Node16 + + + + +Node17 + + +Game/src/EndState.cpp + + + + +Node9->Node17 + + + + +Node18 + + +Game/src/StageState.cpp + + + + +Node9->Node18 + + + + +Node19 + + +Game/src/TitleState.cpp + + + + +Node9->Node19 + + + + +Node20 + + +Game/src/Tower.cpp + + + + +Node9->Node20 + + + + +Node21->Node15 + + + + +Node21->Node22 + + + + +Node21->Node23 + + + + +Node21->Node25 + + + + +Node26 + + +Game/src/WaveManager.cpp + + + + +Node21->Node26 + + + + +Node21->Node27 + + + + +Node21->Node30 + + + + +Node22->Node11 + + + + +Node22->Node20 + + + + +Node22->Node23 + + + + +Node23->Node18 + + + + +Node23->Node19 + + + + +Node23->Node24 + + + + +Node24->Node17 + + + + +Node24->Node23 + + + + +Node25->Node23 + + + + +Node25->Node26 + + + + +Node27->Node5 + + + + +Node27->Node18 + + + + +Node27->Node26 + + + + +Node28 + + +Game/include/GameResources.h + + + + +Node27->Node28 + + + + +Node28->Node26 + + + + +Node29 + + +Game/src/GameResources.cpp + + + + +Node28->Node29 + + + + +Node30->Node18 + + + + +Node30->Node20 + + + + +Node31->Node14 + + + + +Node31->Node23 + + + + +Node32 + + +Engine/include/Game.h + + + + +Node31->Node32 + + + + +Node38 + + +Game/include/TitleState.h + + + + +Node31->Node38 + + + + +Node32->Node10 + + + + +Node32->Node13 + + + + +Node32->Node16 + + + + +Node32->Node18 + + + + +Node32->Node19 + + + + +Node32->Node26 + + + + +Node33 + + +Engine/include/Text.h + + + + +Node32->Node33 + + + + +Node35 + + +Engine/src/Game.cpp + + + + +Node32->Node35 + + + + +Node36 + + +Engine/src/Resources.cpp + + + + +Node32->Node36 + + + + +Node37 + + +Game/src/main.cpp + + + + +Node32->Node37 + + + + +Node33->Node24 + + + + +Node34 + + +Engine/src/Text.cpp + + + + +Node33->Node34 + + + + +Node38->Node19 + + + + +Node38->Node37 + + + + +Node39->Node5 + + + + +Node40 + + +Engine/src/HItPoints.cpp + + + + +Node39->Node40 + + + + + diff --git a/docs/Component_8cpp.html b/docs/Component_8cpp.html index 68cf14d4..dd69f8bd 100644 --- a/docs/Component_8cpp.html +++ b/docs/Component_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Component.cpp @@ -31,7 +31,7 @@ - + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Component.cpp:
-
+
+
diff --git a/docs/Component_8cpp__incl.map b/docs/Component_8cpp__incl.map index 778dddc6..048b734b 100644 --- a/docs/Component_8cpp__incl.map +++ b/docs/Component_8cpp__incl.map @@ -1,7 +1,8 @@ - - - - - + + + + + + diff --git a/docs/Component_8cpp__incl.md5 b/docs/Component_8cpp__incl.md5 index c4f555bb..76a95848 100644 --- a/docs/Component_8cpp__incl.md5 +++ b/docs/Component_8cpp__incl.md5 @@ -1 +1 @@ -450ea6c1107c0cde59e774ba0c436e26 \ No newline at end of file +dd93d016156b7d031e82f4d274ecba67 \ No newline at end of file diff --git a/docs/Component_8cpp__incl.svg b/docs/Component_8cpp__incl.svg index a4f4edff..40901315 100644 --- a/docs/Component_8cpp__incl.svg +++ b/docs/Component_8cpp__incl.svg @@ -1,138 +1,156 @@ - - + Engine/src/Component.cpp - + Node1 - -Engine/src/Component.cpp + +Engine/src/Component.cpp Node2 - -Component.h + +Component.h Node1->Node2 - - + + Node3 - - -GameObject.h + + +ComponentType.h Node2->Node3 - - - - -Node3->Node2 - - + + Node4 - - -SDL_include.h + + +GameObject.h - -Node3->Node4 - - + +Node2->Node4 + + + + +Node4->Node2 + + + + +Node4->Node3 + + Node5 - -vector + + +SDL_include.h + - -Node3->Node5 - - + + +Node4->Node5 + + Node6 - -memory + +vector - -Node3->Node6 - - + +Node4->Node6 + + Node7 - -string + +memory - -Node3->Node7 - - + +Node4->Node7 + + Node8 - - -Rect.h - - - - -Node3->Node8 - - + +string - -Node8->Node4 - - + +Node4->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node4->Node9 + + + + +Node9->Node5 + + Node10 - -cmath - - -Node8->Node10 - - - - -Node9->Node4 - - + + +Vec2.h + + + + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node5 + + diff --git a/docs/Component_8h.html b/docs/Component_8h.html index acf521ca..fff563cf 100644 --- a/docs/Component_8h.html +++ b/docs/Component_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Component.h @@ -31,7 +31,7 @@ - + @@ -87,22 +87,24 @@
Referência do Arquivo Component.h
-
#include "GameObject.h"
+
#include "ComponentType.h"
+#include "GameObject.h"
Gráfico de dependência de inclusões para Component.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+
-

@@ -115,21 +117,6 @@ Definições e Macros

#define COMPONENT
 
- - - -

-Enumerações

enum  ComponentType {
-  DRAG_AND_DROP =0, -HIT_POINTS, -AI_GO_DOWN, -WAVE_MANAGER, -
-  SIZE, -COMPONENT_TYPE_SIZE -
- }
 Tipos de Componentes. Mais...
 

Definições e macros

@@ -142,44 +129,14 @@

Definições e macros

-
-
-

Enumerações

- -
-
- - - - -
enum ComponentType
-
- -

Tipos de Componentes.

-

Enumeração com os tipos de componentes possíveis, usado no método Is que todo componente deve implementar.

- - - - - - - -
Valores enumerados
DRAG_AND_DROP  -
HIT_POINTS  -
AI_GO_DOWN  -
WAVE_MANAGER  -
SIZE  -
COMPONENT_TYPE_SIZE  -
-
diff --git a/docs/Component_8h__dep__incl.map b/docs/Component_8h__dep__incl.map index 4b648e2f..ce692038 100644 --- a/docs/Component_8h__dep__incl.map +++ b/docs/Component_8h__dep__incl.map @@ -1,42 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Component_8h__dep__incl.md5 b/docs/Component_8h__dep__incl.md5 index a96686d9..d0fa0da4 100644 --- a/docs/Component_8h__dep__incl.md5 +++ b/docs/Component_8h__dep__incl.md5 @@ -1 +1 @@ -e5f8d504476c32cc921c810243267ba5 \ No newline at end of file +383f60414fdc444f00907aaeaa82abf0 \ No newline at end of file diff --git a/docs/Component_8h__dep__incl.svg b/docs/Component_8h__dep__incl.svg index b71e61de..01334f23 100644 --- a/docs/Component_8h__dep__incl.svg +++ b/docs/Component_8h__dep__incl.svg @@ -1,728 +1,720 @@ - - + Engine/include/Component.h - + Node1 - -Engine/include/Component.h + +Engine/include/Component.h Node2 - -Engine/include/AIGoDown.h + +Engine/include/AIGoDown.h Node1->Node2 - - + + Node5 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node1->Node5 - - + + - -Node20 - - -Engine/include/DragAndDrop.h + +Node21 + + +Engine/include/DragAndDrop.h - -Node1->Node20 - - + +Node1->Node21 + + - -Node23 - - -Game/include/WaveManager.h + +Node24 + + +Game/include/WaveManager.h - -Node1->Node23 - - + +Node1->Node24 + + - -Node39 - - -Engine/include/HitPoints.h + +Node38 + + +Engine/include/HitPoints.h - -Node1->Node39 - - + +Node1->Node38 + + - -Node41 - - -Engine/src/Component.cpp + +Node40 + + +Engine/src/Component.cpp - -Node1->Node41 - - + +Node1->Node40 + + Node3 - -Engine/src/AIGoDown.cpp + +Engine/src/AIGoDown.cpp Node2->Node3 - - + + Node4 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node2->Node4 - - + + Node5->Node1 - - + + Node6 - -Engine/include/Animation.h + +Engine/include/Animation.h Node5->Node6 - - + + Node8 - -Engine/include/Camera.h + +Engine/include/Camera.h Node5->Node8 - - + + - -Node19 - - -Engine/include/TileMap.h + +Node11 + + +Engine/src/GameObject.cpp - -Node5->Node19 - - + +Node5->Node11 + + - -Node21 - - -Game/include/StageState.h + +Node20 + + +Engine/include/TileMap.h - -Node5->Node21 - - + +Node5->Node20 + + Node22 - - -Game/include/EndState.h + + +Game/include/StageState.h -Node5->Node22 - - - - -Node5->Node23 - - +Node5->Node22 + + - -Node25 - - -Game/include/Enemy.h + +Node23 + + +Game/include/EndState.h - -Node5->Node25 - - + +Node5->Node23 + + - -Node28 - - -Game/include/Tower.h + +Node5->Node24 + + + + +Node26 + + +Game/include/Enemy.h - -Node5->Node28 - - + +Node5->Node26 + + Node29 - - -Engine/include/State.h + + +Game/include/Tower.h -Node5->Node29 - - +Node5->Node29 + + - -Node37 - - -Engine/src/GameObject.cpp - - - - -Node5->Node37 - - - - -Node38 - - -Game/include/EmptyGameObject.h + +Node30 + + +Engine/include/State.h - -Node5->Node38 - - + +Node5->Node30 + + Node7 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node6->Node7 - - + + -Node8->Node4 - - +Node8->Node4 + + Node8->Node7 - - + + Node9 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node8->Node9 - - + + Node10 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node8->Node10 - - - - -Node11 - - -Engine/src/Sprite.cpp - - + + Node8->Node11 - - + + Node12 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node8->Node12 - - + + Node13 - - -Engine/src/TileMap.cpp + + +Engine/src/State.cpp Node8->Node13 - - + + Node14 - - -Engine/src/Tileset.cpp + + +Engine/src/TileMap.cpp Node8->Node14 - - + + Node15 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node8->Node15 - - + + Node16 - - -Game/src/StageState.cpp + + +Game/src/EndState.cpp -Node8->Node16 - - +Node8->Node16 + + Node17 - - -Game/src/TitleState.cpp + + +Game/src/StageState.cpp Node8->Node17 - - + + Node18 - - -Game/src/Tower.cpp + + +Game/src/TitleState.cpp Node8->Node18 - - + + - -Node19->Node13 - - + +Node19 + + +Game/src/Tower.cpp + - -Node19->Node20 - - - -Node19->Node21 - - + +Node8->Node19 + + - -Node19->Node23 - - + +Node20->Node14 + + - -Node24 - - -Game/src/WaveManager.cpp - + +Node20->Node21 + + + +Node20->Node22 + + - -Node19->Node24 - - + +Node20->Node24 + + - -Node19->Node25 - - + +Node25 + + +Game/src/WaveManager.cpp + - -Node19->Node28 - - - -Node20->Node10 - - + +Node20->Node25 + + - -Node20->Node18 - - + +Node20->Node26 + + - -Node21->Node16 - - + +Node20->Node29 + + - -Node21->Node17 - - + +Node21->Node10 + + + + +Node21->Node19 + + -Node21->Node22 - - - - -Node22->Node15 - - - - -Node22->Node21 - - - - -Node23->Node21 - - - - -Node23->Node24 - - - - -Node25->Node4 - - - - -Node25->Node16 - - - - -Node25->Node24 - - +Node21->Node22 + + + + +Node22->Node17 + + + + +Node22->Node18 + + + + +Node22->Node23 + + + + +Node23->Node16 + + + + +Node23->Node22 + + + + +Node24->Node22 + + + + +Node24->Node25 + + + + +Node26->Node4 + + + + +Node26->Node17 + + + + +Node26->Node25 + + - -Node26 - - -Game/include/GameResources.h + +Node27 + + +Game/include/GameResources.h - -Node25->Node26 - - + +Node26->Node27 + + - -Node26->Node24 - - + +Node27->Node25 + + - -Node27 - - -Game/src/GameResources.cpp + +Node28 + + +Game/src/GameResources.cpp - -Node26->Node27 - - - - -Node28->Node16 - - - - -Node28->Node18 - - - - -Node29->Node12 - - - - -Node29->Node21 - - + +Node27->Node28 + + - -Node30 - - -Engine/include/Game.h - + +Node29->Node17 + + + +Node29->Node19 + + - -Node29->Node30 - - + +Node30->Node13 + + - -Node36 - - -Game/include/TitleState.h + +Node30->Node22 + + + + +Node31 + + +Engine/include/Game.h - -Node29->Node36 - - + +Node30->Node31 + + - -Node30->Node9 - - + +Node37 + + +Game/include/TitleState.h + - -Node30->Node11 - - - -Node30->Node14 - - + +Node30->Node37 + + - -Node30->Node16 - - + +Node31->Node9 + + - -Node30->Node17 - - + +Node31->Node12 + + - -Node30->Node24 - - + +Node31->Node15 + + - -Node31 - - -Engine/include/Text.h - + +Node31->Node17 + + + +Node31->Node18 + + - -Node30->Node31 - - + +Node31->Node25 + + - -Node33 - - -Engine/src/Game.cpp + +Node32 + + +Engine/include/Text.h - -Node30->Node33 - - + +Node31->Node32 + + Node34 - - -Engine/src/Resources.cpp + + +Engine/src/Game.cpp - -Node30->Node34 - - + +Node31->Node34 + + Node35 - - -Game/src/main.cpp + + +Engine/src/Resources.cpp - -Node30->Node35 - - + +Node31->Node35 + + - -Node31->Node22 - - + +Node36 + + +Game/src/main.cpp + - -Node32 - - -Engine/src/Text.cpp + + +Node31->Node36 + + + + +Node32->Node23 + + + + +Node33 + + +Engine/src/Text.cpp - -Node31->Node32 - - - - -Node36->Node17 - - - - -Node36->Node35 - - - - -Node38->Node21 - - - - -Node39->Node4 - - + +Node32->Node33 + + - -Node40 - - -Engine/src/HItPoints.cpp + +Node37->Node18 + + + + +Node37->Node36 + + + + +Node38->Node4 + + + + +Node39 + + +Engine/src/HItPoints.cpp - -Node39->Node40 - - + +Node38->Node39 + + diff --git a/docs/Component_8h__incl.map b/docs/Component_8h__incl.map index 91d53c8a..68d74a93 100644 --- a/docs/Component_8h__incl.map +++ b/docs/Component_8h__incl.map @@ -1,6 +1,7 @@ - - - - + + + + + diff --git a/docs/Component_8h__incl.md5 b/docs/Component_8h__incl.md5 index 3ca27447..105b3e95 100644 --- a/docs/Component_8h__incl.md5 +++ b/docs/Component_8h__incl.md5 @@ -1 +1 @@ -77b3378f8d00461729afaf25f0f6330a \ No newline at end of file +a12823701fcb751b750bd4eb2323df12 \ No newline at end of file diff --git a/docs/Component_8h__incl.svg b/docs/Component_8h__incl.svg index b3427185..b8079757 100644 --- a/docs/Component_8h__incl.svg +++ b/docs/Component_8h__incl.svg @@ -1,125 +1,143 @@ - - + Engine/include/Component.h - + Node1 - -Engine/include/Component.h + +Engine/include/Component.h Node2 - - -GameObject.h + + +ComponentType.h Node1->Node2 - - - - -Node2->Node1 - - + + Node3 - - -SDL_include.h + + +GameObject.h - -Node2->Node3 - - + +Node1->Node3 + + + + +Node3->Node1 + + + + +Node3->Node2 + + Node4 - -vector + + +SDL_include.h + - -Node2->Node4 - - + + +Node3->Node4 + + Node5 - -memory + +vector - -Node2->Node5 - - + +Node3->Node5 + + Node6 - -string + +memory - -Node2->Node6 - - + +Node3->Node6 + + Node7 - - -Rect.h - - - - -Node2->Node7 - - + +string - -Node7->Node3 - - + +Node3->Node7 + + Node8 - - -Vec2.h + + +Rect.h - -Node7->Node8 - - + +Node3->Node8 + + + + +Node8->Node4 + + Node9 - -cmath - - -Node7->Node9 - - - - -Node8->Node3 - - + + +Vec2.h + + + + +Node8->Node9 + + + + +Node10 + +cmath + + +Node8->Node10 + + + + +Node9->Node4 + + diff --git a/docs/Defines_8h.html b/docs/Defines_8h.html index f60e9294..4d7bf584 100644 --- a/docs/Defines_8h.html +++ b/docs/Defines_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/Defines.h @@ -31,7 +31,7 @@ - + @@ -94,7 +94,8 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -118,9 +119,9 @@

Definições e macros

diff --git a/docs/Defines_8h__dep__incl.map b/docs/Defines_8h__dep__incl.map index d85743c1..5fe6b34d 100644 --- a/docs/Defines_8h__dep__incl.map +++ b/docs/Defines_8h__dep__incl.map @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/docs/Defines_8h__dep__incl.md5 b/docs/Defines_8h__dep__incl.md5 index e1bbcf17..302dca3a 100644 --- a/docs/Defines_8h__dep__incl.md5 +++ b/docs/Defines_8h__dep__incl.md5 @@ -1 +1 @@ -a068a796a0239ab2dbdb6ebae76faa50 \ No newline at end of file +ba1ac6acb2cafc0c6fb5302df2ebbc02 \ No newline at end of file diff --git a/docs/Defines_8h__dep__incl.svg b/docs/Defines_8h__dep__incl.svg index c9efbe2c..82cee40e 100644 --- a/docs/Defines_8h__dep__incl.svg +++ b/docs/Defines_8h__dep__incl.svg @@ -1,119 +1,119 @@ - - + Game/include/Defines.h - + Node1 - -Game/include/Defines.h + +Game/include/Defines.h Node2 - -Game/include/EndStateData.h + +Game/include/EndStateData.h Node1->Node2 - - + + Node8 - -Game/src/EndStateData.cpp + +Game/src/EndStateData.cpp Node1->Node8 - - + + Node3 - -Game/include/EndState.h + +Game/include/EndState.h Node2->Node3 - - + + Node5 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node2->Node5 - - + + Node4 - -Game/include/StageState.h + +Game/include/StageState.h Node3->Node4 - - + + Node7 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node3->Node7 - - + + Node4->Node3 - - + + Node4->Node5 - - + + Node6 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node4->Node6 - - + + diff --git a/docs/DragAndDrop_8cpp.html b/docs/DragAndDrop_8cpp.html index 6c6120c3..755979ec 100644 --- a/docs/DragAndDrop_8cpp.html +++ b/docs/DragAndDrop_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/DragAndDrop.cpp @@ -31,7 +31,7 @@
- + @@ -96,14 +96,15 @@
Gráfico de dependência de inclusões para DragAndDrop.cpp:
-
+
+
diff --git a/docs/DragAndDrop_8cpp__incl.map b/docs/DragAndDrop_8cpp__incl.map index 5eb7f473..a4fb0903 100644 --- a/docs/DragAndDrop_8cpp__incl.map +++ b/docs/DragAndDrop_8cpp__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/DragAndDrop_8cpp__incl.md5 b/docs/DragAndDrop_8cpp__incl.md5 index 5deeb256..e109a9db 100644 --- a/docs/DragAndDrop_8cpp__incl.md5 +++ b/docs/DragAndDrop_8cpp__incl.md5 @@ -1 +1 @@ -3a8cc60bb812e3b730516a73f0926eb4 \ No newline at end of file +396944b5f5698b956b2bc3a9272d17a1 \ No newline at end of file diff --git a/docs/DragAndDrop_8cpp__incl.svg b/docs/DragAndDrop_8cpp__incl.svg index 3ecd4e8c..3869a38f 100644 --- a/docs/DragAndDrop_8cpp__incl.svg +++ b/docs/DragAndDrop_8cpp__incl.svg @@ -1,370 +1,388 @@ - - + Engine/src/DragAndDrop.cpp - + Node1 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node2 - -DragAndDrop.h + +DragAndDrop.h Node1->Node2 - - + + - -Node16 - - -InputManager.h + +Node17 + + +InputManager.h - -Node1->Node16 - - + +Node1->Node17 + + - -Node19 - - -Camera.h + +Node20 + + +Camera.h - -Node1->Node19 - - + +Node1->Node20 + + - -Node21 - - -Error.h + +Node22 + + +Error.h - -Node1->Node21 - - + +Node1->Node22 + + Node3 - -Component.h + +Component.h Node2->Node3 - - + + - -Node12 - - -TileMap.h + +Node13 + + +TileMap.h - -Node2->Node12 - - + +Node2->Node13 + + Node4 - - -GameObject.h + + +ComponentType.h Node3->Node4 - - - - -Node4->Node3 - - + + Node5 - - -SDL_include.h + + +GameObject.h - -Node4->Node5 - - + +Node3->Node5 + + + + +Node5->Node3 + + + + +Node5->Node4 + + Node6 - -vector + + +SDL_include.h + + - -Node4->Node6 - - + +Node5->Node6 + + Node7 - -memory + +vector - -Node4->Node7 - - + +Node5->Node7 + + Node8 - -string + +memory - -Node4->Node8 - - + +Node5->Node8 + + Node9 - - -Rect.h - + +string - - -Node4->Node9 - - - - -Node9->Node5 - - + +Node5->Node9 + + Node10 - - -Vec2.h + + +Rect.h - -Node9->Node10 - - + +Node5->Node10 + + + + +Node10->Node6 + + Node11 - -cmath - - -Node9->Node11 - - - - -Node10->Node5 - - - - -Node12->Node4 - - - - -Node12->Node6 - - - - -Node12->Node8 - - - - -Node12->Node10 - - - - -Node13 - - -Tileset.h + + +Vec2.h - -Node12->Node13 - - + +Node10->Node11 + + - -Node13->Node8 - - + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node6 + + + + +Node13->Node5 + + + + +Node13->Node7 + + + + +Node13->Node9 + + + + +Node13->Node11 + + Node14 - - -Sprite.h + + +Tileset.h Node13->Node14 - - - - -Node14->Node5 - - - - -Node14->Node7 - - - - -Node14->Node8 - - + + -Node14->Node9 - - +Node14->Node9 + + Node15 - - -Color.h + + +Sprite.h -Node14->Node15 - - +Node14->Node15 + + + + +Node15->Node6 + + + + +Node15->Node8 + + + + +Node15->Node9 + + + + +Node15->Node10 + + - -Node14->Node16 - - + +Node16 + + +Color.h + - -Node16->Node5 - - - -Node16->Node10 - - + +Node15->Node16 + + - -Node17 - -unordered_map + +Node15->Node17 + + - -Node16->Node17 - - + +Node17->Node6 + + + + +Node17->Node11 + + Node18 - -cstdint + +unordered_map - -Node16->Node18 - - + +Node17->Node18 + + - -Node19->Node4 - - + +Node19 + +cstdint - -Node19->Node10 - - + +Node17->Node19 + + - -Node20 - - -ActionManager.h - + +Node20->Node5 + + + +Node20->Node11 + + - -Node19->Node20 - - + +Node21 + + +ActionManager.h + - -Node20->Node16 - - - -Node22 - -iostream + +Node20->Node21 + + - -Node21->Node22 - - + +Node21->Node17 + + Node23 - -stdlib.h - - -Node21->Node23 - - + +iostream + + +Node22->Node23 + + + + +Node24 + +stdlib.h + + +Node22->Node24 + + diff --git a/docs/DragAndDrop_8h.html b/docs/DragAndDrop_8h.html index 52f85595..eed83642 100644 --- a/docs/DragAndDrop_8h.html +++ b/docs/DragAndDrop_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/DragAndDrop.h @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Gráfico de dependência de inclusões para DragAndDrop.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -113,9 +115,9 @@ diff --git a/docs/DragAndDrop_8h__dep__incl.map b/docs/DragAndDrop_8h__dep__incl.map index 46249e99..17e12847 100644 --- a/docs/DragAndDrop_8h__dep__incl.map +++ b/docs/DragAndDrop_8h__dep__incl.map @@ -1,4 +1,9 @@ - + + + + + + diff --git a/docs/DragAndDrop_8h__dep__incl.md5 b/docs/DragAndDrop_8h__dep__incl.md5 index 9dfa2280..e4cc4129 100644 --- a/docs/DragAndDrop_8h__dep__incl.md5 +++ b/docs/DragAndDrop_8h__dep__incl.md5 @@ -1 +1 @@ -992a52f11c13f2586fa0f9304a4c0794 \ No newline at end of file +3304f0205e4eeed342bff32b6b80be07 \ No newline at end of file diff --git a/docs/DragAndDrop_8h__dep__incl.svg b/docs/DragAndDrop_8h__dep__incl.svg index 021262df..6765ef97 100644 --- a/docs/DragAndDrop_8h__dep__incl.svg +++ b/docs/DragAndDrop_8h__dep__incl.svg @@ -1,44 +1,114 @@ - - - + + Engine/include/DragAndDrop.h - + Node1 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node2 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node1->Node2 - - + + Node3 - - -Game/src/Tower.cpp + + +Game/include/StageState.h Node1->Node3 - - + + + + +Node8 + + +Game/src/Tower.cpp + + + + +Node1->Node8 + + + + +Node4 + + +Game/include/EndState.h + + + + +Node3->Node4 + + + + +Node6 + + +Game/src/StageState.cpp + + + + +Node3->Node6 + + + + +Node7 + + +Game/src/TitleState.cpp + + + + +Node3->Node7 + + + + +Node4->Node3 + + + + +Node5 + + +Game/src/EndState.cpp + + + + +Node4->Node5 + + diff --git a/docs/DragAndDrop_8h__incl.map b/docs/DragAndDrop_8h__incl.map index f986f020..55948997 100644 --- a/docs/DragAndDrop_8h__incl.map +++ b/docs/DragAndDrop_8h__incl.map @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/DragAndDrop_8h__incl.md5 b/docs/DragAndDrop_8h__incl.md5 index 09735532..1bbe1048 100644 --- a/docs/DragAndDrop_8h__incl.md5 +++ b/docs/DragAndDrop_8h__incl.md5 @@ -1 +1 @@ -b6535a9d76a7c96a603281e200b059ab \ No newline at end of file +7e93fd87111af40edc48aaa8e2111671 \ No newline at end of file diff --git a/docs/DragAndDrop_8h__incl.svg b/docs/DragAndDrop_8h__incl.svg index eaab732d..372618ff 100644 --- a/docs/DragAndDrop_8h__incl.svg +++ b/docs/DragAndDrop_8h__incl.svg @@ -1,278 +1,296 @@ - - + Engine/include/DragAndDrop.h - + Node1 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node2 - -Component.h + +Component.h Node1->Node2 - - + + - -Node11 - - -TileMap.h + +Node12 + + +TileMap.h - -Node1->Node11 - - + +Node1->Node12 + + Node3 - - -GameObject.h + + +ComponentType.h Node2->Node3 - - - - -Node3->Node2 - - + + Node4 - - -SDL_include.h + + +GameObject.h - -Node3->Node4 - - + +Node2->Node4 + + + + +Node4->Node2 + + + + +Node4->Node3 + + Node5 - -vector + + +SDL_include.h + - -Node3->Node5 - - + + +Node4->Node5 + + Node6 - -memory + +vector - -Node3->Node6 - - + +Node4->Node6 + + Node7 - -string + +memory - -Node3->Node7 - - + +Node4->Node7 + + Node8 - - -Rect.h - - - - -Node3->Node8 - - + +string - -Node8->Node4 - - + +Node4->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node4->Node9 + + + + +Node9->Node5 + + Node10 - -cmath - - -Node8->Node10 - - - - -Node9->Node4 - - - - -Node11->Node3 - - - - -Node11->Node5 - - - - -Node11->Node7 - - - - -Node11->Node9 - - - - -Node12 - - -Tileset.h + + +Vec2.h - -Node11->Node12 - - + +Node9->Node10 + + - -Node12->Node7 - - + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node5 + + + + +Node12->Node4 + + + + +Node12->Node6 + + + + +Node12->Node8 + + + + +Node12->Node10 + + Node13 - - -Sprite.h + + +Tileset.h Node12->Node13 - - - - -Node13->Node4 - - - - -Node13->Node6 - - - - -Node13->Node7 - - + + -Node13->Node8 - - +Node13->Node8 + + Node14 - - -Color.h + + +Sprite.h -Node13->Node14 - - +Node13->Node14 + + + + +Node14->Node5 + + + + +Node14->Node7 + + + + +Node14->Node8 + + + + +Node14->Node9 + + Node15 - - -InputManager.h + + +Color.h - -Node13->Node15 - - - - -Node15->Node4 - - - - -Node15->Node9 - - + +Node14->Node15 + + Node16 - -unordered_map + + +InputManager.h + - -Node15->Node16 - - + + +Node14->Node16 + + + + +Node16->Node5 + + + + +Node16->Node10 + + Node17 - -cstdint - - -Node15->Node17 - - + +unordered_map + + +Node16->Node17 + + + + +Node18 + +cstdint + + +Node16->Node18 + + diff --git a/docs/EmptyGameObject_8h.html b/docs/EmptyGameObject_8h.html deleted file mode 100644 index 0c1c060a..00000000 --- a/docs/EmptyGameObject_8h.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - -Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/EmptyGameObject.h - - - - - - - - - -
-
- - - - - - -
-
Projeto IDJ - Towers Of Madness -
-
TowerDefenseLovecraftnianoZombicida
-
-
- - - - - - - - - -
- -
- - -
-
- -
-
Referência do Arquivo EmptyGameObject.h
-
-
-
#include "GameObject.h"
-#include "Rect.h"
-
-Gráfico de dependência de inclusões para EmptyGameObject.h:
-
-
-
-
-Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
-
-
-
- - - -

-Componentes

class  EmptyGameObject
 
-
- - - - diff --git a/docs/EmptyGameObject_8h__dep__incl.map b/docs/EmptyGameObject_8h__dep__incl.map deleted file mode 100644 index 3ffa370c..00000000 --- a/docs/EmptyGameObject_8h__dep__incl.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/EmptyGameObject_8h__dep__incl.md5 b/docs/EmptyGameObject_8h__dep__incl.md5 deleted file mode 100644 index 51241057..00000000 --- a/docs/EmptyGameObject_8h__dep__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -dc197c5336d2543c7dad40401c45f115 \ No newline at end of file diff --git a/docs/EmptyGameObject_8h__dep__incl.svg b/docs/EmptyGameObject_8h__dep__incl.svg deleted file mode 100644 index 28750f3e..00000000 --- a/docs/EmptyGameObject_8h__dep__incl.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - -Game/include/EmptyGameObject.h - - -Node1 - -Game/include/EmptyGameObject.h - - -Node2 - - -Game/include/StageState.h - - - - -Node1->Node2 - - - - -Node3 - - -Game/include/EndState.h - - - - -Node2->Node3 - - - - -Node5 - - -Game/src/StageState.cpp - - - - -Node2->Node5 - - - - -Node6 - - -Game/src/TitleState.cpp - - - - -Node2->Node6 - - - - -Node3->Node2 - - - - -Node4 - - -Game/src/EndState.cpp - - - - -Node3->Node4 - - - - - diff --git a/docs/EmptyGameObject_8h__incl.map b/docs/EmptyGameObject_8h__incl.map deleted file mode 100644 index 01abc272..00000000 --- a/docs/EmptyGameObject_8h__incl.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/EmptyGameObject_8h__incl.md5 b/docs/EmptyGameObject_8h__incl.md5 deleted file mode 100644 index ffe08536..00000000 --- a/docs/EmptyGameObject_8h__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -5d88701c57e40b3189476243037b35b0 \ No newline at end of file diff --git a/docs/EmptyGameObject_8h__incl.svg b/docs/EmptyGameObject_8h__incl.svg deleted file mode 100644 index b5e6d6c7..00000000 --- a/docs/EmptyGameObject_8h__incl.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - -Game/include/EmptyGameObject.h - - -Node1 - -Game/include/EmptyGameObject.h - - -Node2 - - -GameObject.h - - - - -Node1->Node2 - - - - -Node8 - - -Rect.h - - - - -Node1->Node8 - - - - -Node3 - - -SDL_include.h - - - - -Node2->Node3 - - - - -Node4 - -vector - - -Node2->Node4 - - - - -Node5 - -memory - - -Node2->Node5 - - - - -Node6 - -string - - -Node2->Node6 - - - - -Node7 - - -Component.h - - - - -Node2->Node7 - - - - -Node2->Node8 - - - - -Node7->Node2 - - - - -Node8->Node3 - - - - -Node9 - - -Vec2.h - - - - -Node8->Node9 - - - - -Node10 - -cmath - - -Node8->Node10 - - - - -Node9->Node3 - - - - - diff --git a/docs/EndStateData_8cpp.html b/docs/EndStateData_8cpp.html index 8d8e8528..0bc8da3d 100644 --- a/docs/EndStateData_8cpp.html +++ b/docs/EndStateData_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/EndStateData.cpp @@ -31,7 +31,7 @@

- + @@ -97,7 +97,8 @@
Gráfico de dependência de inclusões para EndStateData.cpp:
-
+
+

@@ -126,9 +127,9 @@

Definições e macros

diff --git a/docs/EndStateData_8cpp__incl.map b/docs/EndStateData_8cpp__incl.map index bac714db..a8e5344a 100644 --- a/docs/EndStateData_8cpp__incl.map +++ b/docs/EndStateData_8cpp__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/EndStateData_8cpp__incl.md5 b/docs/EndStateData_8cpp__incl.md5 index 27fe8d3a..b96f0db1 100644 --- a/docs/EndStateData_8cpp__incl.md5 +++ b/docs/EndStateData_8cpp__incl.md5 @@ -1 +1 @@ -2f261c7fd4224e61e4016d54d506d3fb \ No newline at end of file +9814eccc5f31b678827cad136d673703 \ No newline at end of file diff --git a/docs/EndStateData_8cpp__incl.svg b/docs/EndStateData_8cpp__incl.svg index 826b70b0..9e94857b 100644 --- a/docs/EndStateData_8cpp__incl.svg +++ b/docs/EndStateData_8cpp__incl.svg @@ -1,44 +1,44 @@ - - + Game/src/EndStateData.cpp - + Node1 - -Game/src/EndStateData.cpp + +Game/src/EndStateData.cpp Node2 - -StateData.h + +StateData.h Node1->Node2 - - + + Node3 - -Defines.h + +Defines.h Node1->Node3 - - + + diff --git a/docs/EndStateData_8h.html b/docs/EndStateData_8h.html index 433c0e9e..3f300183 100644 --- a/docs/EndStateData_8h.html +++ b/docs/EndStateData_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/EndStateData.h @@ -31,7 +31,7 @@
- + @@ -96,12 +96,14 @@
Gráfico de dependência de inclusões para EndStateData.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -112,9 +114,9 @@ diff --git a/docs/EndStateData_8h__dep__incl.map b/docs/EndStateData_8h__dep__incl.map index 13e7e23c..dee04c20 100644 --- a/docs/EndStateData_8h__dep__incl.map +++ b/docs/EndStateData_8h__dep__incl.map @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/docs/EndStateData_8h__dep__incl.md5 b/docs/EndStateData_8h__dep__incl.md5 index 5f70ecf3..25f1681c 100644 --- a/docs/EndStateData_8h__dep__incl.md5 +++ b/docs/EndStateData_8h__dep__incl.md5 @@ -1 +1 @@ -8e6d1b7c44b30dc79f0e3f87bbb6d4b4 \ No newline at end of file +43b2da32c4e2fe97725651a3647057bd \ No newline at end of file diff --git a/docs/EndStateData_8h__dep__incl.svg b/docs/EndStateData_8h__dep__incl.svg index 18e4303c..85a03871 100644 --- a/docs/EndStateData_8h__dep__incl.svg +++ b/docs/EndStateData_8h__dep__incl.svg @@ -1,93 +1,93 @@ - - + Game/include/EndStateData.h - + Node1 - -Game/include/EndStateData.h + +Game/include/EndStateData.h Node2 - -Game/include/EndState.h + +Game/include/EndState.h Node1->Node2 - - + + Node4 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node1->Node4 - - + + Node3 - -Game/include/StageState.h + +Game/include/StageState.h Node2->Node3 - - + + Node6 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node2->Node6 - - + + Node3->Node2 - - + + Node3->Node4 - - + + Node5 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node3->Node5 - - + + diff --git a/docs/EndStateData_8h__incl.map b/docs/EndStateData_8h__incl.map index bda57469..8fe361a4 100644 --- a/docs/EndStateData_8h__incl.map +++ b/docs/EndStateData_8h__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/EndStateData_8h__incl.md5 b/docs/EndStateData_8h__incl.md5 index 3e661845..b627b92a 100644 --- a/docs/EndStateData_8h__incl.md5 +++ b/docs/EndStateData_8h__incl.md5 @@ -1 +1 @@ -b9b42fb949a781c904a78594e2a8dd32 \ No newline at end of file +fef5d2e4507bdc1b6c622a28ae22104e \ No newline at end of file diff --git a/docs/EndStateData_8h__incl.svg b/docs/EndStateData_8h__incl.svg index 0f41d30c..50eead44 100644 --- a/docs/EndStateData_8h__incl.svg +++ b/docs/EndStateData_8h__incl.svg @@ -1,44 +1,44 @@ - - + Game/include/EndStateData.h - + Node1 - -Game/include/EndStateData.h + +Game/include/EndStateData.h Node2 - -StateData.h + +StateData.h Node1->Node2 - - + + Node3 - -Defines.h + +Defines.h Node1->Node3 - - + + diff --git a/docs/EndState_8cpp.html b/docs/EndState_8cpp.html index 74537429..52961590 100644 --- a/docs/EndState_8cpp.html +++ b/docs/EndState_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/EndState.cpp @@ -31,7 +31,7 @@

- + @@ -94,14 +94,15 @@
Gráfico de dependência de inclusões para EndState.cpp:
-
+
+
diff --git a/docs/EndState_8cpp__incl.map b/docs/EndState_8cpp__incl.map index 9a0238f4..9cbe1df8 100644 --- a/docs/EndState_8cpp__incl.map +++ b/docs/EndState_8cpp__incl.map @@ -1,29 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/EndState_8cpp__incl.md5 b/docs/EndState_8cpp__incl.md5 index 0ec4be70..8abdf97c 100644 --- a/docs/EndState_8cpp__incl.md5 +++ b/docs/EndState_8cpp__incl.md5 @@ -1 +1 @@ -a36a546506da210df722f17293acb854 \ No newline at end of file +8e4202e0631df4f9c6e8efd815970c90 \ No newline at end of file diff --git a/docs/EndState_8cpp__incl.svg b/docs/EndState_8cpp__incl.svg index 07a4349a..1348da06 100644 --- a/docs/EndState_8cpp__incl.svg +++ b/docs/EndState_8cpp__incl.svg @@ -1,779 +1,797 @@ - - + Game/src/EndState.cpp - + Node1 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node2 - -EndState.h + +EndState.h Node1->Node2 - - - - -Node37 - - -Camera.h + + + + +Node38 + + +Camera.h - -Node1->Node37 - - + +Node1->Node38 + + Node3 - -EndStateData.h + +EndStateData.h Node2->Node3 - - + + Node6 - -GameObject.h + +GameObject.h Node2->Node6 - - + + - -Node15 - - -Music.h + +Node16 + + +Music.h - -Node2->Node15 - - + +Node2->Node16 + + - -Node21 - - -InputManager.h + +Node22 + + +InputManager.h - -Node2->Node21 - - + +Node2->Node22 + + - -Node23 - - -Sprite.h + +Node24 + + +Sprite.h - -Node2->Node23 - - + +Node2->Node24 + + - -Node25 - - -Text.h + +Node26 + + +Text.h - -Node2->Node25 - - + +Node2->Node26 + + - -Node30 - - -StageState.h + +Node31 + + +StageState.h - -Node2->Node30 - - + +Node2->Node31 + + Node4 - -StateData.h + +StateData.h Node3->Node4 - - + + Node5 - -Defines.h + +Defines.h Node3->Node5 - - + + Node7 - -SDL_include.h + +SDL_include.h Node6->Node7 - - + + Node8 - -vector + +vector Node6->Node8 - - + + Node9 - -memory + +memory Node6->Node9 - - + + Node10 - -string + +string Node6->Node10 - - + + Node11 - -Component.h + +Component.h Node6->Node11 - - + + Node12 - - -Rect.h + + +ComponentType.h -Node6->Node12 - - - - -Node11->Node6 - - - - -Node12->Node7 - - +Node6->Node12 + + Node13 - - -Vec2.h + + +Rect.h - -Node12->Node13 - - + +Node6->Node13 + + - -Node14 - -cmath + +Node11->Node6 + + - -Node12->Node14 - - + +Node11->Node12 + + Node13->Node7 - - - - -Node15->Node7 - - - - -Node15->Node9 - - + + - -Node15->Node10 - - - - -Node16 - - -Resources.h + +Node14 + + +Vec2.h - -Node15->Node16 - - - - -Node18 - - -Error.h - + +Node13->Node14 + + + +Node15 + +cmath - -Node15->Node18 - - + +Node13->Node15 + + - -Node15->Node21 - - + +Node14->Node7 + + -Node16->Node7 - - +Node16->Node7 + + -Node16->Node9 - - +Node16->Node9 + + -Node16->Node10 - - +Node16->Node10 + + Node17 - -unordered_map + + +Resources.h + + -Node16->Node17 - - +Node16->Node17 + + Node19 - -iostream + + +Error.h + - -Node18->Node19 - - - -Node20 - -stdlib.h + +Node16->Node19 + + - -Node18->Node20 - - + +Node16->Node22 + + - -Node21->Node7 - - + +Node17->Node7 + + - -Node21->Node13 - - + +Node17->Node9 + + - -Node21->Node17 - - + +Node17->Node10 + + - -Node22 - -cstdint - - -Node21->Node22 - - - - -Node23->Node7 - - - - -Node23->Node9 - - - - -Node23->Node10 - - - - -Node23->Node12 - - - - -Node23->Node21 - - + +Node18 + +unordered_map - -Node24 - - -Color.h - + +Node17->Node18 + + + +Node20 + +iostream - -Node23->Node24 - - + +Node19->Node20 + + - -Node25->Node7 - - + +Node21 + +stdlib.h - -Node25->Node9 - - + +Node19->Node21 + + - -Node25->Node10 - - + +Node22->Node7 + + - -Node25->Node12 - - + +Node22->Node14 + + - -Node25->Node16 - - + +Node22->Node18 + + - -Node25->Node18 - - + +Node23 + +cstdint + + +Node22->Node23 + + + + +Node24->Node7 + + + + +Node24->Node9 + + + + +Node24->Node10 + + + + +Node24->Node13 + + + + +Node24->Node22 + + - -Node26 - - -Timer.h + +Node25 + + +Color.h - -Node25->Node26 - - + +Node24->Node25 + + - -Node27 - - -Game.h - + +Node26->Node7 + + + +Node26->Node9 + + - -Node25->Node27 - - + +Node26->Node10 + + - -Node27->Node7 - - + +Node26->Node13 + + - -Node27->Node10 - - + +Node26->Node17 + + - -Node27->Node13 - - + +Node26->Node19 + + - -Node27->Node21 - - + +Node27 + + +Timer.h + + + + +Node26->Node27 + + Node28 - -stack + + +Game.h + - -Node27->Node28 - - - -Node29 - - -State.h - + +Node26->Node28 + + + + +Node28->Node7 + + + +Node28->Node10 + + - -Node27->Node29 - - + +Node28->Node14 + + - -Node29->Node6 - - + +Node28->Node22 + + - -Node29->Node8 - - + +Node29 + +stack - -Node29->Node9 - - + +Node28->Node29 + + - -Node29->Node16 - - + +Node30 + + +State.h + - -Node29->Node21 - - - -Node30->Node2 - - + +Node28->Node30 + + -Node30->Node6 - - +Node30->Node6 + + -Node30->Node8 - - +Node30->Node8 + + -Node30->Node9 - - - - -Node30->Node15 - - - - -Node30->Node21 - - - - -Node30->Node23 - - - - -Node30->Node26 - - - - -Node30->Node29 - - - - -Node31 - - -ActionManager.h - - - - -Node30->Node31 - - +Node30->Node9 + + + + +Node30->Node17 + + + + +Node30->Node22 + + + + +Node31->Node2 + + + + +Node31->Node6 + + + + +Node31->Node8 + + + + +Node31->Node9 + + + + +Node31->Node16 + + + + +Node31->Node22 + + + + +Node31->Node24 + + + + +Node31->Node27 + + + + +Node31->Node30 + + Node32 - - -TileMap.h + + +ActionManager.h - -Node30->Node32 - - + +Node31->Node32 + + Node33 - - -Tileset.h + + +DragAndDrop.h - -Node30->Node33 - - + +Node31->Node33 + + Node34 - - -WaveManager.h + + +TileMap.h - -Node30->Node34 - - + +Node31->Node34 + + - -Node36 - - -EmptyGameObject.h + +Node35 + + +Tileset.h - -Node30->Node36 - - + +Node31->Node35 + + - -Node31->Node21 - - - - -Node32->Node6 - - - - -Node32->Node8 - - + +Node36 + + +WaveManager.h + - -Node32->Node10 - - - -Node32->Node13 - - + +Node31->Node36 + + - -Node32->Node33 - - + +Node32->Node22 + + - -Node33->Node10 - - + +Node33->Node11 + + - -Node33->Node23 - - + +Node33->Node34 + + -Node34->Node6 - - - - -Node34->Node9 - - - - -Node34->Node11 - - - - -Node34->Node18 - - - - -Node34->Node26 - - - - -Node34->Node32 - - +Node34->Node6 + + - -Node35 - - -WaveData.h - + +Node34->Node8 + + + +Node34->Node10 + + - -Node34->Node35 - - + +Node34->Node14 + + - -Node35->Node8 - - + +Node34->Node35 + + -Node35->Node10 - - +Node35->Node10 + + - -Node35->Node18 - - + +Node35->Node24 + + -Node36->Node6 - - - - -Node36->Node12 - - - - -Node37->Node6 - - - - -Node37->Node13 - - - - -Node37->Node31 - - +Node36->Node6 + + + + +Node36->Node9 + + + + +Node36->Node11 + + + + +Node36->Node19 + + + + +Node36->Node27 + + + + +Node36->Node34 + + + + +Node37 + + +WaveData.h + + + + +Node36->Node37 + + + + +Node37->Node8 + + + + +Node37->Node10 + + + + +Node37->Node19 + + + + +Node38->Node6 + + + + +Node38->Node14 + + + + +Node38->Node32 + + diff --git a/docs/EndState_8h.html b/docs/EndState_8h.html index 8356fc16..32a74121 100644 --- a/docs/EndState_8h.html +++ b/docs/EndState_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/EndState.h @@ -31,7 +31,7 @@ - + @@ -102,12 +102,14 @@
Gráfico de dependência de inclusões para EndState.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -150,9 +152,9 @@

Definições e macros

diff --git a/docs/EndState_8h__dep__incl.md5 b/docs/EndState_8h__dep__incl.md5 index 0bd7a6af..853694ff 100644 --- a/docs/EndState_8h__dep__incl.md5 +++ b/docs/EndState_8h__dep__incl.md5 @@ -1 +1 @@ -9246b7c4d363a85c98970fa50dee9208 \ No newline at end of file +7766a191faa6e1692f3c7019a951d8f6 \ No newline at end of file diff --git a/docs/EndState_8h__dep__incl.svg b/docs/EndState_8h__dep__incl.svg index f21e6e09..1082b269 100644 --- a/docs/EndState_8h__dep__incl.svg +++ b/docs/EndState_8h__dep__incl.svg @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/EndState_8h__incl.md5 b/docs/EndState_8h__incl.md5 index 27e03148..8a2239cb 100644 --- a/docs/EndState_8h__incl.md5 +++ b/docs/EndState_8h__incl.md5 @@ -1 +1 @@ -a81e7072ac273e453065ffe3fe7f9687 \ No newline at end of file +f2c6798e04938dbe01a334fda72e9ec1 \ No newline at end of file diff --git a/docs/EndState_8h__incl.svg b/docs/EndState_8h__incl.svg index fc370810..af146f5c 100644 --- a/docs/EndState_8h__incl.svg +++ b/docs/EndState_8h__incl.svg @@ -1,738 +1,756 @@ - - + Game/include/EndState.h - + Node1 - -Game/include/EndState.h + +Game/include/EndState.h Node2 - -EndStateData.h + +EndStateData.h Node1->Node2 - - + + Node5 - -GameObject.h + +GameObject.h Node1->Node5 - - + + - -Node14 - - -Music.h + +Node15 + + +Music.h - -Node1->Node14 - - + +Node1->Node15 + + - -Node20 - - -InputManager.h + +Node21 + + +InputManager.h - -Node1->Node20 - - + +Node1->Node21 + + - -Node22 - - -Sprite.h + +Node23 + + +Sprite.h - -Node1->Node22 - - + +Node1->Node23 + + - -Node24 - - -Text.h + +Node25 + + +Text.h - -Node1->Node24 - - + +Node1->Node25 + + - -Node29 - - -StageState.h + +Node30 + + +StageState.h - -Node1->Node29 - - + +Node1->Node30 + + Node3 - -StateData.h + +StateData.h Node2->Node3 - - + + Node4 - -Defines.h + +Defines.h Node2->Node4 - - + + Node6 - -SDL_include.h + +SDL_include.h Node5->Node6 - - + + Node7 - -vector + +vector Node5->Node7 - - + + Node8 - -memory + +memory Node5->Node8 - - + + Node9 - -string + +string Node5->Node9 - - + + Node10 - -Component.h + +Component.h Node5->Node10 - - + + Node11 - - -Rect.h + + +ComponentType.h -Node5->Node11 - - - - -Node10->Node5 - - - - -Node11->Node6 - - +Node5->Node11 + + Node12 - - -Vec2.h + + +Rect.h - -Node11->Node12 - - + +Node5->Node12 + + - -Node13 - -cmath + +Node10->Node5 + + - -Node11->Node13 - - + +Node10->Node11 + + Node12->Node6 - - + + - -Node14->Node6 - - - - -Node14->Node8 - - - - -Node14->Node9 - - - - -Node15 - - -Resources.h + +Node13 + + +Vec2.h - -Node14->Node15 - - - - -Node17 - - -Error.h - + +Node12->Node13 + + + +Node14 + +cmath - -Node14->Node17 - - + +Node12->Node14 + + - -Node14->Node20 - - + +Node13->Node6 + + -Node15->Node6 - - +Node15->Node6 + + -Node15->Node8 - - +Node15->Node8 + + -Node15->Node9 - - +Node15->Node9 + + Node16 - -unordered_map + + +Resources.h + + -Node15->Node16 - - +Node15->Node16 + + Node18 - -iostream + + +Error.h + - -Node17->Node18 - - - -Node19 - -stdlib.h + +Node15->Node18 + + - -Node17->Node19 - - + +Node15->Node21 + + - -Node20->Node6 - - + +Node16->Node6 + + - -Node20->Node12 - - + +Node16->Node8 + + - -Node20->Node16 - - + +Node16->Node9 + + - -Node21 - -cstdint - - -Node20->Node21 - - - - -Node22->Node6 - - - - -Node22->Node8 - - - - -Node22->Node9 - - - - -Node22->Node11 - - - - -Node22->Node20 - - + +Node17 + +unordered_map - -Node23 - - -Color.h - + +Node16->Node17 + + + +Node19 + +iostream - -Node22->Node23 - - + +Node18->Node19 + + - -Node24->Node6 - - + +Node20 + +stdlib.h - -Node24->Node8 - - + +Node18->Node20 + + - -Node24->Node9 - - + +Node21->Node6 + + - -Node24->Node11 - - + +Node21->Node13 + + - -Node24->Node15 - - + +Node21->Node17 + + - -Node24->Node17 - - + +Node22 + +cstdint + + +Node21->Node22 + + + + +Node23->Node6 + + + + +Node23->Node8 + + + + +Node23->Node9 + + + + +Node23->Node12 + + + + +Node23->Node21 + + - -Node25 - - -Timer.h + +Node24 + + +Color.h - -Node24->Node25 - - + +Node23->Node24 + + - -Node26 - - -Game.h - + +Node25->Node6 + + + + +Node25->Node8 + + + +Node25->Node9 + + - -Node24->Node26 - - + +Node25->Node12 + + - -Node26->Node6 - - + +Node25->Node16 + + - -Node26->Node9 - - + +Node25->Node18 + + + + +Node26 + + +Timer.h + - -Node26->Node12 - - - -Node26->Node20 - - + +Node25->Node26 + + Node27 - -stack + + +Game.h + - -Node26->Node27 - - - -Node28 - - -State.h - + +Node25->Node27 + + + +Node27->Node6 + + - -Node26->Node28 - - + +Node27->Node9 + + - -Node28->Node5 - - + +Node27->Node13 + + - -Node28->Node7 - - + +Node27->Node21 + + - -Node28->Node8 - - + +Node28 + +stack - -Node28->Node15 - - + +Node27->Node28 + + - -Node28->Node20 - - + +Node29 + + +State.h + - -Node29->Node1 - - + + +Node27->Node29 + + -Node29->Node5 - - +Node29->Node5 + + -Node29->Node7 - - +Node29->Node7 + + -Node29->Node8 - - - - -Node29->Node14 - - - - -Node29->Node20 - - - - -Node29->Node22 - - - - -Node29->Node25 - - - - -Node29->Node28 - - - - -Node30 - - -ActionManager.h - - - - -Node29->Node30 - - +Node29->Node8 + + + + +Node29->Node16 + + + + +Node29->Node21 + + + + +Node30->Node1 + + + + +Node30->Node5 + + + + +Node30->Node7 + + + + +Node30->Node8 + + + + +Node30->Node15 + + + + +Node30->Node21 + + + + +Node30->Node23 + + + + +Node30->Node26 + + + + +Node30->Node29 + + Node31 - - -TileMap.h + + +ActionManager.h - -Node29->Node31 - - + +Node30->Node31 + + Node32 - - -Tileset.h + + +DragAndDrop.h - -Node29->Node32 - - + +Node30->Node32 + + Node33 - - -WaveManager.h + + +TileMap.h + + + + +Node30->Node33 + + + + +Node34 + + +Tileset.h - -Node29->Node33 - - + +Node30->Node34 + + Node35 - - -EmptyGameObject.h + + +WaveManager.h - -Node29->Node35 - - + +Node30->Node35 + + - -Node30->Node20 - - + +Node31->Node21 + + - -Node31->Node5 - - + +Node32->Node10 + + - -Node31->Node7 - - + +Node32->Node33 + + - -Node31->Node9 - - + +Node33->Node5 + + - -Node31->Node12 - - + +Node33->Node7 + + - -Node31->Node32 - - + +Node33->Node9 + + - -Node32->Node9 - - + +Node33->Node13 + + - -Node32->Node22 - - + +Node33->Node34 + + - -Node33->Node5 - - - - -Node33->Node8 - - - - -Node33->Node10 - - - - -Node33->Node17 - - - - -Node33->Node25 - - - - -Node33->Node31 - - + +Node34->Node9 + + - -Node34 - - -WaveData.h - + +Node34->Node23 + + + +Node35->Node5 + + + + +Node35->Node8 + + + + +Node35->Node10 + + + + +Node35->Node18 + + + + +Node35->Node26 + + + + +Node35->Node33 + + + + +Node36 + + +WaveData.h + - -Node33->Node34 - - - -Node34->Node7 - - + +Node35->Node36 + + - -Node34->Node9 - - + +Node36->Node7 + + - -Node34->Node17 - - + +Node36->Node9 + + - -Node35->Node5 - - - - -Node35->Node11 - - + +Node36->Node18 + + diff --git a/docs/Enemy_8cpp.html b/docs/Enemy_8cpp.html index 5f4f6566..a1f5c638 100644 --- a/docs/Enemy_8cpp.html +++ b/docs/Enemy_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/Enemy.cpp @@ -31,7 +31,7 @@
- + @@ -85,8 +85,6 @@
-
Referência do Arquivo Enemy.cpp
@@ -99,33 +97,15 @@
Gráfico de dependência de inclusões para Enemy.cpp:
-
-
-
- - - -

-Definições e Macros

#define ENEMY_MOVE_SPEED   (120.)
 
-

Definições e macros

- -
-
- - - - -
#define ENEMY_MOVE_SPEED   (120.)
-
- +
-
+ diff --git a/docs/Enemy_8cpp__incl.map b/docs/Enemy_8cpp__incl.map index 0c3c7800..44add0d1 100644 --- a/docs/Enemy_8cpp__incl.map +++ b/docs/Enemy_8cpp__incl.map @@ -1,20 +1,21 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/docs/Enemy_8cpp__incl.md5 b/docs/Enemy_8cpp__incl.md5 index 4ac66047..141262bb 100644 --- a/docs/Enemy_8cpp__incl.md5 +++ b/docs/Enemy_8cpp__incl.md5 @@ -1 +1 @@ -980033beaf5ce2bad8159e61f5c75619 \ No newline at end of file +b8686715368cf3de3c66e13b653d7103 \ No newline at end of file diff --git a/docs/Enemy_8cpp__incl.svg b/docs/Enemy_8cpp__incl.svg index b2136728..0991f0b7 100644 --- a/docs/Enemy_8cpp__incl.svg +++ b/docs/Enemy_8cpp__incl.svg @@ -1,457 +1,480 @@ - - + Game/src/Enemy.cpp - + Node1 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node2 - -Enemy.h + +Enemy.h Node1->Node2 - - + + Node21 - -Error.h + +Error.h -Node1->Node21 - - +Node1->Node21 + + - -Node24 - - -Camera.h - - - - -Node1->Node24 - - - - -Node26 - - -AIGoDown.h + +Node25 + + +Camera.h - -Node1->Node26 - - + +Node1->Node25 + + Node27 - - -HitPoints.h + + +AIGoDown.h -Node1->Node27 - - +Node1->Node27 + + + + +Node28 + + +HitPoints.h + + + + +Node1->Node28 + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + - -Node9 - - -Rect.h + +Node10 + + +Rect.h - -Node2->Node9 - - + +Node2->Node10 + + - -Node12 - - -Sprite.h + +Node13 + + +Sprite.h - -Node2->Node12 - - + +Node2->Node13 + + - -Node17 - - -TileMap.h + +Node18 + + +TileMap.h - -Node2->Node17 - - + +Node2->Node18 + + - -Node19 - - -Timer.h + +Node20 + + +Timer.h - -Node2->Node19 - - + +Node2->Node20 + + - -Node20 - - -WaveData.h + +Node2->Node21 + + + + +Node24 + + +WaveData.h - -Node2->Node20 - - + +Node2->Node24 + + 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 - - + + - -Node3->Node9 - - + +Node9 + + +ComponentType.h + - -Node8->Node3 - - - -Node9->Node4 - - + +Node3->Node9 + + - -Node10 - - -Vec2.h - + +Node3->Node10 + + + + +Node8->Node3 + + + +Node8->Node9 + + - -Node9->Node10 - - + +Node10->Node4 + + Node11 - -cmath + + +Vec2.h + - -Node9->Node11 - - - -Node10->Node4 - - + +Node10->Node11 + + - -Node12->Node4 - - + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node4 + + + + +Node13->Node4 + + + + +Node13->Node6 + + + + +Node13->Node7 + + + + +Node13->Node10 + + - -Node12->Node6 - - + +Node14 + + +Color.h + - -Node12->Node7 - - - -Node12->Node9 - - + +Node13->Node14 + + - -Node13 - - -Color.h + +Node15 + + +InputManager.h - -Node12->Node13 - - + +Node13->Node15 + + - -Node14 - - -InputManager.h - + +Node15->Node4 + + + + +Node15->Node11 + + + + +Node16 + +unordered_map + +Node15->Node16 + + - -Node12->Node14 - - + +Node17 + +cstdint - -Node14->Node4 - - + +Node15->Node17 + + - -Node14->Node10 - - + +Node18->Node3 + + - -Node15 - -unordered_map + +Node18->Node5 + + - -Node14->Node15 - - + +Node18->Node7 + + - -Node16 - -cstdint - - -Node14->Node16 - - - - -Node17->Node3 - - - - -Node17->Node5 - - - - -Node17->Node7 - - - - -Node17->Node10 - - + +Node18->Node11 + + - -Node18 - - -Tileset.h + +Node19 + + +Tileset.h - -Node17->Node18 - - + +Node18->Node19 + + - -Node18->Node7 - - - - -Node18->Node12 - - - - -Node20->Node5 - - - - -Node20->Node7 - - - - -Node20->Node21 - - + +Node19->Node7 + + + + +Node19->Node13 + + Node22 - -iostream + +iostream -Node21->Node22 - - +Node21->Node22 + + Node23 - -stdlib.h + +stdlib.h -Node21->Node23 - - - - -Node24->Node3 - - - - -Node24->Node10 - - +Node21->Node23 + + + + +Node24->Node5 + + + + +Node24->Node7 + + + + +Node24->Node21 + + + + +Node25->Node3 + + + + +Node25->Node11 + + - -Node25 - - -ActionManager.h + +Node26 + + +ActionManager.h - -Node24->Node25 - - - - -Node25->Node14 - - + +Node25->Node26 + + - -Node26->Node8 - - + +Node26->Node15 + + -Node27->Node8 - - - - -Node27->Node12 - - +Node27->Node8 + + + + +Node28->Node8 + + + + +Node28->Node13 + + diff --git a/docs/Enemy_8h.html b/docs/Enemy_8h.html index ff8ac91e..37c4c739 100644 --- a/docs/Enemy_8h.html +++ b/docs/Enemy_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/Enemy.h @@ -31,7 +31,7 @@ - + @@ -88,7 +88,6 @@
Referência do Arquivo Enemy.h
@@ -99,16 +98,19 @@ #include "Rect.h"
#include "TileMap.h"
#include "Timer.h"
+#include "Error.h"
#include "WaveData.h"
Gráfico de dependência de inclusões para Enemy.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+
-

@@ -123,11 +125,8 @@

 
#define DIFICULTY_CONSTANT   12
 
- - - + +

-Definições de Tipos

typedef unsigned int uint
 
#define ENEMY_MOVE_SPEED   (120.)
 
@@ -169,13 +168,12 @@

Definições e macros

-

Definições dos tipos

- +

Enumerações

- +
typedef unsigned int uint#define ENEMY_MOVE_SPEED   (120.)
@@ -214,9 +212,9 @@

Enumerações

diff --git a/docs/Enemy_8h__dep__incl.map b/docs/Enemy_8h__dep__incl.map index d22e9d6d..01797b41 100644 --- a/docs/Enemy_8h__dep__incl.map +++ b/docs/Enemy_8h__dep__incl.map @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/docs/Enemy_8h__dep__incl.md5 b/docs/Enemy_8h__dep__incl.md5 index 91f2df56..37e37166 100644 --- a/docs/Enemy_8h__dep__incl.md5 +++ b/docs/Enemy_8h__dep__incl.md5 @@ -1 +1 @@ -dfe681c01ef91d911ae5ed4f15b63348 \ No newline at end of file +c3b35e3a37e19a180cec36b5a744c5dd \ No newline at end of file diff --git a/docs/Enemy_8h__dep__incl.svg b/docs/Enemy_8h__dep__incl.svg index 48f31746..9f7abbef 100644 --- a/docs/Enemy_8h__dep__incl.svg +++ b/docs/Enemy_8h__dep__incl.svg @@ -1,88 +1,88 @@ - - + Game/include/Enemy.h - + Node1 - -Game/include/Enemy.h + +Game/include/Enemy.h Node2 - -Game/include/GameResources.h + +Game/include/GameResources.h Node1->Node2 - - + + Node4 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node1->Node4 - - + + Node5 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node1->Node5 - - + + Node6 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node1->Node6 - - + + Node3 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp Node2->Node3 - - + + Node2->Node4 - - + + diff --git a/docs/Enemy_8h__incl.map b/docs/Enemy_8h__incl.map index 1b09991a..567be063 100644 --- a/docs/Enemy_8h__incl.map +++ b/docs/Enemy_8h__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/Enemy_8h__incl.md5 b/docs/Enemy_8h__incl.md5 index 4ffcc136..10b15b07 100644 --- a/docs/Enemy_8h__incl.md5 +++ b/docs/Enemy_8h__incl.md5 @@ -1 +1 @@ -1e48e4f5eefbd97b6d4d9c400e2a33c0 \ No newline at end of file +8885f2b0d42634b8938c7ab19753dfe3 \ No newline at end of file diff --git a/docs/Enemy_8h__incl.svg b/docs/Enemy_8h__incl.svg index 32f67f66..1e2d3eb4 100644 --- a/docs/Enemy_8h__incl.svg +++ b/docs/Enemy_8h__incl.svg @@ -1,357 +1,380 @@ - - + Game/include/Enemy.h - + Node1 - -Game/include/Enemy.h + +Game/include/Enemy.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + - -Node8 - - -Rect.h + +Node9 + + +Rect.h - -Node1->Node8 - - + +Node1->Node9 + + - -Node11 - - -Sprite.h + +Node12 + + +Sprite.h - -Node1->Node11 - - + +Node1->Node12 + + - -Node16 - - -TileMap.h + +Node17 + + +TileMap.h - -Node1->Node16 - - + +Node1->Node17 + + - -Node18 - - -Timer.h + +Node19 + + +Timer.h - -Node1->Node18 - - + +Node1->Node19 + + - -Node19 - - -WaveData.h + +Node20 + + +Error.h - -Node1->Node19 - - + +Node1->Node20 + + + + +Node23 + + +WaveData.h + + + + +Node1->Node23 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node7 - -Component.h + +Component.h Node2->Node7 - - + + - -Node2->Node8 - - - - -Node7->Node2 - - - - -Node8->Node3 - - - - -Node9 - - -Vec2.h + +Node8 + + +ComponentType.h - -Node8->Node9 - - + +Node2->Node8 + + - -Node10 - -cmath + +Node2->Node9 + + + + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - - - -Node11->Node3 - - - - -Node11->Node5 - - - - -Node11->Node6 - - - - -Node11->Node8 - - + + - -Node12 - - -Color.h + +Node10 + + +Vec2.h - -Node11->Node12 - - + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node3 + + + + +Node12->Node3 + + + + +Node12->Node5 + + + + +Node12->Node6 + + + + +Node12->Node9 + + Node13 - - -InputManager.h + + +Color.h - -Node11->Node13 - - - - -Node13->Node3 - - - - -Node13->Node9 - - + +Node12->Node13 + + Node14 - -unordered_map + + +InputManager.h + + + + +Node12->Node14 + + - -Node13->Node14 - - + +Node14->Node3 + + + + +Node14->Node10 + + Node15 - -cstdint - - -Node13->Node15 - - - - -Node16->Node2 - - - - -Node16->Node4 - - - - -Node16->Node6 - - - - -Node16->Node9 - - + +unordered_map - -Node17 - - -Tileset.h - + +Node14->Node15 + + + + +Node16 + +cstdint + + +Node14->Node16 + + + +Node17->Node2 + + - -Node16->Node17 - - + +Node17->Node4 + + -Node17->Node6 - - +Node17->Node6 + + - -Node17->Node11 - - + +Node17->Node10 + + - -Node19->Node4 - - + +Node18 + + +Tileset.h + - -Node19->Node6 - - - -Node20 - - -Error.h - + +Node17->Node18 + + + +Node18->Node6 + + - -Node19->Node20 - - + +Node18->Node12 + + Node21 - -iostream + +iostream -Node20->Node21 - - +Node20->Node21 + + Node22 - -stdlib.h + +stdlib.h -Node20->Node22 - - +Node20->Node22 + + + + +Node23->Node4 + + + + +Node23->Node6 + + + + +Node23->Node20 + + diff --git a/docs/Error_8h.html b/docs/Error_8h.html index ef8cf7d8..13e0d87d 100644 --- a/docs/Error_8h.html +++ b/docs/Error_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Error.h @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para Error.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -356,9 +358,9 @@

Definições dos tipos

diff --git a/docs/Error_8h__dep__incl.map b/docs/Error_8h__dep__incl.map index 76d6573a..bc7ae72a 100644 --- a/docs/Error_8h__dep__incl.map +++ b/docs/Error_8h__dep__incl.map @@ -1,29 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Error_8h__dep__incl.md5 b/docs/Error_8h__dep__incl.md5 index 79b0c085..4e321d5a 100644 --- a/docs/Error_8h__dep__incl.md5 +++ b/docs/Error_8h__dep__incl.md5 @@ -1 +1 @@ -d30ab5eab34f27b81d526a603a4a5834 \ No newline at end of file +eff2a3f16130ad2cc98980cebca1b813 \ No newline at end of file diff --git a/docs/Error_8h__dep__incl.svg b/docs/Error_8h__dep__incl.svg index f68b333b..f2e5df19 100644 --- a/docs/Error_8h__dep__incl.svg +++ b/docs/Error_8h__dep__incl.svg @@ -1,434 +1,465 @@ - - + Engine/include/Error.h - + Node1 - -Engine/include/Error.h + +Engine/include/Error.h Node2 - -Engine/include/Music.h + +Engine/include/Music.h Node1->Node2 - - + + Node6 - -Game/src/StageState.cpp + +Game/src/StageState.cpp -Node1->Node6 - - +Node1->Node6 + + Node9 - -Engine/include/Text.h + +Engine/include/Text.h Node1->Node9 - - + + Node11 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node1->Node11 - - + + Node12 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node1->Node12 - - + + Node13 - -Engine/src/Game.cpp + +Engine/src/Game.cpp Node1->Node13 - - + + Node14 - - -Engine/src/InputManager.cpp + + +Engine/src/GameObject.cpp Node1->Node14 - - + + Node15 - - -Engine/src/Resources.cpp + + +Engine/src/InputManager.cpp Node1->Node15 - - + + Node16 - - -Engine/src/Sprite.cpp + + +Engine/src/Resources.cpp Node1->Node16 - - + + Node17 - - -Engine/src/TileMap.cpp + + +Engine/src/Sprite.cpp Node1->Node17 - - + + Node18 - - -Engine/src/Tileset.cpp + + +Engine/src/State.cpp Node1->Node18 - - + + Node19 - - -Engine/src/Vec2.cpp + + +Engine/src/TileMap.cpp Node1->Node19 - - + + Node20 - - -Game/include/WaveData.h + + +Engine/src/Tileset.cpp Node1->Node20 - - + + Node21 - - -Game/include/WaveManager.h + + +Engine/src/Vec2.cpp -Node1->Node21 - - +Node1->Node21 + + Node22 - - -Game/src/WaveManager.cpp + + +Game/include/WaveData.h -Node1->Node22 - - +Node1->Node22 + + + + +Node23 + + +Game/include/WaveManager.h + + + + +Node1->Node23 + + + + +Node24 + + +Game/src/WaveManager.cpp + + + + +Node1->Node24 + + Node25 - - -Game/src/GameResources.cpp + + +Game/include/Enemy.h -Node1->Node25 - - +Node1->Node25 + + - -Node26 - - -Game/src/Enemy.cpp + +Node27 + + +Game/src/GameResources.cpp - -Node1->Node26 - - + +Node1->Node27 + + Node28 - - -Game/src/Tower.cpp + + +Game/src/Enemy.cpp Node1->Node28 - - + + + + +Node30 + + +Game/src/Tower.cpp + + + + +Node1->Node30 + + Node3 - -Engine/src/Music.cpp + +Engine/src/Music.cpp Node2->Node3 - - + + Node4 - -Game/include/EndState.h + +Game/include/EndState.h Node2->Node4 - - + + Node5 - -Game/include/StageState.h + +Game/include/StageState.h Node2->Node5 - - + + Node4->Node5 - - + + Node8 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node4->Node8 - - + + Node5->Node4 - - + + Node5->Node6 - - + + Node7 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node5->Node7 - - + + Node9->Node4 - - + + Node10 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node9->Node10 - - - - -Node20->Node21 - - - - -Node23 - - -Game/include/Enemy.h - + + + +Node22->Node23 + + - -Node20->Node23 - - + +Node22->Node25 + + - -Node24 - - -Game/include/GameResources.h + +Node26 + + +Game/include/GameResources.h - -Node20->Node24 - - + +Node22->Node26 + + - -Node27 - - -Game/src/WaveData.cpp + +Node29 + + +Game/src/WaveData.cpp - -Node20->Node27 - - - - -Node21->Node5 - - - - -Node21->Node22 - - - - -Node23->Node6 - - + +Node22->Node29 + + - -Node23->Node22 - - + +Node23->Node5 + + Node23->Node24 - - - - -Node23->Node26 - - - - -Node24->Node22 - - - - -Node24->Node25 - - + + + + +Node25->Node6 + + + + +Node25->Node24 + + + + +Node25->Node26 + + + + +Node25->Node28 + + + + +Node26->Node24 + + + + +Node26->Node27 + + diff --git a/docs/Error_8h__incl.md5 b/docs/Error_8h__incl.md5 index 51b4767b..60c38ad5 100644 --- a/docs/Error_8h__incl.md5 +++ b/docs/Error_8h__incl.md5 @@ -1 +1 @@ -011c70ae0b68a1af53c75471aadb22c2 \ No newline at end of file +12fad8ed3602d7f6cbc0abbd9250e39c \ No newline at end of file diff --git a/docs/Error_8h__incl.svg b/docs/Error_8h__incl.svg index 62d00c9a..65b0c453 100644 --- a/docs/Error_8h__incl.svg +++ b/docs/Error_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/GameObject.cpp @@ -31,7 +31,7 @@
- + @@ -90,17 +90,20 @@
#include "GameObject.h"
+#include "Error.h"
+#include "Camera.h"
Gráfico de dependência de inclusões para GameObject.cpp:
-
+
+
diff --git a/docs/GameObject_8cpp__incl.map b/docs/GameObject_8cpp__incl.map index bc405db9..6877f42a 100644 --- a/docs/GameObject_8cpp__incl.map +++ b/docs/GameObject_8cpp__incl.map @@ -1,7 +1,12 @@ - - - - - + + + + + + + + + + diff --git a/docs/GameObject_8cpp__incl.md5 b/docs/GameObject_8cpp__incl.md5 index d902386e..dcf64e73 100644 --- a/docs/GameObject_8cpp__incl.md5 +++ b/docs/GameObject_8cpp__incl.md5 @@ -1 +1 @@ -2e41c30b08bd773b3d57d2c9a71a5a43 \ No newline at end of file +82e2e2f2f1fb9353fec9118c84fb70a5 \ No newline at end of file diff --git a/docs/GameObject_8cpp__incl.svg b/docs/GameObject_8cpp__incl.svg index 9d3ac82b..bdc4f3f5 100644 --- a/docs/GameObject_8cpp__incl.svg +++ b/docs/GameObject_8cpp__incl.svg @@ -1,138 +1,268 @@ - - - + + Engine/src/GameObject.cpp - + Node1 - -Engine/src/GameObject.cpp + +Engine/src/GameObject.cpp Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + + + +Node12 + + +Error.h + + + + +Node1->Node12 + + + + +Node15 + + +Camera.h + + + + +Node1->Node15 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node7 - -Component.h + +Component.h Node2->Node7 - - + + Node8 - - -Rect.h + + +ComponentType.h -Node2->Node8 - - - - -Node7->Node2 - - - - -Node8->Node3 - - +Node2->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node2->Node9 + + - -Node10 - -cmath + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - + + + + +Node10 + + +Vec2.h + + + + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node3 + + + + +Node13 + +iostream + + +Node12->Node13 + + + + +Node14 + +stdlib.h + + +Node12->Node14 + + + + +Node15->Node2 + + + + +Node15->Node10 + + + + +Node16 + + +ActionManager.h + + + + +Node15->Node16 + + + + +Node17 + + +InputManager.h + + + + +Node16->Node17 + + + + +Node17->Node3 + + + + +Node17->Node10 + + + + +Node18 + +unordered_map + + +Node17->Node18 + + + + +Node19 + +cstdint + + +Node17->Node19 + + diff --git a/docs/GameObject_8h.html b/docs/GameObject_8h.html index ed387cfa..d0cdeac0 100644 --- a/docs/GameObject_8h.html +++ b/docs/GameObject_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/GameObject.h @@ -31,7 +31,7 @@ - + @@ -97,16 +97,19 @@ #include <memory>
#include <string>
#include "Component.h"
+#include "ComponentType.h"
#include "Rect.h"
Gráfico de dependência de inclusões para GameObject.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -164,9 +167,9 @@

Definições e macros

diff --git a/docs/GameObject_8h__dep__incl.map b/docs/GameObject_8h__dep__incl.map index 9c64ae9a..721dd362 100644 --- a/docs/GameObject_8h__dep__incl.map +++ b/docs/GameObject_8h__dep__incl.map @@ -1,42 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/GameObject_8h__dep__incl.md5 b/docs/GameObject_8h__dep__incl.md5 index 7be932de..9fadb7f5 100644 --- a/docs/GameObject_8h__dep__incl.md5 +++ b/docs/GameObject_8h__dep__incl.md5 @@ -1 +1 @@ -89950af76e588ac9e85578cfddaac4e2 \ No newline at end of file +b097a6f281b842020c998a2ac3a59d2a \ No newline at end of file diff --git a/docs/GameObject_8h__dep__incl.svg b/docs/GameObject_8h__dep__incl.svg index 68b295b4..b395e263 100644 --- a/docs/GameObject_8h__dep__incl.svg +++ b/docs/GameObject_8h__dep__incl.svg @@ -1,728 +1,720 @@ - - + Engine/include/GameObject.h - + Node1 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node2 - -Engine/include/Component.h + +Engine/include/Component.h Node1->Node2 - - + + - -Node12 - - -Game/include/WaveManager.h + +Node8 + + +Game/include/StageState.h - -Node1->Node12 - - + +Node1->Node8 + + - -Node13 - - -Game/include/StageState.h + +Node9 + + +Game/include/EndState.h - -Node1->Node13 - - + +Node1->Node9 + + - -Node14 - - -Game/include/EndState.h + +Node17 + + +Game/include/WaveManager.h - -Node1->Node14 - - + +Node1->Node17 + + Node19 - -Engine/include/Animation.h + +Engine/include/Animation.h -Node1->Node19 - - +Node1->Node19 + + Node21 - -Engine/include/Camera.h + +Engine/include/Camera.h -Node1->Node21 - - +Node1->Node21 + + - -Node27 - - -Engine/include/TileMap.h + +Node23 + + +Engine/src/GameObject.cpp - -Node1->Node27 - - + +Node1->Node23 + + Node28 - - -Game/include/Enemy.h + + +Engine/include/TileMap.h -Node1->Node28 - - +Node1->Node28 + + - -Node31 - - -Game/include/Tower.h + +Node29 + + +Game/include/Enemy.h - -Node1->Node31 - - + +Node1->Node29 + + Node32 - - -Engine/include/State.h + + +Game/include/Tower.h -Node1->Node32 - - - - -Node40 - - -Engine/src/GameObject.cpp - - +Node1->Node32 + + - -Node1->Node40 - - - - -Node41 - - -Game/include/EmptyGameObject.h + +Node33 + + +Engine/include/State.h - -Node1->Node41 - - + +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 - - + + - -Node9 - - -Engine/include/HitPoints.h + +Node14 + + +Engine/include/HitPoints.h - -Node2->Node9 - - + +Node2->Node14 + + - -Node11 - - -Engine/src/Component.cpp + +Node16 + + +Engine/src/Component.cpp - -Node2->Node11 - - + +Node2->Node16 + + - -Node2->Node12 - - + +Node2->Node17 + + Node4 - -Engine/src/AIGoDown.cpp + +Engine/src/AIGoDown.cpp Node3->Node4 - - + + Node5 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node3->Node5 - - + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node6->Node7 - - - - -Node8 - - -Game/src/Tower.cpp - - + + Node6->Node8 - - - - -Node9->Node5 - - + + - -Node10 - - -Engine/src/HItPoints.cpp + +Node13 + + +Game/src/Tower.cpp - -Node9->Node10 - - + +Node6->Node13 + + - -Node12->Node13 - - + +Node8->Node9 + + - -Node18 - - -Game/src/WaveManager.cpp + +Node11 + + +Game/src/StageState.cpp - -Node12->Node18 - - + +Node8->Node11 + + - -Node13->Node14 - - - - -Node16 - - -Game/src/StageState.cpp + +Node12 + + +Game/src/TitleState.cpp - -Node13->Node16 - - + +Node8->Node12 + + - -Node17 - - -Game/src/TitleState.cpp + +Node9->Node8 + + + + +Node10 + + +Game/src/EndState.cpp - -Node13->Node17 - - + +Node9->Node10 + + - -Node14->Node13 - - + +Node14->Node5 + + Node15 - - -Game/src/EndState.cpp + + +Engine/src/HItPoints.cpp -Node14->Node15 - - +Node14->Node15 + + + + +Node17->Node8 + + + + +Node18 + + +Game/src/WaveManager.cpp + + + + +Node17->Node18 + + Node20 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp -Node19->Node20 - - +Node19->Node20 + + -Node21->Node5 - - +Node21->Node5 + + -Node21->Node7 - - - - -Node21->Node8 - - - - -Node21->Node15 - - - - -Node21->Node16 - - - - -Node21->Node17 - - +Node21->Node7 + + + + +Node21->Node10 + + + + +Node21->Node11 + + + + +Node21->Node12 + + + + +Node21->Node13 + + -Node21->Node20 - - +Node21->Node20 + + Node22 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp -Node21->Node22 - - - - -Node23 - - -Engine/src/Sprite.cpp - - +Node21->Node22 + + -Node21->Node23 - - +Node21->Node23 + + Node24 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp -Node21->Node24 - - +Node21->Node24 + + Node25 - - -Engine/src/TileMap.cpp + + +Engine/src/State.cpp -Node21->Node25 - - +Node21->Node25 + + Node26 - - -Engine/src/Tileset.cpp + + +Engine/src/TileMap.cpp -Node21->Node26 - - - - -Node27->Node6 - - - - -Node27->Node12 - - - - -Node27->Node13 - - - - -Node27->Node18 - - - - -Node27->Node25 - - - - -Node27->Node28 - - - - -Node27->Node31 - - - - -Node28->Node5 - - - - -Node28->Node16 - - - - -Node28->Node18 - - +Node21->Node26 + + - -Node29 - - -Game/include/GameResources.h + +Node27 + + +Engine/src/Tileset.cpp + +Node21->Node27 + + + + +Node28->Node6 + + + + +Node28->Node8 + + + + +Node28->Node17 + + + + +Node28->Node18 + + + + +Node28->Node26 + + + -Node28->Node29 - - +Node28->Node29 + + + + +Node28->Node32 + + + + +Node29->Node5 + + + + +Node29->Node11 + + -Node29->Node18 - - +Node29->Node18 + + Node30 - - -Game/src/GameResources.cpp + + +Game/include/GameResources.h -Node29->Node30 - - +Node29->Node30 + + - -Node31->Node8 - - + +Node30->Node18 + + - -Node31->Node16 - - + +Node31 + + +Game/src/GameResources.cpp + - -Node32->Node13 - - - -Node32->Node24 - - + +Node30->Node31 + + - -Node33 - - -Engine/include/Game.h - + +Node32->Node11 + + + +Node32->Node13 + + - -Node32->Node33 - - + +Node33->Node8 + + - -Node39 - - -Game/include/TitleState.h + +Node33->Node25 + + + + +Node34 + + +Engine/include/Game.h - -Node32->Node39 - - + +Node33->Node34 + + - -Node33->Node16 - - + +Node40 + + +Game/include/TitleState.h + - -Node33->Node17 - - - -Node33->Node18 - - + +Node33->Node40 + + - -Node33->Node22 - - + +Node34->Node11 + + - -Node33->Node23 - - + +Node34->Node12 + + - -Node33->Node26 - - + +Node34->Node18 + + - -Node34 - - -Engine/include/Text.h - + +Node34->Node22 + + + +Node34->Node24 + + - -Node33->Node34 - - + +Node34->Node27 + + - -Node36 - - -Engine/src/Game.cpp + +Node35 + + +Engine/include/Text.h - -Node33->Node36 - - + +Node34->Node35 + + Node37 - - -Engine/src/Resources.cpp + + +Engine/src/Game.cpp - -Node33->Node37 - - + +Node34->Node37 + + Node38 - - -Game/src/main.cpp + + +Engine/src/Resources.cpp - -Node33->Node38 - - + +Node34->Node38 + + - -Node34->Node14 - - + +Node39 + + +Game/src/main.cpp + - -Node35 - - -Engine/src/Text.cpp + + +Node34->Node39 + + + + +Node35->Node9 + + + + +Node36 + + +Engine/src/Text.cpp - -Node34->Node35 - - - - -Node39->Node17 - - - - -Node39->Node38 - - - - -Node41->Node13 - - + +Node35->Node36 + + + + +Node40->Node12 + + + + +Node40->Node39 + + diff --git a/docs/GameObject_8h__incl.map b/docs/GameObject_8h__incl.map index 0929dc28..59147d22 100644 --- a/docs/GameObject_8h__incl.map +++ b/docs/GameObject_8h__incl.map @@ -1,6 +1,7 @@ - - - - + + + + + diff --git a/docs/GameObject_8h__incl.md5 b/docs/GameObject_8h__incl.md5 index 088d2fe9..bbf61e6d 100644 --- a/docs/GameObject_8h__incl.md5 +++ b/docs/GameObject_8h__incl.md5 @@ -1 +1 @@ -de68423e6d62e324dbb45eac5b6fa474 \ No newline at end of file +7827e89fc5e82a7012eac29ee76f8431 \ No newline at end of file diff --git a/docs/GameObject_8h__incl.svg b/docs/GameObject_8h__incl.svg index 4dc79e54..74aef068 100644 --- a/docs/GameObject_8h__incl.svg +++ b/docs/GameObject_8h__incl.svg @@ -1,125 +1,143 @@ - - + Engine/include/GameObject.h - + Node1 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node2 - -SDL_include.h + +SDL_include.h Node1->Node2 - - + + Node3 - -vector + +vector Node1->Node3 - - + + Node4 - -memory + +memory Node1->Node4 - - + + Node5 - -string + +string Node1->Node5 - - + + Node6 - -Component.h + +Component.h Node1->Node6 - - + + Node7 - - -Rect.h + + +ComponentType.h -Node1->Node7 - - - - -Node6->Node1 - - - - -Node7->Node2 - - +Node1->Node7 + + Node8 - - -Vec2.h + + +Rect.h - -Node7->Node8 - - + +Node1->Node8 + + - -Node9 - -cmath + +Node6->Node1 + + - -Node7->Node9 - - + +Node6->Node7 + + Node8->Node2 - - + + + + +Node9 + + +Vec2.h + + + + +Node8->Node9 + + + + +Node10 + +cmath + + +Node8->Node10 + + + + +Node9->Node2 + + diff --git a/docs/GameResources_8cpp.html b/docs/GameResources_8cpp.html index 4c6ed60c..d346e2d2 100644 --- a/docs/GameResources_8cpp.html +++ b/docs/GameResources_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/GameResources.cpp @@ -31,7 +31,7 @@
- + @@ -100,7 +100,8 @@
Gráfico de dependência de inclusões para GameResources.cpp:
-
+
+

@@ -180,9 +181,9 @@

Definições e macros

diff --git a/docs/GameResources_8cpp__incl.map b/docs/GameResources_8cpp__incl.map index 93580cb3..7b3c8d81 100644 --- a/docs/GameResources_8cpp__incl.map +++ b/docs/GameResources_8cpp__incl.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/GameResources_8cpp__incl.md5 b/docs/GameResources_8cpp__incl.md5 index 8e0970d7..1f6070d7 100644 --- a/docs/GameResources_8cpp__incl.md5 +++ b/docs/GameResources_8cpp__incl.md5 @@ -1 +1 @@ -a5c36a868a1453f089172849553307e8 \ No newline at end of file +baa8f7eb839e9fc832c0e6c4201b6bd0 \ No newline at end of file diff --git a/docs/GameResources_8cpp__incl.svg b/docs/GameResources_8cpp__incl.svg index 3ce4b1de..a5b1aaf1 100644 --- a/docs/GameResources_8cpp__incl.svg +++ b/docs/GameResources_8cpp__incl.svg @@ -1,478 +1,501 @@ - - + Game/src/GameResources.cpp - + Node1 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp Node2 - -fstream + +fstream Node1->Node2 - - + + Node3 - -string.h + +string.h Node1->Node3 - - + + Node4 - -GameResources.h + +GameResources.h Node1->Node4 - - + + Node7 - -vector + +vector -Node1->Node7 - - +Node1->Node7 + + Node13 - -Error.h + +Error.h -Node1->Node13 - - +Node1->Node13 + + - -Node30 - -stdio.h + +Node31 + +stdio.h - -Node1->Node30 - - + +Node1->Node31 + + Node5 - -memory + +memory Node4->Node5 - - + + Node6 - -array + +array Node4->Node6 - - + + Node4->Node7 - - + + Node8 - -utility + +utility Node4->Node8 - - + + Node9 - -string + +string Node4->Node9 - - + + Node10 - -unordered_map + +unordered_map Node4->Node10 - - + + Node11 - -map + +map Node4->Node11 - - + + Node12 - -WaveData.h + +WaveData.h Node4->Node12 - - + + Node16 - -Enemy.h + +Enemy.h Node4->Node16 - - + + Node12->Node7 - - + + Node12->Node9 - - + + Node12->Node13 - - + + Node14 - -iostream + +iostream Node13->Node14 - - + + Node15 - -stdlib.h + +stdlib.h Node13->Node15 - - + + -Node16->Node12 - - +Node16->Node12 + + + + +Node16->Node13 + + Node17 - -GameObject.h + +GameObject.h Node16->Node17 - - + + - -Node20 - - -Rect.h + +Node21 + + +Rect.h - -Node16->Node20 - - + +Node16->Node21 + + - -Node23 - - -Sprite.h + +Node24 + + +Sprite.h - -Node16->Node23 - - + +Node16->Node24 + + - -Node27 - - -TileMap.h + +Node28 + + +TileMap.h - -Node16->Node27 - - + +Node16->Node28 + + - -Node29 - - -Timer.h + +Node30 + + +Timer.h - -Node16->Node29 - - + +Node16->Node30 + + Node17->Node5 - - + + Node17->Node7 - - + + Node17->Node9 - - + + Node18 - -SDL_include.h + +SDL_include.h Node17->Node18 - - + + Node19 - -Component.h + +Component.h Node17->Node19 - - + + - -Node17->Node20 - - + +Node20 + + +ComponentType.h + - -Node19->Node17 - - - -Node20->Node18 - - + +Node17->Node20 + + - -Node21 - - -Vec2.h - + +Node17->Node21 + + + + +Node19->Node17 + + + +Node19->Node20 + + - -Node20->Node21 - - + +Node21->Node18 + + Node22 - -cmath + + +Vec2.h + - -Node20->Node22 - - - -Node21->Node18 - - + +Node21->Node22 + + - -Node23->Node5 - - + +Node23 + +cmath + + +Node21->Node23 + + + + +Node22->Node18 + + + + +Node24->Node5 + + + + +Node24->Node9 + + + + +Node24->Node18 + + + + +Node24->Node21 + + - -Node23->Node9 - - + +Node25 + + +Color.h + - -Node23->Node18 - - - -Node23->Node20 - - + +Node24->Node25 + + - -Node24 - - -Color.h + +Node26 + + +InputManager.h - -Node23->Node24 - - + +Node24->Node26 + + - -Node25 - - -InputManager.h - + +Node26->Node10 + + + +Node26->Node18 + + - -Node23->Node25 - - + +Node26->Node22 + + - -Node25->Node10 - - + +Node27 + +cstdint - -Node25->Node18 - - + +Node26->Node27 + + - -Node25->Node21 - - + +Node28->Node7 + + - -Node26 - -cstdint - - -Node25->Node26 - - - - -Node27->Node7 - - - - -Node27->Node9 - - - - -Node27->Node17 - - - - -Node27->Node21 - - + +Node28->Node9 + + - -Node28 - - -Tileset.h + +Node28->Node17 + + + + +Node28->Node22 + + + + +Node29 + + +Tileset.h - -Node27->Node28 - - + +Node28->Node29 + + - -Node28->Node9 - - - - -Node28->Node23 - - + +Node29->Node9 + + + + +Node29->Node24 + + diff --git a/docs/GameResources_8h.html b/docs/GameResources_8h.html index 1fcd3cd2..4d89b548 100644 --- a/docs/GameResources_8h.html +++ b/docs/GameResources_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/GameResources.h @@ -31,7 +31,7 @@
- + @@ -103,12 +103,14 @@
Gráfico de dependência de inclusões para GameResources.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -120,9 +122,9 @@ diff --git a/docs/GameResources_8h__dep__incl.map b/docs/GameResources_8h__dep__incl.map index b9fa8628..f739c21f 100644 --- a/docs/GameResources_8h__dep__incl.map +++ b/docs/GameResources_8h__dep__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/GameResources_8h__dep__incl.md5 b/docs/GameResources_8h__dep__incl.md5 index f3dee951..b9260778 100644 --- a/docs/GameResources_8h__dep__incl.md5 +++ b/docs/GameResources_8h__dep__incl.md5 @@ -1 +1 @@ -444fa7cc1f38312d79880ace61908c7b \ No newline at end of file +4bb5824140f94cc0d190dc05c05eb58c \ No newline at end of file diff --git a/docs/GameResources_8h__dep__incl.svg b/docs/GameResources_8h__dep__incl.svg index 55221cc2..a585579c 100644 --- a/docs/GameResources_8h__dep__incl.svg +++ b/docs/GameResources_8h__dep__incl.svg @@ -1,44 +1,44 @@ - - + Game/include/GameResources.h - + Node1 - -Game/include/GameResources.h + +Game/include/GameResources.h Node2 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp Node1->Node2 - - + + Node3 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node1->Node3 - - + + diff --git a/docs/GameResources_8h__incl.map b/docs/GameResources_8h__incl.map index 000b6012..34ea4ea2 100644 --- a/docs/GameResources_8h__incl.map +++ b/docs/GameResources_8h__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/GameResources_8h__incl.md5 b/docs/GameResources_8h__incl.md5 index 064a6d24..51c825cc 100644 --- a/docs/GameResources_8h__incl.md5 +++ b/docs/GameResources_8h__incl.md5 @@ -1 +1 @@ -6f92309c75218140d599eada290bc7c2 \ No newline at end of file +ffca4bad7ff36aad48b4ba3c1be32937 \ No newline at end of file diff --git a/docs/GameResources_8h__incl.svg b/docs/GameResources_8h__incl.svg index 245c1535..353b6101 100644 --- a/docs/GameResources_8h__incl.svg +++ b/docs/GameResources_8h__incl.svg @@ -1,425 +1,448 @@ - - + Game/include/GameResources.h - + Node1 - -Game/include/GameResources.h + +Game/include/GameResources.h Node2 - -memory + +memory Node1->Node2 - - + + Node3 - -array + +array Node1->Node3 - - + + Node4 - -vector + +vector Node1->Node4 - - + + Node5 - -utility + +utility Node1->Node5 - - + + Node6 - -string + +string Node1->Node6 - - + + Node7 - -unordered_map + +unordered_map Node1->Node7 - - + + Node8 - -map + +map Node1->Node8 - - + + Node9 - -WaveData.h + +WaveData.h Node1->Node9 - - + + Node13 - -Enemy.h + +Enemy.h Node1->Node13 - - + + Node9->Node4 - - + + Node9->Node6 - - + + Node10 - -Error.h + +Error.h Node9->Node10 - - + + Node11 - -iostream + +iostream Node10->Node11 - - + + Node12 - -stdlib.h + +stdlib.h Node10->Node12 - - + + -Node13->Node9 - - +Node13->Node9 + + + + +Node13->Node10 + + Node14 - -GameObject.h + +GameObject.h Node13->Node14 - - + + - -Node17 - - -Rect.h + +Node18 + + +Rect.h - -Node13->Node17 - - + +Node13->Node18 + + - -Node20 - - -Sprite.h + +Node21 + + +Sprite.h - -Node13->Node20 - - + +Node13->Node21 + + - -Node24 - - -TileMap.h + +Node25 + + +TileMap.h - -Node13->Node24 - - + +Node13->Node25 + + - -Node26 - - -Timer.h + +Node27 + + +Timer.h - -Node13->Node26 - - + +Node13->Node27 + + Node14->Node2 - - + + Node14->Node4 - - + + Node14->Node6 - - + + Node15 - -SDL_include.h + +SDL_include.h Node14->Node15 - - + + Node16 - -Component.h + +Component.h Node14->Node16 - - + + - -Node14->Node17 - - + +Node17 + + +ComponentType.h + - -Node16->Node14 - - - -Node17->Node15 - - + +Node14->Node17 + + + + +Node14->Node18 + + - -Node18 - - -Vec2.h - + +Node16->Node14 + + + +Node16->Node17 + + - -Node17->Node18 - - + +Node18->Node15 + + Node19 - -cmath + + +Vec2.h + - -Node17->Node19 - - - -Node18->Node15 - - + +Node18->Node19 + + - -Node20->Node2 - - + +Node20 + +cmath + + +Node18->Node20 + + + + +Node19->Node15 + + + + +Node21->Node2 + + + + +Node21->Node6 + + + + +Node21->Node15 + + + + +Node21->Node18 + + - -Node20->Node6 - - + +Node22 + + +Color.h + - -Node20->Node15 - - - -Node20->Node17 - - + +Node21->Node22 + + - -Node21 - - -Color.h + +Node23 + + +InputManager.h - -Node20->Node21 - - + +Node21->Node23 + + - -Node22 - - -InputManager.h - + +Node23->Node7 + + + +Node23->Node15 + + - -Node20->Node22 - - + +Node23->Node19 + + - -Node22->Node7 - - + +Node24 + +cstdint - -Node22->Node15 - - + +Node23->Node24 + + - -Node22->Node18 - - + +Node25->Node4 + + - -Node23 - -cstdint - - -Node22->Node23 - - - - -Node24->Node4 - - - - -Node24->Node6 - - - - -Node24->Node14 - - - - -Node24->Node18 - - + +Node25->Node6 + + - -Node25 - - -Tileset.h + +Node25->Node14 + + + + +Node25->Node19 + + + + +Node26 + + +Tileset.h - -Node24->Node25 - - + +Node25->Node26 + + - -Node25->Node6 - - - - -Node25->Node20 - - + +Node26->Node6 + + + + +Node26->Node21 + + diff --git a/docs/Game_8cpp.html b/docs/Game_8cpp.html index 2a62e17c..998c3746 100644 --- a/docs/Game_8cpp.html +++ b/docs/Game_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Game.cpp @@ -31,7 +31,7 @@

- + @@ -97,14 +97,15 @@
Gráfico de dependência de inclusões para Game.cpp:
-
+
+
diff --git a/docs/Game_8cpp__incl.map b/docs/Game_8cpp__incl.map index 8c686106..93f3e85d 100644 --- a/docs/Game_8cpp__incl.map +++ b/docs/Game_8cpp__incl.map @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/Game_8cpp__incl.md5 b/docs/Game_8cpp__incl.md5 index a6f4fada..5a2232e9 100644 --- a/docs/Game_8cpp__incl.md5 +++ b/docs/Game_8cpp__incl.md5 @@ -1 +1 @@ -b52bb8c60cd9ec2e046c3526a84ff351 \ No newline at end of file +123b83d025f413a25174c8912b5e7053 \ No newline at end of file diff --git a/docs/Game_8cpp__incl.svg b/docs/Game_8cpp__incl.svg index dd9c67ff..57210140 100644 --- a/docs/Game_8cpp__incl.svg +++ b/docs/Game_8cpp__incl.svg @@ -1,333 +1,351 @@ - - + Engine/src/Game.cpp - + Node1 - -Engine/src/Game.cpp + +Engine/src/Game.cpp Node2 - -Game.h + +Game.h Node1->Node2 - - + + Node13 - -Resources.h + +Resources.h -Node1->Node13 - - - - -Node18 - -stdlib.h - - -Node1->Node18 - - +Node1->Node13 + + Node19 - -time.h + +stdlib.h -Node1->Node19 - - +Node1->Node19 + + Node20 - - -Error.h + +time.h + + +Node1->Node20 + + + + +Node21 + + +Error.h - -Node1->Node20 - - + +Node1->Node21 + + Node3 - -string + +string Node2->Node3 - - + + Node4 - -stack + +stack Node2->Node4 - - + + Node5 - -State.h + +State.h Node2->Node5 - - + + Node8 - -InputManager.h + +InputManager.h -Node2->Node8 - - +Node2->Node8 + + Node9 - -SDL_include.h + +SDL_include.h -Node2->Node9 - - +Node2->Node9 + + Node10 - -Vec2.h + +Vec2.h -Node2->Node10 - - +Node2->Node10 + + Node6 - -vector + +vector Node5->Node6 - - + + Node7 - -memory + +memory Node5->Node7 - - + + Node5->Node8 - - + + Node5->Node13 - - + + Node14 - -GameObject.h + +GameObject.h Node5->Node14 - - + + Node8->Node9 - - + + Node8->Node10 - - + + Node11 - -unordered_map + +unordered_map Node8->Node11 - - + + Node12 - -cstdint + +cstdint Node8->Node12 - - + + Node10->Node9 - - + + Node13->Node3 - - + + Node13->Node7 - - + + Node13->Node9 - - + + Node13->Node11 - - + + Node14->Node3 - - + + Node14->Node6 - - + + Node14->Node7 - - + + Node14->Node9 - - + + Node15 - -Component.h + +Component.h Node14->Node15 - - + + Node16 - - -Rect.h + + +ComponentType.h -Node14->Node16 - - +Node14->Node16 + + - -Node15->Node14 - - + +Node17 + + +Rect.h + - -Node16->Node9 - - - -Node16->Node10 - - + +Node14->Node17 + + - -Node17 - -cmath + +Node15->Node14 + + - -Node16->Node17 - - + +Node15->Node16 + + - -Node20->Node18 - - + +Node17->Node9 + + - -Node21 - -iostream + +Node17->Node10 + + - -Node20->Node21 - - + +Node18 + +cmath + + +Node17->Node18 + + + + +Node21->Node19 + + + + +Node22 + +iostream + + +Node21->Node22 + + diff --git a/docs/Game_8h.html b/docs/Game_8h.html index 9c9d9ea6..ab3a3b55 100644 --- a/docs/Game_8h.html +++ b/docs/Game_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Game.h @@ -31,7 +31,7 @@ - + @@ -101,12 +101,14 @@
Gráfico de dependência de inclusões para Game.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -206,9 +208,9 @@

Definições e macros

diff --git a/docs/Game_8h__dep__incl.map b/docs/Game_8h__dep__incl.map index 4d946b12..59dd2142 100644 --- a/docs/Game_8h__dep__incl.map +++ b/docs/Game_8h__dep__incl.map @@ -7,10 +7,10 @@ - + - + diff --git a/docs/Game_8h__dep__incl.md5 b/docs/Game_8h__dep__incl.md5 index 72e36832..07fc0121 100644 --- a/docs/Game_8h__dep__incl.md5 +++ b/docs/Game_8h__dep__incl.md5 @@ -1 +1 @@ -71b3658745c45e959d6fbb23c4b1fc82 \ No newline at end of file +a3950b4612a13ae8b8d5cab3980d9885 \ No newline at end of file diff --git a/docs/Game_8h__dep__incl.svg b/docs/Game_8h__dep__incl.svg index 09e7160c..09860eab 100644 --- a/docs/Game_8h__dep__incl.svg +++ b/docs/Game_8h__dep__incl.svg @@ -1,7 +1,7 @@ - Node1->Node15 - - + + Node3 diff --git a/docs/Game_8h__incl.map b/docs/Game_8h__incl.map index af3058f1..439b16f4 100644 --- a/docs/Game_8h__incl.map +++ b/docs/Game_8h__incl.map @@ -1,10 +1,11 @@ - - - - - - - - + + + + + + + + + diff --git a/docs/Game_8h__incl.md5 b/docs/Game_8h__incl.md5 index 1745bb18..d3602f9c 100644 --- a/docs/Game_8h__incl.md5 +++ b/docs/Game_8h__incl.md5 @@ -1 +1 @@ -20007a86f8cbfa064ff95a26076d5a31 \ No newline at end of file +cd84dc5775c37c23e320aae0f632d7d0 \ No newline at end of file diff --git a/docs/Game_8h__incl.svg b/docs/Game_8h__incl.svg index 993ecad1..324e913d 100644 --- a/docs/Game_8h__incl.svg +++ b/docs/Game_8h__incl.svg @@ -1,267 +1,285 @@ - - + Engine/include/Game.h - + Node1 - -Engine/include/Game.h + +Engine/include/Game.h Node2 - -string + +string Node1->Node2 - - + + Node3 - -stack + +stack Node1->Node3 - - + + Node4 - -State.h + +State.h Node1->Node4 - - + + Node7 - -InputManager.h + +InputManager.h -Node1->Node7 - - +Node1->Node7 + + Node8 - -SDL_include.h + +SDL_include.h -Node1->Node8 - - +Node1->Node8 + + Node9 - -Vec2.h + +Vec2.h -Node1->Node9 - - +Node1->Node9 + + Node5 - -vector + +vector Node4->Node5 - - + + Node6 - -memory + +memory Node4->Node6 - - + + Node4->Node7 - - + + Node12 - -Resources.h + +Resources.h Node4->Node12 - - + + Node13 - -GameObject.h + +GameObject.h Node4->Node13 - - + + Node7->Node8 - - + + Node7->Node9 - - + + Node10 - -unordered_map + +unordered_map Node7->Node10 - - + + Node11 - -cstdint + +cstdint Node7->Node11 - - + + Node9->Node8 - - + + Node12->Node2 - - + + Node12->Node6 - - + + Node12->Node8 - - + + Node12->Node10 - - + + Node13->Node2 - - + + Node13->Node5 - - + + Node13->Node6 - - + + Node13->Node8 - - + + Node14 - -Component.h + +Component.h Node13->Node14 - - + + Node15 - - -Rect.h + + +ComponentType.h -Node13->Node15 - - - - -Node14->Node13 - - - - -Node15->Node8 - - - - -Node15->Node9 - - +Node13->Node15 + + Node16 - -cmath + + +Rect.h + + - -Node15->Node16 - - + +Node13->Node16 + + + + +Node14->Node13 + + + + +Node14->Node15 + + + + +Node16->Node8 + + + + +Node16->Node9 + + + + +Node17 + +cmath + + +Node16->Node17 + + diff --git a/docs/HItPoints_8cpp.html b/docs/HItPoints_8cpp.html index b176ba1f..8a398a4b 100644 --- a/docs/HItPoints_8cpp.html +++ b/docs/HItPoints_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/HItPoints.cpp @@ -31,7 +31,7 @@
- + @@ -93,14 +93,15 @@
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 index 2675c254..ba607cf0 100644 --- a/docs/HItPoints_8cpp__incl.map +++ b/docs/HItPoints_8cpp__incl.map @@ -1,11 +1,12 @@ - - - - - - - - - + + + + + + + + + + diff --git a/docs/HItPoints_8cpp__incl.md5 b/docs/HItPoints_8cpp__incl.md5 index 4ed0f662..73a6258c 100644 --- a/docs/HItPoints_8cpp__incl.md5 +++ b/docs/HItPoints_8cpp__incl.md5 @@ -1 +1 @@ -420ac6e65a856103c45e8dcb7cc72c90 \ No newline at end of file +4db08c725586874e6476640252c5b3f3 \ No newline at end of file diff --git a/docs/HItPoints_8cpp__incl.svg b/docs/HItPoints_8cpp__incl.svg index f487704d..8a519ba3 100644 --- a/docs/HItPoints_8cpp__incl.svg +++ b/docs/HItPoints_8cpp__incl.svg @@ -1,240 +1,258 @@ - - + Engine/src/HItPoints.cpp - + Node1 - -Engine/src/HItPoints.cpp + +Engine/src/HItPoints.cpp Node2 - -HitPoints.h + +HitPoints.h Node1->Node2 - - + + Node3 - -Component.h + +Component.h Node2->Node3 - - + + - -Node12 - - -Sprite.h + +Node13 + + +Sprite.h - -Node2->Node12 - - + +Node2->Node13 + + Node4 - - -GameObject.h + + +ComponentType.h Node3->Node4 - - - - -Node4->Node3 - - + + Node5 - - -SDL_include.h + + +GameObject.h - -Node4->Node5 - - + +Node3->Node5 + + + + +Node5->Node3 + + + + +Node5->Node4 + + Node6 - -vector + + +SDL_include.h + + - -Node4->Node6 - - + +Node5->Node6 + + Node7 - -memory + +vector - -Node4->Node7 - - + +Node5->Node7 + + Node8 - -string + +memory - -Node4->Node8 - - + +Node5->Node8 + + Node9 - - -Rect.h - + +string - - -Node4->Node9 - - - - -Node9->Node5 - - + +Node5->Node9 + + Node10 - - -Vec2.h + + +Rect.h - -Node9->Node10 - - + +Node5->Node10 + + + + +Node10->Node6 + + Node11 - -cmath - - -Node9->Node11 - - - - -Node10->Node5 - - - - -Node12->Node5 - - - - -Node12->Node7 - - - - -Node12->Node8 - - - - -Node12->Node9 - - - - -Node13 - - -Color.h + + +Vec2.h - -Node12->Node13 - - + +Node10->Node11 + + + + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node6 + + + + +Node13->Node6 + + + + +Node13->Node8 + + + + +Node13->Node9 + + + + +Node13->Node10 + + Node14 - - -InputManager.h + + +Color.h - -Node12->Node14 - - - - -Node14->Node5 - - - - -Node14->Node10 - - + +Node13->Node14 + + Node15 - -unordered_map + + +InputManager.h + + - -Node14->Node15 - - + +Node13->Node15 + + + + +Node15->Node6 + + + + +Node15->Node11 + + Node16 - -cstdint - - -Node14->Node16 - - + +unordered_map + + +Node15->Node16 + + + + +Node17 + +cstdint + + +Node15->Node17 + + diff --git a/docs/HitPoints_8h.html b/docs/HitPoints_8h.html index c0420415..559c41dc 100644 --- a/docs/HitPoints_8h.html +++ b/docs/HitPoints_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/HitPoints.h @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para HitPoints.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -131,9 +133,9 @@

Definições dos tipos

diff --git a/docs/HitPoints_8h__dep__incl.map b/docs/HitPoints_8h__dep__incl.map index dfbc62f8..d965170b 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 7d3b3c2c..bbe9b974 100644 --- a/docs/HitPoints_8h__dep__incl.md5 +++ b/docs/HitPoints_8h__dep__incl.md5 @@ -1 +1 @@ -da95c88b711a266afb1f997ce0d8c244 \ No newline at end of file +66d8729cbaa5763ab8ddb3d48e37cc57 \ No newline at end of file diff --git a/docs/HitPoints_8h__dep__incl.svg b/docs/HitPoints_8h__dep__incl.svg index 81672818..1347044d 100644 --- a/docs/HitPoints_8h__dep__incl.svg +++ b/docs/HitPoints_8h__dep__incl.svg @@ -1,7 +1,7 @@ - - - - - - - - - + + + + + + + + + diff --git a/docs/HitPoints_8h__incl.md5 b/docs/HitPoints_8h__incl.md5 index 3f0a2842..a281bba0 100644 --- a/docs/HitPoints_8h__incl.md5 +++ b/docs/HitPoints_8h__incl.md5 @@ -1 +1 @@ -f40e07a274ce48befa7be45b3cb66638 \ No newline at end of file +d73bac8c41763fdf30634965899a81cb \ No newline at end of file diff --git a/docs/HitPoints_8h__incl.svg b/docs/HitPoints_8h__incl.svg index c20582bc..9d86c3af 100644 --- a/docs/HitPoints_8h__incl.svg +++ b/docs/HitPoints_8h__incl.svg @@ -1,227 +1,245 @@ - - + Engine/include/HitPoints.h - + Node1 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h Node2 - -Component.h + +Component.h Node1->Node2 - - + + - -Node11 - - -Sprite.h + +Node12 + + +Sprite.h - -Node1->Node11 - - + +Node1->Node12 + + Node3 - - -GameObject.h + + +ComponentType.h Node2->Node3 - - - - -Node3->Node2 - - + + Node4 - - -SDL_include.h + + +GameObject.h - -Node3->Node4 - - + +Node2->Node4 + + + + +Node4->Node2 + + + + +Node4->Node3 + + Node5 - -vector + + +SDL_include.h + + - -Node3->Node5 - - + +Node4->Node5 + + Node6 - -memory + +vector - -Node3->Node6 - - + +Node4->Node6 + + Node7 - -string + +memory - -Node3->Node7 - - + +Node4->Node7 + + Node8 - - -Rect.h - + +string - - -Node3->Node8 - - - - -Node8->Node4 - - + +Node4->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node4->Node9 + + + + +Node9->Node5 + + Node10 - -cmath - - -Node8->Node10 - - - - -Node9->Node4 - - - - -Node11->Node4 - - - - -Node11->Node6 - - - - -Node11->Node7 - - - - -Node11->Node8 - - - - -Node12 - - -Color.h + + +Vec2.h - -Node11->Node12 - - + +Node9->Node10 + + + + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node5 + + + + +Node12->Node5 + + + + +Node12->Node7 + + + + +Node12->Node8 + + + + +Node12->Node9 + + Node13 - - -InputManager.h + + +Color.h - -Node11->Node13 - - - - -Node13->Node4 - - - - -Node13->Node9 - - + +Node12->Node13 + + Node14 - -unordered_map + + +InputManager.h + + - -Node13->Node14 - - + +Node12->Node14 + + + + +Node14->Node5 + + + + +Node14->Node10 + + Node15 - -cstdint - - -Node13->Node15 - - + +unordered_map + + +Node14->Node15 + + + + +Node16 + +cstdint + + +Node14->Node16 + + diff --git a/docs/InputManager_8cpp.html b/docs/InputManager_8cpp.html index c42478de..fc273c9a 100644 --- a/docs/InputManager_8cpp.html +++ b/docs/InputManager_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/InputManager.cpp @@ -31,7 +31,7 @@
- + @@ -95,14 +95,15 @@
Gráfico de dependência de inclusões para InputManager.cpp:
-
+
+
diff --git a/docs/InputManager_8cpp__incl.map b/docs/InputManager_8cpp__incl.map index fec92142..8443081d 100644 --- a/docs/InputManager_8cpp__incl.map +++ b/docs/InputManager_8cpp__incl.map @@ -1,6 +1,6 @@ - + - + diff --git a/docs/InputManager_8cpp__incl.md5 b/docs/InputManager_8cpp__incl.md5 index 8c35d5cb..83c463aa 100644 --- a/docs/InputManager_8cpp__incl.md5 +++ b/docs/InputManager_8cpp__incl.md5 @@ -1 +1 @@ -e4ee9c58148d5cd61ae4fa99469cc023 \ No newline at end of file +14916919c6c561cb269e84746e1b15d0 \ No newline at end of file diff --git a/docs/InputManager_8cpp__incl.svg b/docs/InputManager_8cpp__incl.svg index c5493225..411dfb83 100644 --- a/docs/InputManager_8cpp__incl.svg +++ b/docs/InputManager_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/InputManager.h @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Gráfico de dependência de inclusões para InputManager.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -316,9 +318,9 @@

Definições e macros

diff --git a/docs/InputManager_8h__dep__incl.map b/docs/InputManager_8h__dep__incl.map index 41b18d90..4713149d 100644 --- a/docs/InputManager_8h__dep__incl.map +++ b/docs/InputManager_8h__dep__incl.map @@ -1,43 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/InputManager_8h__dep__incl.md5 b/docs/InputManager_8h__dep__incl.md5 index 36da52c5..cafc9dba 100644 --- a/docs/InputManager_8h__dep__incl.md5 +++ b/docs/InputManager_8h__dep__incl.md5 @@ -1 +1 @@ -09d7f2ae2ae2b2e191e5604d1e640a09 \ No newline at end of file +4fbfa723ba2cbf622346e482945b5f2f \ No newline at end of file diff --git a/docs/InputManager_8h__dep__incl.svg b/docs/InputManager_8h__dep__incl.svg index 9ed1ecc1..5f9368cf 100644 --- a/docs/InputManager_8h__dep__incl.svg +++ b/docs/InputManager_8h__dep__incl.svg @@ -1,791 +1,809 @@ - - + Engine/include/InputManager.h - + Node1 - -Engine/include/InputManager.h + +Engine/include/InputManager.h Node2 - -Engine/include/ActionManager.h + +Engine/include/ActionManager.h Node1->Node2 - - + + Node5 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp -Node1->Node5 - - +Node1->Node5 + + Node6 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp -Node1->Node6 - - +Node1->Node6 + + - -Node9 - - -Engine/src/TileMap.cpp - - - - -Node1->Node9 - - - - -Node14 - - -Game/src/TitleState.cpp + +Node10 + + +Engine/src/TileMap.cpp - -Node1->Node14 - - + +Node1->Node10 + + - -Node17 - - -Game/include/StageState.h + +Node15 + + +Game/src/TitleState.cpp - -Node1->Node17 - - + +Node1->Node15 + + Node18 - - -Game/include/EndState.h + + +Game/include/StageState.h -Node1->Node18 - - +Node1->Node18 + + - -Node21 - - -Engine/include/Sprite.h + +Node19 + + +Game/include/EndState.h - -Node1->Node21 - - + +Node1->Node19 + + - -Node27 - - -Game/src/WaveManager.cpp + +Node22 + + +Engine/include/Sprite.h - -Node1->Node27 - - + +Node1->Node22 + + - -Node34 - - -Engine/include/State.h + +Node28 + + +Game/src/WaveManager.cpp - -Node1->Node34 - - + +Node1->Node28 + + Node35 - - -Engine/include/Game.h + + +Engine/include/State.h -Node1->Node35 - - +Node1->Node35 + + - -Node40 - - -Engine/include/Music.h + +Node36 + + +Engine/include/Game.h - -Node1->Node40 - - + +Node1->Node36 + + - -Node42 - - -Engine/src/InputManager.cpp + +Node41 + + +Engine/include/Music.h - -Node1->Node42 - - + +Node1->Node41 + + + + +Node43 + + +Engine/src/InputManager.cpp + + + + +Node1->Node43 + + Node3 - -Engine/include/Camera.h + +Engine/include/Camera.h Node2->Node3 - - + + - -Node16 - - -Engine/src/ActionManager.cpp + +Node17 + + +Engine/src/ActionManager.cpp - -Node2->Node16 - - - Node2->Node17 - - + + - -Node19 - - -Game/include/TitleState.h + +Node2->Node18 + + + + +Node20 + + +Game/include/TitleState.h - -Node2->Node19 - - + +Node2->Node20 + + Node4 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node3->Node4 - - + + Node3->Node5 - - + + Node3->Node6 - - + + Node7 - - -Engine/src/Sprite.cpp + + +Engine/src/GameObject.cpp Node3->Node7 - - + + Node8 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node3->Node8 - - + + - -Node3->Node9 - - - - -Node10 - - -Engine/src/Tileset.cpp + +Node9 + + +Engine/src/State.cpp + +Node3->Node9 + + + Node3->Node10 - - + + Node11 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node3->Node11 - - + + Node12 - - -Game/src/Enemy.cpp + + +Game/src/EndState.cpp Node3->Node12 - - + + Node13 - - -Game/src/StageState.cpp + + +Game/src/Enemy.cpp Node3->Node13 - - + + - -Node3->Node14 - - - - -Node15 - - -Game/src/Tower.cpp + +Node14 + + +Game/src/StageState.cpp + +Node3->Node14 + + + Node3->Node15 - - - - -Node17->Node13 - - - - -Node17->Node14 - - - - -Node17->Node18 - - - - -Node18->Node11 - - - - -Node18->Node17 - - - - -Node19->Node14 - - + + - -Node20 - - -Game/src/main.cpp + +Node16 + + +Game/src/Tower.cpp - -Node19->Node20 - - + +Node3->Node16 + + - -Node21->Node7 - - + +Node18->Node14 + + - -Node21->Node17 - - + +Node18->Node15 + + - -Node21->Node18 - - + +Node18->Node19 + + - -Node21->Node19 - - + +Node19->Node12 + + - -Node22 - - -Engine/include/Animation.h + +Node19->Node18 + + + + +Node20->Node15 + + + + +Node21 + + +Game/src/main.cpp - -Node21->Node22 - - + +Node20->Node21 + + + + +Node22->Node8 + + + + +Node22->Node18 + + + + +Node22->Node19 + + + + +Node22->Node20 + + Node23 - - -Engine/include/Tileset.h + + +Engine/include/Animation.h - -Node21->Node23 - - + +Node22->Node23 + + - -Node28 - - -Game/include/Enemy.h + +Node24 + + +Engine/include/Tileset.h - -Node21->Node28 - - + +Node22->Node24 + + - -Node31 - - -Game/include/Tower.h + +Node29 + + +Game/include/Enemy.h - -Node21->Node31 - - + +Node22->Node29 + + Node32 - - -Engine/include/HitPoints.h + + +Game/include/Tower.h - -Node21->Node32 - - - - -Node22->Node4 - - - - -Node23->Node10 - - + +Node22->Node32 + + - -Node23->Node17 - - - - -Node24 - - -Engine/include/TileMap.h + +Node33 + + +Engine/include/HitPoints.h - -Node23->Node24 - - + +Node22->Node33 + + + + +Node23->Node4 + + - -Node24->Node9 - - + +Node24->Node11 + + - -Node24->Node17 - - + +Node24->Node18 + + Node25 - - -Engine/include/DragAndDrop.h + + +Engine/include/TileMap.h Node24->Node25 - - + + + + +Node25->Node10 + + + + +Node25->Node18 + + Node26 - - -Game/include/WaveManager.h - - - - -Node24->Node26 - - - - -Node24->Node27 - - - - -Node24->Node28 - - - - -Node24->Node31 - - - - -Node25->Node6 - - - - -Node25->Node15 - - - - -Node26->Node17 - - - - -Node26->Node27 - - - - -Node28->Node12 - - - - -Node28->Node13 - - - - -Node28->Node27 - - - - -Node29 - - -Game/include/GameResources.h + + +Engine/include/DragAndDrop.h - -Node28->Node29 - - + +Node25->Node26 + + - -Node29->Node27 - - + +Node27 + + +Game/include/WaveManager.h + + + + +Node25->Node27 + + + + +Node25->Node28 + + + + +Node25->Node29 + + + + +Node25->Node32 + + + + +Node26->Node6 + + + + +Node26->Node16 + + + + +Node26->Node18 + + + + +Node27->Node18 + + + + +Node27->Node28 + + + + +Node29->Node13 + + + + +Node29->Node14 + + + + +Node29->Node28 + + Node30 - - -Game/src/GameResources.cpp + + +Game/include/GameResources.h -Node29->Node30 - - +Node29->Node30 + + + + +Node30->Node28 + + - -Node31->Node13 - - + +Node31 + + +Game/src/GameResources.cpp + - -Node31->Node15 - - - -Node32->Node12 - - + +Node30->Node31 + + - -Node33 - - -Engine/src/HItPoints.cpp - - - - -Node32->Node33 - - - - -Node34->Node8 - - - - -Node34->Node17 - - - - -Node34->Node19 - - - - -Node34->Node35 - - - - -Node35->Node5 - - - - -Node35->Node7 - - - - -Node35->Node10 - - - - -Node35->Node13 - - - - -Node35->Node14 - - + +Node32->Node14 + + - -Node35->Node20 - - + +Node32->Node16 + + - -Node35->Node27 - - + +Node33->Node13 + + - -Node36 - - -Engine/include/Text.h + +Node34 + + +Engine/src/HItPoints.cpp + +Node33->Node34 + + + + +Node35->Node9 + + + + +Node35->Node18 + + + + +Node35->Node20 + + + -Node35->Node36 - - +Node35->Node36 + + + + +Node36->Node5 + + + + +Node36->Node8 + + + + +Node36->Node11 + + + + +Node36->Node14 + + + + +Node36->Node15 + + + + +Node36->Node21 + + + + +Node36->Node28 + + - -Node38 - - -Engine/src/Game.cpp + +Node37 + + +Engine/include/Text.h - -Node35->Node38 - - + +Node36->Node37 + + Node39 - - -Engine/src/Resources.cpp + + +Engine/src/Game.cpp - -Node35->Node39 - - + +Node36->Node39 + + - -Node36->Node18 - - + +Node40 + + +Engine/src/Resources.cpp + - -Node37 - - -Engine/src/Text.cpp + + +Node36->Node40 + + + + +Node37->Node19 + + + + +Node38 + + +Engine/src/Text.cpp - -Node36->Node37 - - + +Node37->Node38 + + - -Node40->Node17 - - + +Node41->Node18 + + - -Node40->Node18 - - + +Node41->Node19 + + - -Node41 - - -Engine/src/Music.cpp + +Node42 + + +Engine/src/Music.cpp - -Node40->Node41 - - + +Node41->Node42 + + diff --git a/docs/InputManager_8h__incl.map b/docs/InputManager_8h__incl.map index 31ae4e31..5d50e052 100644 --- a/docs/InputManager_8h__incl.map +++ b/docs/InputManager_8h__incl.map @@ -1,4 +1,4 @@ - + diff --git a/docs/InputManager_8h__incl.md5 b/docs/InputManager_8h__incl.md5 index 1be20133..9de19a29 100644 --- a/docs/InputManager_8h__incl.md5 +++ b/docs/InputManager_8h__incl.md5 @@ -1 +1 @@ -291bf48a77d076a4a389540c7fa8a223 \ No newline at end of file +2359ab9364aca72e8b4b099d0f1e4ad1 \ No newline at end of file diff --git a/docs/InputManager_8h__incl.svg b/docs/InputManager_8h__incl.svg index c3a4104a..c4efc804 100644 --- a/docs/InputManager_8h__incl.svg +++ b/docs/InputManager_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Music.cpp @@ -31,7 +31,7 @@
- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Music.cpp:
-
+
+
diff --git a/docs/Music_8cpp__incl.map b/docs/Music_8cpp__incl.map index 14cd3787..40529104 100644 --- a/docs/Music_8cpp__incl.map +++ b/docs/Music_8cpp__incl.map @@ -3,6 +3,6 @@ - - + + diff --git a/docs/Music_8cpp__incl.md5 b/docs/Music_8cpp__incl.md5 index ef988888..0c943343 100644 --- a/docs/Music_8cpp__incl.md5 +++ b/docs/Music_8cpp__incl.md5 @@ -1 +1 @@ -bbd8347f9e8416062be976c5aef01149 \ No newline at end of file +eded2b882220c343e30fc26b0b9a1d28 \ No newline at end of file diff --git a/docs/Music_8cpp__incl.svg b/docs/Music_8cpp__incl.svg index 6eb63500..615f7838 100644 --- a/docs/Music_8cpp__incl.svg +++ b/docs/Music_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Music.h @@ -31,7 +31,7 @@ - + @@ -101,12 +101,14 @@
Gráfico de dependência de inclusões para Music.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -178,9 +180,9 @@

Definições e macros

diff --git a/docs/Music_8h__dep__incl.map b/docs/Music_8h__dep__incl.map index 147e2aff..c8cd9325 100644 --- a/docs/Music_8h__dep__incl.map +++ b/docs/Music_8h__dep__incl.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/Music_8h__dep__incl.md5 b/docs/Music_8h__dep__incl.md5 index 94467eb3..88801cee 100644 --- a/docs/Music_8h__dep__incl.md5 +++ b/docs/Music_8h__dep__incl.md5 @@ -1 +1 @@ -0fa4501f38f65662d4166cc0a05563ec \ No newline at end of file +f5ad06675dd82e6a6e93d30c10c223f5 \ No newline at end of file diff --git a/docs/Music_8h__dep__incl.svg b/docs/Music_8h__dep__incl.svg index 5d5ca3d1..83c3e4fd 100644 --- a/docs/Music_8h__dep__incl.svg +++ b/docs/Music_8h__dep__incl.svg @@ -1,106 +1,106 @@ - - + Engine/include/Music.h - + Node1 - -Engine/include/Music.h + +Engine/include/Music.h Node2 - -Engine/src/Music.cpp + +Engine/src/Music.cpp Node1->Node2 - - + + Node3 - -Game/include/EndState.h + +Game/include/EndState.h Node1->Node3 - - + + Node4 - -Game/include/StageState.h + +Game/include/StageState.h Node1->Node4 - - + + Node3->Node4 - - + + Node7 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node3->Node7 - - + + Node4->Node3 - - + + Node5 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node4->Node5 - - + + Node6 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node4->Node6 - - + + diff --git a/docs/Music_8h__incl.map b/docs/Music_8h__incl.map index 4d851b6a..61e6fb1d 100644 --- a/docs/Music_8h__incl.map +++ b/docs/Music_8h__incl.map @@ -2,6 +2,6 @@ - - + + diff --git a/docs/Music_8h__incl.md5 b/docs/Music_8h__incl.md5 index 49869056..34c9fe19 100644 --- a/docs/Music_8h__incl.md5 +++ b/docs/Music_8h__incl.md5 @@ -1 +1 @@ -e382e08154c534c8681e3467e03376c2 \ No newline at end of file +4767783d94aafdc1734640ed922aea1f \ No newline at end of file diff --git a/docs/Music_8h__incl.svg b/docs/Music_8h__incl.svg index 8d51f52b..ca59bebb 100644 --- a/docs/Music_8h__incl.svg +++ b/docs/Music_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo README.md @@ -31,7 +31,7 @@
- + @@ -88,9 +88,9 @@ diff --git a/docs/Rect_8cpp.html b/docs/Rect_8cpp.html index 2bac4391..4c3e3a48 100644 --- a/docs/Rect_8cpp.html +++ b/docs/Rect_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Rect.cpp @@ -31,7 +31,7 @@ - + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Rect.cpp:
-
+
+
diff --git a/docs/Rect_8cpp__incl.map b/docs/Rect_8cpp__incl.map index cc693384..127f5257 100644 --- a/docs/Rect_8cpp__incl.map +++ b/docs/Rect_8cpp__incl.map @@ -1,5 +1,5 @@ - + diff --git a/docs/Rect_8cpp__incl.md5 b/docs/Rect_8cpp__incl.md5 index 413dbb87..9e5b933b 100644 --- a/docs/Rect_8cpp__incl.md5 +++ b/docs/Rect_8cpp__incl.md5 @@ -1 +1 @@ -f548ba44dc3e78b633c83ca5fc678034 \ No newline at end of file +1182f760c5121981e42bdfc537f9789a \ No newline at end of file diff --git a/docs/Rect_8cpp__incl.svg b/docs/Rect_8cpp__incl.svg index 5c36e837..b52e0478 100644 --- a/docs/Rect_8cpp__incl.svg +++ b/docs/Rect_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Rect.h @@ -31,7 +31,7 @@ - + @@ -98,12 +98,14 @@
Gráfico de dependência de inclusões para Rect.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -147,9 +149,9 @@

Definições e macros

diff --git a/docs/Rect_8h__dep__incl.map b/docs/Rect_8h__dep__incl.map index 83012c2f..f3995383 100644 --- a/docs/Rect_8h__dep__incl.map +++ b/docs/Rect_8h__dep__incl.map @@ -1,47 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Rect_8h__dep__incl.md5 b/docs/Rect_8h__dep__incl.md5 index a0c0847b..dec72356 100644 --- a/docs/Rect_8h__dep__incl.md5 +++ b/docs/Rect_8h__dep__incl.md5 @@ -1 +1 @@ -71656b0317dc3f62497e3d2d55b87138 \ No newline at end of file +7ba9409dddcc7b59454a47f64699c571 \ No newline at end of file diff --git a/docs/Rect_8h__dep__incl.svg b/docs/Rect_8h__dep__incl.svg index 73fa64f4..38bb4d15 100644 --- a/docs/Rect_8h__dep__incl.svg +++ b/docs/Rect_8h__dep__incl.svg @@ -1,873 +1,860 @@ - - + Engine/include/Rect.h - + Node1 - -Engine/include/Rect.h + +Engine/include/Rect.h Node2 - -Engine/include/GameObject.h + +Engine/include/GameObject.h Node1->Node2 - - + + - -Node29 - - -Game/include/Enemy.h + +Node30 + + +Game/include/Enemy.h - -Node1->Node29 - - + +Node1->Node30 + + - -Node32 - - -Game/include/Tower.h + +Node33 + + +Game/include/Tower.h - -Node1->Node32 - - + +Node1->Node33 + + - -Node35 - - -Engine/include/Text.h + +Node36 + + +Engine/include/Text.h - -Node1->Node35 - - + +Node1->Node36 + + Node42 - - -Game/include/EmptyGameObject.h + + +Engine/include/Sprite.h -Node1->Node42 - - +Node1->Node42 + + - -Node43 - - -Engine/include/Sprite.h + +Node44 + + +Engine/include/Collision.h - -Node1->Node43 - - + +Node1->Node44 + + Node45 - - -Engine/include/Collision.h + + +Engine/src/Rect.cpp -Node1->Node45 - - - - -Node46 - - -Engine/src/Rect.cpp - - - - -Node1->Node46 - - +Node1->Node45 + + Node3 - -Engine/include/Component.h + +Engine/include/Component.h Node2->Node3 - - + + - -Node13 - - -Game/include/WaveManager.h + +Node9 + + +Game/include/StageState.h - -Node2->Node13 - - + +Node2->Node9 + + - -Node14 - - -Game/include/StageState.h + +Node10 + + +Game/include/EndState.h - -Node2->Node14 - - + +Node2->Node10 + + - -Node15 - - -Game/include/EndState.h + +Node18 + + +Game/include/WaveManager.h - -Node2->Node15 - - + +Node2->Node18 + + Node20 - -Engine/include/Animation.h + +Engine/include/Animation.h -Node2->Node20 - - +Node2->Node20 + + Node22 - -Engine/include/Camera.h + +Engine/include/Camera.h -Node2->Node22 - - +Node2->Node22 + + - -Node28 - - -Engine/include/TileMap.h + +Node24 + + +Engine/src/GameObject.cpp - -Node2->Node28 - - + +Node2->Node24 + + - -Node2->Node29 - - + +Node29 + + +Engine/include/TileMap.h + - -Node2->Node32 - - - -Node33 - - -Engine/include/State.h - + +Node2->Node29 + + + +Node2->Node30 + + -Node2->Node33 - - +Node2->Node33 + + - -Node41 - - -Engine/src/GameObject.cpp + +Node34 + + +Engine/include/State.h - -Node2->Node41 - - - - -Node2->Node42 - - + +Node2->Node34 + + Node3->Node2 - - + + Node4 - -Engine/include/AIGoDown.h + +Engine/include/AIGoDown.h Node3->Node4 - - + + Node7 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node3->Node7 - - + + - -Node10 - - -Engine/include/HitPoints.h + +Node15 + + +Engine/include/HitPoints.h - -Node3->Node10 - - + +Node3->Node15 + + - -Node12 - - -Engine/src/Component.cpp + +Node17 + + +Engine/src/Component.cpp - -Node3->Node12 - - + +Node3->Node17 + + - -Node3->Node13 - - + +Node3->Node18 + + Node5 - -Engine/src/AIGoDown.cpp + +Engine/src/AIGoDown.cpp Node4->Node5 - - + + Node6 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node4->Node6 - - + + Node8 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node7->Node8 - - - - -Node9 - - -Game/src/Tower.cpp - - + + Node7->Node9 - - + + - -Node10->Node6 - - - - -Node11 - - -Engine/src/HItPoints.cpp + +Node14 + + +Game/src/Tower.cpp - -Node10->Node11 - - + +Node7->Node14 + + - -Node13->Node14 - - + +Node9->Node10 + + - -Node19 - - -Game/src/WaveManager.cpp + +Node12 + + +Game/src/StageState.cpp - -Node13->Node19 - - - - -Node14->Node15 - - + +Node9->Node12 + + - -Node17 - - -Game/src/StageState.cpp + +Node13 + + +Game/src/TitleState.cpp - -Node14->Node17 - - + +Node9->Node13 + + - -Node18 - - -Game/src/TitleState.cpp + +Node10->Node9 + + + + +Node11 + + +Game/src/EndState.cpp - -Node14->Node18 - - + +Node10->Node11 + + - -Node15->Node14 - - + +Node15->Node6 + + Node16 - - -Game/src/EndState.cpp + + +Engine/src/HItPoints.cpp -Node15->Node16 - - +Node15->Node16 + + + + +Node18->Node9 + + + + +Node19 + + +Game/src/WaveManager.cpp + + + + +Node18->Node19 + + Node21 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp -Node20->Node21 - - +Node20->Node21 + + -Node22->Node6 - - +Node22->Node6 + + -Node22->Node8 - - - - -Node22->Node9 - - - - -Node22->Node16 - - - - -Node22->Node17 - - - - -Node22->Node18 - - +Node22->Node8 + + + + +Node22->Node11 + + + + +Node22->Node12 + + + + +Node22->Node13 + + + + +Node22->Node14 + + -Node22->Node21 - - +Node22->Node21 + + Node23 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp -Node22->Node23 - - - - -Node24 - - -Engine/src/Sprite.cpp - - +Node22->Node23 + + -Node22->Node24 - - +Node22->Node24 + + Node25 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp -Node22->Node25 - - +Node22->Node25 + + Node26 - - -Engine/src/TileMap.cpp + + +Engine/src/State.cpp -Node22->Node26 - - +Node22->Node26 + + Node27 - - -Engine/src/Tileset.cpp + + +Engine/src/TileMap.cpp -Node22->Node27 - - - - -Node28->Node7 - - - - -Node28->Node13 - - - - -Node28->Node14 - - - - -Node28->Node19 - - - - -Node28->Node26 - - - - -Node28->Node29 - - - - -Node28->Node32 - - - - -Node29->Node6 - - - - -Node29->Node17 - - +Node22->Node27 + + - -Node29->Node19 - - - - -Node30 - - -Game/include/GameResources.h + +Node28 + + +Engine/src/Tileset.cpp + +Node22->Node28 + + + + +Node29->Node7 + + + + +Node29->Node9 + + + + +Node29->Node18 + + + + +Node29->Node19 + + + + +Node29->Node27 + + + -Node29->Node30 - - +Node29->Node30 + + + + +Node29->Node33 + + + + +Node30->Node6 + + + + +Node30->Node12 + + -Node30->Node19 - - +Node30->Node19 + + Node31 - - -Game/src/GameResources.cpp + + +Game/include/GameResources.h -Node30->Node31 - - +Node30->Node31 + + - -Node32->Node9 - - + +Node31->Node19 + + - -Node32->Node17 - - + +Node32 + + +Game/src/GameResources.cpp + - -Node33->Node14 - - - -Node33->Node25 - - + +Node31->Node32 + + - -Node34 - - -Engine/include/Game.h - + +Node33->Node12 + + + +Node33->Node14 + + - -Node33->Node34 - - + +Node34->Node9 + + - -Node40 - - -Game/include/TitleState.h + +Node34->Node26 + + + + +Node35 + + +Engine/include/Game.h - -Node33->Node40 - - + +Node34->Node35 + + - -Node34->Node17 - - + +Node41 + + +Game/include/TitleState.h + - -Node34->Node18 - - - -Node34->Node19 - - + +Node34->Node41 + + - -Node34->Node23 - - + +Node35->Node12 + + - -Node34->Node24 - - + +Node35->Node13 + + - -Node34->Node27 - - + +Node35->Node19 + + - -Node34->Node35 - - + +Node35->Node23 + + - -Node37 - - -Engine/src/Game.cpp - + +Node35->Node25 + + + +Node35->Node28 + + - -Node34->Node37 - - + +Node35->Node36 + + Node38 - - -Engine/src/Resources.cpp + + +Engine/src/Game.cpp - -Node34->Node38 - - + +Node35->Node38 + + Node39 - - -Game/src/main.cpp + + +Engine/src/Resources.cpp - -Node34->Node39 - - - - -Node35->Node15 - - + +Node35->Node39 + + - -Node36 - - -Engine/src/Text.cpp + +Node40 + + +Game/src/main.cpp - -Node35->Node36 - - - - -Node40->Node18 - - - - -Node40->Node39 - - - - -Node42->Node14 - - - - -Node43->Node10 - - - - -Node43->Node14 - - - - -Node43->Node15 - - - - -Node43->Node20 - - - - -Node43->Node24 - - - - -Node43->Node29 - - + +Node35->Node40 + + - -Node43->Node32 - - + +Node36->Node10 + + - -Node43->Node40 - - + +Node37 + + +Engine/src/Text.cpp + + + + +Node36->Node37 + + + + +Node41->Node13 + + + + +Node41->Node40 + + + + +Node42->Node9 + + + + +Node42->Node10 + + + + +Node42->Node15 + + + + +Node42->Node20 + + + + +Node42->Node25 + + + + +Node42->Node30 + + + + +Node42->Node33 + + + + +Node42->Node41 + + - -Node44 - - -Engine/include/Tileset.h + +Node43 + + +Engine/include/Tileset.h - -Node43->Node44 - - + +Node42->Node43 + + - -Node44->Node14 - - + +Node43->Node9 + + - -Node44->Node27 - - + +Node43->Node28 + + - -Node44->Node28 - - - - -Node45->Node17 - - + +Node43->Node29 + + + + +Node44->Node12 + + diff --git a/docs/Rect_8h__incl.map b/docs/Rect_8h__incl.map index 073151b5..85b8c9de 100644 --- a/docs/Rect_8h__incl.map +++ b/docs/Rect_8h__incl.map @@ -1,4 +1,4 @@ - + diff --git a/docs/Rect_8h__incl.md5 b/docs/Rect_8h__incl.md5 index 86d5571f..2affc8e8 100644 --- a/docs/Rect_8h__incl.md5 +++ b/docs/Rect_8h__incl.md5 @@ -1 +1 @@ -004b0fe930a09419b10e744371b04284 \ No newline at end of file +2d1212a3c8e13d7b3bdc1bf9184872e2 \ No newline at end of file diff --git a/docs/Rect_8h__incl.svg b/docs/Rect_8h__incl.svg index d519d888..f37e9209 100644 --- a/docs/Rect_8h__incl.svg +++ b/docs/Rect_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Resources.cpp @@ -31,7 +31,7 @@
- + @@ -97,7 +97,8 @@
Gráfico de dependência de inclusões para Resources.cpp:
-
+
+

@@ -133,9 +134,9 @@

Definições e macros

diff --git a/docs/Resources_8cpp__incl.map b/docs/Resources_8cpp__incl.map index bbd2dc43..69953ead 100644 --- a/docs/Resources_8cpp__incl.map +++ b/docs/Resources_8cpp__incl.map @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/Resources_8cpp__incl.md5 b/docs/Resources_8cpp__incl.md5 index 1981a6ea..e3238caa 100644 --- a/docs/Resources_8cpp__incl.md5 +++ b/docs/Resources_8cpp__incl.md5 @@ -1 +1 @@ -fc07794c780ee1fcee3ec9a216609beb \ No newline at end of file +76e09d36b546e92ab429ce84ea293742 \ No newline at end of file diff --git a/docs/Resources_8cpp__incl.svg b/docs/Resources_8cpp__incl.svg index 7f376171..228df999 100644 --- a/docs/Resources_8cpp__incl.svg +++ b/docs/Resources_8cpp__incl.svg @@ -1,318 +1,336 @@ - - + Engine/src/Resources.cpp - + Node1 - -Engine/src/Resources.cpp + +Engine/src/Resources.cpp Node2 - -Resources.h + +Resources.h Node1->Node2 - - + + Node7 - -Error.h + +Error.h Node1->Node7 - - + + Node10 - -Game.h + +Game.h Node1->Node10 - - + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -string + +string Node2->Node4 - - + + Node5 - -unordered_map + +unordered_map Node2->Node5 - - + + Node6 - -memory + +memory Node2->Node6 - - + + Node8 - -iostream + +iostream Node7->Node8 - - + + Node9 - -stdlib.h + +stdlib.h Node7->Node9 - - + + -Node10->Node3 - - +Node10->Node3 + + Node10->Node4 - - + + Node11 - -stack + +stack Node10->Node11 - - + + Node12 - -State.h + +State.h Node10->Node12 - - + + Node14 - -InputManager.h + +InputManager.h -Node10->Node14 - - +Node10->Node14 + + Node15 - -Vec2.h + +Vec2.h -Node10->Node15 - - +Node10->Node15 + + Node12->Node2 - - + + Node12->Node6 - - + + Node13 - -vector + +vector Node12->Node13 - - + + Node12->Node14 - - + + Node17 - -GameObject.h + +GameObject.h Node12->Node17 - - + + Node14->Node3 - - + + Node14->Node5 - - + + Node14->Node15 - - + + Node16 - -cstdint + +cstdint Node14->Node16 - - + + Node15->Node3 - - + + Node17->Node3 - - + + Node17->Node4 - - + + Node17->Node6 - - + + Node17->Node13 - - + + Node18 - -Component.h + +Component.h Node17->Node18 - - + + Node19 - - -Rect.h + + +ComponentType.h -Node17->Node19 - - - - -Node18->Node17 - - - - -Node19->Node3 - - - - -Node19->Node15 - - +Node17->Node19 + + Node20 - -cmath + + +Rect.h + + - -Node19->Node20 - - + +Node17->Node20 + + + + +Node18->Node17 + + + + +Node18->Node19 + + + + +Node20->Node3 + + + + +Node20->Node15 + + + + +Node21 + +cmath + + +Node20->Node21 + + diff --git a/docs/Resources_8h.html b/docs/Resources_8h.html index b334c6f8..5471e0d1 100644 --- a/docs/Resources_8h.html +++ b/docs/Resources_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Resources.h @@ -31,7 +31,7 @@
- + @@ -99,12 +99,14 @@
Gráfico de dependência de inclusões para Resources.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -176,9 +178,9 @@

Definições e macros

diff --git a/docs/Resources_8h__dep__incl.map b/docs/Resources_8h__dep__incl.map index 3328da32..ba8ecdb8 100644 --- a/docs/Resources_8h__dep__incl.map +++ b/docs/Resources_8h__dep__incl.map @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + diff --git a/docs/Resources_8h__dep__incl.md5 b/docs/Resources_8h__dep__incl.md5 index 42aa5176..7536622a 100644 --- a/docs/Resources_8h__dep__incl.md5 +++ b/docs/Resources_8h__dep__incl.md5 @@ -1 +1 @@ -0f75daddad7176ae793a846e52907d8e \ No newline at end of file +169607d74e5ebb1ae0e5d4779d0ac69e \ No newline at end of file diff --git a/docs/Resources_8h__dep__incl.svg b/docs/Resources_8h__dep__incl.svg index 41b942a2..4611812e 100644 --- a/docs/Resources_8h__dep__incl.svg +++ b/docs/Resources_8h__dep__incl.svg @@ -1,351 +1,351 @@ - - + Engine/include/Resources.h - + Node1 - -Engine/include/Resources.h + +Engine/include/Resources.h Node2 - -Engine/include/State.h + +Engine/include/State.h Node1->Node2 - - + + Node4 - -Engine/include/Text.h + +Engine/include/Text.h Node1->Node4 - - + + Node12 - -Engine/src/Game.cpp + +Engine/src/Game.cpp Node1->Node12 - - + + Node13 - -Engine/src/Resources.cpp + +Engine/src/Resources.cpp Node1->Node13 - - + + Node14 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp Node1->Node14 - - + + Node20 - -Engine/include/Music.h + +Engine/include/Music.h Node1->Node20 - - + + Node22 - -Engine/src/Sound.cpp + +Engine/src/Sound.cpp Node1->Node22 - - + + Node3 - -Engine/include/Game.h + +Engine/include/Game.h Node2->Node3 - - + + Node7 - -Game/include/StageState.h + +Game/include/StageState.h Node2->Node7 - - + + Node18 - -Engine/src/State.cpp + +Engine/src/State.cpp Node2->Node18 - - + + Node19 - -Game/include/TitleState.h + +Game/include/TitleState.h Node2->Node19 - - + + Node3->Node4 - - + + Node8 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node3->Node8 - - + + Node9 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node3->Node9 - - + + Node11 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp Node3->Node11 - - + + Node3->Node12 - - + + Node3->Node13 - - + + Node3->Node14 - - + + Node15 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp Node3->Node15 - - + + Node16 - -Game/src/main.cpp + +Game/src/main.cpp Node3->Node16 - - + + Node17 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node3->Node17 - - + + Node5 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node4->Node5 - - + + Node6 - -Game/include/EndState.h + +Game/include/EndState.h Node4->Node6 - - + + Node6->Node7 - - + + Node10 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node6->Node10 - - + + Node7->Node6 - - + + Node7->Node8 - - + + Node7->Node9 - - + + Node19->Node9 - - + + Node19->Node16 - - + + Node20->Node6 - - + + Node20->Node7 - - + + Node21 - -Engine/src/Music.cpp + +Engine/src/Music.cpp Node20->Node21 - - + + diff --git a/docs/Resources_8h__incl.md5 b/docs/Resources_8h__incl.md5 index a5b2549a..ea5ae3d6 100644 --- a/docs/Resources_8h__incl.md5 +++ b/docs/Resources_8h__incl.md5 @@ -1 +1 @@ -347ed1b95bb3d71c31ee399c20be4879 \ No newline at end of file +5f677e1bb013baf8997ba6c9e5e38234 \ No newline at end of file diff --git a/docs/Resources_8h__incl.svg b/docs/Resources_8h__incl.svg index 58731609..c92a2f83 100644 --- a/docs/Resources_8h__incl.svg +++ b/docs/Resources_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/SDL_include.h @@ -31,7 +31,7 @@
- + @@ -92,14 +92,15 @@
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 4f060317..9ddc781b 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 413176c7..e16d00cf 100644 --- a/docs/SDL__include_8h__dep__incl.md5 +++ b/docs/SDL__include_8h__dep__incl.md5 @@ -1 +1 @@ -8253488cd7d89b92f43ceb35f2067a0d \ No newline at end of file +a6855afee9bb2a96b98a609ad7017aee \ 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 5fd42739..49ba0726 100644 --- a/docs/SDL__include_8h__dep__incl.svg +++ b/docs/SDL__include_8h__dep__incl.svg @@ -1,1066 +1,1066 @@ - - - + + 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 - - + + - -Node21 - - -Engine/include/Sprite.h + +Node23 + + +Engine/include/Sprite.h - -Node1->Node21 - - + +Node1->Node23 + + - -Node31 - - -Engine/include/Game.h + +Node33 + + +Engine/include/Game.h - -Node1->Node31 - - + +Node1->Node33 + + - -Node32 - - -Engine/include/Text.h + +Node34 + + +Engine/include/Text.h - -Node1->Node32 - - + +Node1->Node34 + + - -Node36 - - -Engine/include/Music.h + +Node38 + + +Engine/include/Music.h - -Node1->Node36 - - + +Node1->Node38 + + - -Node39 - - -Engine/include/Vec2.h + +Node41 + + +Engine/include/Vec2.h - -Node1->Node39 - - + +Node1->Node41 + + - -Node40 - - -Engine/include/Rect.h + +Node42 + + +Engine/include/Rect.h - -Node1->Node40 - - + +Node1->Node42 + + - -Node41 - - -Engine/include/GameObject.h + +Node43 + + +Engine/include/GameObject.h - -Node1->Node41 - - + +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 - - +Node2->Node6 + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp -Node2->Node7 - - +Node2->Node7 + + - -Node10 - - -Engine/src/TileMap.cpp + +Node11 + + +Engine/src/TileMap.cpp - -Node2->Node10 - - + +Node2->Node11 + + - -Node15 - - -Game/src/TitleState.cpp + +Node16 + + +Game/src/TitleState.cpp - -Node2->Node15 - - + +Node2->Node16 + + - -Node17 - - -Game/include/StageState.h + +Node19 + + +Game/include/StageState.h - -Node2->Node17 - - + +Node2->Node19 + + - -Node18 - - -Game/include/EndState.h + +Node20 + + +Game/include/EndState.h - -Node2->Node18 - - + +Node2->Node20 + + - -Node2->Node21 - - + +Node2->Node23 + + - -Node26 - - -Game/src/WaveManager.cpp + +Node28 + + +Game/src/WaveManager.cpp - -Node2->Node26 - - + +Node2->Node28 + + - -Node30 - - -Engine/include/State.h + +Node32 + + +Engine/include/State.h - -Node2->Node30 - - + +Node2->Node32 + + - -Node2->Node31 - - + +Node2->Node33 + + - -Node2->Node36 - - + +Node2->Node38 + + - -Node38 - - -Engine/src/InputManager.cpp + +Node40 + + +Engine/src/InputManager.cpp - -Node2->Node38 - - + +Node2->Node40 + + Node4 - -Engine/include/Camera.h + +Engine/include/Camera.h Node3->Node4 - - + + - -Node16 - - -Engine/src/ActionManager.cpp + +Node18 + + +Engine/src/ActionManager.cpp - -Node3->Node16 - - + +Node3->Node18 + + - -Node3->Node17 - - + +Node3->Node19 + + - -Node19 - - -Game/include/TitleState.h + +Node21 + + +Game/include/TitleState.h - -Node3->Node19 - - + +Node3->Node21 + + Node5 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node4->Node5 - - + + Node4->Node6 - - + + Node4->Node7 - - + + Node8 - - -Engine/src/Sprite.cpp + + +Engine/src/GameObject.cpp Node4->Node8 - - + + Node9 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node4->Node9 - - - - -Node4->Node10 - - + + - -Node11 - - -Engine/src/Tileset.cpp + +Node10 + + +Engine/src/State.cpp + +Node4->Node10 + + + Node4->Node11 - - + + Node12 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node4->Node12 - - + + Node13 - - -Game/src/Enemy.cpp + + +Game/src/EndState.cpp Node4->Node13 - - + + Node14 - - -Game/src/StageState.cpp + + +Game/src/Enemy.cpp Node4->Node14 - - + + + + +Node15 + + +Game/src/StageState.cpp + + Node4->Node15 - - - - -Node17->Node14 - - - - -Node17->Node15 - - - - -Node17->Node18 - - - - -Node18->Node12 - - - - -Node18->Node17 - - + + - -Node19->Node15 - - + +Node4->Node16 + + - -Node20 - - -Game/src/main.cpp + +Node17 + + +Game/src/Tower.cpp + +Node4->Node17 + + + + +Node19->Node15 + + + + +Node19->Node16 + + + -Node19->Node20 - - - - -Node21->Node8 - - - - -Node21->Node17 - - - - -Node21->Node18 - - - - -Node21->Node19 - - +Node19->Node20 + + - -Node22 - - -Engine/include/Animation.h - + +Node20->Node13 + + + +Node20->Node19 + + - -Node21->Node22 - - + +Node21->Node16 + + - -Node23 - - -Engine/include/Tileset.h + +Node22 + + +Game/src/main.cpp - -Node21->Node23 - - + +Node21->Node22 + + + + +Node23->Node9 + + + + +Node23->Node19 + + + + +Node23->Node20 + + + + +Node23->Node21 + + - -Node27 - - -Game/include/Enemy.h + +Node24 + + +Engine/include/Animation.h - -Node21->Node27 - - + +Node23->Node24 + + - -Node28 - - -Game/include/Tower.h + +Node25 + + +Engine/include/Tileset.h - -Node21->Node28 - - + +Node23->Node25 + + Node29 - - -Engine/include/HitPoints.h + + +Game/include/Enemy.h - -Node21->Node29 - - + +Node23->Node29 + + - -Node22->Node5 - - + +Node30 + + +Game/include/Tower.h + - -Node23->Node11 - - - -Node23->Node17 - - + +Node23->Node30 + + - -Node24 - - -Engine/include/TileMap.h + +Node31 + + +Engine/include/HitPoints.h - -Node23->Node24 - - + +Node23->Node31 + + - -Node24->Node10 - - + +Node24->Node5 + + - -Node24->Node17 - - + +Node25->Node12 + + - -Node25 - - -Game/include/WaveManager.h + +Node25->Node19 + + + + +Node26 + + +Engine/include/TileMap.h - -Node24->Node25 - - + +Node25->Node26 + + - -Node24->Node26 - - + +Node26->Node11 + + - -Node24->Node27 - - + +Node26->Node19 + + - -Node24->Node28 - - + +Node27 + + +Game/include/WaveManager.h + - -Node25->Node17 - - - -Node25->Node26 - - - - -Node27->Node13 - - - - -Node27->Node14 - - - - -Node27->Node26 - - - - -Node28->Node14 - - - - -Node29->Node13 - - - - -Node30->Node9 - - + +Node26->Node27 + + + + +Node26->Node28 + + + + +Node26->Node29 + + + + +Node26->Node30 + + + + +Node27->Node19 + + + + +Node27->Node28 + + + + +Node29->Node14 + + + + +Node29->Node15 + + + + +Node29->Node28 + + + + +Node30->Node15 + + -Node30->Node17 - - - - -Node30->Node19 - - - - -Node30->Node31 - - - - -Node31->Node6 - - - - -Node31->Node8 - - - - -Node31->Node11 - - +Node30->Node17 + + -Node31->Node14 - - - - -Node31->Node15 - - - - -Node31->Node20 - - - - -Node31->Node26 - - - - -Node31->Node32 - - +Node31->Node14 + + - -Node34 - - -Engine/src/Game.cpp + +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 - -Node31->Node34 - - + +Node33->Node36 + + - -Node35 - - -Engine/src/Resources.cpp + +Node37 + + +Engine/src/Resources.cpp - -Node31->Node35 - - + +Node33->Node37 + + - -Node32->Node18 - - + +Node34->Node20 + + - -Node33 - - -Engine/src/Text.cpp + +Node35 + + +Engine/src/Text.cpp - -Node32->Node33 - - + +Node34->Node35 + + - -Node36->Node17 - - + +Node38->Node19 + + - -Node36->Node18 - - + +Node38->Node20 + + - -Node37 - - -Engine/src/Music.cpp + +Node39 + + +Engine/src/Music.cpp - -Node36->Node37 - - + +Node38->Node39 + + - -Node39->Node2 - - + +Node41->Node2 + + - -Node39->Node4 - - + +Node41->Node4 + + - -Node39->Node24 - - + +Node41->Node26 + + - -Node39->Node26 - - + +Node41->Node28 + + - -Node39->Node28 - - + +Node41->Node30 + + - -Node39->Node31 - - + +Node41->Node33 + + - -Node39->Node40 - - + +Node41->Node42 + + Node47 - -Engine/src/Vec2.cpp + +Engine/src/Vec2.cpp - -Node39->Node47 - - + +Node41->Node47 + + - -Node40->Node21 - - + +Node42->Node23 + + - -Node40->Node27 - - + +Node42->Node29 + + - -Node40->Node28 - - + +Node42->Node30 + + - -Node40->Node32 - - + +Node42->Node34 + + - -Node40->Node41 - - - - -Node44 - - -Game/include/EmptyGameObject.h - - - - -Node40->Node44 - - + +Node42->Node43 + + Node45 - -Engine/include/Collision.h + +Engine/include/Collision.h - -Node40->Node45 - - + +Node42->Node45 + + Node46 - -Engine/src/Rect.cpp + +Engine/src/Rect.cpp - -Node40->Node46 - - + +Node42->Node46 + + + + +Node43->Node4 + + + + +Node43->Node8 + + + + +Node43->Node19 + + + + +Node43->Node20 + + + + +Node43->Node24 + + + + +Node43->Node26 + + + + +Node43->Node27 + + + + +Node43->Node29 + + + + +Node43->Node30 + + + + +Node43->Node32 + + - -Node41->Node4 - - - - -Node41->Node17 - - - - -Node41->Node18 - - - - -Node41->Node22 - - - - -Node41->Node24 - - - - -Node41->Node25 - - - - -Node41->Node27 - - - - -Node41->Node28 - - - - -Node41->Node30 - - - - -Node42 - - -Engine/include/Component.h + +Node44 + + +Engine/include/Component.h - -Node41->Node42 - - + +Node43->Node44 + + - -Node43 - - -Engine/src/GameObject.cpp - + +Node44->Node27 + + + +Node44->Node31 + + - -Node41->Node43 - - + +Node44->Node43 + + - -Node41->Node44 - - + +Node45->Node15 + + - -Node42->Node25 - - - - -Node42->Node29 - - - - -Node42->Node41 - - - - -Node44->Node17 - - - - -Node45->Node14 - - - - -Node48->Node8 - - - - -Node48->Node30 - - + +Node48->Node9 + + -Node48->Node32 - - +Node48->Node32 + + -Node48->Node34 - - - - -Node48->Node35 - - +Node48->Node34 + + -Node48->Node36 - - +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 bc0dbe04..86c47b5f 100644 --- a/docs/Sound_8cpp.html +++ b/docs/Sound_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Sound.cpp @@ -31,7 +31,7 @@ - + @@ -94,14 +94,15 @@
Gráfico de dependência de inclusões para Sound.cpp:
-
+
+
diff --git a/docs/Sound_8cpp__incl.map b/docs/Sound_8cpp__incl.map index c554b38f..8e97b53d 100644 --- a/docs/Sound_8cpp__incl.map +++ b/docs/Sound_8cpp__incl.map @@ -1,5 +1,5 @@ - + diff --git a/docs/Sound_8cpp__incl.md5 b/docs/Sound_8cpp__incl.md5 index ad425678..a3df7a35 100644 --- a/docs/Sound_8cpp__incl.md5 +++ b/docs/Sound_8cpp__incl.md5 @@ -1 +1 @@ -68b0e5da91815c138b5492d1e7d2ba63 \ No newline at end of file +3f679acb6d2bd7262d8eb403f15e840e \ No newline at end of file diff --git a/docs/Sound_8cpp__incl.svg b/docs/Sound_8cpp__incl.svg index d6b39a8f..7f613dce 100644 --- a/docs/Sound_8cpp__incl.svg +++ b/docs/Sound_8cpp__incl.svg @@ -1,14 +1,14 @@ - - + Engine/src/Sound.cpp - + Node1 diff --git a/docs/Sound_8h.html b/docs/Sound_8h.html index 5eff81e2..59c0c572 100644 --- a/docs/Sound_8h.html +++ b/docs/Sound_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Sound.h @@ -31,7 +31,7 @@ - + @@ -98,12 +98,14 @@
Gráfico de dependência de inclusões para Sound.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -161,9 +163,9 @@

Definições e macros

diff --git a/docs/Sound_8h__dep__incl.map b/docs/Sound_8h__dep__incl.map index e59d5658..9a40066c 100644 --- a/docs/Sound_8h__dep__incl.map +++ b/docs/Sound_8h__dep__incl.map @@ -1,3 +1,3 @@ - + diff --git a/docs/Sound_8h__dep__incl.md5 b/docs/Sound_8h__dep__incl.md5 index d5ea369b..61583fe7 100644 --- a/docs/Sound_8h__dep__incl.md5 +++ b/docs/Sound_8h__dep__incl.md5 @@ -1 +1 @@ -bde481434dc7f9ee4f0519dd8d1a2fa1 \ No newline at end of file +4d0cb77b7292c60c37682e09199f672a \ No newline at end of file diff --git a/docs/Sound_8h__dep__incl.svg b/docs/Sound_8h__dep__incl.svg index bce2a3da..b5f7ef31 100644 --- a/docs/Sound_8h__dep__incl.svg +++ b/docs/Sound_8h__dep__incl.svg @@ -1,31 +1,31 @@ - - + Engine/include/Sound.h - + Node1 - -Engine/include/Sound.h + +Engine/include/Sound.h Node2 - -Engine/src/Sound.cpp + +Engine/src/Sound.cpp Node1->Node2 - - + + diff --git a/docs/Sound_8h__incl.md5 b/docs/Sound_8h__incl.md5 index 64817ec8..9a1cfe94 100644 --- a/docs/Sound_8h__incl.md5 +++ b/docs/Sound_8h__incl.md5 @@ -1 +1 @@ -05a37208bb3bbe26817f0cbe9d5dc16b \ No newline at end of file +aa4c6351c6617248d7e5ee2c1fbe370c \ No newline at end of file diff --git a/docs/Sound_8h__incl.svg b/docs/Sound_8h__incl.svg index c2284138..83e99234 100644 --- a/docs/Sound_8h__incl.svg +++ b/docs/Sound_8h__incl.svg @@ -1,14 +1,14 @@ - - + Engine/include/Sound.h - + Node1 diff --git a/docs/Sprite_8cpp.html b/docs/Sprite_8cpp.html index 97f3a0f6..268ed19a 100644 --- a/docs/Sprite_8cpp.html +++ b/docs/Sprite_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Sprite.cpp @@ -31,7 +31,7 @@
- + @@ -99,7 +99,8 @@
Gráfico de dependência de inclusões para Sprite.cpp:
-
+
+

@@ -151,9 +152,9 @@

Definições e macros

diff --git a/docs/Sprite_8cpp__incl.map b/docs/Sprite_8cpp__incl.map index 16ea8670..633894bb 100644 --- a/docs/Sprite_8cpp__incl.map +++ b/docs/Sprite_8cpp__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/Sprite_8cpp__incl.md5 b/docs/Sprite_8cpp__incl.md5 index 655398a5..67b73d39 100644 --- a/docs/Sprite_8cpp__incl.md5 +++ b/docs/Sprite_8cpp__incl.md5 @@ -1 +1 @@ -45a754d8be5cb09de755799d5d3326c6 \ No newline at end of file +05fd1680e54821797dc3075a474f080a \ No newline at end of file diff --git a/docs/Sprite_8cpp__incl.svg b/docs/Sprite_8cpp__incl.svg index 3a133663..36e11c19 100644 --- a/docs/Sprite_8cpp__incl.svg +++ b/docs/Sprite_8cpp__incl.svg @@ -1,410 +1,428 @@ - - + Engine/src/Sprite.cpp - + Node1 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp Node2 - -Sprite.h + +Sprite.h Node1->Node2 - - + + Node13 - -Camera.h + +Camera.h Node1->Node13 - - + + - -Node18 - - -Error.h + +Node19 + + +Error.h - -Node1->Node18 - - + +Node1->Node19 + + - -Node21 - - -Game.h + +Node22 + + +Game.h - -Node1->Node21 - - + +Node1->Node22 + + - -Node24 - - -Resources.h + +Node25 + + +Resources.h - -Node1->Node24 - - + +Node1->Node25 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -string + +string Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -Color.h + +Color.h Node2->Node6 - - + + Node7 - -Rect.h + +Rect.h Node2->Node7 - - + + Node10 - -InputManager.h + +InputManager.h Node2->Node10 - - + + Node7->Node3 - - + + Node8 - -Vec2.h + +Vec2.h Node7->Node8 - - + + Node9 - -cmath + +cmath Node7->Node9 - - + + Node8->Node3 - - + + Node10->Node3 - - + + Node10->Node8 - - + + Node11 - -unordered_map + +unordered_map Node10->Node11 - - + + Node12 - -cstdint + +cstdint Node10->Node12 - - + + -Node13->Node8 - - +Node13->Node8 + + Node14 - -GameObject.h + +GameObject.h Node13->Node14 - - + + - -Node17 - - -ActionManager.h + +Node18 + + +ActionManager.h - -Node13->Node17 - - + +Node13->Node18 + + Node14->Node3 - - + + Node14->Node4 - - + + Node14->Node5 - - + + -Node14->Node7 - - +Node14->Node7 + + Node15 - -vector + +vector Node14->Node15 - - + + Node16 - -Component.h + +Component.h Node14->Node16 - - + + - -Node16->Node14 - - + +Node17 + + +ComponentType.h + - -Node17->Node10 - - - -Node19 - -iostream + +Node14->Node17 + + + + +Node16->Node14 + + + + +Node16->Node17 + + - -Node18->Node19 - - + +Node18->Node10 + + Node20 - -stdlib.h - - -Node18->Node20 - - - - -Node21->Node3 - - - - -Node21->Node4 - - - - -Node21->Node8 - - - - -Node21->Node10 - - + +iostream - -Node22 - -stack + +Node19->Node20 + + - -Node21->Node22 - - + +Node21 + +stdlib.h + + +Node19->Node21 + + + + +Node22->Node3 + + + + +Node22->Node4 + + + + +Node22->Node8 + + + + +Node22->Node10 + + Node23 - - -State.h - - - - -Node21->Node23 - - - - -Node23->Node5 - - - - -Node23->Node10 - - + +stack - -Node23->Node14 - - + +Node22->Node23 + + - -Node23->Node15 - - - - -Node23->Node24 - - + +Node24 + + +State.h + - -Node24->Node3 - - - -Node24->Node4 - - + +Node22->Node24 + + -Node24->Node5 - - - - -Node24->Node11 - - +Node24->Node5 + + + + +Node24->Node10 + + + + +Node24->Node14 + + + + +Node24->Node15 + + + + +Node24->Node25 + + + + +Node25->Node3 + + + + +Node25->Node4 + + + + +Node25->Node5 + + + + +Node25->Node11 + + diff --git a/docs/Sprite_8h.html b/docs/Sprite_8h.html index 75d074c8..c1e438eb 100644 --- a/docs/Sprite_8h.html +++ b/docs/Sprite_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Sprite.h @@ -31,7 +31,7 @@
- + @@ -101,12 +101,14 @@
Gráfico de dependência de inclusões para Sprite.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -192,9 +194,9 @@

Definições e macros

diff --git a/docs/Sprite_8h__dep__incl.map b/docs/Sprite_8h__dep__incl.map index f5d90b42..3faec578 100644 --- a/docs/Sprite_8h__dep__incl.map +++ b/docs/Sprite_8h__dep__incl.map @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Sprite_8h__dep__incl.md5 b/docs/Sprite_8h__dep__incl.md5 index 2433ec85..551d79f2 100644 --- a/docs/Sprite_8h__dep__incl.md5 +++ b/docs/Sprite_8h__dep__incl.md5 @@ -1 +1 @@ -13056ae5d26002abba687c0043d43c64 \ No newline at end of file +5329a368d7c7e4a5714fb4c46e040e64 \ No newline at end of file diff --git a/docs/Sprite_8h__dep__incl.svg b/docs/Sprite_8h__dep__incl.svg index 4cf7b7e5..7b1492e0 100644 --- a/docs/Sprite_8h__dep__incl.svg +++ b/docs/Sprite_8h__dep__incl.svg @@ -1,431 +1,436 @@ - - + Engine/include/Sprite.h - + Node1 - -Engine/include/Sprite.h + +Engine/include/Sprite.h Node2 - -Engine/include/Animation.h + +Engine/include/Animation.h Node1->Node2 - - + + Node4 - -Engine/include/Tileset.h + +Engine/include/Tileset.h Node1->Node4 - - + + - -Node10 - - -Game/include/StageState.h + +Node8 + + +Game/include/StageState.h - -Node1->Node10 - - + +Node1->Node8 + + - -Node11 - - -Game/include/EndState.h + +Node9 + + +Game/include/EndState.h - -Node1->Node11 - - + +Node1->Node9 + + Node17 - -Game/include/Enemy.h + +Game/include/Enemy.h -Node1->Node17 - - +Node1->Node17 + + Node21 - -Game/include/Tower.h + +Game/include/Tower.h -Node1->Node21 - - +Node1->Node21 + + Node23 - -Engine/include/HitPoints.h + +Engine/include/HitPoints.h -Node1->Node23 - - +Node1->Node23 + + Node25 - -Engine/src/Sprite.cpp + +Engine/src/Sprite.cpp -Node1->Node25 - - +Node1->Node25 + + Node26 - -Game/include/TitleState.h + +Game/include/TitleState.h -Node1->Node26 - - +Node1->Node26 + + Node3 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node2->Node3 - - + + Node5 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node4->Node5 - - + + - -Node4->Node10 - - + +Node4->Node8 + + Node22 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp -Node4->Node22 - - +Node4->Node22 + + Node6 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node5->Node6 - - + + - -Node9 - - -Engine/src/TileMap.cpp - + +Node5->Node8 + + + +Node14 + + +Engine/src/TileMap.cpp + - -Node5->Node9 - - - -Node5->Node10 - - + +Node5->Node14 + + Node15 - -Game/include/WaveManager.h + +Game/include/WaveManager.h -Node5->Node15 - - +Node5->Node15 + + Node16 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp -Node5->Node16 - - +Node5->Node16 + + -Node5->Node17 - - +Node5->Node17 + + -Node5->Node21 - - +Node5->Node21 + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node6->Node7 - - - - -Node8 - - -Game/src/Tower.cpp - - + + Node6->Node8 - - - - -Node10->Node11 - - + + Node13 - - -Game/src/StageState.cpp + + +Game/src/Tower.cpp - -Node10->Node13 - - + +Node6->Node13 + + - -Node14 - - -Game/src/TitleState.cpp - + +Node8->Node9 + + + +Node11 + + +Game/src/StageState.cpp + - -Node10->Node14 - - - -Node11->Node10 - - + +Node8->Node11 + + Node12 - - -Game/src/EndState.cpp + + +Game/src/TitleState.cpp + + + + +Node8->Node12 + + + + +Node9->Node8 + + + + +Node10 + + +Game/src/EndState.cpp - -Node11->Node12 - - + +Node9->Node10 + + - -Node15->Node10 - - + +Node15->Node8 + + -Node15->Node16 - - +Node15->Node16 + + - -Node17->Node13 - - + +Node17->Node11 + + -Node17->Node16 - - +Node17->Node16 + + Node18 - -Game/include/GameResources.h + +Game/include/GameResources.h -Node17->Node18 - - +Node17->Node18 + + Node20 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp -Node17->Node20 - - +Node17->Node20 + + -Node18->Node16 - - +Node18->Node16 + + Node19 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp -Node18->Node19 - - +Node18->Node19 + + - -Node21->Node8 - - + +Node21->Node11 + + -Node21->Node13 - - +Node21->Node13 + + -Node23->Node20 - - +Node23->Node20 + + Node24 - -Engine/src/HItPoints.cpp + +Engine/src/HItPoints.cpp -Node23->Node24 - - +Node23->Node24 + + - -Node26->Node14 - - + +Node26->Node12 + + Node27 - -Game/src/main.cpp + +Game/src/main.cpp -Node26->Node27 - - +Node26->Node27 + + diff --git a/docs/Sprite_8h__incl.map b/docs/Sprite_8h__incl.map index 10e7c434..34b54a79 100644 --- a/docs/Sprite_8h__incl.map +++ b/docs/Sprite_8h__incl.map @@ -2,6 +2,6 @@ - - + + diff --git a/docs/Sprite_8h__incl.md5 b/docs/Sprite_8h__incl.md5 index b4409ece..798779fa 100644 --- a/docs/Sprite_8h__incl.md5 +++ b/docs/Sprite_8h__incl.md5 @@ -1 +1 @@ -463f1dd56247fa7225e2a212e97a05a4 \ No newline at end of file +4135909e1b239f1e31f2d8b54b27b715 \ No newline at end of file diff --git a/docs/Sprite_8h__incl.svg b/docs/Sprite_8h__incl.svg index 543b08c2..389b314c 100644 --- a/docs/Sprite_8h__incl.svg +++ b/docs/Sprite_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/StageState.cpp @@ -31,7 +31,7 @@
- + @@ -102,7 +102,8 @@
Gráfico de dependência de inclusões para StageState.cpp:
-
+
+

@@ -238,9 +239,9 @@

Definições e macros

diff --git a/docs/StageState_8cpp__incl.map b/docs/StageState_8cpp__incl.map index 331210be..2a6434db 100644 --- a/docs/StageState_8cpp__incl.map +++ b/docs/StageState_8cpp__incl.map @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/StageState_8cpp__incl.md5 b/docs/StageState_8cpp__incl.md5 index 94f13c19..12b138b5 100644 --- a/docs/StageState_8cpp__incl.md5 +++ b/docs/StageState_8cpp__incl.md5 @@ -1 +1 @@ -3c0399b60f8689155b78b981e40d28fb \ No newline at end of file +ef1cecb141f2219dc7de4f898442eabf \ No newline at end of file diff --git a/docs/StageState_8cpp__incl.svg b/docs/StageState_8cpp__incl.svg index 8e7e076a..246e2818 100644 --- a/docs/StageState_8cpp__incl.svg +++ b/docs/StageState_8cpp__incl.svg @@ -1,908 +1,931 @@ - - + Game/src/StageState.cpp - + Node1 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node2 - -StageState.h + +StageState.h Node1->Node2 - - + + - -Node18 - - -Error.h - - - - -Node1->Node18 - - - - -Node31 - - -EndStateData.h + +Node24 + + +Error.h - -Node1->Node31 - - + +Node1->Node24 + + - -Node35 - - -Game.h + +Node32 + + +EndStateData.h - -Node1->Node35 - - + +Node1->Node32 + + - -Node37 - - -Camera.h + +Node36 + + +Game.h - -Node1->Node37 - - + +Node1->Node36 + + Node38 - - -Collision.h + + +Camera.h -Node1->Node38 - - +Node1->Node38 + + - -Node40 - - -Enemy.h + +Node39 + + +Collision.h - -Node1->Node40 - - + +Node1->Node39 + + Node41 - - -Tower.h + + +Enemy.h -Node1->Node41 - - +Node1->Node41 + + + + +Node42 + + +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 - - +Node2->Node6 + + Node11 - - -GameObject.h + + +DragAndDrop.h Node2->Node11 - - + + - -Node16 - - -Music.h + +Node14 + + +GameObject.h - -Node2->Node16 - - + +Node2->Node14 + + - -Node21 - - -Sprite.h + +Node18 + + +TileMap.h - -Node2->Node21 - - + +Node2->Node18 + + - -Node23 - - -State.h + +Node19 + + +Tileset.h - -Node2->Node23 - - + +Node2->Node19 + + - -Node24 - - -TileMap.h + +Node20 + + +Sprite.h - -Node2->Node24 - - + +Node2->Node20 + + - -Node25 - - -Tileset.h + +Node22 + + +Music.h - -Node2->Node25 - - + +Node2->Node22 + + - -Node26 - - -Timer.h + +Node27 + + +State.h - -Node2->Node26 - - + +Node2->Node27 + + - -Node27 - - -WaveManager.h + +Node28 + + +Timer.h - -Node2->Node27 - - + +Node2->Node28 + + Node29 - - -EmptyGameObject.h + + +WaveManager.h -Node2->Node29 - - +Node2->Node29 + + - -Node30 - - -EndState.h + +Node31 + + +EndState.h - -Node2->Node30 - - + +Node2->Node31 + + Node5->Node6 - - + + Node7 - -SDL_include.h + +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 - - - - -Node11->Node3 - - - - -Node11->Node4 - - - - -Node11->Node7 - - + + Node12 - -string + + +Component.h + + -Node11->Node12 - - +Node11->Node12 + + + + +Node11->Node18 + + Node13 - - -Component.h + + +ComponentType.h - -Node11->Node13 - - - - -Node14 - - -Rect.h - + +Node12->Node13 + + + +Node12->Node14 + + - -Node11->Node14 - - + +Node14->Node3 + + - -Node13->Node11 - - + +Node14->Node4 + + -Node14->Node7 - - +Node14->Node7 + + - -Node14->Node8 - - + +Node14->Node12 + + + + +Node14->Node13 + + Node15 - -cmath + +string -Node14->Node15 - - +Node14->Node15 + + + + +Node16 + + +Rect.h + - -Node16->Node4 - - - -Node16->Node6 - - + +Node14->Node16 + + -Node16->Node7 - - +Node16->Node7 + + - -Node16->Node12 - - + +Node16->Node8 + + Node17 - - -Resources.h + +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 - -Node16->Node17 - - - - -Node16->Node18 - - - - -Node17->Node4 - - - - -Node17->Node7 - - - - -Node17->Node9 - - - - -Node17->Node12 - - + +Node20->Node21 + + - -Node19 - -iostream + +Node22->Node4 + + - -Node18->Node19 - - + +Node22->Node6 + + - -Node20 - -stdlib.h - - -Node18->Node20 - - - - -Node21->Node4 - - - - -Node21->Node6 - - - - -Node21->Node7 - - - - -Node21->Node12 - - - - -Node21->Node14 - - + +Node22->Node7 + + - -Node22 - - -Color.h + +Node22->Node15 + + + + +Node23 + + +Resources.h - -Node21->Node22 - - + +Node22->Node23 + + - -Node23->Node3 - - + +Node22->Node24 + + -Node23->Node4 - - - - -Node23->Node6 - - - - -Node23->Node11 - - - - -Node23->Node17 - - - - -Node24->Node3 - - - - -Node24->Node8 - - - - -Node24->Node11 - - - - -Node24->Node12 - - +Node23->Node4 + + + + +Node23->Node7 + + + + +Node23->Node9 + + + + +Node23->Node15 + + + + +Node25 + +iostream -Node24->Node25 - - +Node24->Node25 + + - -Node25->Node12 - - + +Node26 + +stdlib.h + + +Node24->Node26 + + - -Node25->Node21 - - + +Node27->Node3 + + -Node27->Node4 - - - - -Node27->Node11 - - - - -Node27->Node13 - - - - -Node27->Node18 - - - - -Node27->Node24 - - - - -Node27->Node26 - - +Node27->Node4 + + + + +Node27->Node6 + + + + +Node27->Node14 + + + + +Node27->Node23 + + + + +Node29->Node4 + + + + +Node29->Node12 + + - -Node28 - - -WaveData.h + +Node29->Node14 + + + + +Node29->Node18 + + + + +Node29->Node24 + + + + +Node29->Node28 + + + + +Node30 + + +WaveData.h - -Node27->Node28 - - + +Node29->Node30 + + - -Node28->Node3 - - + +Node30->Node3 + + - -Node28->Node12 - - + +Node30->Node15 + + - -Node28->Node18 - - + +Node30->Node24 + + - -Node29->Node11 - - + +Node31->Node2 + + - -Node29->Node14 - - - - -Node30->Node2 - - - - -Node30->Node6 - - - - -Node30->Node11 - - - - -Node30->Node16 - - - - -Node30->Node21 - - - - -Node30->Node31 - - + +Node31->Node6 + + - -Node34 - - -Text.h - + +Node31->Node14 + + + +Node31->Node20 + + - -Node30->Node34 - - + +Node31->Node22 + + - -Node32 - - -StateData.h + +Node31->Node32 + + + + +Node35 + + +Text.h - -Node31->Node32 - - + +Node31->Node35 + + Node33 - - -Defines.h + + +StateData.h - -Node31->Node33 - - - - -Node34->Node4 - - - - -Node34->Node7 - - - - -Node34->Node12 - - - - -Node34->Node14 - - - - -Node34->Node17 - - - - -Node34->Node18 - - - - -Node34->Node26 - - - - -Node34->Node35 - - - - -Node35->Node6 - - + +Node32->Node33 + + + + +Node34 + + +Defines.h + + + + +Node32->Node34 + + + + +Node35->Node4 + + -Node35->Node7 - - +Node35->Node7 + + - -Node35->Node8 - - + +Node35->Node15 + + - -Node35->Node12 - - + +Node35->Node16 + + -Node35->Node23 - - +Node35->Node23 + + - -Node36 - -stack + +Node35->Node24 + + + + +Node35->Node28 + + Node35->Node36 - - + + + + +Node36->Node6 + + + + +Node36->Node7 + + + + +Node36->Node8 + + + + +Node36->Node15 + + + + +Node36->Node27 + + + + +Node37 + +stack - -Node37->Node5 - - + +Node36->Node37 + + - -Node37->Node8 - - + +Node38->Node5 + + - -Node37->Node11 - - + +Node38->Node8 + + -Node38->Node14 - - +Node38->Node14 + + - -Node38->Node15 - - + +Node39->Node16 + + - -Node39 - -algorithm - - -Node38->Node39 - - - - -Node40->Node11 - - - - -Node40->Node14 - - - - -Node40->Node21 - - - - -Node40->Node24 - - - - -Node40->Node26 - - - - -Node40->Node28 - - - - -Node41->Node8 - - - - -Node41->Node11 - - + +Node39->Node17 + + + + +Node40 + +algorithm + + +Node39->Node40 + + -Node41->Node14 - - +Node41->Node14 + + + + +Node41->Node16 + + + + +Node41->Node18 + + - -Node41->Node21 - - + +Node41->Node20 + + -Node41->Node24 - - +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 69398ad9..b75098c0 100644 --- a/docs/StageState_8h.html +++ b/docs/StageState_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/StageState.h @@ -31,7 +31,7 @@
- + @@ -94,6 +94,7 @@
#include <vector>
#include <memory>
#include "ActionManager.h"
+#include "DragAndDrop.h"
#include "GameObject.h"
#include "InputManager.h"
#include "Music.h"
@@ -103,17 +104,18 @@ #include "Tileset.h"
#include "Timer.h"
#include "WaveManager.h"
-#include "EmptyGameObject.h"
#include "EndState.h"
Gráfico de dependência de inclusões para StageState.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -124,9 +126,9 @@ diff --git a/docs/StageState_8h__dep__incl.map b/docs/StageState_8h__dep__incl.map index 7bfabfd8..68a1570c 100644 --- a/docs/StageState_8h__dep__incl.map +++ b/docs/StageState_8h__dep__incl.map @@ -1,6 +1,6 @@ - + diff --git a/docs/StageState_8h__dep__incl.md5 b/docs/StageState_8h__dep__incl.md5 index 9640527d..ff45d462 100644 --- a/docs/StageState_8h__dep__incl.md5 +++ b/docs/StageState_8h__dep__incl.md5 @@ -1 +1 @@ -6fbcab76dab1f82870c7956e14ad0d75 \ No newline at end of file +bc8ece17eaa484b1433af7ac697ebc79 \ No newline at end of file diff --git a/docs/StageState_8h__dep__incl.svg b/docs/StageState_8h__dep__incl.svg index 100ec60c..def39fb5 100644 --- a/docs/StageState_8h__dep__incl.svg +++ b/docs/StageState_8h__dep__incl.svg @@ -1,14 +1,14 @@ - - + Game/include/StageState.h - + Node1 diff --git a/docs/StageState_8h__incl.map b/docs/StageState_8h__incl.map index 0fb0f3d1..ebc11e2d 100644 --- a/docs/StageState_8h__incl.map +++ b/docs/StageState_8h__incl.map @@ -1,27 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/StageState_8h__incl.md5 b/docs/StageState_8h__incl.md5 index 2b049876..cd4fb2c3 100644 --- a/docs/StageState_8h__incl.md5 +++ b/docs/StageState_8h__incl.md5 @@ -1 +1 @@ -8a3c0e3f87f55126e9ccfec4baa3e16e \ No newline at end of file +28f670228faea320bb0569909eb7db57 \ No newline at end of file diff --git a/docs/StageState_8h__incl.svg b/docs/StageState_8h__incl.svg index 96607e14..1ef84465 100644 --- a/docs/StageState_8h__incl.svg +++ b/docs/StageState_8h__incl.svg @@ -1,738 +1,756 @@ - - + Game/include/StageState.h - + Node1 - -Game/include/StageState.h + +Game/include/StageState.h Node2 - -vector + +vector Node1->Node2 - - + + Node3 - -memory + +memory Node1->Node3 - - + + Node4 - -ActionManager.h + +ActionManager.h Node1->Node4 - - + + Node5 - -InputManager.h + +InputManager.h -Node1->Node5 - - +Node1->Node5 + + Node10 - - -GameObject.h + + +DragAndDrop.h Node1->Node10 - - + + - -Node15 - - -Music.h + +Node13 + + +GameObject.h - -Node1->Node15 - - + +Node1->Node13 + + - -Node20 - - -Sprite.h + +Node17 + + +TileMap.h - -Node1->Node20 - - + +Node1->Node17 + + - -Node22 - - -State.h + +Node18 + + +Tileset.h - -Node1->Node22 - - + +Node1->Node18 + + - -Node23 - - -TileMap.h + +Node19 + + +Sprite.h - -Node1->Node23 - - + +Node1->Node19 + + - -Node24 - - -Tileset.h + +Node21 + + +Music.h - -Node1->Node24 - - + +Node1->Node21 + + - -Node25 - - -Timer.h + +Node26 + + +State.h - -Node1->Node25 - - + +Node1->Node26 + + - -Node26 - - -WaveManager.h + +Node27 + + +Timer.h - -Node1->Node26 - - + +Node1->Node27 + + Node28 - - -EmptyGameObject.h + + +WaveManager.h -Node1->Node28 - - +Node1->Node28 + + - -Node29 - - -EndState.h + +Node30 + + +EndState.h - -Node1->Node29 - - + +Node1->Node30 + + Node4->Node5 - - + + Node6 - -SDL_include.h + +SDL_include.h Node5->Node6 - - + + Node7 - -Vec2.h + +Vec2.h Node5->Node7 - - + + Node8 - -unordered_map + +unordered_map Node5->Node8 - - + + Node9 - -cstdint + +cstdint Node5->Node9 - - + + Node7->Node6 - - - - -Node10->Node2 - - - - -Node10->Node3 - - - - -Node10->Node6 - - + + Node11 - -string + + +Component.h + + -Node10->Node11 - - +Node10->Node11 + + + + +Node10->Node17 + + Node12 - - -Component.h + + +ComponentType.h - -Node10->Node12 - - - - -Node13 - - -Rect.h - + +Node11->Node12 + + + +Node11->Node13 + + - -Node10->Node13 - - + +Node13->Node2 + + - -Node12->Node10 - - + +Node13->Node3 + + -Node13->Node6 - - +Node13->Node6 + + + + +Node13->Node11 + + - -Node13->Node7 - - + +Node13->Node12 + + Node14 - -cmath + +string -Node13->Node14 - - +Node13->Node14 + + + + +Node15 + + +Rect.h + - -Node15->Node3 - - - -Node15->Node5 - - + +Node13->Node15 + + -Node15->Node6 - - +Node15->Node6 + + - -Node15->Node11 - - + +Node15->Node7 + + Node16 - - -Resources.h - - + +cmath -Node15->Node16 - - +Node15->Node16 + + + + +Node17->Node2 + + + + +Node17->Node7 + + + + +Node17->Node13 + + + + +Node17->Node14 + + - -Node17 - - -Error.h + +Node17->Node18 + + + + +Node18->Node14 + + + + +Node18->Node19 + + + + +Node19->Node3 + + + + +Node19->Node5 + + + + +Node19->Node6 + + + + +Node19->Node14 + + + + +Node19->Node15 + + + + +Node20 + + +Color.h - -Node15->Node17 - - + +Node19->Node20 + + - -Node16->Node3 - - + +Node21->Node3 + + - -Node16->Node6 - - + +Node21->Node5 + + - -Node16->Node8 - - + +Node21->Node6 + + - -Node16->Node11 - - + +Node21->Node14 + + - -Node18 - -iostream + +Node22 + + +Resources.h + - -Node17->Node18 - - - -Node19 - -stdlib.h - - -Node17->Node19 - - - - -Node20->Node3 - - - - -Node20->Node5 - - - - -Node20->Node6 - - - - -Node20->Node11 - - - - -Node20->Node13 - - + +Node21->Node22 + + - -Node21 - - -Color.h + +Node23 + + +Error.h - -Node20->Node21 - - - - -Node22->Node2 - - + +Node21->Node23 + + -Node22->Node3 - - - - -Node22->Node5 - - - - -Node22->Node10 - - - - -Node22->Node16 - - - - -Node23->Node2 - - - - -Node23->Node7 - - - - -Node23->Node10 - - - - -Node23->Node11 - - +Node22->Node3 + + + + +Node22->Node6 + + + + +Node22->Node8 + + + + +Node22->Node14 + + + + +Node24 + +iostream -Node23->Node24 - - +Node23->Node24 + + + + +Node25 + +stdlib.h - -Node24->Node11 - - + +Node23->Node25 + + - -Node24->Node20 - - + +Node26->Node2 + + -Node26->Node3 - - - - -Node26->Node10 - - - - -Node26->Node12 - - - - -Node26->Node17 - - - - -Node26->Node23 - - - - -Node26->Node25 - - +Node26->Node3 + + + + +Node26->Node5 + + + + +Node26->Node13 + + + + +Node26->Node22 + + + + +Node28->Node3 + + + + +Node28->Node11 + + - -Node27 - - -WaveData.h - + +Node28->Node13 + + + + +Node28->Node17 + + + +Node28->Node23 + + - -Node26->Node27 - - + +Node28->Node27 + + - -Node27->Node2 - - + +Node29 + + +WaveData.h + - -Node27->Node11 - - - -Node27->Node17 - - + +Node28->Node29 + + - -Node28->Node10 - - + +Node29->Node2 + + - -Node28->Node13 - - - - -Node29->Node1 - - - - -Node29->Node5 - - - - -Node29->Node10 - - - - -Node29->Node15 - - - - -Node29->Node20 - - + +Node29->Node14 + + - -Node30 - - -EndStateData.h - + +Node29->Node23 + + + +Node30->Node1 + + - -Node29->Node30 - - + +Node30->Node5 + + - -Node33 - - -Text.h - + +Node30->Node13 + + + +Node30->Node19 + + - -Node29->Node33 - - + +Node30->Node21 + + Node31 - - -StateData.h + + +EndStateData.h -Node30->Node31 - - +Node30->Node31 + + - -Node32 - - -Defines.h + +Node34 + + +Text.h - -Node30->Node32 - - - - -Node33->Node3 - - + +Node30->Node34 + + - -Node33->Node6 - - - - -Node33->Node11 - - - - -Node33->Node13 - - - - -Node33->Node16 - - + +Node32 + + +StateData.h + - -Node33->Node17 - - - -Node33->Node25 - - + +Node31->Node32 + + - -Node34 - - -Game.h + +Node33 + + +Defines.h - -Node33->Node34 - - + +Node31->Node33 + + - -Node34->Node5 - - + +Node34->Node3 + + -Node34->Node6 - - +Node34->Node6 + + - -Node34->Node7 - - + +Node34->Node14 + + - -Node34->Node11 - - + +Node34->Node15 + + -Node34->Node22 - - +Node34->Node22 + + + + +Node34->Node23 + + + + +Node34->Node27 + + Node35 - -stack + + +Game.h + + Node34->Node35 - - + + + + +Node35->Node5 + + + + +Node35->Node6 + + + + +Node35->Node7 + + + + +Node35->Node14 + + + + +Node35->Node26 + + + + +Node36 + +stack + + +Node35->Node36 + + diff --git a/docs/StateData_8h.html b/docs/StateData_8h.html index 0329a5b2..cc87efa2 100644 --- a/docs/StateData_8h.html +++ b/docs/StateData_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/StateData.h @@ -31,7 +31,7 @@

- + @@ -95,7 +95,8 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -129,9 +130,9 @@

Definições dos tipos

diff --git a/docs/StateData_8h__dep__incl.map b/docs/StateData_8h__dep__incl.map index 603ad05c..19b3d392 100644 --- a/docs/StateData_8h__dep__incl.map +++ b/docs/StateData_8h__dep__incl.map @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/docs/StateData_8h__dep__incl.md5 b/docs/StateData_8h__dep__incl.md5 index 52331add..016778dc 100644 --- a/docs/StateData_8h__dep__incl.md5 +++ b/docs/StateData_8h__dep__incl.md5 @@ -1 +1 @@ -90fcda7bfd4bd80cc1fd289964a067e0 \ No newline at end of file +7ed7dca5ad45e2dc8b240b86c123969f \ No newline at end of file diff --git a/docs/StateData_8h__dep__incl.svg b/docs/StateData_8h__dep__incl.svg index f3a7fc9b..1dd04c66 100644 --- a/docs/StateData_8h__dep__incl.svg +++ b/docs/StateData_8h__dep__incl.svg @@ -1,119 +1,119 @@ - - + Engine/include/StateData.h - + Node1 - -Engine/include/StateData.h + +Engine/include/StateData.h Node2 - -Game/include/EndStateData.h + +Game/include/EndStateData.h Node1->Node2 - - + + Node8 - -Game/src/EndStateData.cpp + +Game/src/EndStateData.cpp Node1->Node8 - - + + Node3 - -Game/include/EndState.h + +Game/include/EndState.h Node2->Node3 - - + + Node5 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node2->Node5 - - + + Node4 - -Game/include/StageState.h + +Game/include/StageState.h Node3->Node4 - - + + Node7 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node3->Node7 - - + + Node4->Node3 - - + + Node4->Node5 - - + + Node6 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node4->Node6 - - + + diff --git a/docs/State_8cpp.html b/docs/State_8cpp.html index d0fc4585..b1d64d81 100644 --- a/docs/State_8cpp.html +++ b/docs/State_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/State.cpp @@ -31,7 +31,7 @@
- + @@ -90,18 +90,20 @@
#include "State.h"
+#include "Error.h"
#include "Camera.h"
Gráfico de dependência de inclusões para State.cpp:
-
+
+
diff --git a/docs/State_8cpp__incl.map b/docs/State_8cpp__incl.map index 0458747d..52d29590 100644 --- a/docs/State_8cpp__incl.map +++ b/docs/State_8cpp__incl.map @@ -1,12 +1,14 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/State_8cpp__incl.md5 b/docs/State_8cpp__incl.md5 index bbae081e..fe509a58 100644 --- a/docs/State_8cpp__incl.md5 +++ b/docs/State_8cpp__incl.md5 @@ -1 +1 @@ -47c88151c127b83fbfd0b30dd4b6302d \ No newline at end of file +3d34ec9ac408a00bdcf9166f60767400 \ No newline at end of file diff --git a/docs/State_8cpp__incl.svg b/docs/State_8cpp__incl.svg index fc24f08f..b13f4e90 100644 --- a/docs/State_8cpp__incl.svg +++ b/docs/State_8cpp__incl.svg @@ -1,278 +1,329 @@ - - + Engine/src/State.cpp - + Node1 - -Engine/src/State.cpp + +Engine/src/State.cpp Node2 - -State.h + +State.h Node1->Node2 - - + + - -Node16 - - -Camera.h + +Node17 + + +Error.h + + + + +Node1->Node17 + + + + +Node20 + + +Camera.h - -Node1->Node16 - - + +Node1->Node20 + + Node3 - -vector + +vector Node2->Node3 - - + + Node4 - -memory + +memory Node2->Node4 - - + + Node5 - -InputManager.h + +InputManager.h Node2->Node5 - - + + Node10 - -Resources.h + +Resources.h Node2->Node10 - - + + Node12 - -GameObject.h + +GameObject.h Node2->Node12 - - + + Node6 - -SDL_include.h + +SDL_include.h Node5->Node6 - - + + Node7 - -Vec2.h + +Vec2.h Node5->Node7 - - + + Node8 - -unordered_map + +unordered_map Node5->Node8 - - + + Node9 - -cstdint + +cstdint Node5->Node9 - - + + Node7->Node6 - - + + Node10->Node4 - - + + Node10->Node6 - - + + Node10->Node8 - - + + Node11 - -string + +string Node10->Node11 - - + + Node12->Node3 - - + + Node12->Node4 - - + + Node12->Node6 - - + + Node12->Node11 - - + + Node13 - -Component.h + +Component.h Node12->Node13 - - + + Node14 - - -Rect.h + + +ComponentType.h -Node12->Node14 - - +Node12->Node14 + + - -Node13->Node12 - - + +Node15 + + +Rect.h + - -Node14->Node6 - - - -Node14->Node7 - - + +Node12->Node15 + + - -Node15 - -cmath + +Node13->Node12 + + - -Node14->Node15 - - + +Node13->Node14 + + - -Node16->Node7 - - + +Node15->Node6 + + - -Node16->Node12 - - + +Node15->Node7 + + - -Node17 - - -ActionManager.h + +Node16 + +cmath + + +Node15->Node16 + + + + +Node18 + +iostream + + +Node17->Node18 + + + + +Node19 + +stdlib.h + + +Node17->Node19 + + + + +Node20->Node7 + + + + +Node20->Node12 + + + + +Node21 + + +ActionManager.h - -Node16->Node17 - - + +Node20->Node21 + + - -Node17->Node5 - - + +Node21->Node5 + + diff --git a/docs/State_8h.html b/docs/State_8h.html index 70c33352..e7bd3eab 100644 --- a/docs/State_8h.html +++ b/docs/State_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/State.h @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Gráfico de dependência de inclusões para State.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -116,9 +118,9 @@ diff --git a/docs/State_8h__dep__incl.map b/docs/State_8h__dep__incl.map index 73ea8662..34adab97 100644 --- a/docs/State_8h__dep__incl.map +++ b/docs/State_8h__dep__incl.map @@ -1,17 +1,17 @@ - + - - - + + + - + diff --git a/docs/State_8h__dep__incl.md5 b/docs/State_8h__dep__incl.md5 index 7be28696..19349644 100644 --- a/docs/State_8h__dep__incl.md5 +++ b/docs/State_8h__dep__incl.md5 @@ -1 +1 @@ -4cdf4b6f3a880cd1c3745555d451c810 \ No newline at end of file +a74595ee68fcac6c7310179a1fe2e062 \ No newline at end of file diff --git a/docs/State_8h__dep__incl.svg b/docs/State_8h__dep__incl.svg index 999e80af..bea24d39 100644 --- a/docs/State_8h__dep__incl.svg +++ b/docs/State_8h__dep__incl.svg @@ -1,14 +1,14 @@ - - + Engine/include/State.h - + Node1 @@ -102,8 +102,8 @@ Node2->Node8 - - + + Node10 @@ -257,8 +257,8 @@ Node18->Node8 - - + + Node18->Node15 diff --git a/docs/State_8h__incl.map b/docs/State_8h__incl.map index a1e9c67d..c0d4b3f1 100644 --- a/docs/State_8h__incl.map +++ b/docs/State_8h__incl.map @@ -1,9 +1,10 @@ - + - - - - - + + + + + + diff --git a/docs/State_8h__incl.md5 b/docs/State_8h__incl.md5 index 30e2371c..3ac2b8c5 100644 --- a/docs/State_8h__incl.md5 +++ b/docs/State_8h__incl.md5 @@ -1 +1 @@ -e23f597c0e8a7a105f911f3156e0d19e \ No newline at end of file +2c4169fd7ce78025efd4513ba98cc7c4 \ No newline at end of file diff --git a/docs/State_8h__incl.svg b/docs/State_8h__incl.svg index a026082f..2a9a77ba 100644 --- a/docs/State_8h__incl.svg +++ b/docs/State_8h__incl.svg @@ -1,224 +1,242 @@ - - + Engine/include/State.h - + Node1 - -Engine/include/State.h + +Engine/include/State.h Node2 - -vector + +vector Node1->Node2 - - + + Node3 - -memory + +memory Node1->Node3 - - + + Node4 - -InputManager.h + +InputManager.h Node1->Node4 - - + + Node9 - -Resources.h + +Resources.h Node1->Node9 - - + + Node11 - -GameObject.h + +GameObject.h Node1->Node11 - - + + Node5 - -SDL_include.h + +SDL_include.h Node4->Node5 - - + + Node6 - -Vec2.h + +Vec2.h Node4->Node6 - - + + Node7 - -unordered_map + +unordered_map Node4->Node7 - - + + Node8 - -cstdint + +cstdint Node4->Node8 - - + + Node6->Node5 - - + + Node9->Node3 - - + + Node9->Node5 - - + + Node9->Node7 - - + + Node10 - -string + +string Node9->Node10 - - + + Node11->Node2 - - + + Node11->Node3 - - + + Node11->Node5 - - + + Node11->Node10 - - + + Node12 - -Component.h + +Component.h Node11->Node12 - - + + Node13 - - -Rect.h + + +ComponentType.h -Node11->Node13 - - - - -Node12->Node11 - - - - -Node13->Node5 - - - - -Node13->Node6 - - +Node11->Node13 + + Node14 - -cmath + + +Rect.h + + - -Node13->Node14 - - + +Node11->Node14 + + + + +Node12->Node11 + + + + +Node12->Node13 + + + + +Node14->Node5 + + + + +Node14->Node6 + + + + +Node15 + +cmath + + +Node14->Node15 + + diff --git a/docs/Text_8cpp.html b/docs/Text_8cpp.html index 5bc2618e..a9cca9e7 100644 --- a/docs/Text_8cpp.html +++ b/docs/Text_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Text.cpp @@ -31,7 +31,7 @@

- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Text.cpp:
-
+
+
diff --git a/docs/Text_8cpp__incl.map b/docs/Text_8cpp__incl.map index 64721f4f..9bd78442 100644 --- a/docs/Text_8cpp__incl.map +++ b/docs/Text_8cpp__incl.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/Text_8cpp__incl.md5 b/docs/Text_8cpp__incl.md5 index 4564f73c..3f6291b3 100644 --- a/docs/Text_8cpp__incl.md5 +++ b/docs/Text_8cpp__incl.md5 @@ -1 +1 @@ -64b2507632684dfcf5dd4f296eb82dda \ No newline at end of file +88152d26c92390798ca9c7981fb6d90b \ No newline at end of file diff --git a/docs/Text_8cpp__incl.svg b/docs/Text_8cpp__incl.svg index 082d1951..b63bb3d8 100644 --- a/docs/Text_8cpp__incl.svg +++ b/docs/Text_8cpp__incl.svg @@ -1,364 +1,382 @@ - - + Engine/src/Text.cpp - + Node1 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node2 - -Text.h + +Text.h Node1->Node2 - - + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -Rect.h + +Rect.h Node2->Node4 - - + + Node7 - -Timer.h + +Timer.h Node2->Node7 - - + + Node8 - -memory + +memory Node2->Node8 - - + + Node9 - -string + +string Node2->Node9 - - + + Node10 - -Resources.h + +Resources.h Node2->Node10 - - + + Node12 - -Game.h + +Game.h Node2->Node12 - - + + - -Node20 - - -Error.h + +Node21 + + +Error.h - -Node2->Node20 - - + +Node2->Node21 + + Node4->Node3 - - + + Node5 - -Vec2.h + +Vec2.h Node4->Node5 - - + + Node6 - -cmath + +cmath Node4->Node6 - - + + Node5->Node3 - - + + Node10->Node3 - - + + Node10->Node8 - - + + Node10->Node9 - - + + Node11 - -unordered_map + +unordered_map Node10->Node11 - - + + -Node12->Node3 - - +Node12->Node3 + + -Node12->Node5 - - +Node12->Node5 + + Node12->Node9 - - + + Node13 - -stack + +stack Node12->Node13 - - + + Node14 - -State.h + +State.h Node12->Node14 - - + + Node16 - -InputManager.h + +InputManager.h -Node12->Node16 - - +Node12->Node16 + + Node14->Node8 - - + + Node14->Node10 - - + + Node15 - -vector + +vector Node14->Node15 - - + + Node14->Node16 - - + + Node18 - -GameObject.h + +GameObject.h Node14->Node18 - - + + Node16->Node3 - - + + Node16->Node5 - - + + Node16->Node11 - - + + Node17 - -cstdint + +cstdint Node16->Node17 - - + + Node18->Node3 - - + + -Node18->Node4 - - +Node18->Node4 + + Node18->Node8 - - + + Node18->Node9 - - + + Node18->Node15 - - + + Node19 - -Component.h + +Component.h Node18->Node19 - - + + - -Node19->Node18 - - + +Node20 + + +ComponentType.h + - -Node21 - -iostream - -Node20->Node21 - - + +Node18->Node20 + + + + +Node19->Node18 + + + + +Node19->Node20 + + Node22 - -stdlib.h - - -Node20->Node22 - - + +iostream + + +Node21->Node22 + + + + +Node23 + +stdlib.h + + +Node21->Node23 + + diff --git a/docs/Text_8h.html b/docs/Text_8h.html index 7ba91b7d..807d7196 100644 --- a/docs/Text_8h.html +++ b/docs/Text_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Text.h @@ -31,7 +31,7 @@ - + @@ -104,12 +104,14 @@
Gráfico de dependência de inclusões para Text.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -245,9 +247,9 @@

Enumerações

diff --git a/docs/Text_8h__dep__incl.map b/docs/Text_8h__dep__incl.map index 24bbda40..53718e3f 100644 --- a/docs/Text_8h__dep__incl.map +++ b/docs/Text_8h__dep__incl.map @@ -1,8 +1,8 @@ - + - + diff --git a/docs/Text_8h__dep__incl.md5 b/docs/Text_8h__dep__incl.md5 index 9daf0cf8..641eb014 100644 --- a/docs/Text_8h__dep__incl.md5 +++ b/docs/Text_8h__dep__incl.md5 @@ -1 +1 @@ -15342e8e03927e2bc52bf6f4dfec7886 \ No newline at end of file +f33102b381cbb2f12bc4308b584db800 \ No newline at end of file diff --git a/docs/Text_8h__dep__incl.svg b/docs/Text_8h__dep__incl.svg index e96cc8c6..08c134fb 100644 --- a/docs/Text_8h__dep__incl.svg +++ b/docs/Text_8h__dep__incl.svg @@ -1,7 +1,7 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/Text_8h__incl.md5 b/docs/Text_8h__incl.md5 index effb928a..7f39b9d6 100644 --- a/docs/Text_8h__incl.md5 +++ b/docs/Text_8h__incl.md5 @@ -1 +1 @@ -a915997276cc94b21ccc6bebca544eff \ No newline at end of file +c5d8c1767803227da192dbb1e5dfcebe \ No newline at end of file diff --git a/docs/Text_8h__incl.svg b/docs/Text_8h__incl.svg index beb5224e..c4f3a9e5 100644 --- a/docs/Text_8h__incl.svg +++ b/docs/Text_8h__incl.svg @@ -1,351 +1,369 @@ - - + Engine/include/Text.h - + Node1 - -Engine/include/Text.h + +Engine/include/Text.h Node2 - -SDL_include.h + +SDL_include.h Node1->Node2 - - + + Node3 - -Rect.h + +Rect.h Node1->Node3 - - + + Node6 - -Timer.h + +Timer.h Node1->Node6 - - + + Node7 - -memory + +memory Node1->Node7 - - + + Node8 - -string + +string Node1->Node8 - - + + Node9 - -Resources.h + +Resources.h Node1->Node9 - - + + Node11 - -Game.h + +Game.h Node1->Node11 - - + + - -Node19 - - -Error.h + +Node20 + + +Error.h - -Node1->Node19 - - + +Node1->Node20 + + Node3->Node2 - - + + Node4 - -Vec2.h + +Vec2.h Node3->Node4 - - + + Node5 - -cmath + +cmath Node3->Node5 - - + + Node4->Node2 - - + + Node9->Node2 - - + + Node9->Node7 - - + + Node9->Node8 - - + + Node10 - -unordered_map + +unordered_map Node9->Node10 - - + + -Node11->Node2 - - +Node11->Node2 + + -Node11->Node4 - - +Node11->Node4 + + Node11->Node8 - - + + Node12 - -stack + +stack Node11->Node12 - - + + Node13 - -State.h + +State.h Node11->Node13 - - + + Node15 - -InputManager.h + +InputManager.h -Node11->Node15 - - +Node11->Node15 + + Node13->Node7 - - + + Node13->Node9 - - + + Node14 - -vector + +vector Node13->Node14 - - + + Node13->Node15 - - + + Node17 - -GameObject.h + +GameObject.h Node13->Node17 - - + + Node15->Node2 - - + + Node15->Node4 - - + + Node15->Node10 - - + + Node16 - -cstdint + +cstdint Node15->Node16 - - + + Node17->Node2 - - + + -Node17->Node3 - - +Node17->Node3 + + Node17->Node7 - - + + Node17->Node8 - - + + Node17->Node14 - - + + Node18 - -Component.h + +Component.h Node17->Node18 - - + + - -Node18->Node17 - - + +Node19 + + +ComponentType.h + - -Node20 - -iostream - -Node19->Node20 - - + +Node17->Node19 + + + + +Node18->Node17 + + + + +Node18->Node19 + + Node21 - -stdlib.h - - -Node19->Node21 - - + +iostream + + +Node20->Node21 + + + + +Node22 + +stdlib.h + + +Node20->Node22 + + diff --git a/docs/TileMap_8cpp.html b/docs/TileMap_8cpp.html index ce02a769..8b09dea7 100644 --- a/docs/TileMap_8cpp.html +++ b/docs/TileMap_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/TileMap.cpp @@ -31,7 +31,7 @@
- + @@ -102,7 +102,8 @@
Gráfico de dependência de inclusões para TileMap.cpp:
-
+
+

@@ -126,9 +127,9 @@

Definições e macros

diff --git a/docs/TileMap_8cpp__incl.map b/docs/TileMap_8cpp__incl.map index a7ac0b23..11dc32f9 100644 --- a/docs/TileMap_8cpp__incl.map +++ b/docs/TileMap_8cpp__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/TileMap_8cpp__incl.md5 b/docs/TileMap_8cpp__incl.md5 index 60c83599..ef84a3bd 100644 --- a/docs/TileMap_8cpp__incl.md5 +++ b/docs/TileMap_8cpp__incl.md5 @@ -1 +1 @@ -b505732a6c05e005b62d91bb3d848daf \ No newline at end of file +b884dfe31d2cbd4f4e1b24dd93b36a60 \ No newline at end of file diff --git a/docs/TileMap_8cpp__incl.svg b/docs/TileMap_8cpp__incl.svg index fc7d39e3..881aba6b 100644 --- a/docs/TileMap_8cpp__incl.svg +++ b/docs/TileMap_8cpp__incl.svg @@ -1,387 +1,405 @@ - - + Engine/src/TileMap.cpp - + Node1 - -Engine/src/TileMap.cpp + +Engine/src/TileMap.cpp Node2 - -TileMap.h + +TileMap.h Node1->Node2 - - + + - -Node15 - - -InputManager.h + +Node16 + + +InputManager.h - -Node1->Node15 - - - - -Node18 - -algorithm - - -Node1->Node18 - - + +Node1->Node16 + + Node19 - -cstdio + +algorithm -Node1->Node19 - - +Node1->Node19 + + Node20 - -exception + +cstdio -Node1->Node20 - - +Node1->Node20 + + Node21 - -iostream + +exception -Node1->Node21 - - +Node1->Node21 + + Node22 - - -Camera.h + +iostream + + +Node1->Node22 + + + + +Node23 + + +Camera.h - -Node1->Node22 - - + +Node1->Node23 + + - -Node24 - - -Error.h + +Node25 + + +Error.h - -Node1->Node24 - - + +Node1->Node25 + + Node3 - -string + +string Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -GameObject.h + +GameObject.h Node2->Node5 - - + + - -Node10 - - -Vec2.h + +Node11 + + +Vec2.h - -Node2->Node10 - - + +Node2->Node11 + + - -Node12 - - -Tileset.h + +Node13 + + +Tileset.h - -Node2->Node12 - - + +Node2->Node13 + + Node5->Node3 - - + + Node5->Node4 - - + + Node6 - -SDL_include.h + +SDL_include.h Node5->Node6 - - + + Node7 - -memory + +memory Node5->Node7 - - + + Node8 - -Component.h + +Component.h Node5->Node8 - - + + Node9 - - -Rect.h + + +ComponentType.h -Node5->Node9 - - +Node5->Node9 + + - -Node8->Node5 - - + +Node10 + + +Rect.h + - -Node9->Node6 - - - -Node9->Node10 - - + +Node5->Node10 + + - -Node11 - -cmath + +Node8->Node5 + + - -Node9->Node11 - - + +Node8->Node9 + + Node10->Node6 - - + + - -Node12->Node3 - - + +Node10->Node11 + + - -Node13 - - -Sprite.h - + +Node12 + +cmath + +Node10->Node12 + + - -Node12->Node13 - - + +Node11->Node6 + + -Node13->Node3 - - - - -Node13->Node6 - - - - -Node13->Node7 - - - - -Node13->Node9 - - +Node13->Node3 + + Node14 - - -Color.h + + +Sprite.h -Node13->Node14 - - +Node13->Node14 + + + + +Node14->Node3 + + + + +Node14->Node6 + + + + +Node14->Node7 + + + + +Node14->Node10 + + + + +Node15 + + +Color.h + - -Node13->Node15 - - - -Node15->Node6 - - + +Node14->Node15 + + - -Node15->Node10 - - + +Node14->Node16 + + - -Node16 - -unordered_map + +Node16->Node6 + + - -Node15->Node16 - - + +Node16->Node11 + + Node17 - -cstdint + +unordered_map - -Node15->Node17 - - + +Node16->Node17 + + - -Node22->Node5 - - + +Node18 + +cstdint - -Node22->Node10 - - + +Node16->Node18 + + - -Node23 - - -ActionManager.h + +Node23->Node5 + + + + +Node23->Node11 + + + + +Node24 + + +ActionManager.h - -Node22->Node23 - - + +Node23->Node24 + + - -Node23->Node15 - - + +Node24->Node16 + + - -Node24->Node21 - - + +Node25->Node22 + + - -Node25 - -stdlib.h + +Node26 + +stdlib.h - -Node24->Node25 - - + +Node25->Node26 + + diff --git a/docs/TileMap_8h.html b/docs/TileMap_8h.html index 201e6a14..d146f7ad 100644 --- a/docs/TileMap_8h.html +++ b/docs/TileMap_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/TileMap.h @@ -31,7 +31,7 @@
- + @@ -100,12 +100,14 @@
Gráfico de dependência de inclusões para TileMap.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -163,9 +165,9 @@

Definições e macros

diff --git a/docs/TileMap_8h__dep__incl.map b/docs/TileMap_8h__dep__incl.map index ce96dad8..c84c6c65 100644 --- a/docs/TileMap_8h__dep__incl.map +++ b/docs/TileMap_8h__dep__incl.map @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/TileMap_8h__dep__incl.md5 b/docs/TileMap_8h__dep__incl.md5 index 0ae0477f..cc2f8a0b 100644 --- a/docs/TileMap_8h__dep__incl.md5 +++ b/docs/TileMap_8h__dep__incl.md5 @@ -1 +1 @@ -a56f8117ea86b49813d2db93fea3d9aa \ No newline at end of file +19da625f1716b9bc1586e8b684cdcfc1 \ No newline at end of file diff --git a/docs/TileMap_8h__dep__incl.svg b/docs/TileMap_8h__dep__incl.svg index d8c3e572..120032a3 100644 --- a/docs/TileMap_8h__dep__incl.svg +++ b/docs/TileMap_8h__dep__incl.svg @@ -1,266 +1,271 @@ - - + Engine/include/TileMap.h - + Node1 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node2 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node1->Node2 - - + + - -Node5 - - -Engine/src/TileMap.cpp + +Node4 + + +Game/include/StageState.h - -Node1->Node5 - - + +Node1->Node4 + + - -Node6 - - -Game/include/StageState.h + +Node10 + + +Engine/src/TileMap.cpp - -Node1->Node6 - - + +Node1->Node10 + + Node11 - -Game/include/WaveManager.h + +Game/include/WaveManager.h -Node1->Node11 - - +Node1->Node11 + + Node12 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp -Node1->Node12 - - +Node1->Node12 + + Node13 - -Game/include/Enemy.h + +Game/include/Enemy.h -Node1->Node13 - - +Node1->Node13 + + Node17 - -Game/include/Tower.h + +Game/include/Tower.h -Node1->Node17 - - +Node1->Node17 + + Node3 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node2->Node3 - - - - -Node4 - - -Game/src/Tower.cpp - - + + Node2->Node4 - - + + - -Node7 - - -Game/include/EndState.h + +Node9 + + +Game/src/Tower.cpp - -Node6->Node7 - - + +Node2->Node9 + + - -Node9 - - -Game/src/StageState.cpp + +Node5 + + +Game/include/EndState.h - -Node6->Node9 - - + +Node4->Node5 + + - -Node10 - - -Game/src/TitleState.cpp + +Node7 + + +Game/src/StageState.cpp - -Node6->Node10 - - - - -Node7->Node6 - - + +Node4->Node7 + + Node8 - - -Game/src/EndState.cpp + + +Game/src/TitleState.cpp + + + + +Node4->Node8 + + + + +Node5->Node4 + + + + +Node6 + + +Game/src/EndState.cpp - -Node7->Node8 - - + +Node5->Node6 + + - -Node11->Node6 - - + +Node11->Node4 + + -Node11->Node12 - - +Node11->Node12 + + - -Node13->Node9 - - + +Node13->Node7 + + -Node13->Node12 - - +Node13->Node12 + + Node14 - -Game/include/GameResources.h + +Game/include/GameResources.h -Node13->Node14 - - +Node13->Node14 + + Node16 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp -Node13->Node16 - - +Node13->Node16 + + -Node14->Node12 - - +Node14->Node12 + + Node15 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp -Node14->Node15 - - +Node14->Node15 + + - -Node17->Node4 - - + +Node17->Node7 + + -Node17->Node9 - - +Node17->Node9 + + diff --git a/docs/TileMap_8h__incl.map b/docs/TileMap_8h__incl.map index 26a36143..403c0123 100644 --- a/docs/TileMap_8h__incl.map +++ b/docs/TileMap_8h__incl.map @@ -1,11 +1,12 @@ - - - - - - - - - + + + + + + + + + + diff --git a/docs/TileMap_8h__incl.md5 b/docs/TileMap_8h__incl.md5 index acdb0114..45c4ad68 100644 --- a/docs/TileMap_8h__incl.md5 +++ b/docs/TileMap_8h__incl.md5 @@ -1 +1 @@ -e3d9e4d1c598eb6eba61d63c9ff6abdb \ No newline at end of file +92799047d3aca39589f1f428d16fc567 \ No newline at end of file diff --git a/docs/TileMap_8h__incl.svg b/docs/TileMap_8h__incl.svg index b82f8d50..4e08ddac 100644 --- a/docs/TileMap_8h__incl.svg +++ b/docs/TileMap_8h__incl.svg @@ -1,260 +1,278 @@ - - + Engine/include/TileMap.h - + Node1 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node2 - -string + +string Node1->Node2 - - + + Node3 - -vector + +vector Node1->Node3 - - + + Node4 - -GameObject.h + +GameObject.h Node1->Node4 - - + + - -Node9 - - -Vec2.h + +Node10 + + +Vec2.h - -Node1->Node9 - - + +Node1->Node10 + + - -Node11 - - -Tileset.h + +Node12 + + +Tileset.h - -Node1->Node11 - - + +Node1->Node12 + + Node4->Node2 - - + + Node4->Node3 - - + + Node5 - -SDL_include.h + +SDL_include.h Node4->Node5 - - + + Node6 - -memory + +memory Node4->Node6 - - + + Node7 - -Component.h + +Component.h Node4->Node7 - - + + Node8 - - -Rect.h + + +ComponentType.h -Node4->Node8 - - +Node4->Node8 + + - -Node7->Node4 - - + +Node9 + + +Rect.h + - -Node8->Node5 - - - -Node8->Node9 - - + +Node4->Node9 + + - -Node10 - -cmath + +Node7->Node4 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node5 - - + + - -Node11->Node2 - - + +Node9->Node10 + + - -Node12 - - -Sprite.h - + +Node11 + +cmath + +Node9->Node11 + + - -Node11->Node12 - - + +Node10->Node5 + + -Node12->Node2 - - - - -Node12->Node5 - - - - -Node12->Node6 - - - - -Node12->Node8 - - +Node12->Node2 + + Node13 - - -Color.h + + +Sprite.h -Node12->Node13 - - +Node12->Node13 + + + + +Node13->Node2 + + + + +Node13->Node5 + + + + +Node13->Node6 + + + + +Node13->Node9 + + Node14 - - -InputManager.h + + +Color.h - -Node12->Node14 - - - - -Node14->Node5 - - - - -Node14->Node9 - - + +Node13->Node14 + + Node15 - -unordered_map + + +InputManager.h + + - -Node14->Node15 - - + +Node13->Node15 + + + + +Node15->Node5 + + + + +Node15->Node10 + + Node16 - -cstdint - - -Node14->Node16 - - + +unordered_map + + +Node15->Node16 + + + + +Node17 + +cstdint + + +Node15->Node17 + + diff --git a/docs/Tileset_8cpp.html b/docs/Tileset_8cpp.html index 6ec8297b..cbcdc5b0 100644 --- a/docs/Tileset_8cpp.html +++ b/docs/Tileset_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Tileset.cpp @@ -31,7 +31,7 @@
- + @@ -98,7 +98,8 @@
Gráfico de dependência de inclusões para Tileset.cpp:
-
+
+

@@ -122,9 +123,9 @@

Definições e macros

diff --git a/docs/Tileset_8cpp__incl.map b/docs/Tileset_8cpp__incl.map index 65c433ad..598a5ce0 100644 --- a/docs/Tileset_8cpp__incl.map +++ b/docs/Tileset_8cpp__incl.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/Tileset_8cpp__incl.md5 b/docs/Tileset_8cpp__incl.md5 index 4a69cae1..5bbb8924 100644 --- a/docs/Tileset_8cpp__incl.md5 +++ b/docs/Tileset_8cpp__incl.md5 @@ -1 +1 @@ -50e4f7e98938401e675ded905481f78d \ No newline at end of file +dcade0a204ce0d55e966127bbd5bcaee \ No newline at end of file diff --git a/docs/Tileset_8cpp__incl.svg b/docs/Tileset_8cpp__incl.svg index 013c26ef..0cdde3f5 100644 --- a/docs/Tileset_8cpp__incl.svg +++ b/docs/Tileset_8cpp__incl.svg @@ -1,423 +1,441 @@ - - + Engine/src/Tileset.cpp - + Node1 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp Node2 - -Tileset.h + +Tileset.h Node1->Node2 - - + + Node14 - -Error.h + +Error.h Node1->Node14 - - + + Node17 - -Game.h + +Game.h Node1->Node17 - - + + - -Node24 - - -Camera.h + +Node25 + + +Camera.h - -Node1->Node24 - - + +Node1->Node25 + + Node3 - -string + +string Node2->Node3 - - + + Node4 - -Sprite.h + +Sprite.h Node2->Node4 - - + + Node4->Node3 - - + + Node5 - -SDL_include.h + +SDL_include.h Node4->Node5 - - + + Node6 - -memory + +memory Node4->Node6 - - + + Node7 - -Color.h + +Color.h Node4->Node7 - - + + Node8 - -Rect.h + +Rect.h Node4->Node8 - - + + Node11 - -InputManager.h + +InputManager.h Node4->Node11 - - + + Node8->Node5 - - + + Node9 - -Vec2.h + +Vec2.h Node8->Node9 - - + + Node10 - -cmath + +cmath Node8->Node10 - - + + Node9->Node5 - - + + Node11->Node5 - - + + Node11->Node9 - - + + Node12 - -unordered_map + +unordered_map Node11->Node12 - - + + Node13 - -cstdint + +cstdint Node11->Node13 - - + + Node15 - -iostream + +iostream Node14->Node15 - - + + Node16 - -stdlib.h + +stdlib.h Node14->Node16 - - + + Node17->Node3 - - + + -Node17->Node5 - - +Node17->Node5 + + -Node17->Node9 - - +Node17->Node9 + + -Node17->Node11 - - +Node17->Node11 + + Node18 - -stack + +stack Node17->Node18 - - + + Node19 - -State.h + +State.h Node17->Node19 - - + + Node19->Node6 - - + + Node19->Node11 - - + + Node20 - -vector + +vector Node19->Node20 - - + + Node21 - -Resources.h + +Resources.h Node19->Node21 - - + + Node22 - -GameObject.h + +GameObject.h Node19->Node22 - - + + Node21->Node3 - - + + Node21->Node5 - - + + Node21->Node6 - - + + Node21->Node12 - - + + Node22->Node3 - - + + Node22->Node5 - - + + Node22->Node6 - - + + -Node22->Node8 - - +Node22->Node8 + + Node22->Node20 - - + + Node23 - -Component.h + +Component.h Node22->Node23 - - + + - -Node23->Node22 - - + +Node24 + + +ComponentType.h + - -Node24->Node9 - - - -Node24->Node22 - - + +Node22->Node24 + + - -Node25 - - -ActionManager.h + +Node23->Node22 + + + + +Node23->Node24 + + + + +Node25->Node9 + + + + +Node25->Node22 + + + + +Node26 + + +ActionManager.h - -Node24->Node25 - - + +Node25->Node26 + + - -Node25->Node11 - - + +Node26->Node11 + + diff --git a/docs/Tileset_8h.html b/docs/Tileset_8h.html index 7788e220..380acbc4 100644 --- a/docs/Tileset_8h.html +++ b/docs/Tileset_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Tileset.h @@ -31,7 +31,7 @@
- + @@ -96,12 +96,14 @@
Gráfico de dependência de inclusões para Tileset.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -113,9 +115,9 @@ diff --git a/docs/Tileset_8h__dep__incl.map b/docs/Tileset_8h__dep__incl.map index ddcb535e..9cd26fe4 100644 --- a/docs/Tileset_8h__dep__incl.map +++ b/docs/Tileset_8h__dep__incl.map @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/Tileset_8h__dep__incl.md5 b/docs/Tileset_8h__dep__incl.md5 index ae0497fd..042b51a5 100644 --- a/docs/Tileset_8h__dep__incl.md5 +++ b/docs/Tileset_8h__dep__incl.md5 @@ -1 +1 @@ -5cf7974d33f6838139b9f69ddf37fa32 \ No newline at end of file +1c057a43848e3e681c7f4d745a1384e9 \ No newline at end of file diff --git a/docs/Tileset_8h__dep__incl.svg b/docs/Tileset_8h__dep__incl.svg index cdb9c9f0..277510ea 100644 --- a/docs/Tileset_8h__dep__incl.svg +++ b/docs/Tileset_8h__dep__incl.svg @@ -1,297 +1,302 @@ - - + Engine/include/Tileset.h - + Node1 - -Engine/include/Tileset.h + +Engine/include/Tileset.h Node2 - -Engine/include/TileMap.h + +Engine/include/TileMap.h Node1->Node2 - - + + - -Node7 - - -Game/include/StageState.h + +Node5 + + +Game/include/StageState.h - -Node1->Node7 - - + +Node1->Node5 + + Node19 - -Engine/src/Tileset.cpp + +Engine/src/Tileset.cpp -Node1->Node19 - - +Node1->Node19 + + Node3 - -Engine/include/DragAndDrop.h + +Engine/include/DragAndDrop.h Node2->Node3 - - + + - -Node6 - - -Engine/src/TileMap.cpp - + +Node2->Node5 + + + +Node11 + + +Engine/src/TileMap.cpp + - -Node2->Node6 - - - -Node2->Node7 - - + +Node2->Node11 + + Node12 - -Game/include/WaveManager.h + +Game/include/WaveManager.h -Node2->Node12 - - +Node2->Node12 + + Node13 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp -Node2->Node13 - - +Node2->Node13 + + Node14 - -Game/include/Enemy.h + +Game/include/Enemy.h -Node2->Node14 - - +Node2->Node14 + + Node18 - -Game/include/Tower.h + +Game/include/Tower.h -Node2->Node18 - - +Node2->Node18 + + Node4 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp Node3->Node4 - - - - -Node5 - - -Game/src/Tower.cpp - - + + Node3->Node5 - - + + - -Node8 - - -Game/include/EndState.h + +Node10 + + +Game/src/Tower.cpp - -Node7->Node8 - - + +Node3->Node10 + + - -Node10 - - -Game/src/StageState.cpp + +Node6 + + +Game/include/EndState.h - -Node7->Node10 - - + +Node5->Node6 + + - -Node11 - - -Game/src/TitleState.cpp + +Node8 + + +Game/src/StageState.cpp - -Node7->Node11 - - - - -Node8->Node7 - - + +Node5->Node8 + + Node9 - - -Game/src/EndState.cpp + + +Game/src/TitleState.cpp + + + + +Node5->Node9 + + + + +Node6->Node5 + + + + +Node7 + + +Game/src/EndState.cpp - -Node8->Node9 - - + +Node6->Node7 + + - -Node12->Node7 - - + +Node12->Node5 + + -Node12->Node13 - - +Node12->Node13 + + - -Node14->Node10 - - + +Node14->Node8 + + -Node14->Node13 - - +Node14->Node13 + + Node15 - -Game/include/GameResources.h + +Game/include/GameResources.h -Node14->Node15 - - +Node14->Node15 + + Node17 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp -Node14->Node17 - - +Node14->Node17 + + -Node15->Node13 - - +Node15->Node13 + + Node16 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp -Node15->Node16 - - +Node15->Node16 + + - -Node18->Node5 - - + +Node18->Node8 + + -Node18->Node10 - - +Node18->Node10 + + diff --git a/docs/Tileset_8h__incl.map b/docs/Tileset_8h__incl.map index b3c6a36e..c887949c 100644 --- a/docs/Tileset_8h__incl.map +++ b/docs/Tileset_8h__incl.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/Tileset_8h__incl.md5 b/docs/Tileset_8h__incl.md5 index ce3aeaea..7038ae47 100644 --- a/docs/Tileset_8h__incl.md5 +++ b/docs/Tileset_8h__incl.md5 @@ -1 +1 @@ -152ee1cadaf144edf0ea5cb88aa9555a \ No newline at end of file +ae51598343d92999ec188fde80dacd10 \ No newline at end of file diff --git a/docs/Tileset_8h__incl.svg b/docs/Tileset_8h__incl.svg index d1a421b6..a50ab405 100644 --- a/docs/Tileset_8h__incl.svg +++ b/docs/Tileset_8h__incl.svg @@ -1,171 +1,171 @@ - - + Engine/include/Tileset.h - + Node1 - -Engine/include/Tileset.h + +Engine/include/Tileset.h Node2 - -string + +string Node1->Node2 - - + + Node3 - -Sprite.h + +Sprite.h Node1->Node3 - - + + Node3->Node2 - - + + Node4 - -SDL_include.h + +SDL_include.h Node3->Node4 - - + + Node5 - -memory + +memory Node3->Node5 - - + + Node6 - -Color.h + +Color.h Node3->Node6 - - + + Node7 - -Rect.h + +Rect.h Node3->Node7 - - + + Node10 - -InputManager.h + +InputManager.h Node3->Node10 - - + + Node7->Node4 - - + + Node8 - -Vec2.h + +Vec2.h Node7->Node8 - - + + Node9 - -cmath + +cmath Node7->Node9 - - + + Node8->Node4 - - + + Node10->Node4 - - + + Node10->Node8 - - + + Node11 - -unordered_map + +unordered_map Node10->Node11 - - + + Node12 - -cstdint + +cstdint Node10->Node12 - - + + diff --git a/docs/Timer_8cpp.html b/docs/Timer_8cpp.html index 0b136bc0..8aa30ea0 100644 --- a/docs/Timer_8cpp.html +++ b/docs/Timer_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Timer.cpp @@ -31,7 +31,7 @@

- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para Timer.cpp:
-
+
+
diff --git a/docs/Timer_8cpp__incl.md5 b/docs/Timer_8cpp__incl.md5 index a6a77a9b..e41be504 100644 --- a/docs/Timer_8cpp__incl.md5 +++ b/docs/Timer_8cpp__incl.md5 @@ -1 +1 @@ -bbf01c184c4590d3c11d98db4fc2f729 \ No newline at end of file +1812ecd3439a9ff04db40b491f1133e9 \ No newline at end of file diff --git a/docs/Timer_8cpp__incl.svg b/docs/Timer_8cpp__incl.svg index 3e5fd73a..e72fb321 100644 --- a/docs/Timer_8cpp__incl.svg +++ b/docs/Timer_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Timer.h @@ -31,7 +31,7 @@ - + @@ -94,7 +94,8 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -106,9 +107,9 @@ diff --git a/docs/Timer_8h__dep__incl.map b/docs/Timer_8h__dep__incl.map index 17570491..38d58446 100644 --- a/docs/Timer_8h__dep__incl.map +++ b/docs/Timer_8h__dep__incl.map @@ -1,18 +1,18 @@ - - - + + + - + - + - - + + diff --git a/docs/Timer_8h__dep__incl.md5 b/docs/Timer_8h__dep__incl.md5 index cdf32e2b..f68a81c6 100644 --- a/docs/Timer_8h__dep__incl.md5 +++ b/docs/Timer_8h__dep__incl.md5 @@ -1 +1 @@ -22359d3a6a670e8c1c3de8befb1a4e87 \ No newline at end of file +aec29abd4a407e1aadc2e479e6f76b35 \ No newline at end of file diff --git a/docs/Timer_8h__dep__incl.svg b/docs/Timer_8h__dep__incl.svg index b3d63803..953ac1d2 100644 --- a/docs/Timer_8h__dep__incl.svg +++ b/docs/Timer_8h__dep__incl.svg @@ -1,14 +1,14 @@ - - + Engine/include/Timer.h - + Node1 @@ -200,8 +200,8 @@ Node14->Node8 - - + + Node14->Node13 diff --git a/docs/TitleState_8cpp.html b/docs/TitleState_8cpp.html index e56b3cf5..e8802951 100644 --- a/docs/TitleState_8cpp.html +++ b/docs/TitleState_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/TitleState.cpp @@ -31,7 +31,7 @@

- + @@ -97,14 +97,15 @@
Gráfico de dependência de inclusões para TitleState.cpp:
-
+
+
diff --git a/docs/TitleState_8cpp__incl.map b/docs/TitleState_8cpp__incl.map index 2ca02957..04f253a6 100644 --- a/docs/TitleState_8cpp__incl.map +++ b/docs/TitleState_8cpp__incl.map @@ -1,30 +1,31 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/TitleState_8cpp__incl.md5 b/docs/TitleState_8cpp__incl.md5 index d3039616..c9ec8202 100644 --- a/docs/TitleState_8cpp__incl.md5 +++ b/docs/TitleState_8cpp__incl.md5 @@ -1 +1 @@ -e94ac116936e0e10dd77eafa7d09f08c \ No newline at end of file +c3ab2092f157a8e990a983dcaaeb0b22 \ No newline at end of file diff --git a/docs/TitleState_8cpp__incl.svg b/docs/TitleState_8cpp__incl.svg index d307fddd..d0ba3d0b 100644 --- a/docs/TitleState_8cpp__incl.svg +++ b/docs/TitleState_8cpp__incl.svg @@ -1,83 +1,83 @@ - - + Game/src/TitleState.cpp - + Node1 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node2 - -TitleState.h + +TitleState.h Node1->Node2 - - + + Node4 - -InputManager.h + +InputManager.h -Node1->Node4 - - +Node1->Node4 + + - -Node20 - + +Node21 + Camera.h - -Node1->Node20 - - + +Node1->Node21 + + - -Node21 - - -Game.h + +Node22 + + +Game.h - -Node1->Node21 - - + +Node1->Node22 + + - -Node23 - - -StageState.h + +Node24 + + +StageState.h - -Node1->Node23 - - + +Node1->Node24 + + Node3 @@ -89,186 +89,186 @@ Node2->Node3 - - + + Node9 - -Sprite.h + +Sprite.h Node2->Node9 - - + + Node15 - -State.h + +State.h Node2->Node15 - - + + Node3->Node4 - - + + Node5 - -SDL_include.h + +SDL_include.h Node4->Node5 - - + + Node6 - -Vec2.h + +Vec2.h Node4->Node6 - - + + Node7 - -unordered_map + +unordered_map Node4->Node7 - - + + Node8 - -cstdint + +cstdint Node4->Node8 - - + + Node6->Node5 - - + + Node9->Node4 - - + + Node9->Node5 - - + + Node10 - -string + +string Node9->Node10 - - + + Node11 - -memory + +memory Node9->Node11 - - + + Node12 - -Color.h + +Color.h Node9->Node12 - - + + Node13 - -Rect.h + +Rect.h Node9->Node13 - - + + Node13->Node5 - - + + Node13->Node6 - - + + Node14 - -cmath + +cmath Node13->Node14 - - + + Node15->Node4 - - + + Node15->Node11 - - + + Node16 - -vector + +vector Node15->Node16 - - + + Node17 @@ -280,538 +280,556 @@ Node15->Node17 - - + + Node18 - -GameObject.h + +GameObject.h Node15->Node18 - - + + Node17->Node5 - - + + Node17->Node7 - - + + Node17->Node10 - - + + Node17->Node11 - - + + Node18->Node5 - - + + Node18->Node10 - - + + Node18->Node11 - - + + -Node18->Node13 - - +Node18->Node13 + + Node18->Node16 - - + + Node19 - -Component.h + +Component.h Node18->Node19 - - + + + + +Node20 + + +ComponentType.h + + + + +Node18->Node20 + + -Node19->Node18 - - +Node19->Node18 + + - -Node20->Node3 + +Node19->Node20 + + + + +Node21->Node3 - -Node20->Node6 - - + +Node21->Node6 + + + + +Node21->Node18 + + + + +Node22->Node4 + + + + +Node22->Node5 + + + + +Node22->Node6 + + + + +Node22->Node10 + + + + +Node22->Node15 + + - -Node20->Node18 - - + +Node23 + +stack - -Node21->Node4 - - + +Node22->Node23 + + - -Node21->Node5 - - + +Node24->Node3 + + - -Node21->Node6 - - + +Node24->Node4 + + - -Node21->Node10 - - + +Node24->Node9 + + - -Node21->Node15 - - + +Node24->Node11 + + - -Node22 - -stack - - -Node21->Node22 - - - - -Node23->Node3 - - - - -Node23->Node4 - - - - -Node23->Node9 - - - - -Node23->Node11 - - - - -Node23->Node15 - - - - -Node23->Node16 - - - - -Node23->Node18 - - + +Node24->Node15 + + - -Node24 - - -Music.h + +Node24->Node16 + + + + +Node24->Node18 + + + + +Node25 + + +DragAndDrop.h - -Node23->Node24 - - + +Node24->Node25 + + - -Node28 - - -TileMap.h + +Node26 + + +TileMap.h - -Node23->Node28 - - + +Node24->Node26 + + - -Node29 - - -Tileset.h + +Node27 + + +Tileset.h - -Node23->Node29 - - + +Node24->Node27 + + - -Node30 - - -Timer.h + +Node28 + + +Music.h - -Node23->Node30 - - + +Node24->Node28 + + - -Node31 - - -WaveManager.h + +Node32 + + +Timer.h - -Node23->Node31 - - + +Node24->Node32 + + Node33 - - -EmptyGameObject.h + + +WaveManager.h - -Node23->Node33 - - + +Node24->Node33 + + - -Node34 - - -EndState.h + +Node35 + + +EndState.h - -Node23->Node34 - - + +Node24->Node35 + + - -Node24->Node4 - - + +Node25->Node19 + + - -Node24->Node5 - - + +Node25->Node26 + + + + +Node26->Node6 + + + + +Node26->Node10 + + + + +Node26->Node16 + + + + +Node26->Node18 + + + + +Node26->Node27 + + + + +Node27->Node9 + + + + +Node27->Node10 + + + + +Node28->Node4 + + + + +Node28->Node5 + + - -Node24->Node10 - - + +Node28->Node10 + + - -Node24->Node11 - - + +Node28->Node11 + + - -Node24->Node17 - - + +Node28->Node17 + + - -Node25 - - -Error.h + +Node29 + + +Error.h - -Node24->Node25 - - + +Node28->Node29 + + - -Node26 - -iostream + +Node30 + +iostream - -Node25->Node26 - - + +Node29->Node30 + + - -Node27 - -stdlib.h + +Node31 + +stdlib.h - -Node25->Node27 - - + +Node29->Node31 + + - -Node28->Node6 - - + +Node33->Node11 + + - -Node28->Node10 - - + +Node33->Node18 + + + + +Node33->Node19 + + + + +Node33->Node26 + + + + +Node33->Node29 + + + + +Node33->Node32 + + - -Node28->Node16 - - + +Node34 + + +WaveData.h + - -Node28->Node18 - - - -Node28->Node29 - - - - -Node29->Node9 - - - - -Node29->Node10 - - - - -Node31->Node11 - - - - -Node31->Node18 - - - - -Node31->Node19 - - - - -Node31->Node25 - - - - -Node31->Node28 - - - - -Node31->Node30 - - + +Node33->Node34 + + - -Node32 - - -WaveData.h - + +Node34->Node10 + + + +Node34->Node16 + + - -Node31->Node32 - - + +Node34->Node29 + + - -Node32->Node10 - - + +Node35->Node4 + + - -Node32->Node16 - - + +Node35->Node9 + + - -Node32->Node25 - - + +Node35->Node18 + + - -Node33->Node13 - - + +Node35->Node24 + + - -Node33->Node18 - - - - -Node34->Node4 - - - - -Node34->Node9 - - - - -Node34->Node18 - - - - -Node34->Node23 - - - - -Node34->Node24 - - + +Node35->Node28 + + - -Node35 - - -EndStateData.h + +Node36 + + +EndStateData.h - -Node34->Node35 - - - - -Node38 - - -Text.h + +Node35->Node36 + + + + +Node39 + + +Text.h - -Node34->Node38 - - + +Node35->Node39 + + - -Node36 - - -StateData.h + +Node37 + + +StateData.h - -Node35->Node36 - - + +Node36->Node37 + + - -Node37 - - -Defines.h + +Node38 + + +Defines.h - -Node35->Node37 - - - - -Node38->Node5 - - - - -Node38->Node10 - - - - -Node38->Node11 - - - - -Node38->Node13 - - - - -Node38->Node17 - - - - -Node38->Node21 - - - - -Node38->Node25 - - - - -Node38->Node30 - - + +Node36->Node38 + + + + +Node39->Node5 + + + + +Node39->Node10 + + + + +Node39->Node11 + + + + +Node39->Node13 + + + + +Node39->Node17 + + + + +Node39->Node22 + + + + +Node39->Node29 + + + + +Node39->Node32 + + diff --git a/docs/TitleState_8h.html b/docs/TitleState_8h.html index 4bbfafad..0e90fb5d 100644 --- a/docs/TitleState_8h.html +++ b/docs/TitleState_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/TitleState.h @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para TitleState.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -113,9 +115,9 @@ diff --git a/docs/TitleState_8h__dep__incl.map b/docs/TitleState_8h__dep__incl.map index 898b1c2f..bc4a3a95 100644 --- a/docs/TitleState_8h__dep__incl.map +++ b/docs/TitleState_8h__dep__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/TitleState_8h__dep__incl.md5 b/docs/TitleState_8h__dep__incl.md5 index ccbefc67..7878f24c 100644 --- a/docs/TitleState_8h__dep__incl.md5 +++ b/docs/TitleState_8h__dep__incl.md5 @@ -1 +1 @@ -35c90d60cc9ad7fa599cd2305dc0a757 \ No newline at end of file +7a29380bddb995bcd12330e25588d8a5 \ No newline at end of file diff --git a/docs/TitleState_8h__dep__incl.svg b/docs/TitleState_8h__dep__incl.svg index 987dbe47..dca8b072 100644 --- a/docs/TitleState_8h__dep__incl.svg +++ b/docs/TitleState_8h__dep__incl.svg @@ -1,14 +1,14 @@ - - + Game/include/TitleState.h - + Node1 diff --git a/docs/TitleState_8h__incl.map b/docs/TitleState_8h__incl.map index ddce26ac..9489fa3a 100644 --- a/docs/TitleState_8h__incl.map +++ b/docs/TitleState_8h__incl.map @@ -1,13 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/TitleState_8h__incl.md5 b/docs/TitleState_8h__incl.md5 index a6cc2d66..a77bb64a 100644 --- a/docs/TitleState_8h__incl.md5 +++ b/docs/TitleState_8h__incl.md5 @@ -1 +1 @@ -b2a7c4a97de45ad3e832140a6939f58f \ No newline at end of file +3a6c34c1e562f85d6a3cc91ac92c5733 \ No newline at end of file diff --git a/docs/TitleState_8h__incl.svg b/docs/TitleState_8h__incl.svg index 1650a38b..53e90078 100644 --- a/docs/TitleState_8h__incl.svg +++ b/docs/TitleState_8h__incl.svg @@ -1,306 +1,324 @@ - - + Game/include/TitleState.h - + Node1 - -Game/include/TitleState.h + +Game/include/TitleState.h Node2 - -ActionManager.h + +ActionManager.h Node1->Node2 - - + + Node8 - -Sprite.h + +Sprite.h Node1->Node8 - - + + Node14 - -State.h + +State.h Node1->Node14 - - + + Node3 - -InputManager.h + +InputManager.h Node2->Node3 - - + + Node4 - -SDL_include.h + +SDL_include.h Node3->Node4 - - + + Node5 - -Vec2.h + +Vec2.h Node3->Node5 - - + + Node6 - -unordered_map + +unordered_map Node3->Node6 - - + + Node7 - -cstdint + +cstdint Node3->Node7 - - + + Node5->Node4 - - + + Node8->Node3 - - + + Node8->Node4 - - + + Node9 - -string + +string Node8->Node9 - - + + Node10 - -memory + +memory Node8->Node10 - - + + Node11 - -Color.h + +Color.h Node8->Node11 - - + + Node12 - -Rect.h + +Rect.h Node8->Node12 - - + + Node12->Node4 - - + + Node12->Node5 - - + + Node13 - -cmath + +cmath Node12->Node13 - - + + Node14->Node3 - - + + Node14->Node10 - - + + Node15 - -vector + +vector Node14->Node15 - - + + Node16 - -Resources.h + +Resources.h Node14->Node16 - - + + Node17 - -GameObject.h + +GameObject.h Node14->Node17 - - + + Node16->Node4 - - + + Node16->Node6 - - + + Node16->Node9 - - + + Node16->Node10 - - + + Node17->Node4 - - + + Node17->Node9 - - + + Node17->Node10 - - + + -Node17->Node12 - - +Node17->Node12 + + Node17->Node15 - - + + Node18 - -Component.h + +Component.h Node17->Node18 - - + + + + +Node19 + + +ComponentType.h + + + + +Node17->Node19 + + -Node18->Node17 - - +Node18->Node17 + + + + +Node18->Node19 + + diff --git a/docs/Tower_8cpp.html b/docs/Tower_8cpp.html index 39a01861..f98f3977 100644 --- a/docs/Tower_8cpp.html +++ b/docs/Tower_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/Tower.cpp @@ -31,7 +31,7 @@

- + @@ -98,7 +98,8 @@
Gráfico de dependência de inclusões para Tower.cpp:
-
+
+

@@ -122,9 +123,9 @@

Definições dos tipos

diff --git a/docs/Tower_8cpp__incl.map b/docs/Tower_8cpp__incl.map index e8e05e4b..10e368d7 100644 --- a/docs/Tower_8cpp__incl.map +++ b/docs/Tower_8cpp__incl.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/Tower_8cpp__incl.md5 b/docs/Tower_8cpp__incl.md5 index 8c3df009..47324d8e 100644 --- a/docs/Tower_8cpp__incl.md5 +++ b/docs/Tower_8cpp__incl.md5 @@ -1 +1 @@ -e0a4e120891b864cf76ee54dca61a71a \ No newline at end of file +4a9f83b4c81356fe26331a7db6492650 \ No newline at end of file diff --git a/docs/Tower_8cpp__incl.svg b/docs/Tower_8cpp__incl.svg index 7af05ae1..aa1d99d8 100644 --- a/docs/Tower_8cpp__incl.svg +++ b/docs/Tower_8cpp__incl.svg @@ -1,403 +1,421 @@ - - + Game/src/Tower.cpp - + Node1 - -Game/src/Tower.cpp + +Game/src/Tower.cpp Node2 - -Tower.h + +Tower.h Node1->Node2 - - + + - -Node19 - - -Camera.h + +Node20 + + +Camera.h - -Node1->Node19 - - + +Node1->Node20 + + - -Node21 - - -DragAndDrop.h + +Node22 + + +DragAndDrop.h - -Node1->Node21 - - + +Node1->Node22 + + - -Node22 - - -Error.h + +Node23 + + +Error.h - -Node1->Node22 - - + +Node1->Node23 + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + - -Node9 - - -Rect.h + +Node10 + + +Rect.h - -Node2->Node9 - - + +Node2->Node10 + + - -Node10 - - -Vec2.h + +Node11 + + +Vec2.h - -Node2->Node10 - - + +Node2->Node11 + + - -Node12 - - -Sprite.h + +Node13 + + +Sprite.h - -Node2->Node12 - - + +Node2->Node13 + + - -Node17 - - -TileMap.h + +Node18 + + +TileMap.h - -Node2->Node17 - - + +Node2->Node18 + + 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 - - + + - -Node3->Node9 - - + +Node9 + + +ComponentType.h + - -Node8->Node3 - - - -Node9->Node4 - - + +Node3->Node9 + + - -Node9->Node10 - - + +Node3->Node10 + + - -Node11 - -cmath + +Node8->Node3 + + - -Node9->Node11 - - + +Node8->Node9 + + Node10->Node4 - - - - -Node12->Node4 - - - - -Node12->Node6 - - - - -Node12->Node7 - - - - -Node12->Node9 - - + + - -Node13 - - -Color.h - + +Node10->Node11 + + - - -Node12->Node13 - - + +Node12 + +cmath + + +Node10->Node12 + + + + +Node11->Node4 + + + + +Node13->Node4 + + + + +Node13->Node6 + + + + +Node13->Node7 + + + + +Node13->Node10 + + Node14 - - -InputManager.h + + +Color.h - -Node12->Node14 - - - - -Node14->Node4 - - - - -Node14->Node10 - - + +Node13->Node14 + + Node15 - -unordered_map + + +InputManager.h + + - -Node14->Node15 - - + +Node13->Node15 + + + + +Node15->Node4 + + + + +Node15->Node11 + + Node16 - -cstdint - - -Node14->Node16 - - - - -Node17->Node3 - - - - -Node17->Node5 - - - - -Node17->Node7 - - - - -Node17->Node10 - - + +unordered_map - -Node18 - - -Tileset.h - + +Node15->Node16 + + + +Node17 + +cstdint - -Node17->Node18 - - + +Node15->Node17 + + - -Node18->Node7 - - + +Node18->Node3 + + - -Node18->Node12 - - + +Node18->Node5 + + - -Node19->Node3 - - + +Node18->Node7 + + - -Node19->Node10 - - + +Node18->Node11 + + - -Node20 - - -ActionManager.h + +Node19 + + +Tileset.h - -Node19->Node20 - - + +Node18->Node19 + + - -Node20->Node14 - - + +Node19->Node7 + + - -Node21->Node8 - - + +Node19->Node13 + + - -Node21->Node17 - - + +Node20->Node3 + + - -Node23 - -iostream + +Node20->Node11 + + - -Node22->Node23 - - + +Node21 + + +ActionManager.h + + + + +Node20->Node21 + + + + +Node21->Node15 + + + + +Node22->Node8 + + + + +Node22->Node18 + + Node24 - -stdlib.h - - -Node22->Node24 - - + +iostream + + +Node23->Node24 + + + + +Node25 + +stdlib.h + + +Node23->Node25 + + diff --git a/docs/Tower_8h.html b/docs/Tower_8h.html index 0d85a4da..d1c7c04c 100644 --- a/docs/Tower_8h.html +++ b/docs/Tower_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/Tower.h @@ -31,7 +31,7 @@
- + @@ -100,12 +100,14 @@
Gráfico de dependência de inclusões para Tower.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -148,9 +150,9 @@

Definições e macros

diff --git a/docs/Tower_8h__dep__incl.md5 b/docs/Tower_8h__dep__incl.md5 index 60127b6a..d17cfd6c 100644 --- a/docs/Tower_8h__dep__incl.md5 +++ b/docs/Tower_8h__dep__incl.md5 @@ -1 +1 @@ -287ad62edd14dd29ff97691d28cdd066 \ No newline at end of file +45d73d33baf1efb6917ed2835a026de6 \ No newline at end of file diff --git a/docs/Tower_8h__dep__incl.svg b/docs/Tower_8h__dep__incl.svg index 9a8f16c6..10f96dc3 100644 --- a/docs/Tower_8h__dep__incl.svg +++ b/docs/Tower_8h__dep__incl.svg @@ -1,7 +1,7 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/Tower_8h__incl.md5 b/docs/Tower_8h__incl.md5 index c6cbded4..567d4bc6 100644 --- a/docs/Tower_8h__incl.md5 +++ b/docs/Tower_8h__incl.md5 @@ -1 +1 @@ -b4d0ebc1ff50f2518a8ca7eec1f2819e \ No newline at end of file +ae0bff4c9ecd59db9c1f6e1a7cce3b72 \ No newline at end of file diff --git a/docs/Tower_8h__incl.svg b/docs/Tower_8h__incl.svg index 722bfd3f..c0f23740 100644 --- a/docs/Tower_8h__incl.svg +++ b/docs/Tower_8h__incl.svg @@ -1,293 +1,311 @@ - - + Game/include/Tower.h - + Node1 - -Game/include/Tower.h + +Game/include/Tower.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + - -Node8 - - -Rect.h + +Node9 + + +Rect.h - -Node1->Node8 - - + +Node1->Node9 + + - -Node9 - - -Vec2.h + +Node10 + + +Vec2.h - -Node1->Node9 - - + +Node1->Node10 + + - -Node11 - - -Sprite.h + +Node12 + + +Sprite.h - -Node1->Node11 - - + +Node1->Node12 + + - -Node16 - - -TileMap.h + +Node17 + + +TileMap.h - -Node1->Node16 - - + +Node1->Node17 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -memory + +memory Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node7 - -Component.h + +Component.h Node2->Node7 - - + + - -Node2->Node8 - - + +Node8 + + +ComponentType.h + - -Node7->Node2 - - - -Node8->Node3 - - + +Node2->Node8 + + - -Node8->Node9 - - + +Node2->Node9 + + - -Node10 - -cmath + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - + + - -Node11->Node3 - - + +Node9->Node10 + + - -Node11->Node5 - - + +Node11 + +cmath + + +Node9->Node11 + + + + +Node10->Node3 + + + + +Node12->Node3 + + + + +Node12->Node5 + + + + +Node12->Node6 + + + + +Node12->Node9 + + - -Node11->Node6 - - + +Node13 + + +Color.h + - -Node11->Node8 - - - -Node12 - - -Color.h + +Node12->Node13 + + + + +Node14 + + +InputManager.h - -Node11->Node12 - - + +Node12->Node14 + + - -Node13 - - -InputManager.h - + +Node14->Node3 + + + +Node14->Node10 + + - -Node11->Node13 - - + +Node15 + +unordered_map - -Node13->Node3 - - + +Node14->Node15 + + - -Node13->Node9 - - + +Node16 + +cstdint - -Node14 - -unordered_map + +Node14->Node16 + + - -Node13->Node14 - - + +Node17->Node2 + + - -Node15 - -cstdint - - -Node13->Node15 - - - - -Node16->Node2 - - - - -Node16->Node4 - - - - -Node16->Node6 - - - - -Node16->Node9 - - + +Node17->Node4 + + - -Node17 - - -Tileset.h + +Node17->Node6 + + + + +Node17->Node10 + + + + +Node18 + + +Tileset.h - -Node16->Node17 - - + +Node17->Node18 + + - -Node17->Node6 - - - - -Node17->Node11 - - + +Node18->Node6 + + + + +Node18->Node12 + + diff --git a/docs/Vec2_8cpp.html b/docs/Vec2_8cpp.html index 800c3a71..85ef151b 100644 --- a/docs/Vec2_8cpp.html +++ b/docs/Vec2_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/src/Vec2.cpp @@ -31,7 +31,7 @@
- + @@ -95,14 +95,15 @@
Gráfico de dependência de inclusões para Vec2.cpp:
-
+
+
diff --git a/docs/Vec2_8cpp__incl.md5 b/docs/Vec2_8cpp__incl.md5 index f509e056..4ed9bfdc 100644 --- a/docs/Vec2_8cpp__incl.md5 +++ b/docs/Vec2_8cpp__incl.md5 @@ -1 +1 @@ -dfb4ddae5f6eee1dd82a958f647722d5 \ No newline at end of file +2bab73fd7bdb35437f687f8c3a00e50e \ No newline at end of file diff --git a/docs/Vec2_8cpp__incl.svg b/docs/Vec2_8cpp__incl.svg index a410c22b..08f657bf 100644 --- a/docs/Vec2_8cpp__incl.svg +++ b/docs/Vec2_8cpp__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Engine/include/Vec2.h @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Gráfico de dependência de inclusões para Vec2.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -145,9 +147,9 @@

Definições e macros

diff --git a/docs/Vec2_8h__dep__incl.map b/docs/Vec2_8h__dep__incl.map index 941ed558..c5218574 100644 --- a/docs/Vec2_8h__dep__incl.map +++ b/docs/Vec2_8h__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Vec2_8h__dep__incl.md5 b/docs/Vec2_8h__dep__incl.md5 index 11a0c655..3fb3bc29 100644 --- a/docs/Vec2_8h__dep__incl.md5 +++ b/docs/Vec2_8h__dep__incl.md5 @@ -1 +1 @@ -7adbe6b1407bb169423d9e765efe08c6 \ No newline at end of file +aed687378a0309a8f3678fb4c0d6633a \ No newline at end of file diff --git a/docs/Vec2_8h__dep__incl.svg b/docs/Vec2_8h__dep__incl.svg index c2f6975d..8572648c 100644 --- a/docs/Vec2_8h__dep__incl.svg +++ b/docs/Vec2_8h__dep__incl.svg @@ -1,1020 +1,1025 @@ - - + Engine/include/Vec2.h - + Node1 - -Engine/include/Vec2.h + +Engine/include/Vec2.h Node2 - -Engine/include/InputManager.h + +Engine/include/InputManager.h Node1->Node2 - - + + Node4 - -Engine/include/Camera.h + +Engine/include/Camera.h -Node1->Node4 - - +Node1->Node4 + + - -Node25 - - -Engine/include/TileMap.h + +Node26 + + +Engine/include/TileMap.h - -Node1->Node25 - - + +Node1->Node26 + + - -Node28 - - -Game/src/WaveManager.cpp + +Node29 + + +Game/src/WaveManager.cpp - -Node1->Node28 - - + +Node1->Node29 + + - -Node31 - - -Game/include/Tower.h + +Node32 + + +Game/include/Tower.h - -Node1->Node31 - - + +Node1->Node32 + + - -Node35 - - -Engine/include/Game.h + +Node36 + + +Engine/include/Game.h - -Node1->Node35 - - + +Node1->Node36 + + - -Node43 - - -Engine/include/Rect.h + +Node44 + + +Engine/include/Rect.h - -Node1->Node43 - - + +Node1->Node44 + + Node50 - -Engine/src/Vec2.cpp + +Engine/src/Vec2.cpp -Node1->Node50 - - +Node1->Node50 + + Node3 - -Engine/include/ActionManager.h + +Engine/include/ActionManager.h Node2->Node3 - - + + Node6 - -Engine/src/Camera.cpp + +Engine/src/Camera.cpp -Node2->Node6 - - +Node2->Node6 + + Node7 - -Engine/src/DragAndDrop.cpp + +Engine/src/DragAndDrop.cpp -Node2->Node7 - - +Node2->Node7 + + - -Node10 - - -Engine/src/TileMap.cpp + +Node11 + + +Engine/src/TileMap.cpp - -Node2->Node10 - - + +Node2->Node11 + + - -Node15 - - -Game/src/TitleState.cpp + +Node16 + + +Game/src/TitleState.cpp - -Node2->Node15 - - + +Node2->Node16 + + - -Node18 - - -Game/include/StageState.h + +Node19 + + +Game/include/StageState.h - -Node2->Node18 - - + +Node2->Node19 + + - -Node19 - - -Game/include/EndState.h + +Node20 + + +Game/include/EndState.h - -Node2->Node19 - - + +Node2->Node20 + + - -Node22 - - -Engine/include/Sprite.h + +Node23 + + +Engine/include/Sprite.h - -Node2->Node22 - - + +Node2->Node23 + + - -Node2->Node28 - - + +Node2->Node29 + + - -Node34 - - -Engine/include/State.h + +Node35 + + +Engine/include/State.h - -Node2->Node34 - - - -Node2->Node35 - - +Node2->Node35 + + - -Node40 - - -Engine/include/Music.h + +Node2->Node36 + + + + +Node41 + + +Engine/include/Music.h - -Node2->Node40 - - + +Node2->Node41 + + - -Node42 - - -Engine/src/InputManager.cpp + +Node43 + + +Engine/src/InputManager.cpp - -Node2->Node42 - - + +Node2->Node43 + + Node3->Node4 - - + + - -Node17 - - -Engine/src/ActionManager.cpp + +Node18 + + +Engine/src/ActionManager.cpp - -Node3->Node17 - - - Node3->Node18 - - + + - -Node20 - - -Game/include/TitleState.h + +Node3->Node19 + + + + +Node21 + + +Game/include/TitleState.h - -Node3->Node20 - - + +Node3->Node21 + + Node5 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node4->Node5 - - + + Node4->Node6 - - + + Node4->Node7 - - + + Node8 - - -Engine/src/Sprite.cpp + + +Engine/src/GameObject.cpp Node4->Node8 - - + + Node9 - - -Engine/src/State.cpp + + +Engine/src/Sprite.cpp Node4->Node9 - - + + - -Node4->Node10 - - - - -Node11 - - -Engine/src/Tileset.cpp + +Node10 + + +Engine/src/State.cpp + +Node4->Node10 + + + Node4->Node11 - - + + Node12 - - -Game/src/EndState.cpp + + +Engine/src/Tileset.cpp Node4->Node12 - - + + Node13 - - -Game/src/Enemy.cpp + + +Game/src/EndState.cpp Node4->Node13 - - + + Node14 - - -Game/src/StageState.cpp + + +Game/src/Enemy.cpp Node4->Node14 - - - - -Node4->Node15 - - + + - -Node16 - - -Game/src/Tower.cpp + +Node15 + + +Game/src/StageState.cpp + +Node4->Node15 + + + Node4->Node16 - - - - -Node18->Node14 - - - - -Node18->Node15 - - - - -Node18->Node19 - - - - -Node19->Node12 - - - - -Node19->Node18 - - - - -Node20->Node15 - - + + - -Node21 - - -Game/src/main.cpp + +Node17 + + +Game/src/Tower.cpp - -Node20->Node21 - - + +Node4->Node17 + + - -Node22->Node8 - - + +Node19->Node15 + + - -Node22->Node18 - - + +Node19->Node16 + + - -Node22->Node19 - - + +Node19->Node20 + + - -Node22->Node20 - - + +Node20->Node13 + + - -Node23 - - -Engine/include/Animation.h + +Node20->Node19 + + + + +Node21->Node16 + + + + +Node22 + + +Game/src/main.cpp - -Node22->Node23 - - + +Node21->Node22 + + + + +Node23->Node9 + + + + +Node23->Node19 + + + + +Node23->Node20 + + + + +Node23->Node21 + + Node24 - - -Engine/include/Tileset.h + + +Engine/include/Animation.h - -Node22->Node24 - - + +Node23->Node24 + + - -Node29 - - -Game/include/Enemy.h + +Node25 + + +Engine/include/Tileset.h - -Node22->Node29 - - + +Node23->Node25 + + - -Node22->Node31 - - - - -Node32 - - -Engine/include/HitPoints.h + +Node30 + + +Game/include/Enemy.h - -Node22->Node32 - - - - -Node23->Node5 - - + +Node23->Node30 + + - -Node24->Node11 - - + +Node23->Node32 + + - -Node24->Node18 - - + +Node33 + + +Engine/include/HitPoints.h + - -Node24->Node25 - - - -Node25->Node10 - - + +Node23->Node33 + + - -Node25->Node18 - - + +Node24->Node5 + + - -Node26 - - -Engine/include/DragAndDrop.h - + +Node25->Node12 + + + +Node25->Node19 + + Node25->Node26 - - + + + + +Node26->Node11 + + + + +Node26->Node19 + + Node27 - - -Game/include/WaveManager.h - - - - -Node25->Node27 - - - - -Node25->Node28 - - - - -Node25->Node29 - - - - -Node25->Node31 - - - - -Node26->Node7 - - - - -Node26->Node16 - - - - -Node27->Node18 - - - - -Node27->Node28 - - - - -Node29->Node13 - - - - -Node29->Node14 - - - - -Node29->Node28 - - - - -Node30 - - -Game/include/GameResources.h + + +Engine/include/DragAndDrop.h - -Node29->Node30 - - + +Node26->Node27 + + - -Node30->Node28 - - + +Node28 + + +Game/include/WaveManager.h + - -Node31->Node14 - - - -Node31->Node16 - - + +Node26->Node28 + + + + +Node26->Node29 + + + + +Node26->Node30 + + + + +Node26->Node32 + + + + +Node27->Node7 + + + + +Node27->Node17 + + + + +Node27->Node19 + + + + +Node28->Node19 + + + + +Node28->Node29 + + + + +Node30->Node14 + + + + +Node30->Node15 + + + + +Node30->Node29 + + - -Node32->Node13 - - + +Node31 + + +Game/include/GameResources.h + - -Node33 - - -Engine/src/HItPoints.cpp - - - - -Node32->Node33 - - - - -Node34->Node9 - - - - -Node34->Node18 - - - - -Node34->Node20 - - - - -Node34->Node35 - - - - -Node35->Node6 - - - - -Node35->Node8 - - - - -Node35->Node11 - - - - -Node35->Node14 - - - - -Node35->Node15 - - - -Node35->Node21 - - + +Node30->Node31 + + - -Node35->Node28 - - + +Node31->Node29 + + - -Node36 - - -Engine/include/Text.h - + +Node32->Node15 + + + +Node32->Node17 + + - -Node35->Node36 - - + +Node33->Node14 + + - -Node38 - - -Engine/src/Game.cpp + +Node34 + + +Engine/src/HItPoints.cpp - -Node35->Node38 - - + +Node33->Node34 + + - -Node39 - - -Engine/src/Resources.cpp - + +Node35->Node10 + + + +Node35->Node19 + + - -Node35->Node39 - - + +Node35->Node21 + + - -Node36->Node19 - - + +Node35->Node36 + + + + +Node36->Node6 + + + + +Node36->Node9 + + + + +Node36->Node12 + + + + +Node36->Node15 + + + + +Node36->Node16 + + + + +Node36->Node22 + + + + +Node36->Node29 + + Node37 - - -Engine/src/Text.cpp + + +Engine/include/Text.h -Node36->Node37 - - +Node36->Node37 + + - -Node40->Node18 - - + +Node39 + + +Engine/src/Game.cpp + - -Node40->Node19 - - - -Node41 - - -Engine/src/Music.cpp + +Node36->Node39 + + + + +Node40 + + +Engine/src/Resources.cpp - -Node40->Node41 - - + +Node36->Node40 + + - -Node43->Node22 - - + +Node37->Node20 + + - -Node43->Node29 - - + +Node38 + + +Engine/src/Text.cpp + - -Node43->Node31 - - - -Node43->Node36 - - + +Node37->Node38 + + - -Node44 - - -Engine/include/GameObject.h + +Node41->Node19 + + + + +Node41->Node20 + + + + +Node42 + + +Engine/src/Music.cpp - -Node43->Node44 - - + +Node41->Node42 + + - -Node47 - - -Game/include/EmptyGameObject.h + +Node44->Node23 + + + + +Node44->Node30 + + + + +Node44->Node32 + + + + +Node44->Node37 + + + + +Node45 + + +Engine/include/GameObject.h - -Node43->Node47 - - + +Node44->Node45 + + Node48 - -Engine/include/Collision.h + +Engine/include/Collision.h - -Node43->Node48 - - + +Node44->Node48 + + Node49 - -Engine/src/Rect.cpp + +Engine/src/Rect.cpp - -Node43->Node49 - - + +Node44->Node49 + + - -Node44->Node4 - - + +Node45->Node4 + + - -Node44->Node18 - - + +Node45->Node8 + + - -Node44->Node19 - - + +Node45->Node19 + + - -Node44->Node23 - - - - -Node44->Node25 - - - - -Node44->Node27 - - - - -Node44->Node29 - - - - -Node44->Node31 - - - - -Node44->Node34 - - + +Node45->Node20 + + - -Node45 - - -Engine/include/Component.h - + +Node45->Node24 + + + +Node45->Node26 + + - -Node44->Node45 - - + +Node45->Node28 + + + + +Node45->Node30 + + + + +Node45->Node32 + + + + +Node45->Node35 + + Node46 - - -Engine/src/GameObject.cpp + + +Engine/include/Component.h - -Node44->Node46 - - + +Node45->Node46 + + - -Node44->Node47 - - + +Node46->Node27 + + - -Node45->Node26 - - + +Node46->Node28 + + - -Node45->Node27 - - + +Node46->Node33 + + - -Node45->Node32 - - - - -Node45->Node44 - - - - -Node47->Node18 - - - - -Node48->Node14 - - + +Node46->Node45 + + + + +Node47 + + +Engine/include/AIGoDown.h + + + + +Node46->Node47 + + + + +Node47->Node14 + + + + +Node48->Node15 + + diff --git a/docs/Vec2_8h__incl.md5 b/docs/Vec2_8h__incl.md5 index 2fd8d107..69d4c912 100644 --- a/docs/Vec2_8h__incl.md5 +++ b/docs/Vec2_8h__incl.md5 @@ -1 +1 @@ -a9eea586d52f5b2079458f71e628b507 \ No newline at end of file +437bb39e1c56cd22d33deeca8af1da20 \ No newline at end of file diff --git a/docs/Vec2_8h__incl.svg b/docs/Vec2_8h__incl.svg index a21a67da..9469cfde 100644 --- a/docs/Vec2_8h__incl.svg +++ b/docs/Vec2_8h__incl.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/WaveData.cpp @@ -31,7 +31,7 @@
- + @@ -93,14 +93,15 @@
Gráfico de dependência de inclusões para WaveData.cpp:
-
+
+
diff --git a/docs/WaveData_8cpp__incl.map b/docs/WaveData_8cpp__incl.map index 28a925da..8c83bd26 100644 --- a/docs/WaveData_8cpp__incl.map +++ b/docs/WaveData_8cpp__incl.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/WaveData_8cpp__incl.md5 b/docs/WaveData_8cpp__incl.md5 index d4f822db..8c2d3172 100644 --- a/docs/WaveData_8cpp__incl.md5 +++ b/docs/WaveData_8cpp__incl.md5 @@ -1 +1 @@ -13394646793d630924f53a97ab01538f \ No newline at end of file +25c987f7c965c7adcbab3982d96d4eb8 \ No newline at end of file diff --git a/docs/WaveData_8cpp__incl.svg b/docs/WaveData_8cpp__incl.svg index 66c7e08d..d1e6e683 100644 --- a/docs/WaveData_8cpp__incl.svg +++ b/docs/WaveData_8cpp__incl.svg @@ -1,84 +1,84 @@ - - + Game/src/WaveData.cpp - + Node1 - -Game/src/WaveData.cpp + +Game/src/WaveData.cpp Node2 - -WaveData.h + +WaveData.h Node1->Node2 - - + + Node3 - -string + +string Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node5 - -Error.h + +Error.h Node2->Node5 - - + + Node6 - -iostream + +iostream Node5->Node6 - - + + Node7 - -stdlib.h + +stdlib.h Node5->Node7 - - + + diff --git a/docs/WaveData_8h.html b/docs/WaveData_8h.html index 7fa47b85..631e2570 100644 --- a/docs/WaveData_8h.html +++ b/docs/WaveData_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/WaveData.h @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Gráfico de dependência de inclusões para WaveData.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -119,9 +121,9 @@ diff --git a/docs/WaveData_8h__dep__incl.map b/docs/WaveData_8h__dep__incl.map index fd2527f4..c64ad433 100644 --- a/docs/WaveData_8h__dep__incl.map +++ b/docs/WaveData_8h__dep__incl.map @@ -1,14 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/WaveData_8h__dep__incl.md5 b/docs/WaveData_8h__dep__incl.md5 index 50a386ec..f66b136d 100644 --- a/docs/WaveData_8h__dep__incl.md5 +++ b/docs/WaveData_8h__dep__incl.md5 @@ -1 +1 @@ -668d95868543d8ecef9db8b9ff9bec1d \ No newline at end of file +eabcd1b263897907be9a7f53795354f2 \ No newline at end of file diff --git a/docs/WaveData_8h__dep__incl.svg b/docs/WaveData_8h__dep__incl.svg index 233e32b0..8e957a14 100644 --- a/docs/WaveData_8h__dep__incl.svg +++ b/docs/WaveData_8h__dep__incl.svg @@ -1,199 +1,199 @@ - - + Game/include/WaveData.h - + Node1 - -Game/include/WaveData.h + +Game/include/WaveData.h Node2 - -Game/include/WaveManager.h + +Game/include/WaveManager.h Node1->Node2 - - + + Node9 - -Game/include/Enemy.h + +Game/include/Enemy.h Node1->Node9 - - + + Node10 - -Game/include/GameResources.h + +Game/include/GameResources.h Node1->Node10 - - + + Node13 - -Game/src/WaveData.cpp + +Game/src/WaveData.cpp Node1->Node13 - - + + Node3 - -Game/include/StageState.h + +Game/include/StageState.h Node2->Node3 - - + + Node8 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node2->Node8 - - + + Node4 - -Game/include/EndState.h + +Game/include/EndState.h Node3->Node4 - - + + Node6 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node3->Node6 - - + + Node7 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node3->Node7 - - + + Node4->Node3 - - + + Node5 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node4->Node5 - - + + Node9->Node6 - - + + Node9->Node8 - - + + Node9->Node10 - - + + Node12 - -Game/src/Enemy.cpp + +Game/src/Enemy.cpp Node9->Node12 - - + + Node10->Node8 - - + + Node11 - -Game/src/GameResources.cpp + +Game/src/GameResources.cpp Node10->Node11 - - + + diff --git a/docs/WaveData_8h__incl.map b/docs/WaveData_8h__incl.map index 5d7aaecc..e63fe13d 100644 --- a/docs/WaveData_8h__incl.map +++ b/docs/WaveData_8h__incl.map @@ -1,3 +1,3 @@ - + diff --git a/docs/WaveData_8h__incl.md5 b/docs/WaveData_8h__incl.md5 index aa98aafc..4383258e 100644 --- a/docs/WaveData_8h__incl.md5 +++ b/docs/WaveData_8h__incl.md5 @@ -1 +1 @@ -de657d4b32fbd235f02c3cf730165b0c \ No newline at end of file +e30c89decf94f249730753ecf8c53602 \ No newline at end of file diff --git a/docs/WaveData_8h__incl.svg b/docs/WaveData_8h__incl.svg index b7b066f7..cc87e083 100644 --- a/docs/WaveData_8h__incl.svg +++ b/docs/WaveData_8h__incl.svg @@ -1,71 +1,71 @@ - - + Game/include/WaveData.h - + Node1 - -Game/include/WaveData.h + +Game/include/WaveData.h Node2 - -string + +string Node1->Node2 - - + + Node3 - -vector + +vector Node1->Node3 - - + + Node4 - -Error.h + +Error.h Node1->Node4 - - + + Node5 - -iostream + +iostream Node4->Node5 - - + + Node6 - -stdlib.h + +stdlib.h Node4->Node6 - - + + diff --git a/docs/WaveManager_8cpp.html b/docs/WaveManager_8cpp.html index 10e0dee5..d287cf29 100644 --- a/docs/WaveManager_8cpp.html +++ b/docs/WaveManager_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/WaveManager.cpp @@ -31,7 +31,7 @@

- + @@ -102,12 +102,13 @@
Gráfico de dependência de inclusões para WaveManager.cpp:
-
+
+
- +

Definições e Macros

#define TIME_BETWEEN_SPAWN   (2.)
#define TIME_BETWEEN_SPAWN   (0.8)
 

Definições e macros

@@ -116,7 +117,7 @@

Definições e macros

- +
#define TIME_BETWEEN_SPAWN   (2.)#define TIME_BETWEEN_SPAWN   (0.8)
@@ -126,9 +127,9 @@

Definições e macros

diff --git a/docs/WaveManager_8cpp__incl.map b/docs/WaveManager_8cpp__incl.map index 0f6af7ec..c9fa22f1 100644 --- a/docs/WaveManager_8cpp__incl.map +++ b/docs/WaveManager_8cpp__incl.map @@ -1,21 +1,22 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/WaveManager_8cpp__incl.md5 b/docs/WaveManager_8cpp__incl.md5 index 87d22347..21341794 100644 --- a/docs/WaveManager_8cpp__incl.md5 +++ b/docs/WaveManager_8cpp__incl.md5 @@ -1 +1 @@ -76d0ea163fc07722e345e6d639c4339c \ No newline at end of file +3abe5ae34bc44a6ab8e85ee04fa1580e \ No newline at end of file diff --git a/docs/WaveManager_8cpp__incl.svg b/docs/WaveManager_8cpp__incl.svg index 11b07b3e..1666cf5b 100644 --- a/docs/WaveManager_8cpp__incl.svg +++ b/docs/WaveManager_8cpp__incl.svg @@ -1,620 +1,643 @@ - - + Game/src/WaveManager.cpp - + Node1 - -Game/src/WaveManager.cpp + +Game/src/WaveManager.cpp Node2 - -WaveManager.h + +WaveManager.h Node1->Node2 - - + + - -Node10 - - -Vec2.h + +Node11 + + +Vec2.h - -Node1->Node10 - - + +Node1->Node11 + + - -Node13 - - -TileMap.h + +Node14 + + +TileMap.h - -Node1->Node13 - - + +Node1->Node14 + + - -Node17 - - -InputManager.h + +Node18 + + +InputManager.h - -Node1->Node17 - - + +Node1->Node18 + + - -Node21 - - -Error.h + +Node22 + + +Error.h - -Node1->Node21 - - + +Node1->Node22 + + - -Node24 - - -Game.h + +Node25 + + +Game.h - -Node1->Node24 - - + +Node1->Node25 + + - -Node28 - - -Enemy.h + +Node29 + + +Enemy.h - -Node1->Node28 - - + +Node1->Node29 + + - -Node29 - - -GameResources.h + +Node30 + + +GameResources.h - -Node1->Node29 - - + +Node1->Node30 + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + Node6 - -memory + +memory -Node2->Node6 - - +Node2->Node6 + + Node8 - -Component.h + +Component.h -Node2->Node8 - - +Node2->Node8 + + - -Node12 - - -Timer.h + +Node13 + + +Timer.h - -Node2->Node12 - - - -Node2->Node13 - - +Node2->Node13 + + - -Node20 - - -WaveData.h - + +Node2->Node14 + + + +Node21 + + +WaveData.h + - -Node2->Node20 - - -Node2->Node21 - - +Node2->Node21 + + + + +Node2->Node22 + + Node4 - -SDL_include.h + +SDL_include.h Node3->Node4 - - + + Node5 - -vector + +vector Node3->Node5 - - + + Node3->Node6 - - + + Node7 - -string + +string Node3->Node7 - - + + Node3->Node8 - - + + Node9 - - -Rect.h + + +ComponentType.h -Node3->Node9 - - +Node3->Node9 + + - -Node8->Node3 - - + +Node10 + + +Rect.h + - -Node9->Node4 - - - -Node9->Node10 - - + +Node3->Node10 + + - -Node11 - -cmath + +Node8->Node3 + + - -Node9->Node11 - - + +Node8->Node9 + + Node10->Node4 - - - - -Node13->Node3 - - + + - -Node13->Node5 - - + +Node10->Node11 + + - -Node13->Node7 - - + +Node12 + +cmath - -Node13->Node10 - - + +Node10->Node12 + + - -Node14 - - -Tileset.h - + +Node11->Node4 + + + +Node14->Node3 + + - -Node13->Node14 - - + +Node14->Node5 + + -Node14->Node7 - - +Node14->Node7 + + + + +Node14->Node11 + + Node15 - - -Sprite.h + + +Tileset.h Node14->Node15 - - - - -Node15->Node4 - - - - -Node15->Node6 - - + + -Node15->Node7 - - - - -Node15->Node9 - - +Node15->Node7 + + Node16 - - -Color.h + + +Sprite.h -Node15->Node16 - - +Node15->Node16 + + + + +Node16->Node4 + + + + +Node16->Node6 + + + + +Node16->Node7 + + + + +Node16->Node10 + + - -Node15->Node17 - - + +Node17 + + +Color.h + - -Node17->Node4 - - - -Node17->Node10 - - + +Node16->Node17 + + - -Node18 - -unordered_map + +Node16->Node18 + + - -Node17->Node18 - - + +Node18->Node4 + + + + +Node18->Node11 + + Node19 - -cstdint + +unordered_map - -Node17->Node19 - - + +Node18->Node19 + + - -Node20->Node5 - - + +Node20 + +cstdint - -Node20->Node7 - - + +Node18->Node20 + + - -Node20->Node21 - - + +Node21->Node5 + + - -Node22 - -iostream + +Node21->Node7 + + -Node21->Node22 - - +Node21->Node22 + + Node23 - -stdlib.h - - -Node21->Node23 - - - - -Node24->Node4 - - - - -Node24->Node7 - - - - -Node24->Node10 - - - - -Node24->Node17 - - + +iostream - -Node25 - -stack + +Node22->Node23 + + - -Node24->Node25 - - + +Node24 + +stdlib.h + + +Node22->Node24 + + + + +Node25->Node4 + + + + +Node25->Node7 + + + + +Node25->Node11 + + + + +Node25->Node18 + + Node26 - - -State.h - - - - -Node24->Node26 - - - - -Node26->Node3 - - + +stack - -Node26->Node5 - - - - -Node26->Node6 - - - - -Node26->Node17 - - + +Node25->Node26 + + Node27 - - -Resources.h + + +State.h - -Node26->Node27 - - + +Node25->Node27 + + - -Node27->Node4 - - + +Node27->Node3 + + - -Node27->Node6 - - + +Node27->Node5 + + - -Node27->Node7 - - + +Node27->Node6 + + -Node27->Node18 - - - - -Node28->Node3 - - - - -Node28->Node9 - - - - -Node28->Node12 - - - - -Node28->Node13 - - - - -Node28->Node15 - - - - -Node28->Node20 - - - - -Node29->Node5 - - - - -Node29->Node6 - - - - -Node29->Node7 - - - - -Node29->Node18 - - - - -Node29->Node20 - - - - -Node29->Node28 - - +Node27->Node18 + + - -Node30 - -array + +Node28 + + +Resources.h + - -Node29->Node30 - - + + +Node27->Node28 + + + + +Node28->Node4 + + + + +Node28->Node6 + + + + +Node28->Node7 + + + + +Node28->Node19 + + + + +Node29->Node3 + + + + +Node29->Node10 + + + + +Node29->Node13 + + + + +Node29->Node14 + + + + +Node29->Node16 + + + + +Node29->Node21 + + + + +Node29->Node22 + + + + +Node30->Node5 + + + + +Node30->Node6 + + + + +Node30->Node7 + + + + +Node30->Node19 + + + + +Node30->Node21 + + + + +Node30->Node29 + + Node31 - -utility + +array - -Node29->Node31 - - + +Node30->Node31 + + Node32 - -map - - -Node29->Node32 - - + +utility + + +Node30->Node32 + + + + +Node33 + +map + + +Node30->Node33 + + diff --git a/docs/WaveManager_8h.html b/docs/WaveManager_8h.html index a81bb2cb..0466ba61 100644 --- a/docs/WaveManager_8h.html +++ b/docs/WaveManager_8h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/include/WaveManager.h @@ -31,7 +31,7 @@ - + @@ -101,12 +101,14 @@
Gráfico de dependência de inclusões para WaveManager.h:
-
+
+
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
+

@@ -118,9 +120,9 @@ diff --git a/docs/WaveManager_8h__dep__incl.map b/docs/WaveManager_8h__dep__incl.map index 38f63d89..ee7e4a23 100644 --- a/docs/WaveManager_8h__dep__incl.map +++ b/docs/WaveManager_8h__dep__incl.map @@ -3,6 +3,6 @@ - + diff --git a/docs/WaveManager_8h__dep__incl.md5 b/docs/WaveManager_8h__dep__incl.md5 index 4d2109b7..53b6eeeb 100644 --- a/docs/WaveManager_8h__dep__incl.md5 +++ b/docs/WaveManager_8h__dep__incl.md5 @@ -1 +1 @@ -9683b3fa033a37e18f7f3e39f42b393c \ No newline at end of file +87f2d72ddecaec98543aa9927a019fa9 \ No newline at end of file diff --git a/docs/WaveManager_8h__dep__incl.svg b/docs/WaveManager_8h__dep__incl.svg index 51158259..a1fba2bc 100644 --- a/docs/WaveManager_8h__dep__incl.svg +++ b/docs/WaveManager_8h__dep__incl.svg @@ -1,14 +1,14 @@ - - + Game/include/WaveManager.h - + Node1 diff --git a/docs/WaveManager_8h__incl.map b/docs/WaveManager_8h__incl.map index 2121ddff..6831f877 100644 --- a/docs/WaveManager_8h__incl.map +++ b/docs/WaveManager_8h__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/WaveManager_8h__incl.md5 b/docs/WaveManager_8h__incl.md5 index f40c4576..6e14577c 100644 --- a/docs/WaveManager_8h__incl.md5 +++ b/docs/WaveManager_8h__incl.md5 @@ -1 +1 @@ -8f8404bb4e5c7392c122f3e66f975a89 \ No newline at end of file +9da3c9c1049eafbe4963eff0350a94e0 \ No newline at end of file diff --git a/docs/WaveManager_8h__incl.svg b/docs/WaveManager_8h__incl.svg index 6576342c..4c360bba 100644 --- a/docs/WaveManager_8h__incl.svg +++ b/docs/WaveManager_8h__incl.svg @@ -1,362 +1,380 @@ - - + Game/include/WaveManager.h - + Node1 - -Game/include/WaveManager.h + +Game/include/WaveManager.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + Node5 - -memory + +memory -Node1->Node5 - - +Node1->Node5 + + Node7 - -Component.h + +Component.h -Node1->Node7 - - - - -Node11 - - -Timer.h - - - - -Node1->Node11 - - +Node1->Node7 + + Node12 - - -TileMap.h + + +Timer.h -Node1->Node12 - - +Node1->Node12 + + - -Node19 - - -WaveData.h + +Node13 + + +TileMap.h - -Node1->Node19 - - + +Node1->Node13 + + Node20 - - -Error.h + + +WaveData.h -Node1->Node20 - - +Node1->Node20 + + + + +Node21 + + +Error.h + + + + +Node1->Node21 + + Node3 - -SDL_include.h + +SDL_include.h Node2->Node3 - - + + Node4 - -vector + +vector Node2->Node4 - - + + Node2->Node5 - - + + Node6 - -string + +string Node2->Node6 - - + + Node2->Node7 - - + + Node8 - - -Rect.h + + +ComponentType.h -Node2->Node8 - - - - -Node7->Node2 - - - - -Node8->Node3 - - +Node2->Node8 + + Node9 - - -Vec2.h + + +Rect.h - -Node8->Node9 - - + +Node2->Node9 + + - -Node10 - -cmath + +Node7->Node2 + + - -Node8->Node10 - - + +Node7->Node8 + + Node9->Node3 - - + + + + +Node10 + + +Vec2.h + - -Node12->Node2 - - - -Node12->Node4 - - + +Node9->Node10 + + - -Node12->Node6 - - + +Node11 + +cmath - -Node12->Node9 - - + +Node9->Node11 + + - -Node13 - - -Tileset.h - + +Node10->Node3 + + + +Node13->Node2 + + - -Node12->Node13 - - + +Node13->Node4 + + -Node13->Node6 - - +Node13->Node6 + + + + +Node13->Node10 + + Node14 - - -Sprite.h + + +Tileset.h Node13->Node14 - - - - -Node14->Node3 - - - - -Node14->Node5 - - + + -Node14->Node6 - - - - -Node14->Node8 - - +Node14->Node6 + + Node15 - - -Color.h + + +Sprite.h -Node14->Node15 - - +Node14->Node15 + + + + +Node15->Node3 + + + + +Node15->Node5 + + + + +Node15->Node6 + + + + +Node15->Node9 + + Node16 - - -InputManager.h + + +Color.h - -Node14->Node16 - - - - -Node16->Node3 - - - - -Node16->Node9 - - + +Node15->Node16 + + Node17 - -unordered_map + + +InputManager.h + + + + +Node15->Node17 + + + + +Node17->Node3 + + - -Node16->Node17 - - + +Node17->Node10 + + Node18 - -cstdint + +unordered_map - -Node16->Node18 - - + +Node17->Node18 + + - -Node19->Node4 - - + +Node19 + +cstdint - -Node19->Node6 - - + +Node17->Node19 + + - -Node19->Node20 - - + +Node20->Node4 + + - -Node21 - -iostream + +Node20->Node6 + + -Node20->Node21 - - +Node20->Node21 + + Node22 - -stdlib.h - - -Node20->Node22 - - + +iostream + + +Node21->Node22 + + + + +Node23 + +stdlib.h + + +Node21->Node23 + + diff --git a/docs/annotated.html b/docs/annotated.html index 570b61e0..a908ce75 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista de Componentes @@ -31,7 +31,7 @@

- + @@ -97,44 +97,42 @@  CColorStruct para armazenar informações de cor  CComponentModela os componentes  CDragAndDropClasse responsável por arrastar e posicionar Objetos - CemptyGameObject - CEmptyGameObject - CEndState - CEndStateData - CEnemyClasse que modela inimigos - CEnemyData - CEnemySpawnData - CGameClasse que modela o todo-poderoso Jogo - CGameObjectClasse virtual que especifica o funcionamento de um GameObject - CGameResourcesClasse estática que gerencia recursos específicos do jogo - CHitPoints - CInputManagerClasse que organiza entradas do usuário - CMusicClasse que modela músicas - CRectClasse que modela um rect - CResourcesClasse estática responsável por gestão dos recursos em memória - CSoundClasse que modela sons - CSpawnPointData - CSpriteClasse que modela uma sprite - CStageState - CStateClasse virtual que modela um estado do jogo - CStateDataInterface de comunicação entre States - CTextClasse que modela textos - CTileMapClasse que modela o TileMap - CTileSetClasse responsável por modelar um tileset - CTimerTemporizador - CTitleState - CTower - CVec2Classe que modela um vetor(no sentido físico) - CWaveData - CWaveManagerClasse que gerencia as waves do jogo. Responsavel por iniciar, encerrar e contar as waves. Também gerencia o spawn dos inimigos na wave atual. Mantem a contagem de vidas restantes e inimigos restantes que sao usadas para condição de fim de jogo + CEndState + CEndStateData + CEnemyClasse que modela inimigos + CEnemyData + CEnemySpawnData + CGameClasse que modela o todo-poderoso Jogo + CGameObjectClasse virtual que especifica o funcionamento de um GameObject + CGameResourcesClasse estática que gerencia recursos específicos do jogo + CHitPoints + CInputManagerClasse que organiza entradas do usuário + CMusicClasse que modela músicas + CRectClasse que modela um rect + CResourcesClasse estática responsável por gestão dos recursos em memória + CSoundClasse que modela sons + CSpawnPointData + CSpriteClasse que modela uma sprite + CStageState + CStateClasse virtual que modela um estado do jogo + CStateDataInterface de comunicação entre States + CTextClasse que modela textos + CTileMapClasse que modela o TileMap + CTileSetClasse responsável por modelar um tileset + CTimerTemporizador + CTitleState + CTower + CVec2Classe que modela um vetor(no sentido físico) + CWaveData + CWaveManagerClasse que gerencia as waves do jogo. Responsavel por iniciar, encerrar e contar as waves. Também gerencia o spawn dos inimigos na wave atual. Mantem a contagem de vidas restantes e inimigos restantes que sao usadas para condição de fim de jogo diff --git a/docs/classAIGoDown-members.html b/docs/classAIGoDown-members.html index ff0f8537..79dd645e 100644 --- a/docs/classAIGoDown-members.html +++ b/docs/classAIGoDown-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -98,9 +98,9 @@ diff --git a/docs/classAIGoDown.html b/docs/classAIGoDown.html index 009b6a2f..a6ca3727 100644 --- a/docs/classAIGoDown.html +++ b/docs/classAIGoDown.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe AIGoDown @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Diagrama de Hierarquia para AIGoDown:
-
+
+
[legenda]
Diagrama de colaboração para AIGoDown:
-
+
+
[legenda]
- + @@ -168,7 +170,7 @@

Métodos

- + @@ -262,9 +264,9 @@

Atributos

diff --git a/docs/classAIGoDown__coll__graph.map b/docs/classAIGoDown__coll__graph.map index 7752db37..9f86c660 100644 --- a/docs/classAIGoDown__coll__graph.map +++ b/docs/classAIGoDown__coll__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classAIGoDown__coll__graph.md5 b/docs/classAIGoDown__coll__graph.md5 index 87ff4b56..2acb8c75 100644 --- a/docs/classAIGoDown__coll__graph.md5 +++ b/docs/classAIGoDown__coll__graph.md5 @@ -1 +1 @@ -623ce2779d1a0bbe7c63eea65514e6cf \ No newline at end of file +e74e53613d2c7f32829d0a7f1ca6caa1 \ No newline at end of file diff --git a/docs/classAIGoDown__coll__graph.svg b/docs/classAIGoDown__coll__graph.svg index cd9d3161..9dece4f6 100644 --- a/docs/classAIGoDown__coll__graph.svg +++ b/docs/classAIGoDown__coll__graph.svg @@ -1,42 +1,42 @@ - - - + + AIGoDown - + Node1 - -AIGoDown + +AIGoDown Node2 - -Component + +Component Node2->Node1 - - + + Node3 - -float + +float Node3->Node1 - - - speed + + + speed diff --git a/docs/classAIGoDown__inherit__graph.map b/docs/classAIGoDown__inherit__graph.map index 7752db37..9f86c660 100644 --- a/docs/classAIGoDown__inherit__graph.map +++ b/docs/classAIGoDown__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classAIGoDown__inherit__graph.md5 b/docs/classAIGoDown__inherit__graph.md5 index 9e69c5b7..4486c244 100644 --- a/docs/classAIGoDown__inherit__graph.md5 +++ b/docs/classAIGoDown__inherit__graph.md5 @@ -1 +1 @@ -ce0d60a2fff4c8d412037d4bb0c733ee \ No newline at end of file +65397845ca6a9a6cb8dded5df4fb975c \ No newline at end of file diff --git a/docs/classAIGoDown__inherit__graph.svg b/docs/classAIGoDown__inherit__graph.svg index 2674b3e7..22193e00 100644 --- a/docs/classAIGoDown__inherit__graph.svg +++ b/docs/classAIGoDown__inherit__graph.svg @@ -1,31 +1,31 @@ - - + AIGoDown - + Node1 - -AIGoDown + +AIGoDown Node2 - -Component + +Component Node2->Node1 - - + + diff --git a/docs/classActionManager-members.html b/docs/classActionManager-members.html index fd3d0aab..9f251095 100644 --- a/docs/classActionManager-members.html +++ b/docs/classActionManager-members.html @@ -3,7 +3,7 @@ - +Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@

@@ -115,7 +117,7 @@

void Update (GameObject &associated, float dt)
 Atualiza estado. Mais...
 
bool Is (ComponentType type) const
bool Is (ComponentType type) const
 Verifica se essa componente é do tipo informado. Mais...
 
- Métodos Públicos inherited from Component
bool AIGoDown::Is (ComponentType ComponentType  type) const
- + @@ -102,9 +102,9 @@ diff --git a/docs/classActionManager.html b/docs/classActionManager.html index 6a9602f6..f79ac4ff 100644 --- a/docs/classActionManager.html +++ b/docs/classActionManager.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe ActionManager @@ -31,7 +31,7 @@ - + @@ -334,9 +334,9 @@

Métodos

diff --git a/docs/classAnimation-members.html b/docs/classAnimation-members.html index e92d75a4..8c1bdce6 100644 --- a/docs/classAnimation-members.html +++ b/docs/classAnimation-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -90,29 +90,32 @@

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

- - - + + + + + - + - - - - - - - + + + + + + + +
Animation(float x, float y, float rotation, string sprite, int frameCount, float frameTime, bool ends)Animation
boxGameObject
componentsGameObjectprotected
AddComponent(Component *component)GameObject
Animation(float x, float y, float rotation, string sprite, int frameCount, float frameTime, bool ends)Animation
boxGameObject
componentsGameObjectprotected
deadGameObjectprotected
endTimerAnimationprivate
GameObject(void)GameObject
GetWorldRenderedRect(void) const Animationvirtual
Is(string type)Animationvirtual
IsDead(void)Animationvirtual
IsDead(void)Animation
NotifyCollision(GameObject &other)Animationvirtual
oneTimeOnlyAnimationprivate
Render(void)Animationvirtual
RequestDelete(void)Animationvirtual
rotationGameObject
spAnimationprivate
timeLimitAnimationprivate
Update(float dt)Animationvirtual
~GameObject(void)GameObjectvirtual
RemoveComponent(ComponentType type)GameObject
Render(void)Animationvirtual
RequestDelete(void)Animation
rotationGameObject
spAnimationprivate
timeLimitAnimationprivate
Update(float dt)Animationvirtual
~GameObject(void)GameObject
diff --git a/docs/classAnimation.html b/docs/classAnimation.html index 2fa4180b..f67afa78 100644 --- a/docs/classAnimation.html +++ b/docs/classAnimation.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Animation @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Diagrama de Hierarquia para Animation:
-
+
+
[legenda]
Diagrama de colaboração para Animation:
-
+
+
[legenda]
- + + + + + + + + + + + + +

@@ -137,9 +139,21 @@

 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
void AddComponent (Component *component)
 Adiciona componente a um gameobjet. Mais...
 
void RemoveComponent (ComponentType type)
 Remove componente a um gameobjet. Mais...
 
 ~GameObject (void)
 Destrutor. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
@@ -162,6 +176,8 @@ + +

Atributos Privados

- Atributos Protegidos inherited from GameObject
std::vector< Component * > components
 
bool dead
 

Descrição Detalhada

Classe que modela animações.

@@ -264,7 +280,7 @@

Métodos

Obtém Rect informando a posição renderizada da animação.

Obtém Rect informando a posição renderizada, computando zoom, escala e posição da câmera.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -294,16 +310,13 @@

Métodos

Retorna
Verdadeiro se o argumento for "Animation", falso caso contrário.

Usado pelos objetos que colidem com a animação para saber que tipo de GameObject é.

-

Implementa GameObject.

+

Reimplementação de GameObject.

- - - - - -
@@ -313,19 +326,12 @@

Métodos

bool Animation::IsDead
-
-virtual

Informa se o objeto deve ser destruído.

Retorna
Verdadeiro se o objeto deve ser destruído, falso caso contrário.

Isso é feito verificando se a animação NÃO deve rodar eternamente, se sim, usamos o timer para verificar se já estourou o tempo para a animação rodar.

-

Implementa GameObject.

-
@@ -353,7 +359,7 @@

Métodos

Notifica colisão.

Como a animação a princípio não interage com os outros gameObjects, o corpo desse método está vazio.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -382,16 +388,13 @@

Métodos

Renderiza animação.

Renderiza a animação na tela.

-

Implementa GameObject.

+

Reimplementação de GameObject.

- - - - - -
@@ -401,18 +404,11 @@

Métodos

void Animation::RequestDelete
-
-virtual

Solicita que o Animation seja destruído.

Uma vez que esse método é chamado, futuras chamadas ao IsDead devem retornar verdadeiro.

-

Implementa GameObject.

-
@@ -440,7 +436,7 @@

Métodos

Atualiza estado.

Atualiza o estado da animação e a contagem de tempo do timer.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -536,9 +532,9 @@

Atributos

diff --git a/docs/classAnimation__coll__graph.map b/docs/classAnimation__coll__graph.map index 1eaea047..29d19c72 100644 --- a/docs/classAnimation__coll__graph.map +++ b/docs/classAnimation__coll__graph.map @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/docs/classAnimation__coll__graph.md5 b/docs/classAnimation__coll__graph.md5 index ee4b1c85..7e19ed3b 100644 --- a/docs/classAnimation__coll__graph.md5 +++ b/docs/classAnimation__coll__graph.md5 @@ -1 +1 @@ -4d0f03017b04eeb4fd4684ca8f67d965 \ No newline at end of file +86af3f19ccd0a2fc206e882890e32f4f \ No newline at end of file diff --git a/docs/classAnimation__coll__graph.svg b/docs/classAnimation__coll__graph.svg index 55273acf..27c5b289 100644 --- a/docs/classAnimation__coll__graph.svg +++ b/docs/classAnimation__coll__graph.svg @@ -1,216 +1,222 @@ - - - + + Animation - + Node1 - -Animation + +Animation Node2 - -GameObject + +GameObject Node2->Node1 - - + + Node3 - -Rect + +Rect Node3->Node2 - - - box + + + box Node4 - -float + +float -Node4->Node1 - - - timeLimit +Node4->Node1 + + + timeLimit Node4->Node2 - - - rotation + + + rotation Node4->Node3 - - - w -x -h -y + + + w +x +h +y - -Node6 - - -Sprite + +Node7 + + +Sprite - -Node4->Node6 - - - scaleY -frameTime -timeElapsed -scaleX + +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node14 - -Timer + +Timer -Node4->Node14 - - - time +Node4->Node14 + + + time Node5 - -vector< Component * > + +bool + + +Node5->Node1 + + + oneTimeOnly Node5->Node2 - - - components + + + dead - -Node6->Node1 - - - sp + +Node6 + +vector< Component * > - -Node7 - -unsigned char + +Node6->Node2 + + + components - -Node7->Node6 - - - alpha + +Node7->Node1 + + + sp - -Node12 - - -Color - + +Node8 + +unsigned char + +Node8->Node7 + + + alpha - -Node7->Node12 - - - g -r -b + +Node13 + + +Color + - -Node8 - -SDL_Rect - -Node8->Node6 - - - clipRect + +Node8->Node13 + + + g +r +b Node9 - -int - - -Node9->Node6 - - - width -currentFrame -height -frameCount + +SDL_Rect + + +Node9->Node7 + + + clipRect Node10 - -shared_ptr< SDL_Texture > - - -Node10->Node6 - - - texture + +int + + +Node10->Node7 + + + width +currentFrame +height +frameCount Node11 - -SDL_BlendMode + +shared_ptr< SDL_Texture > - -Node11->Node6 - - - blendMode + +Node11->Node7 + + + texture - -Node12->Node6 - - - colorMultiplier + +Node12 + +SDL_BlendMode - -Node13 - -bool + +Node12->Node7 + + + blendMode - -Node13->Node1 - - - oneTimeOnly + +Node13->Node7 + + + colorMultiplier -Node14->Node1 - - - endTimer +Node14->Node1 + + + endTimer diff --git a/docs/classAnimation__inherit__graph.map b/docs/classAnimation__inherit__graph.map index 29d0d807..8cabab41 100644 --- a/docs/classAnimation__inherit__graph.map +++ b/docs/classAnimation__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classAnimation__inherit__graph.md5 b/docs/classAnimation__inherit__graph.md5 index 368d29d6..77248751 100644 --- a/docs/classAnimation__inherit__graph.md5 +++ b/docs/classAnimation__inherit__graph.md5 @@ -1 +1 @@ -17be45f87f65d86351982b6923cb33f8 \ No newline at end of file +46100a4d31fb4070f31aac9dfb4ed0e2 \ No newline at end of file diff --git a/docs/classAnimation__inherit__graph.svg b/docs/classAnimation__inherit__graph.svg index b7d10cb8..86f98f06 100644 --- a/docs/classAnimation__inherit__graph.svg +++ b/docs/classAnimation__inherit__graph.svg @@ -1,31 +1,31 @@ - - + Animation - + Node1 - -Animation + +Animation Node2 - -GameObject + +GameObject Node2->Node1 - - + + diff --git a/docs/classCamera-members.html b/docs/classCamera-members.html index b23b3f19..cc0e692b 100644 --- a/docs/classCamera-members.html +++ b/docs/classCamera-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -120,9 +120,9 @@ diff --git a/docs/classCamera.html b/docs/classCamera.html index 90f275ff..b17c5101 100644 --- a/docs/classCamera.html +++ b/docs/classCamera.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Camera @@ -31,7 +31,7 @@ - + @@ -101,7 +101,8 @@
Diagrama de colaboração para Camera:
-
+
+
[legenda]

@@ -989,9 +990,9 @@

Atributos

diff --git a/docs/classCamera__coll__graph.map b/docs/classCamera__coll__graph.map index aa0c87c2..4d27e2c7 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 9c6835bd..f2c332b6 100644 --- a/docs/classCamera__coll__graph.md5 +++ b/docs/classCamera__coll__graph.md5 @@ -1 +1 @@ -5d02ff86b6155936d704ce353ee5f34e \ No newline at end of file +4dd9e0d907b3519dbbffb15004e51d6e \ No newline at end of file diff --git a/docs/classCamera__coll__graph.svg b/docs/classCamera__coll__graph.svg index faec599d..2ea8a618 100644 --- a/docs/classCamera__coll__graph.svg +++ b/docs/classCamera__coll__graph.svg @@ -1,121 +1,127 @@ - - - + + Camera - + Node1 - -Camera + +Camera Node2 - -Vec2 + +Vec2 Node2->Node1 - - - pos + + + pos Node3 - -float + +float -Node3->Node1 - - - zoomSpeed -minSpeed -maxSpeed -minZoom -currentSpeed -maxZoom -currentZoom +Node3->Node1 + + + zoomSpeed +minSpeed +maxSpeed +minZoom +currentSpeed +maxZoom +currentZoom 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 - -vector< Component * > + +bool + + +Node6->Node1 + + + zoomFixed Node6->Node4 - - - components + + + dead Node7 - -bool - - -Node7->Node1 - - - zoomFixed + +vector< Component * > + + +Node7->Node4 + + + components diff --git a/docs/classCollision-members.html b/docs/classCollision-members.html index 8b54de45..14466731 100644 --- a/docs/classCollision-members.html +++ b/docs/classCollision-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -98,9 +98,9 @@ diff --git a/docs/classCollision.html b/docs/classCollision.html index b1b8e590..413da945 100644 --- a/docs/classCollision.html +++ b/docs/classCollision.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Collision @@ -31,7 +31,7 @@ - + @@ -309,9 +309,9 @@ diff --git a/docs/classComponent-members.html b/docs/classComponent-members.html index 84f7a5fc..b2548801 100644 --- a/docs/classComponent-members.html +++ b/docs/classComponent-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -96,9 +96,9 @@ diff --git a/docs/classComponent.html b/docs/classComponent.html index 26978f8e..3b4bebc1 100644 --- a/docs/classComponent.html +++ b/docs/classComponent.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Component @@ -31,7 +31,7 @@ - + @@ -98,7 +98,8 @@
Diagrama de Hierarquia para Component:
-
+
+
[legenda]
- + @@ -155,7 +156,7 @@

Métodos

- + @@ -231,9 +232,9 @@

Métodos

diff --git a/docs/classComponent__inherit__graph.map b/docs/classComponent__inherit__graph.map index 541921d0..dc411fd1 100644 --- a/docs/classComponent__inherit__graph.map +++ b/docs/classComponent__inherit__graph.map @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/docs/classComponent__inherit__graph.md5 b/docs/classComponent__inherit__graph.md5 index f31b72cb..8ec7796c 100644 --- a/docs/classComponent__inherit__graph.md5 +++ b/docs/classComponent__inherit__graph.md5 @@ -1 +1 @@ -b6083a152bd70469c99b5c3272e6dce8 \ No newline at end of file +a4e933328cab7daaead37366c29461f2 \ No newline at end of file diff --git a/docs/classComponent__inherit__graph.svg b/docs/classComponent__inherit__graph.svg index dfde68ee..e623e991 100644 --- a/docs/classComponent__inherit__graph.svg +++ b/docs/classComponent__inherit__graph.svg @@ -1,70 +1,70 @@ - - + Component - + Node1 - -Component + +Component Node2 - -AIGoDown + +AIGoDown Node1->Node2 - - + + Node3 - -DragAndDrop + +DragAndDrop Node1->Node3 - - + + Node4 - -HitPoints + +HitPoints Node1->Node4 - - + + Node5 - -WaveManager + +WaveManager Node1->Node5 - - + + diff --git a/docs/classDragAndDrop-members.html b/docs/classDragAndDrop-members.html index 66d3338c..a087c122 100644 --- a/docs/classDragAndDrop-members.html +++ b/docs/classDragAndDrop-members.html @@ -3,7 +3,7 @@ - +Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@

@@ -106,7 +107,7 @@

virtual void Update (GameObject &associated, float dt)=0
 Atualiza estado do componente. Mais...
 
virtual bool Is (ComponentType type) const =0
virtual bool Is (ComponentType type) const =0
 Verifica o subtipo de componente. Mais...
 
virtual ~Component (void)
virtual bool Component::Is (ComponentType ComponentType  type) const
- + @@ -90,19 +90,20 @@

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

- - - - - - - + + + + + + + +
DragAndDrop(TileMap *map, bool dragging=false, bool dragOnActionHold=true)DragAndDrop
dragOnHoldDragAndDropprivate
Is(ComponentType) const DragAndDropvirtual
isDraggingDragAndDropprivate
tileMapDragAndDropprivate
Update(GameObject &associated, float dt)DragAndDropvirtual
~Component(void)Componentinlinevirtual
associatedInitialPosDragAndDropprivate
DragAndDrop(TileMap &map, Vec2 associatedInitialPos, bool redrag=true, bool dragOnActionHold=true)DragAndDrop
dragOnHoldDragAndDropprivate
Is(ComponentType) const DragAndDropvirtual
redragDragAndDropprivate
tileMapDragAndDropprivate
Update(GameObject &associated, float dt)DragAndDropvirtual
~Component(void)Componentinlinevirtual
diff --git a/docs/classDragAndDrop.html b/docs/classDragAndDrop.html index 204f09f5..469f7be1 100644 --- a/docs/classDragAndDrop.html +++ b/docs/classDragAndDrop.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe DragAndDrop @@ -31,7 +31,7 @@ - + @@ -99,23 +99,25 @@
Diagrama de Hierarquia para DragAndDrop:
-
+
+
[legenda]
Diagrama de colaboração para DragAndDrop:
-
+
+
[legenda]
- - - + + + - + @@ -125,32 +127,40 @@

Métodos Públicos

 DragAndDrop (TileMap *map, bool dragging=false, bool dragOnActionHold=true)
 Construtor. Mais...
 
 DragAndDrop (TileMap &map, Vec2 associatedInitialPos, bool redrag=true, bool dragOnActionHold=true)
 Construtor. Mais...
 
void Update (GameObject &associated, float dt)
 Atualiza o estado do objeto em arrasto. Mais...
 
bool Is (ComponentType) const
bool Is (ComponentType) const
 Informa que o tipo deste Compomente é DragAndDrop. Mais...
 
- Métodos Públicos inherited from Component
- - - - + + + + + +

Atributos Privados

bool isDragging
 
bool dragOnHold
 
TileMaptileMap
 
Vec2 associatedInitialPos
 
TileMaptileMap
 
bool redrag
 

Descrição Detalhada

Classe responsável por arrastar e posicionar Objetos.

O DragAndDrop é um tipo de Componente. O objetivo do DragAndDrop é selecionar um objeto arrastavel por meio de Input e posicioná-lo em uma tile. E assim, atualizar o mapa de Tiles.

Construtores & Destrutores

- +
- + + + + + + + - + @@ -171,6 +181,7 @@
DragAndDrop::DragAndDrop (TileMapTileMap map,
Vec2 associatedInitialPos,
bool dragging = false, redrag = true,
+
mapUsado para inserir o objeto no tileMap.
dragginInforma se o objeto esta sendo arrastado.
redragVerdadeiro se for um redrag, falso caso seja um drag inicial.
dragOnActionHoldVariável não utilizada, tem como objetivo verificar se o arrastar é enquanto o botão da ação é segurado ou se pressiona uma vez para arrastar e outra vez para soltar.
@@ -191,7 +202,7 @@

Métodos

bool DragAndDrop::Is ( - ComponentType  + ComponentType  type) const @@ -262,6 +273,27 @@

Métodos

Atributos

+ +
+
+ + + + + +
+ + + + +
Vec2 DragAndDrop::associatedInitialPos
+
+private
+
+

Vec2 no qual o será armazenada a posição do objeto associado no instante do drag.

+ +
+
@@ -283,7 +315,7 @@

Atributos

- +
@@ -291,7 +323,7 @@

Atributos

@@ -300,11 +332,11 @@

Atributos

- +
bool DragAndDrop::isDraggingbool DragAndDrop::redrag
-

Indica se o objeto esta sendo arrastado.

+

Informa se é um drag inicial ou um redrag

- +
@@ -312,7 +344,7 @@

Atributos

@@ -332,9 +364,9 @@

Atributos

diff --git a/docs/classDragAndDrop__coll__graph.map b/docs/classDragAndDrop__coll__graph.map index 0d853963..5a5363be 100644 --- a/docs/classDragAndDrop__coll__graph.map +++ b/docs/classDragAndDrop__coll__graph.map @@ -1,7 +1,8 @@ - - - - - + + + + + + diff --git a/docs/classDragAndDrop__coll__graph.md5 b/docs/classDragAndDrop__coll__graph.md5 index 97e01fcb..9847a1cf 100644 --- a/docs/classDragAndDrop__coll__graph.md5 +++ b/docs/classDragAndDrop__coll__graph.md5 @@ -1 +1 @@ -1a401d8ee18eaba937f3755d83435f9f \ No newline at end of file +32a599361bb528821820fc1ed038bcaf \ No newline at end of file diff --git a/docs/classDragAndDrop__coll__graph.svg b/docs/classDragAndDrop__coll__graph.svg index c8a87585..2cdd237b 100644 --- a/docs/classDragAndDrop__coll__graph.svg +++ b/docs/classDragAndDrop__coll__graph.svg @@ -1,224 +1,245 @@ - - - + + DragAndDrop - + Node1 - -DragAndDrop + +DragAndDrop Node2 - -Component + +Component Node2->Node1 - - + + Node3 - - -TileMap + + +Vec2 Node3->Node1 - - - tileMap + + + associatedInitialPos Node4 - - -TileSet - - + +float Node4->Node3 - - - tileSet + + + x +y + + +Node7 + + +Sprite + + + + +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - - -Sprite + + +TileMap - -Node5->Node4 - - - tileSet + +Node5->Node1 + + + tileMap Node6 - -unsigned char + + +TileSet + + Node6->Node5 - - - alpha + + + tileSet - -Node12 - - -Color - + +Node7->Node6 + + + tileSet + +Node8 + +unsigned char - -Node6->Node12 - - - g -r -b + +Node8->Node7 + + + alpha - -Node7 - -float - - -Node7->Node5 - - - scaleY -frameTime -timeElapsed -scaleX + +Node13 + + +Color + - -Node8 - -SDL_Rect - -Node8->Node5 - - - clipRect + +Node8->Node13 + + + g +r +b Node9 - -int - - -Node9->Node3 - - - mapDepth -mapHeight -mapWidth - - -Node9->Node4 - - - tileHeight -rows -tileWidth -columns - - -Node9->Node5 - - - width -currentFrame -height -frameCount + +SDL_Rect + + +Node9->Node7 + + + clipRect Node10 - -shared_ptr< SDL_Texture > + +int -Node10->Node5 - - - texture +Node10->Node5 + + + mapDepth +mapHeight +mapWidth + + +Node10->Node6 + + + tileHeight +rows +tileWidth +columns + + +Node10->Node7 + + + width +currentFrame +height +frameCount Node11 - -SDL_BlendMode + +shared_ptr< SDL_Texture > - -Node11->Node5 - - - blendMode + +Node11->Node7 + + + texture - -Node12->Node5 - - - colorMultiplier + +Node12 + +SDL_BlendMode - -Node13 - -vector< int > + +Node12->Node7 + + + blendMode - -Node13->Node3 - - - tileMatrix + +Node13->Node7 + + + colorMultiplier Node14 - -vector< GameObject * > + +vector< int > - -Node14->Node3 - - - gameObjectMatrix + +Node14->Node5 + + + tileMatrix Node15 - -bool - - -Node15->Node1 - - - dragOnHold -isDragging - - -Node15->Node3 - - - displayCollisionInfo + +vector< GameObject * > + + +Node15->Node5 + + + gameObjectMatrix + + +Node16 + +bool + + +Node16->Node1 + + + dragOnHold +redrag + + +Node16->Node5 + + + displayCollisionInfo diff --git a/docs/classDragAndDrop__inherit__graph.map b/docs/classDragAndDrop__inherit__graph.map index ba6d72c4..fc4d80bc 100644 --- a/docs/classDragAndDrop__inherit__graph.map +++ b/docs/classDragAndDrop__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classDragAndDrop__inherit__graph.md5 b/docs/classDragAndDrop__inherit__graph.md5 index cd1eee27..fb41c08e 100644 --- a/docs/classDragAndDrop__inherit__graph.md5 +++ b/docs/classDragAndDrop__inherit__graph.md5 @@ -1 +1 @@ -8964eb765135af2c144aa380fc7060ac \ No newline at end of file +07e678020f07b9599ccfc205a9857f4c \ No newline at end of file diff --git a/docs/classDragAndDrop__inherit__graph.svg b/docs/classDragAndDrop__inherit__graph.svg index 29c1bfc7..51edcda7 100644 --- a/docs/classDragAndDrop__inherit__graph.svg +++ b/docs/classDragAndDrop__inherit__graph.svg @@ -1,7 +1,7 @@ - - - - - - -Projeto IDJ - Towers Of Madness: Lista dos Membros - - - - - - - - - -
-
-
- +
TileMap* DragAndDrop::tileMapTileMap& DragAndDrop::tileMap
- - - - - -
-
Projeto IDJ - Towers Of Madness -
-
TowerDefenseLovecraftnianoZombicida
-
-
- - - - - - - - - -
- -
- -
-
-
-
EmptyGameObject Lista dos Membros
-
-
- -

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

- - - - - - - - - - - - - - - -
boxGameObject
componentsGameObjectprotected
EmptyGameObject()EmptyGameObjectinline
GameObject(void)GameObject
GetWorldRenderedRect(void) const EmptyGameObjectinlinevirtual
Is(string type)EmptyGameObjectinlinevirtual
IsDead(void)EmptyGameObjectinlinevirtual
NotifyCollision(GameObject &other)EmptyGameObjectinlinevirtual
Render()EmptyGameObjectinlinevirtual
RequestDelete(void)EmptyGameObjectinlinevirtual
rotationGameObject
Update(float dt)EmptyGameObjectinlinevirtual
~EmptyGameObject()EmptyGameObjectinline
~GameObject(void)GameObjectvirtual
- - - - diff --git a/docs/classEmptyGameObject.html b/docs/classEmptyGameObject.html deleted file mode 100644 index 82277073..00000000 --- a/docs/classEmptyGameObject.html +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - -Projeto IDJ - Towers Of Madness: Referência da Classe EmptyGameObject - - - - - - - - - -
-
- - - - - - -
-
Projeto IDJ - Towers Of Madness -
-
TowerDefenseLovecraftnianoZombicida
-
-
- - - - - - - - - -
- -
- -
-
- -
-
Referência da Classe EmptyGameObject
-
-
- -

#include <EmptyGameObject.h>

-
-Diagrama de Hierarquia para EmptyGameObject:
-
-
-
[legenda]
-
-Diagrama de colaboração para EmptyGameObject:
-
-
-
[legenda]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Métodos Públicos

 EmptyGameObject ()
 
 ~EmptyGameObject ()
 
void Update (float dt)
 Atualizar estado. Mais...
 
void Render ()
 Renderiza o GameObject. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
void NotifyCollision (GameObject &other)
 Notifica Colisão. Mais...
 
Rect GetWorldRenderedRect (void) const
 Obtém Rect informando a posição renderizada da animação. Mais...
 
bool Is (string type)
 Informa que tipo de GameObject é. Mais...
 
- Métodos Públicos inherited from GameObject
 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
 Destrutor. Mais...
 
- - - - - - - - - -

-Additional Inherited Members

- Atributos Públicos inherited from GameObject
Rect box
 
float rotation
 
- Atributos Protegidos inherited from GameObject
std::vector< Component * > components
 
-

Construtores & Destrutores

- -
-
- - - - - -
- - - - - - - -
EmptyGameObject::EmptyGameObject ()
-
-inline
-
- -
-
- -
-
- - - - - -
- - - - - - - -
EmptyGameObject::~EmptyGameObject ()
-
-inline
-
- -
-
-

Métodos

- -
-
- - - - - -
- - - - - - - - -
Rect EmptyGameObject::GetWorldRenderedRect (void ) const
-
-inlinevirtual
-
- -

Obtém Rect informando a posição renderizada da animação.

-

Obtém Rect informando a posição renderizada, computando zoom, escala e posição da câmera.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool EmptyGameObject::Is (string type)
-
-inlinevirtual
-
- -

Informa que tipo de GameObject é.

-
Parâmetros
- - -
typeTipo com o qual quer se verificar que esse GameObject é.
-
-
-
Retorna
Verdadeiro se for do tipo perguntado, falso caso contrário;
-

É usado no tratamento de colisão para que se identifique com quem colidiu.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool EmptyGameObject::IsDead (void )
-
-inlinevirtual
-
- -

Informa se esse gameObject não precisa mais existir.

-
Retorna
Verdadeiro se esse GameObject não é mais necessário, false caso contrário.
-

Deve ser usado no State que o contém para o eliminar da sua estrutura de manipulação de gameObject e destruí-lo.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void EmptyGameObject::NotifyCollision (GameObjectother)
-
-inlinevirtual
-
- -

Notifica Colisão.

-
Parâmetros
- - -
otherReferência para o gameobject com o qual se colidiu.
-
-
-

Deve realizar as ações para tratamento da colisão.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - -
void EmptyGameObject::Render ()
-
-inlinevirtual
-
- -

Renderiza o GameObject.

-

Esse método deve ter a lógica necessário para ser renderizado na tela.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void EmptyGameObject::RequestDelete (void )
-
-inlinevirtual
-
- -

Solicita que o GameObject seja destruído.

-

Uma vez que esse método é chamado, futuras chamadas ao IsDead devem retornar verdadeiro.

- -

Implementa GameObject.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void EmptyGameObject::Update (float dt)
-
-inlinevirtual
-
- -

Atualizar estado.

-
Parâmetros
- - -
dttempo transcorrido desde a última chamada ao método.
-
-
-

No corpo método o GameObject deve atualizar seu estado, utilizando o argumento passado e quaisquer outras funcionalidades que necessitar.

- -

Implementa GameObject.

- -
-
-
A documentação para esta classe foi gerada a partir do seguinte arquivo: -
- - - - diff --git a/docs/classEmptyGameObject__coll__graph.map b/docs/classEmptyGameObject__coll__graph.map deleted file mode 100644 index 4da374ef..00000000 --- a/docs/classEmptyGameObject__coll__graph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classEmptyGameObject__coll__graph.md5 b/docs/classEmptyGameObject__coll__graph.md5 deleted file mode 100644 index ed823105..00000000 --- a/docs/classEmptyGameObject__coll__graph.md5 +++ /dev/null @@ -1 +0,0 @@ -888c9178f45ebff90afcf1cf0ebac794 \ No newline at end of file diff --git a/docs/classEmptyGameObject__coll__graph.svg b/docs/classEmptyGameObject__coll__graph.svg deleted file mode 100644 index 793bc87b..00000000 --- a/docs/classEmptyGameObject__coll__graph.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -EmptyGameObject - - -Node1 - -EmptyGameObject - - -Node2 - - -GameObject - - - - -Node2->Node1 - - - - -Node3 - - -Rect - - - - -Node3->Node2 - - - box - - -Node4 - -float - - -Node4->Node2 - - - rotation - - -Node4->Node3 - - - w -x -h -y - - -Node5 - -vector< Component * > - - -Node5->Node2 - - - components - - - diff --git a/docs/classEmptyGameObject__inherit__graph.map b/docs/classEmptyGameObject__inherit__graph.map deleted file mode 100644 index f52090b1..00000000 --- a/docs/classEmptyGameObject__inherit__graph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classEmptyGameObject__inherit__graph.md5 b/docs/classEmptyGameObject__inherit__graph.md5 deleted file mode 100644 index 4ad3bb2a..00000000 --- a/docs/classEmptyGameObject__inherit__graph.md5 +++ /dev/null @@ -1 +0,0 @@ -aca09e76be8679a5a74cfb97dfc867c1 \ No newline at end of file diff --git a/docs/classEmptyGameObject__inherit__graph.svg b/docs/classEmptyGameObject__inherit__graph.svg deleted file mode 100644 index 66cae248..00000000 --- a/docs/classEmptyGameObject__inherit__graph.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -EmptyGameObject - - -Node1 - -EmptyGameObject - - -Node2 - - -GameObject - - - - -Node2->Node1 - - - - - diff --git a/docs/classEndState-members.html b/docs/classEndState-members.html index 83cbcad8..17b2ef24 100644 --- a/docs/classEndState-members.html +++ b/docs/classEndState-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -111,9 +111,9 @@ diff --git a/docs/classEndState.html b/docs/classEndState.html index af4c8333..4294b4b9 100644 --- a/docs/classEndState.html +++ b/docs/classEndState.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe EndState @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Diagrama de Hierarquia para EndState:
-
+
+
[legenda]
Diagrama de colaboração para EndState:
-
+
+
[legenda]

@@ -369,9 +371,9 @@

Atributos

diff --git a/docs/classEndStateData-members.html b/docs/classEndStateData-members.html index 00dac9e9..a6566974 100644 --- a/docs/classEndStateData-members.html +++ b/docs/classEndStateData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -100,9 +100,9 @@ diff --git a/docs/classEndStateData.html b/docs/classEndStateData.html index e4d99983..f96eb395 100644 --- a/docs/classEndStateData.html +++ b/docs/classEndStateData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe EndStateData @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Diagrama de Hierarquia para EndStateData:
-
+
+
[legenda]
Diagrama de colaboração para EndStateData:
-
+
+
[legenda]

@@ -250,9 +252,9 @@

Atributos

diff --git a/docs/classEndStateData__coll__graph.map b/docs/classEndStateData__coll__graph.map index 4e7721e7..f4ee4970 100644 --- a/docs/classEndStateData__coll__graph.map +++ b/docs/classEndStateData__coll__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classEndStateData__coll__graph.md5 b/docs/classEndStateData__coll__graph.md5 index 0fd7eef3..e838c998 100644 --- a/docs/classEndStateData__coll__graph.md5 +++ b/docs/classEndStateData__coll__graph.md5 @@ -1 +1 @@ -70d84a311b1ab66e8b336aaac5bf406a \ No newline at end of file +984092a0a18a1e143b160eb061ff17a0 \ No newline at end of file diff --git a/docs/classEndStateData__coll__graph.svg b/docs/classEndStateData__coll__graph.svg index 8bff1c3f..4e4a480f 100644 --- a/docs/classEndStateData__coll__graph.svg +++ b/docs/classEndStateData__coll__graph.svg @@ -1,14 +1,14 @@ - - - + + EndStateData - + Node1 @@ -17,43 +17,43 @@ Node2 - -StateData + +StateData Node2->Node1 - - + + Node2->Node1 - - + + Node3 - -int + +int Node3->Node2 - - - lifes -waveCount + + + lifes +waveCount Node4 - -bool + +bool Node4->Node1 - - - playerVictory + + + playerVictory diff --git a/docs/classEndStateData__inherit__graph.map b/docs/classEndStateData__inherit__graph.map index 940997cf..e24ccafd 100644 --- a/docs/classEndStateData__inherit__graph.map +++ b/docs/classEndStateData__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classEndStateData__inherit__graph.md5 b/docs/classEndStateData__inherit__graph.md5 index 3bb563be..ba91e4dd 100644 --- a/docs/classEndStateData__inherit__graph.md5 +++ b/docs/classEndStateData__inherit__graph.md5 @@ -1 +1 @@ -8b07d3357b53de1729059c80d3ffc631 \ No newline at end of file +69bb012a511c359014cb57f4f011b8c9 \ No newline at end of file diff --git a/docs/classEndStateData__inherit__graph.svg b/docs/classEndStateData__inherit__graph.svg index ff3f8c12..1a5bff7e 100644 --- a/docs/classEndStateData__inherit__graph.svg +++ b/docs/classEndStateData__inherit__graph.svg @@ -1,7 +1,7 @@ - - - - - - - - + + + + + + + diff --git a/docs/classEndState__coll__graph.md5 b/docs/classEndState__coll__graph.md5 index 8903b018..9b4e5a24 100644 --- a/docs/classEndState__coll__graph.md5 +++ b/docs/classEndState__coll__graph.md5 @@ -1 +1 @@ -449a4cab31f86b773077ed70cedbf2f4 \ No newline at end of file +7f730f4d239aa4685eeb69f602d32cad \ No newline at end of file diff --git a/docs/classEndState__coll__graph.svg b/docs/classEndState__coll__graph.svg index b9b74861..f6b5f1d5 100644 --- a/docs/classEndState__coll__graph.svg +++ b/docs/classEndState__coll__graph.svg @@ -1,320 +1,320 @@ - - - + + EndState - + Node1 - -EndState + +EndState Node2 - -State + +State Node2->Node1 - - + + Node3 - -vector< std::unique -_ptr< GameObject > > + +vector< std::unique +_ptr< GameObject > > Node3->Node2 - - - objectArray + + + objectArray Node4 - -bool + +bool Node4->Node2 - - - quitRequested -popRequested + + + quitRequested +popRequested Node15 - -Text + +Text Node4->Node15 - - - isStrobe + + + isStrobe Node5 - -Music + +Music Node5->Node1 - - - music + + + music Node6 - -shared_ptr< Mix_Music > + +shared_ptr< Mix_Music > Node6->Node5 - - - music + + + music Node7 - -Sprite + +Sprite Node7->Node1 - - - bg + + + bg Node8 - -unsigned char + +unsigned char Node8->Node7 - - - alpha + + + alpha Node14 - -Color + +Color Node8->Node14 - - - g -r -b + + + g +r +b Node9 - -float + +float Node9->Node7 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node9->Node15 - - - timeShown -strobeFrequency + + + timeShown +strobeFrequency Node18 - -Rect + +Rect Node9->Node18 - - - w -x -h -y + + + w +x +h +y Node21 - -Timer + +Timer Node9->Node21 - - - time + + + time Node10 - -SDL_Rect + +SDL_Rect Node10->Node7 - - - clipRect + + + clipRect Node11 - -int + +int Node11->Node7 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node11->Node15 - - - fontSize + + + fontSize Node12 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node12->Node7 - - - texture + + + texture Node13 - -SDL_BlendMode + +SDL_BlendMode Node13->Node7 - - - blendMode + + + blendMode Node14->Node7 - - - colorMultiplier + + + colorMultiplier Node15->Node1 - - - instruction + + + instruction Node16 - -shared_ptr< TTF_Font > + +shared_ptr< TTF_Font > Node16->Node15 - - - font + + + font Node17 - -SDL_Color + +SDL_Color Node17->Node15 - - - color + + + color Node18->Node15 - - - box + + + box Node19 - -SDL_Texture * + +SDL_Texture * Node19->Node15 - - - texture + + + texture Node20 - -string + +string Node20->Node15 - - - fontFile -text + + + fontFile +text Node21->Node15 - - - textTime + + + textTime Node22 - -TextStyle + +TextStyle Node22->Node15 - - - style + + + style diff --git a/docs/classEndState__inherit__graph.map b/docs/classEndState__inherit__graph.map index c888ca4e..6619fb69 100644 --- a/docs/classEndState__inherit__graph.map +++ b/docs/classEndState__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classEndState__inherit__graph.md5 b/docs/classEndState__inherit__graph.md5 index 9341772e..6124a3fd 100644 --- a/docs/classEndState__inherit__graph.md5 +++ b/docs/classEndState__inherit__graph.md5 @@ -1 +1 @@ -b6f6980c0e46b8dd6f922d0c21f28109 \ No newline at end of file +2528e2956bff46337a53319e6d90f52a \ No newline at end of file diff --git a/docs/classEndState__inherit__graph.svg b/docs/classEndState__inherit__graph.svg index dd75bdc9..01d6f621 100644 --- a/docs/classEndState__inherit__graph.svg +++ b/docs/classEndState__inherit__graph.svg @@ -1,31 +1,31 @@ - - + EndState - + Node1 - -EndState + +EndState Node2 - -State + +State Node2->Node1 - - + + diff --git a/docs/classEnemy-members.html b/docs/classEnemy-members.html index 3f6d17f1..d016cfd5 100644 --- a/docs/classEnemy-members.html +++ b/docs/classEnemy-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -90,38 +90,40 @@

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

- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - +
baseHPEnemyprivate
bodySpNameEnemyprivate
boxGameObject
componentsGameObjectprotected
deadEnemyprivate
endPointEnemyprivate
Enemy(Vec2 position, int life)Enemy
Enemy(Vec2 position, int enemyIndex, EnemyData enemyData, uint baseHP, uint endPoint)Enemy
enemyIndexEnemyprivate
GameObject(void)GameObject
GetWorldRenderedRect(void) const Enemyvirtual
headSpNameEnemyprivate
Is(string type)Enemyvirtual
IsDead(void)Enemyvirtual
NotifyCollision(GameObject &object)Enemyvirtual
pantsSpNameEnemyprivate
quantEnemyprivate
AddComponent(Component *component)GameObject
baseHPEnemyprivate
bodySpNameEnemyprivate
boxGameObject
componentsGameObjectprotected
deadEnemyprivate
endPointEnemyprivate
Enemy(Vec2 position, int life)Enemy
Enemy(Vec2 position, int enemyIndex, EnemyData enemyData, uint baseHP, uint endPoint)Enemy
enemyIndexEnemyprivate
GameObject(void)GameObject
GetWorldRenderedRect(void) const Enemyvirtual
headSpNameEnemyprivate
Is(string type)Enemyvirtual
IsDead(void)Enemy
NotifyCollision(GameObject &object)Enemyvirtual
pantsSpNameEnemyprivate
quantEnemyprivate
RemoveComponent(ComponentType type)GameObject
Render(void)Enemyvirtual
RequestDelete()Enemyvirtual
RequestDelete(void)Enemy
rotationGameObject
spEnemyprivate
spNameEnemyprivate
typeEnemyprivate
Update(float dt)Enemyvirtual
~Enemy()Enemy
~GameObject(void)GameObjectvirtual
~GameObject(void)GameObject
diff --git a/docs/classEnemy.html b/docs/classEnemy.html index 35d7af0e..7f9bebb3 100644 --- a/docs/classEnemy.html +++ b/docs/classEnemy.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Enemy @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Diagrama de Hierarquia para Enemy:
-
+
+
[legenda]
Diagrama de colaboração para Enemy:
-
+
+
[legenda]
+ @@ -126,9 +129,9 @@ - - - + + + @@ -142,9 +145,21 @@ - + + + + + + + + + + + + +

@@ -113,6 +115,7 @@

 Construtor. Mais...
 
 Enemy (Vec2 position, int enemyIndex, EnemyData enemyData, uint baseHP, uint endPoint)
 Construtor. Mais...
 
 ~Enemy ()
 Destrutor. Mais...
bool IsDead (void)
 Verifica se esse GameObject deve ser destruído. Mais...
 
void RequestDelete ()
 Solicita que esse GaeObject seja destruído. Mais...
 
void RequestDelete (void)
 Solicita que esse GaeObject seja destruído. Mais...
 
void NotifyCollision (GameObject &object)
 Notifica evento de colisão. Mais...
 
 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
void AddComponent (Component *component)
 Adiciona componente a um gameobjet. Mais...
 
void RemoveComponent (ComponentType type)
 Remove componente a um gameobjet. Mais...
 
 ~GameObject (void)
 Destrutor. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
@@ -181,6 +196,8 @@ + +

Atributos Privados

- Atributos Protegidos inherited from GameObject
std::vector< Component * > components
 
bool dead
 

Descrição Detalhada

Classe que modela inimigos.

@@ -264,6 +281,18 @@
+

Construtor.

+
Futuras Atividades:

Documentar!

+

Verificar se está sendo usado.

Parâmetros
+ + + +
positionposição onde o inimigo deve ser instancido.
lifeQuantidade de vida que o inimigo deve ter.
+
+
+
+

No momento a position informa o extremo superior esquedo a partir do qual o gameObject será instanciado.

+
@@ -310,7 +339,7 @@

Métodos

Obtém rect do GameObject renderizado na tela.

Utilizado para verificar onde o mouse está.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -337,19 +366,16 @@

Métodos

Identifica tipo de GameObject.

-
Futuras Atividades:
Verificar viabilidade de usar enum no lugar de string
+
Futuras Atividades:
Verificar viabilidade de usar enum no lugar de string

Retorna verdadeiro se type for "Enemy", falso caso contrário.

-

Implementa GameObject.

+

Reimplementação de GameObject.

- - - - - -
@@ -359,18 +385,11 @@

Métodos

bool Enemy::IsDead
-
-virtual

Verifica se esse GameObject deve ser destruído.

Se necessário pode consultar suas componentes para tal, mas o ideal que é as componentes informem isso ao GameObject antes, pela chamado do método RequestDelete.

-

Implementa GameObject.

-
@@ -396,10 +415,10 @@

Métodos

Notifica evento de colisão.

-
Futuras Atividades:
Verificar viabilidade de tratar colisão em componentes.
+
Futuras Atividades:
Verificar viabilidade de tratar colisão em componentes.

No momento não faz nada.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -428,16 +447,13 @@

Métodos

Atualiza estado.

Chama o método Update de todas as suas componentes.

-

Implementa GameObject.

+

Reimplementação de GameObject.

- +
- - - - - -
@@ -447,18 +463,11 @@

Métodos

void Enemy::RequestDelete
-
-virtual

Solicita que esse GaeObject seja destruído.

Deve fazer o necessário para que futuras chamadas a IsDead retornem verdadeiro.

-

Implementa GameObject.

-
@@ -486,7 +495,7 @@

Métodos

Atualiza estado.

Chama o método Update de todas as suas componentes.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -721,9 +730,9 @@

Atributos

diff --git a/docs/classEnemy__coll__graph.map b/docs/classEnemy__coll__graph.map index e39387b8..852b73a5 100644 --- a/docs/classEnemy__coll__graph.map +++ b/docs/classEnemy__coll__graph.map @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/docs/classEnemy__coll__graph.md5 b/docs/classEnemy__coll__graph.md5 index 16538a7d..b237c0c2 100644 --- a/docs/classEnemy__coll__graph.md5 +++ b/docs/classEnemy__coll__graph.md5 @@ -1 +1 @@ -470aaf2a711324cfea7ce0a5690f2cb7 \ No newline at end of file +edc80d7e12513a72fcd49a192d17537d \ No newline at end of file diff --git a/docs/classEnemy__coll__graph.svg b/docs/classEnemy__coll__graph.svg index 47a7feaf..c3e06777 100644 --- a/docs/classEnemy__coll__graph.svg +++ b/docs/classEnemy__coll__graph.svg @@ -1,214 +1,220 @@ - - - + + Enemy - + Node1 - -Enemy + +Enemy Node2 - -GameObject + +GameObject Node2->Node1 - - + + Node3 - -Rect + +Rect Node3->Node2 - - - box + + + box Node4 - -float + +float Node4->Node2 - - - rotation + + + rotation Node4->Node3 - - - w -x -h -y + + + w +x +h +y - -Node7 - - -Sprite + +Node8 + + +Sprite - -Node4->Node7 - - - scaleY -frameTime -timeElapsed -scaleX + +Node4->Node8 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -vector< Component * > + +bool + + +Node5->Node1 + + + dead Node5->Node2 - - - components + + + dead Node6 - -EnemyType + +vector< Component * > + + +Node6->Node2 + + + components - -Node6->Node1 - - - type + +Node7 + +EnemyType Node7->Node1 - - - pantsSpName -headSpName -spName -bodySpName -sp + + + type + + +Node8->Node1 + + + pantsSpName +headSpName +spName +bodySpName +sp - -Node8 - -unsigned char + +Node9 + +unsigned char - -Node8->Node7 - - - alpha + +Node9->Node8 + + + alpha - -Node13 - - -Color + +Node14 + + +Color - -Node8->Node13 - - - g -r -b - - -Node9 - -SDL_Rect - - -Node9->Node7 - - - clipRect + +Node9->Node14 + + + g +r +b Node10 - -int - - -Node10->Node1 - - - endPoint -baseHP -quant -enemyIndex - - -Node10->Node7 - - - width -currentFrame -height -frameCount + +SDL_Rect + + +Node10->Node8 + + + clipRect Node11 - -shared_ptr< SDL_Texture > - - -Node11->Node7 - - - texture + +int + + +Node11->Node1 + + + endPoint +baseHP +quant +enemyIndex + + +Node11->Node8 + + + width +currentFrame +height +frameCount Node12 - -SDL_BlendMode - - -Node12->Node7 - - - blendMode + +shared_ptr< SDL_Texture > - -Node13->Node7 - - - colorMultiplier + +Node12->Node8 + + + texture - -Node14 - -bool - - -Node14->Node1 - - - dead + +Node13 + +SDL_BlendMode + + +Node13->Node8 + + + blendMode + + +Node14->Node8 + + + colorMultiplier diff --git a/docs/classEnemy__inherit__graph.map b/docs/classEnemy__inherit__graph.map index 1bf34b0f..a64aa7ae 100644 --- a/docs/classEnemy__inherit__graph.map +++ b/docs/classEnemy__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classEnemy__inherit__graph.md5 b/docs/classEnemy__inherit__graph.md5 index 396dd81f..c7d3ec23 100644 --- a/docs/classEnemy__inherit__graph.md5 +++ b/docs/classEnemy__inherit__graph.md5 @@ -1 +1 @@ -a2794f548f4aa725dc4c55ca1b53264e \ No newline at end of file +640bf0015b949d2b8779850903609d72 \ No newline at end of file diff --git a/docs/classEnemy__inherit__graph.svg b/docs/classEnemy__inherit__graph.svg index b0ed781d..a6b23aa5 100644 --- a/docs/classEnemy__inherit__graph.svg +++ b/docs/classEnemy__inherit__graph.svg @@ -1,31 +1,31 @@ - - + Enemy - + Node1 - -Enemy + +Enemy Node2 - -GameObject + +GameObject Node2->Node1 - - + + diff --git a/docs/classGame-members.html b/docs/classGame-members.html index e38f051b..c0366e1e 100644 --- a/docs/classGame-members.html +++ b/docs/classGame-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -128,9 +128,9 @@ diff --git a/docs/classGame.html b/docs/classGame.html index ad2b7e44..cf29f98a 100644 --- a/docs/classGame.html +++ b/docs/classGame.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Game @@ -31,7 +31,7 @@ - + @@ -102,7 +102,8 @@
Diagrama de colaboração para Game:
-
+
+
[legenda]

@@ -1033,9 +1034,9 @@

Atributos

diff --git a/docs/classGameObject-members.html b/docs/classGameObject-members.html index 712d345c..f2ff00e0 100644 --- a/docs/classGameObject-members.html +++ b/docs/classGameObject-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -90,24 +90,27 @@

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

- - + + + + - - - - - - - - - + + + + + + + + + +
boxGameObject
componentsGameObjectprotected
AddComponent(Component *component)GameObject
boxGameObject
componentsGameObjectprotected
deadGameObjectprotected
GameObject(void)GameObject
GetWorldRenderedRect(void) const =0GameObjectpure virtual
Is(string type)=0GameObjectpure virtual
IsDead(void)=0GameObjectpure virtual
NotifyCollision(GameObject &other)=0GameObjectpure virtual
Render(void)=0GameObjectpure virtual
RequestDelete(void)=0GameObjectpure virtual
rotationGameObject
Update(float dt)=0GameObjectpure virtual
~GameObject(void)GameObjectvirtual
GetWorldRenderedRect(void) const GameObjectvirtual
Is(string type)GameObjectvirtual
IsDead(void)GameObject
NotifyCollision(GameObject &other)GameObjectvirtual
RemoveComponent(ComponentType type)GameObject
Render(void)GameObjectvirtual
RequestDelete(void)GameObject
rotationGameObject
Update(float dt)GameObjectvirtual
~GameObject(void)GameObject
diff --git a/docs/classGameObject.html b/docs/classGameObject.html index 45032dcb..de076a1d 100644 --- a/docs/classGameObject.html +++ b/docs/classGameObject.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe GameObject @@ -31,7 +31,7 @@ - + @@ -89,7 +89,7 @@ Atributos Protegidos | Lista de todos os Membros
-
Referência da Classe GameObjectabstract
+
Referência da Classe GameObject
@@ -100,12 +100,14 @@
Diagrama de Hierarquia para GameObject:
-
+
+
[legenda]
Diagrama de colaboração para GameObject:
-
+
+
[legenda]
- + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +

@@ -113,30 +115,36 @@

 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
void AddComponent (Component *component)
 Adiciona componente a um gameobjet. Mais...
 
void RemoveComponent (ComponentType type)
 Remove componente a um gameobjet. Mais...
 
 ~GameObject (void)
 Destrutor. Mais...
 
virtual void Update (float dt)=0
 Atualizar estado. Mais...
 
virtual void Render (void)=0
 Renderiza o GameObject. Mais...
 
virtual bool IsDead (void)=0
 Informa se esse gameObject não precisa mais existir. Mais...
 
virtual void RequestDelete (void)=0
 Solicita que o GameObject seja destruído. Mais...
 
virtual void NotifyCollision (GameObject &other)=0
 Notifica Colisão. Mais...
 
virtual bool Is (string type)=0
 Informa que tipo de GameObject é. Mais...
 
virtual Rect GetWorldRenderedRect (void) const =0
 Obtém Rect informando a posição renderizada da animação. Mais...
 
virtual void Update (float dt)
 Atualizar estado. Mais...
 
virtual void Render (void)
 Renderiza o GameObject. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
virtual void NotifyCollision (GameObject &other)
 Notifica Colisão. Mais...
 
virtual bool Is (string type)
 Informa que tipo de GameObject é. Mais...
 
virtual Rect GetWorldRenderedRect (void) const
 Obtém Rect informando a posição renderizada da animação. Mais...
 
@@ -149,6 +157,8 @@ Atributos Protegidos + +

Atributos Públicos

std::vector< Component * > components
 
bool dead
 

Descrição Detalhada

Classe virtual que especifica o funcionamento de um GameObject.

@@ -176,9 +186,6 @@
- - - - - -
@@ -188,11 +195,6 @@
GameObject::~GameObject
-
-virtual

Destrutor.

@@ -201,7 +203,31 @@

Métodos

- + +
+
+ + + + + + + + +
void GameObject::AddComponent (Componentcomponent)
+
+ +

Adiciona componente a um gameobjet.

+
Parâmetros
+ + +
componentcomponente a ser adicionado.
+
+
+ +
+
+
@@ -209,7 +235,7 @@

Métodos

+virtual
- + @@ -218,7 +244,7 @@

Métodos

virtual Rect GameObject::GetWorldRenderedRect Rect GameObject::GetWorldRenderedRect ( void  )
-pure virtual
@@ -226,11 +252,11 @@

Métodos

Obtém Rect informando a posição renderizada da animação.

Obtém Rect informando a posição renderizada, computando zoom, escala e posição da câmera.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

+

Reimplementado por Enemy, Animation e Tower.

- +
@@ -238,7 +264,7 @@

Métodos

+virtual
- + @@ -247,7 +273,7 @@

Métodos

virtual bool GameObject::Is bool GameObject::Is ( string  type)
-pure virtual
@@ -262,41 +288,31 @@

Métodos

Retorna
Verdadeiro se for do tipo perguntado, falso caso contrário;

É usado no tratamento de colisão para que se identifique com quem colidiu.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

+

Reimplementado por Enemy, Animation e Tower.

- +
- - - - - -
- +
virtual bool GameObject::IsDead bool GameObject::IsDead ( void  )
-
-pure virtual

Informa se esse gameObject não precisa mais existir.

Retorna
Verdadeiro se esse GameObject não é mais necessário, false caso contrário.

Deve ser usado no State que o contém para o eliminar da sua estrutura de manipulação de gameObject e destruí-lo.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

-
- +
@@ -304,7 +320,7 @@

Métodos

+virtual
- + @@ -313,7 +329,7 @@

Métodos

virtual void GameObject::NotifyCollision void GameObject::NotifyCollision ( GameObject other)
-pure virtual
@@ -327,11 +343,35 @@

Métodos

Deve realizar as ações para tratamento da colisão.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

+

Reimplementado por Enemy, Animation e Tower.

+ +
+
+ +
+
+ + + + + + + + +
void GameObject::RemoveComponent (ComponentType type)
+
+ +

Remove componente a um gameobjet.

+
Parâmetros
+ + +
typetipo do componente a ser adicionado.
+
+
- +
@@ -339,7 +379,7 @@

Métodos

+virtual
- + @@ -348,7 +388,7 @@

Métodos

virtual void GameObject::Render void GameObject::Render ( void  )
-pure virtual
@@ -356,40 +396,30 @@

Métodos

Renderiza o GameObject.

Esse método deve ter a lógica necessário para ser renderizado na tela.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

+

Reimplementado por Enemy, Animation e Tower.

- +
- - - - - -
- +
virtual void GameObject::RequestDelete void GameObject::RequestDelete ( void  )
-
-pure virtual

Solicita que o GameObject seja destruído.

Uma vez que esse método é chamado, futuras chamadas ao IsDead devem retornar verdadeiro.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

-
- +
@@ -397,7 +427,7 @@

Métodos

+virtual
- + @@ -406,7 +436,7 @@

Métodos

virtual void GameObject::Update void GameObject::Update ( float  dt)
-pure virtual
@@ -420,7 +450,7 @@

Métodos

No corpo método o GameObject deve atualizar seu estado, utilizando o argumento passado e quaisquer outras funcionalidades que necessitar.

-

Implementado por Enemy, Animation, Tower e EmptyGameObject.

+

Reimplementado por Enemy, Animation e Tower.

@@ -457,6 +487,26 @@

Atributos

Vetor de componentes, que provêem funcionalidades adicionais.

+
+
+ +
+
+ + + + + +
+ + + + +
bool GameObject::dead
+
+protected
+
+
@@ -479,9 +529,9 @@

Atributos

diff --git a/docs/classGameObject__coll__graph.map b/docs/classGameObject__coll__graph.map index b90951cf..04bc208f 100644 --- a/docs/classGameObject__coll__graph.map +++ b/docs/classGameObject__coll__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classGameObject__coll__graph.md5 b/docs/classGameObject__coll__graph.md5 index 4b636d96..bb9ab6a2 100644 --- a/docs/classGameObject__coll__graph.md5 +++ b/docs/classGameObject__coll__graph.md5 @@ -1 +1 @@ -c5437cf98fa05a2a06396198d0c70b52 \ No newline at end of file +643b14a45ce17c7b94e6734da17d6ded \ No newline at end of file diff --git a/docs/classGameObject__coll__graph.svg b/docs/classGameObject__coll__graph.svg index 88978f2c..2c89329b 100644 --- a/docs/classGameObject__coll__graph.svg +++ b/docs/classGameObject__coll__graph.svg @@ -1,63 +1,74 @@ - - - + + GameObject - + Node1 - -GameObject + +GameObject Node2 - -Rect + +Rect Node2->Node1 - - - box + + + box Node3 - -float + +float Node3->Node1 - - - rotation + + + rotation Node3->Node2 - - - w -x -h -y + + + w +x +h +y Node4 - -vector< Component * > + +bool Node4->Node1 - - - components + + + dead + + +Node5 + +vector< Component * > + + +Node5->Node1 + + + components diff --git a/docs/classGameObject__inherit__graph.map b/docs/classGameObject__inherit__graph.map index 1ad86472..c520d0cf 100644 --- a/docs/classGameObject__inherit__graph.map +++ b/docs/classGameObject__inherit__graph.map @@ -1,7 +1,5 @@ - - - - - + + + diff --git a/docs/classGameObject__inherit__graph.md5 b/docs/classGameObject__inherit__graph.md5 index 49cab2f9..eae1774b 100644 --- a/docs/classGameObject__inherit__graph.md5 +++ b/docs/classGameObject__inherit__graph.md5 @@ -1 +1 @@ -ef9b16aee1cab37b5b9a8111680b6878 \ No newline at end of file +a30ce28c31d2e9f2df8d92ca62d70215 \ No newline at end of file diff --git a/docs/classGameObject__inherit__graph.svg b/docs/classGameObject__inherit__graph.svg index 01fd79d3..056241a0 100644 --- a/docs/classGameObject__inherit__graph.svg +++ b/docs/classGameObject__inherit__graph.svg @@ -1,18 +1,18 @@ - - + GameObject - + Node1 - -GameObject + +GameObject Node2 @@ -24,60 +24,34 @@ Node1->Node2 - - + + Node3 - - -emptyGameObject + + +Enemy Node1->Node3 - - + + Node4 - - -EmptyGameObject + + +Tower Node1->Node4 - - - - -Node5 - - -Enemy - - - - -Node1->Node5 - - - - -Node6 - - -Tower - - - - -Node1->Node6 - - + + diff --git a/docs/classGameResources-members.html b/docs/classGameResources-members.html index 1b604d24..ce3f6df5 100644 --- a/docs/classGameResources-members.html +++ b/docs/classGameResources-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -101,9 +101,9 @@ diff --git a/docs/classGameResources.html b/docs/classGameResources.html index 19daef11..38e41371 100644 --- a/docs/classGameResources.html +++ b/docs/classGameResources.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe GameResources @@ -31,7 +31,7 @@ - + @@ -101,7 +101,8 @@
Diagrama de colaboração para GameResources:
-
+
+
[legenda]

@@ -368,9 +369,9 @@

Atributos

diff --git a/docs/classGameResources__coll__graph.md5 b/docs/classGameResources__coll__graph.md5 index 595493d2..ee14819a 100644 --- a/docs/classGameResources__coll__graph.md5 +++ b/docs/classGameResources__coll__graph.md5 @@ -1 +1 @@ -6b1758d3e6c790b770dfa746541bb851 \ No newline at end of file +a04513f0246ea164752588aa45285153 \ No newline at end of file diff --git a/docs/classGameResources__coll__graph.svg b/docs/classGameResources__coll__graph.svg index e95207ce..91191466 100644 --- a/docs/classGameResources__coll__graph.svg +++ b/docs/classGameResources__coll__graph.svg @@ -1,47 +1,47 @@ - - - + + GameResources - + Node1 - -GameResources + +GameResources Node2 - -unordered_map< string, - std::shared_ptr< std -::array< std::map< int, - int >, EnemyType::ENEMY -_TYPE_SIZE > > > + +unordered_map< string, + std::shared_ptr< std +::array< std::map< int, + int >, EnemyType::ENEMY +_TYPE_SIZE > > > Node2->Node1 - - - weightDataMap + + + weightDataMap Node3 - -unordered_map< string, - std::shared_ptr< std -::pair< std::vector< WaveData - >, std::vector< EnemyData > > > > + +unordered_map< string, + std::shared_ptr< std +::pair< std::vector< WaveData + >, std::vector< EnemyData > > > > Node3->Node1 - - - waveDataMap + + + waveDataMap diff --git a/docs/classGame__coll__graph.map b/docs/classGame__coll__graph.map index 7e9bd98d..3d9292c4 100644 --- a/docs/classGame__coll__graph.map +++ b/docs/classGame__coll__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classGame__coll__graph.md5 b/docs/classGame__coll__graph.md5 index d58fe19a..0f5a2817 100644 --- a/docs/classGame__coll__graph.md5 +++ b/docs/classGame__coll__graph.md5 @@ -1 +1 @@ -66237a8d474b989ed0c6a4f01363e70e \ No newline at end of file +bb0b6af142040270e7faaf4a63f410ac \ No newline at end of file diff --git a/docs/classGame__coll__graph.svg b/docs/classGame__coll__graph.svg index cc78e64a..8ab5c710 100644 --- a/docs/classGame__coll__graph.svg +++ b/docs/classGame__coll__graph.svg @@ -1,219 +1,219 @@ - - - + + Game - + Node1 - -Game + +Game Node1->Node1 - - - instance + + + instance Node2 - -SDL_Renderer * + +SDL_Renderer * Node2->Node1 - - - renderer + + + renderer Node3 - -float + +float Node3->Node1 - - - frameDuration -dt + + + frameDuration +dt Node8 - -Vec2 + +Vec2 Node3->Node8 - - - x -y + + + x +y Node4 - -stack< std::unique -_ptr< State > > + +stack< std::unique +_ptr< State > > Node4->Node1 - - - stateStack + + + stateStack Node5 - -int + +int Node5->Node1 - - - frameStart -maxFramerate + + + frameStart +maxFramerate Node7 - -InputManager + +InputManager Node5->Node7 - - - mouseX -mouseY -controllerStickUpdate -mouseScroolUpdate -updateCounter -mouseUpdate + + + mouseX +mouseY +controllerStickUpdate +mouseScroolUpdate +updateCounter +mouseUpdate Node6 - -bool + +bool Node6->Node1 - - - capFramerate + + + capFramerate Node6->Node7 - - - quitRequested -mouseState + + + quitRequested +mouseState Node12 - -State + +State Node6->Node12 - - - quitRequested -popRequested + + + quitRequested +popRequested Node7->Node1 - - - inputManager + + + inputManager Node8->Node7 - - - controllerLeftStickState -controllerRightStickState -mouseScroolState + + + controllerLeftStickState +controllerRightStickState +mouseScroolState Node9 - -unordered_map< int, - int > + +unordered_map< int, + int > Node9->Node7 - - - controllerUpdate -keyUpdate + + + controllerUpdate +keyUpdate Node10 - -unordered_map< int, - bool > + +unordered_map< int, + bool > Node10->Node7 - - - keyState -controllerState + + + keyState +controllerState Node11 - -unordered_map< int, - SDL_GameController * > + +unordered_map< int, + SDL_GameController * > Node11->Node7 - - - padToController + + + padToController Node12->Node1 - - - storedState + + + storedState Node13 - -vector< std::unique -_ptr< GameObject > > + +vector< std::unique +_ptr< GameObject > > Node13->Node12 - - - objectArray + + + objectArray Node14 - -SDL_Window * + +SDL_Window * Node14->Node1 - - - window + + + window diff --git a/docs/classHitPoints-members.html b/docs/classHitPoints-members.html index 2e03b9f1..ead87551 100644 --- a/docs/classHitPoints-members.html +++ b/docs/classHitPoints-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -101,9 +101,9 @@ diff --git a/docs/classHitPoints.html b/docs/classHitPoints.html index f29f0bfd..51e0cbfe 100644 --- a/docs/classHitPoints.html +++ b/docs/classHitPoints.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe HitPoints @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Diagrama de Hierarquia para HitPoints:
-
+
+
[legenda]
Diagrama de colaboração para HitPoints:
-
+
+
[legenda]
- + @@ -173,7 +175,7 @@

Métodos

- + @@ -311,9 +313,9 @@

Atributos

diff --git a/docs/classHitPoints__coll__graph.map b/docs/classHitPoints__coll__graph.map index aba0fa55..8c41b24e 100644 --- a/docs/classHitPoints__coll__graph.map +++ b/docs/classHitPoints__coll__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classHitPoints__coll__graph.md5 b/docs/classHitPoints__coll__graph.md5 index db1ff557..a378c002 100644 --- a/docs/classHitPoints__coll__graph.md5 +++ b/docs/classHitPoints__coll__graph.md5 @@ -1 +1 @@ -9a079a4311175ef04047a7643f461761 \ No newline at end of file +8680104172eaf9b0400e8a6da9198efd \ No newline at end of file diff --git a/docs/classHitPoints__coll__graph.svg b/docs/classHitPoints__coll__graph.svg index 3a10f103..438f8704 100644 --- a/docs/classHitPoints__coll__graph.svg +++ b/docs/classHitPoints__coll__graph.svg @@ -1,14 +1,14 @@ - - - + + HitPoints - + Node1 @@ -44,13 +44,13 @@ Node4 - -unsigned char + +unsigned char Node4->Node3 - - + + alpha @@ -63,11 +63,11 @@ Node4->Node10 - - - g -r -b + + + g +r +b Node5 diff --git a/docs/classHitPoints__inherit__graph.map b/docs/classHitPoints__inherit__graph.map index 6049825e..a391e71b 100644 --- a/docs/classHitPoints__inherit__graph.map +++ b/docs/classHitPoints__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classHitPoints__inherit__graph.md5 b/docs/classHitPoints__inherit__graph.md5 index 62590b5b..94360365 100644 --- a/docs/classHitPoints__inherit__graph.md5 +++ b/docs/classHitPoints__inherit__graph.md5 @@ -1 +1 @@ -6b12fb2b986bc716970f756da47ab202 \ No newline at end of file +ff5dd3ccd139a46a180d7f134c300b1b \ No newline at end of file diff --git a/docs/classHitPoints__inherit__graph.svg b/docs/classHitPoints__inherit__graph.svg index 6034a2f6..4e05694c 100644 --- a/docs/classHitPoints__inherit__graph.svg +++ b/docs/classHitPoints__inherit__graph.svg @@ -1,31 +1,31 @@ - - + HitPoints - + Node1 - -HitPoints + +HitPoints Node2 - -Component + +Component Node2->Node1 - - + + diff --git a/docs/classInputManager-members.html b/docs/classInputManager-members.html index d0495284..1cf4678c 100644 --- a/docs/classInputManager-members.html +++ b/docs/classInputManager-members.html @@ -3,7 +3,7 @@ - +Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@

@@ -113,7 +115,7 @@

void Update (GameObject &associated, float dt)
 Atualiza estado do componente. Mais...
 
bool Is (ComponentType) const
bool Is (ComponentType) const
 Verifica o subtipo de componente. Mais...
 
- Métodos Públicos inherited from Component
bool HitPoints::Is (ComponentType ComponentType  type) const
- + @@ -105,35 +105,38 @@ GetMouseY(void) const InputManager InputManager()InputManagerprivate IsButtonDown(int button) const InputManager - IsControllerSticking(void) const InputManager - IsKeyDown(int key) const InputManager + IsButtonUp(int button) const InputManager + IsControllerSticking(void) const InputManager + IsKeyDown(int key) const InputManager + IsKeyUp(int key) const InputManager IsMouseDown(int button) const InputManager IsMouseScrolling(void) const InputManager - KeyPress(int key) const InputManager - KeyRelease(int key) const InputManager - keyStateInputManagerprivate - keyUpdateInputManagerprivate - MousePress(int button) const InputManager - MouseRelease(int button) const InputManager - MouseScroll(void) const InputManager - mouseScroolStateInputManagerprivate - mouseScroolUpdateInputManagerprivate - mouseStateInputManagerprivate - mouseUpdateInputManagerprivate - mouseXInputManagerprivate - mouseYInputManagerprivate - padToControllerInputManagerprivate - QuitRequested(void) const InputManager + IsMouseUp(int button) const InputManager + KeyPress(int key) const InputManager + KeyRelease(int key) const InputManager + keyStateInputManagerprivate + keyUpdateInputManagerprivate + MousePress(int button) const InputManager + MouseRelease(int button) const InputManager + MouseScroll(void) const InputManager + mouseScroolStateInputManagerprivate + mouseScroolUpdateInputManagerprivate + mouseStateInputManagerprivate + mouseUpdateInputManagerprivate + mouseXInputManagerprivate + mouseYInputManagerprivate + padToControllerInputManagerprivate quitRequestedInputManagerprivate - Update(void)InputManager - updateCounterInputManagerprivate - ~InputManager()InputManagerprivate + QuitRequested(void) const InputManager + Update(void)InputManager + updateCounterInputManagerprivate + ~InputManager()InputManagerprivate diff --git a/docs/classInputManager.html b/docs/classInputManager.html index 87abccd0..f5e7140c 100644 --- a/docs/classInputManager.html +++ b/docs/classInputManager.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe InputManager @@ -31,7 +31,7 @@ - + @@ -101,7 +101,8 @@
Diagrama de colaboração para InputManager:
-
+
+
[legenda]
+ + + @@ -127,6 +131,9 @@ + + + @@ -154,6 +161,9 @@ + + + @@ -343,7 +353,7 @@

Métodos

Calcula o deslocamento do sticker esquerdo de um controle.

-
Retorna
Vetor bidimensional que informa se o botão está pressionado ou não.
+
Retorna
Vetor bidimensional que informa a posição (x,y) do analógico esquerdo.
@@ -361,7 +371,7 @@

Métodos

Calcula o deslocamento do sticker direito de um controle.

-
Retorna
Vetor bidimensional que informa se o botão está pressionado ou não.
+
Retorna
Vetor bidimensional que informa a posição (x,y) do analógico direito.
@@ -477,6 +487,32 @@

Métodos

Retorna
Booleano que informa se o botão está pressionado ou não.

Retorna verdadeiro se o controllerState do botão for verdadeiro. Caso contrário retorna-se o valor falso.

+ + + +
+
+

@@ -118,6 +119,9 @@

bool IsKeyDown (int key) const
 Informa se uma tecla do teclado está pressionada no momento. Mais...
 
bool IsKeyUp (int key) const
 Informa se uma tecla do teclado NÃO está pressionada no momento. Mais...
 
bool MousePress (int button) const
 Informa se um botão do mouse foi pressionado no frame corrente. Mais...
 
bool IsMouseDown (int button) const
 Informa se um botão do mouse está pressionada no momento. Mais...
 
bool IsMouseUp (int button) const
 Informa se um botão do mouse NÃO está pressionada no momento. Mais...
 
bool IsMouseScrolling (void) const
 Informa se o scroll dp do mouse foi acionado no frame atual. Mais...
 
bool IsButtonDown (int button) const
 Informa se um botão do controle está pressionada no momento. Mais...
 
bool IsButtonUp (int button) const
 Informa se um botão do controle está NÃO pressionada no momento. Mais...
 
Vec2 GetControllerLeftStickState () const
 Calcula o deslocamento do sticker esquerdo de um controle. Mais...
 
+ + + + + + + +
bool InputManager::IsButtonUp (int button) const
+
+ +

Informa se um botão do controle está NÃO pressionada no momento.

+
Parâmetros
+ + +
buttonBotão do mouse cujo o estado é requierido
+
+
+
Retorna
Booleano que informa se o botão está pressionado ou não.
+

Retorna verdadeiro se o controllerState do botão for falso. Caso contrário retorna-se o valor falso.

+
@@ -521,7 +557,33 @@

Métodos

Retorna
Booleano que informa se a tecla está pressionada ou não.
-

Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for verdadeiro. Caso contrário retorna-se o valor falso.

+

Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for verdadeiro e isso ocorrer nesse frame. Caso contrário retorna-se o valor falso.

+ + + + +
+
+ + + + + + + + +
bool InputManager::IsKeyUp (int key) const
+
+ +

Informa se uma tecla do teclado NÃO está pressionada no momento.

+
Parâmetros
+ + +
keyTecla do teclado cujo o estado é requierido
+
+
+
Retorna
Booleano que informa se a tecla está pressionada ou não.
+

Primeiramente, converte-se o argumento a um válido no vetor através da função macro AJUST_KEY. Retorna verdadeiro se o keyState da tecla for falso. Caso contrário retorna-se o valor falso.

@@ -569,6 +631,32 @@

Métodos

Retorna
Booleano que informa se o scroll está em uso ou não.

Retorna verdadeiro se o mouseScroolUpdate for igual a updateCounter. Caso contrário retorna-se o valor falso.

+ + + +
+
+ + + + + + + + +
bool InputManager::IsMouseUp (int button) const
+
+ +

Informa se um botão do mouse NÃO está pressionada no momento.

+
Parâmetros
+ + +
keyBotão do mouse cujo o estado é requierido
+
+
+
Retorna
Booleano que informa se o botão está pressionado ou não.
+

Retorna verdadeiro se o mouseState do botão for falso. Caso contrário retorna-se o valor falso. Recomenda-se o uso das macros LEFT_MOUSE_BUTTON, RIGHT_MOUSE_BUTTON e MIDDLE_MOUSE_BUTTON.

+
@@ -1093,9 +1181,9 @@

Atributos

diff --git a/docs/classInputManager__coll__graph.map b/docs/classInputManager__coll__graph.map index 9c669077..142cf081 100644 --- a/docs/classInputManager__coll__graph.map +++ b/docs/classInputManager__coll__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classInputManager__coll__graph.md5 b/docs/classInputManager__coll__graph.md5 index d19394bd..e927341f 100644 --- a/docs/classInputManager__coll__graph.md5 +++ b/docs/classInputManager__coll__graph.md5 @@ -1 +1 @@ -0a5295a2f2d9da38155f311d45c0c560 \ No newline at end of file +b93cc1eec9177dbaf1872c0f0c37a8d4 \ No newline at end of file diff --git a/docs/classInputManager__coll__graph.svg b/docs/classInputManager__coll__graph.svg index 78d7a074..91987dee 100644 --- a/docs/classInputManager__coll__graph.svg +++ b/docs/classInputManager__coll__graph.svg @@ -1,112 +1,112 @@ - - - + + InputManager - + Node1 - -InputManager + +InputManager Node2 - -Vec2 + +Vec2 Node2->Node1 - - - controllerLeftStickState -controllerRightStickState -mouseScroolState + + + controllerLeftStickState +controllerRightStickState +mouseScroolState Node3 - -float + +float Node3->Node2 - - - x -y + + + x +y Node4 - -int + +int Node4->Node1 - - - mouseX -mouseY -controllerStickUpdate -mouseScroolUpdate -updateCounter -mouseUpdate + + + mouseX +mouseY +controllerStickUpdate +mouseScroolUpdate +updateCounter +mouseUpdate Node5 - -bool + +bool Node5->Node1 - - - quitRequested -mouseState + + + quitRequested +mouseState Node6 - -unordered_map< int, - int > + +unordered_map< int, + int > Node6->Node1 - - - controllerUpdate -keyUpdate + + + controllerUpdate +keyUpdate Node7 - -unordered_map< int, - bool > + +unordered_map< int, + bool > Node7->Node1 - - - keyState -controllerState + + + keyState +controllerState Node8 - -unordered_map< int, - SDL_GameController * > + +unordered_map< int, + SDL_GameController * > Node8->Node1 - - - padToController + + + padToController diff --git a/docs/classMusic-members.html b/docs/classMusic-members.html index fe43e71e..00b739e4 100644 --- a/docs/classMusic-members.html +++ b/docs/classMusic-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -100,9 +100,9 @@ diff --git a/docs/classMusic.html b/docs/classMusic.html index ebbe7782..9ebc8f0e 100644 --- a/docs/classMusic.html +++ b/docs/classMusic.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Music @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
Diagrama de colaboração para Music:
-
+
+
[legenda]

@@ -301,9 +302,9 @@

Atributos

diff --git a/docs/classMusic__coll__graph.md5 b/docs/classMusic__coll__graph.md5 index f942c7d9..579d0380 100644 --- a/docs/classMusic__coll__graph.md5 +++ b/docs/classMusic__coll__graph.md5 @@ -1 +1 @@ -1096d329984e4153172c115566b814a7 \ No newline at end of file +0fdbcbddce002c64946227c9ae2780ea \ No newline at end of file diff --git a/docs/classMusic__coll__graph.svg b/docs/classMusic__coll__graph.svg index f23713e7..45cd04e9 100644 --- a/docs/classMusic__coll__graph.svg +++ b/docs/classMusic__coll__graph.svg @@ -1,14 +1,14 @@ - - - + + Music - + Node1 @@ -16,14 +16,14 @@ Node2 - -shared_ptr< Mix_Music > + +shared_ptr< Mix_Music > Node2->Node1 - - - music + + + music diff --git a/docs/classRect-members.html b/docs/classRect-members.html index 632b310f..41cbc443 100644 --- a/docs/classRect-members.html +++ b/docs/classRect-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -107,9 +107,9 @@ diff --git a/docs/classRect.html b/docs/classRect.html index e8a1441f..bd62bdfd 100644 --- a/docs/classRect.html +++ b/docs/classRect.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Rect @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
Diagrama de colaboração para Rect:
-
+
+
[legenda]

@@ -426,9 +427,9 @@

Atributos

diff --git a/docs/classRect__coll__graph.md5 b/docs/classRect__coll__graph.md5 index 4a665e91..f9412019 100644 --- a/docs/classRect__coll__graph.md5 +++ b/docs/classRect__coll__graph.md5 @@ -1 +1 @@ -817cfa9abaa2f4c9abd13270adaf12e0 \ No newline at end of file +9f7f2eb848cbd84d26a479759bf705e9 \ No newline at end of file diff --git a/docs/classRect__coll__graph.svg b/docs/classRect__coll__graph.svg index 5bab5c81..76c9d448 100644 --- a/docs/classRect__coll__graph.svg +++ b/docs/classRect__coll__graph.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -113,9 +113,9 @@ diff --git a/docs/classResources.html b/docs/classResources.html index 23a0501b..b8d495f9 100644 --- a/docs/classResources.html +++ b/docs/classResources.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Resources @@ -31,7 +31,7 @@ - + @@ -101,7 +101,8 @@
Diagrama de colaboração para Resources:
-
+
+
[legenda]

@@ -759,9 +760,9 @@

Atributos

diff --git a/docs/classResources__coll__graph.md5 b/docs/classResources__coll__graph.md5 index 72803ba0..3597656a 100644 --- a/docs/classResources__coll__graph.md5 +++ b/docs/classResources__coll__graph.md5 @@ -1 +1 @@ -465154fe3b445bd14fe396d52770fe8f \ No newline at end of file +d1d066d08c212b0e0febd923726fed23 \ No newline at end of file diff --git a/docs/classResources__coll__graph.svg b/docs/classResources__coll__graph.svg index 9a980f31..a9a88299 100644 --- a/docs/classResources__coll__graph.svg +++ b/docs/classResources__coll__graph.svg @@ -1,82 +1,82 @@ - - + Resources - + Node1 - -Resources + +Resources Node2 - -unordered_map< string, - std::shared_ptr< SDL -_Texture > > + +unordered_map< string, + std::shared_ptr< SDL +_Texture > > Node2->Node1 - - - imageTable + + + imageTable Node3 - -unordered_map< string, - std::shared_ptr< TTF -_Font > > + +unordered_map< string, + std::shared_ptr< TTF +_Font > > Node3->Node1 - - - fontTable + + + fontTable Node4 - -int + +int Node4->Node1 - - - musicVolume -soundVolume + + + musicVolume +soundVolume Node5 - -unordered_map< string, - std::shared_ptr< Mix -_Music > > + +unordered_map< string, + std::shared_ptr< Mix +_Music > > Node5->Node1 - - - musicTable + + + musicTable Node6 - -unordered_map< string, - std::shared_ptr< Mix -_Chunk > > + +unordered_map< string, + std::shared_ptr< Mix +_Chunk > > Node6->Node1 - - - soundTable + + + soundTable diff --git a/docs/classSound-members.html b/docs/classSound-members.html index 62a3b855..5028205b 100644 --- a/docs/classSound-members.html +++ b/docs/classSound-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -101,9 +101,9 @@ diff --git a/docs/classSound.html b/docs/classSound.html index 1f11ddf7..df31f116 100644 --- a/docs/classSound.html +++ b/docs/classSound.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Sound @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
Diagrama de colaboração para Sound:
-
+
+
[legenda]

@@ -323,9 +324,9 @@

Atributos

diff --git a/docs/classSound__coll__graph.md5 b/docs/classSound__coll__graph.md5 index e895f231..42be3337 100644 --- a/docs/classSound__coll__graph.md5 +++ b/docs/classSound__coll__graph.md5 @@ -1 +1 @@ -b241baf69ae949367034e2443588c907 \ No newline at end of file +1aa42528e2f9db4f7c56fd0cdd34e33c \ No newline at end of file diff --git a/docs/classSound__coll__graph.svg b/docs/classSound__coll__graph.svg index 80ceb28c..942f51fc 100644 --- a/docs/classSound__coll__graph.svg +++ b/docs/classSound__coll__graph.svg @@ -1,40 +1,40 @@ - - - + + Sound - + Node1 - -Sound + +Sound Node2 - -int + +int Node2->Node1 - - - channel + + + channel Node3 - -shared_ptr< Mix_Chunk > + +shared_ptr< Mix_Chunk > Node3->Node1 - - - sound + + + sound diff --git a/docs/classSprite-members.html b/docs/classSprite-members.html index 5174f02f..0748edb2 100644 --- a/docs/classSprite-members.html +++ b/docs/classSprite-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -126,9 +126,9 @@ diff --git a/docs/classSprite.html b/docs/classSprite.html index 0b4ac049..f7dc06e0 100644 --- a/docs/classSprite.html +++ b/docs/classSprite.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Sprite @@ -31,7 +31,7 @@ - + @@ -100,7 +100,8 @@
Diagrama de colaboração para Sprite:
-
+
+
[legenda]

@@ -997,9 +998,9 @@

Atributos

diff --git a/docs/classSprite__coll__graph.map b/docs/classSprite__coll__graph.map index 8f45ab5a..a3c670f3 100644 --- a/docs/classSprite__coll__graph.map +++ b/docs/classSprite__coll__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classSprite__coll__graph.md5 b/docs/classSprite__coll__graph.md5 index 033bd64a..0e05cefa 100644 --- a/docs/classSprite__coll__graph.md5 +++ b/docs/classSprite__coll__graph.md5 @@ -1 +1 @@ -a8abbc3a7d64657b530632da525b0cb5 \ No newline at end of file +27d035ec1a82a2aa371fd8f45de03a53 \ No newline at end of file diff --git a/docs/classSprite__coll__graph.svg b/docs/classSprite__coll__graph.svg index 8ed446f2..76b51cb3 100644 --- a/docs/classSprite__coll__graph.svg +++ b/docs/classSprite__coll__graph.svg @@ -1,112 +1,112 @@ - - - + + Sprite - + Node1 - -Sprite + +Sprite Node2 - -unsigned char + +unsigned char Node2->Node1 - - - alpha + + + alpha Node8 - -Color + +Color Node2->Node8 - - - g -r -b + + + g +r +b Node3 - -float + +float Node3->Node1 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node4 - -SDL_Rect + +SDL_Rect Node4->Node1 - - - clipRect + + + clipRect Node5 - -int + +int Node5->Node1 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node6 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node6->Node1 - - - texture + + + texture Node7 - -SDL_BlendMode + +SDL_BlendMode Node7->Node1 - - - blendMode + + + blendMode Node8->Node1 - - - colorMultiplier + + + colorMultiplier diff --git a/docs/classStageState-members.html b/docs/classStageState-members.html index 2664c268..6c12467f 100644 --- a/docs/classStageState-members.html +++ b/docs/classStageState-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -94,7 +94,7 @@ bgStageStateprivate inputManagerStageStateprivate musicStageStateprivate - nullGameObjectStageStateprivate + nullGameObjectStageStateprivate objectArrayStateprotected Pause(void)StageStatevirtual popRequestedStateprotected @@ -104,24 +104,23 @@ Render(void) const StageStatevirtual RenderArray(void) const Stateprotectedvirtual Resume(void)StageStatevirtual - SpawnEnemy(int tileMapPosition)StageStateprivate - spawnGroupsStageStateprivate - StageState(void)StageState - State(void)State - tileMapStageStateprivate - tileSetStageStateprivate - Update(float dt)StageStatevirtual - UpdateArray(float dt)Stateprotectedvirtual - waveManagerStageStateprivate - wavesStageStateprivate - ~StageState(void)StageState - ~State(void)Statevirtual + spawnGroupsStageStateprivate + StageState(void)StageState + State(void)State + tileMapStageStateprivate + tileSetStageStateprivate + Update(float dt)StageStatevirtual + UpdateArray(float dt)Stateprotectedvirtual + waveManagerStageStateprivate + wavesStageStateprivate + ~StageState(void)StageState + ~State(void)Statevirtual diff --git a/docs/classStageState.html b/docs/classStageState.html index 1bf95e63..d889ad72 100644 --- a/docs/classStageState.html +++ b/docs/classStageState.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe StageState @@ -31,7 +31,7 @@ - + @@ -85,7 +85,6 @@
@@ -97,12 +96,14 @@
Diagrama de Hierarquia para StageState:
-
+
+
[legenda]
Diagrama de colaboração para StageState:
-
+
+
[legenda]

@@ -140,11 +141,6 @@

 Informa se o state solicitou que o jogo seja fechado. Mais...
 
- - - -

-Métodos Privados

void SpawnEnemy (int tileMapPosition)
 
@@ -161,8 +157,8 @@ - - + +

Atributos Privados

Sprite bg
 
WaveManager waveManager
 
EmptyGameObject nullGameObject
 
GameObject nullGameObject
 
vector< int > waves
 
@@ -303,30 +299,6 @@

Métodos

Implementa State.

- - - -
-
-
- - - - -
- - - - - - - - -
void StageState::SpawnEnemy (int tileMapPosition)
-
-private
-
-
@@ -425,7 +397,7 @@

Atributos

- +
@@ -433,7 +405,7 @@

Atributos

@@ -552,9 +524,9 @@

Atributos

diff --git a/docs/classStageState__coll__graph.map b/docs/classStageState__coll__graph.map index d061dd1d..5afcc8fc 100644 --- a/docs/classStageState__coll__graph.map +++ b/docs/classStageState__coll__graph.map @@ -1,16 +1,15 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/classStageState__coll__graph.md5 b/docs/classStageState__coll__graph.md5 index 987489d2..43bc0a17 100644 --- a/docs/classStageState__coll__graph.md5 +++ b/docs/classStageState__coll__graph.md5 @@ -1 +1 @@ -98e7d08c39b1517050d095257870d0d9 \ No newline at end of file +100339d7c1c2563e0fd3a1fea9755d5f \ No newline at end of file diff --git a/docs/classStageState__coll__graph.svg b/docs/classStageState__coll__graph.svg index 4d41b3fe..8a173a00 100644 --- a/docs/classStageState__coll__graph.svg +++ b/docs/classStageState__coll__graph.svg @@ -1,540 +1,535 @@ - - - + + StageState - + Node1 - -StageState + +StageState Node2 - -State + +State Node2->Node1 - - + + Node3 - -vector< std::unique -_ptr< GameObject > > + +vector< std::unique +_ptr< GameObject > > Node3->Node2 - - - objectArray + + + objectArray Node4 - -bool + +bool Node4->Node2 - - - quitRequested -popRequested + + + quitRequested +popRequested - -Node17 - - -WaveManager + +Node8 + + +GameObject - -Node4->Node17 - - - endWave + +Node4->Node8 + + + dead - -Node19 - - -TileMap + +Node20 + + +WaveManager - -Node4->Node19 - - - displayCollisionInfo + +Node4->Node20 + + + endWave - -Node28 - - -InputManager + +Node22 + + +TileMap - -Node4->Node28 - - - quitRequested -mouseState + +Node4->Node22 + + + displayCollisionInfo + + +Node27 + + +InputManager + + + + +Node4->Node27 + + + quitRequested +mouseState Node5 - -vector< vector< int > > + +vector< vector< int > > Node5->Node1 - - - spawnGroups + + + spawnGroups - -Node5->Node17 - - - spawnGroups + +Node5->Node20 + + + spawnGroups Node6 - -Music + +Music Node6->Node1 - - - music + + + music Node7 - -shared_ptr< Mix_Music > + +shared_ptr< Mix_Music > Node7->Node6 - - - music - - -Node8 - - -Sprite - - + + + music Node8->Node1 - - - bg - - -Node16 - - -TileSet - - - - -Node8->Node16 - - - tileSet + + + nullGameObject Node9 - -unsigned char - - -Node9->Node8 - - - alpha - - -Node15 - - -Color + + +Rect - -Node9->Node15 - - - g -r -b + +Node9->Node8 + + + box Node10 - -float + +float -Node10->Node8 - - - scaleY -frameTime -timeElapsed -scaleX +Node10->Node8 + + + rotation + + +Node10->Node9 + + + w +x +h +y - -Node23 - - -Timer - - - - -Node10->Node23 - - - time - - -Node25 - - -GameObject + +Node12 + + +Sprite - -Node10->Node25 - - - rotation + +Node10->Node12 + + + scaleY +frameTime +timeElapsed +scaleX Node26 - - -Rect + + +Timer Node10->Node26 - - - w -x -h -y + + + time - -Node29 - - -Vec2 + +Node28 + + +Vec2 - -Node10->Node29 - - - x -y + +Node10->Node28 + + + x +y Node11 - -SDL_Rect + +vector< Component * > -Node11->Node8 - - - clipRect +Node11->Node8 + + + components + + +Node12->Node1 + + + bg + + +Node19 + + +TileSet + - -Node12 - -int - - -Node12->Node8 - - - width -currentFrame -height -frameCount - - -Node12->Node16 - - - tileHeight -rows -tileWidth -columns - - -Node12->Node17 - - - totalWaves -waveTotalEnemies -playerLifes -enemiesLeft -waveIndex -waveCount -enemyIndex -Node12->Node19 - - - mapDepth -mapHeight -mapWidth - - -Node12->Node28 - - - mouseX -mouseY -controllerStickUpdate -mouseScroolUpdate -updateCounter -mouseUpdate +Node12->Node19 + + + tileSet Node13 - -shared_ptr< SDL_Texture > - - -Node13->Node8 - - - texture + +unsigned char - -Node14 - -SDL_BlendMode - - -Node14->Node8 - - - blendMode - - -Node15->Node8 - - - colorMultiplier - - -Node16->Node1 - - - tileSet - - -Node16->Node19 - - - tileSet - - -Node17->Node1 - - - waveManager + +Node13->Node12 + + + alpha Node18 - - -Component + + +Color - -Node18->Node17 - - + +Node13->Node18 + + + g +r +b - -Node19->Node1 - - - tileMap + +Node14 + +SDL_Rect - -Node19->Node17 - - - tileMap + +Node14->Node12 + + + clipRect - -Node20 - -vector< int > + +Node15 + +int + + +Node15->Node12 + + + width +currentFrame +height +frameCount + + +Node15->Node19 + + + tileHeight +rows +tileWidth +columns + + +Node15->Node20 + + + maxNumberOfEnemiesInSpawn +Point +totalWaves +waveTotalEnemies +playerLifes +enemiesLeft +waveIndex +waveCount +enemyIndex + + +Node15->Node22 + + + mapDepth +mapHeight +mapWidth + + +Node15->Node27 + + + mouseX +mouseY +controllerStickUpdate +mouseScroolUpdate +updateCounter +mouseUpdate - -Node20->Node1 - - - waves + +Node16 + +shared_ptr< SDL_Texture > + + +Node16->Node12 + + + texture + + +Node17 + +SDL_BlendMode - -Node20->Node19 - - - tileMatrix + +Node17->Node12 + + + blendMode + + +Node18->Node12 + + + colorMultiplier + + +Node19->Node1 + + + tileSet + + +Node19->Node22 + + + tileSet + + +Node20->Node1 + + + waveManager Node21 - -vector< GameObject * > + + +Component + - -Node21->Node19 - - - gameObjectMatrix - -Node22 - -shared_ptr< std::pair -< std::vector< WaveData - >, std::vector< EnemyData > > > - - -Node22->Node17 - - - wavesAndEnemysData - - -Node23->Node17 - - - spawnTimer + +Node21->Node20 + + + + +Node22->Node1 + + + tileMap + + +Node22->Node20 + + + tileMap + + +Node23 + +vector< int > + + +Node23->Node1 + + + waves + + +Node23->Node22 + + + tileMatrix Node24 - - -EmptyGameObject - - + +vector< GameObject * > - -Node24->Node1 - - - nullGameObject + +Node24->Node22 + + + gameObjectMatrix - -Node25->Node24 - - + +Node25 + +shared_ptr< std::pair +< std::vector< WaveData + >, std::vector< EnemyData > > > + + +Node25->Node20 + + + wavesAndEnemysData + + +Node26->Node20 + + + spawnTimer + + +Node27->Node1 + + + inputManager + + +Node28->Node27 + + + controllerLeftStickState +controllerRightStickState +mouseScroolState - -Node26->Node25 - - - box + +Node29 + +unordered_map< int, + int > - -Node27 - -vector< Component * > - - -Node27->Node25 - - - components - - -Node28->Node1 - - - inputManager - - -Node29->Node28 - - - controllerLeftStickState -controllerRightStickState -mouseScroolState + +Node29->Node27 + + + controllerUpdate +keyUpdate Node30 - -unordered_map< int, - int > + +unordered_map< int, + bool > - -Node30->Node28 - - - controllerUpdate -keyUpdate + +Node30->Node27 + + + keyState +controllerState Node31 - -unordered_map< int, - bool > - - -Node31->Node28 - - - keyState -controllerState - - -Node32 - -unordered_map< int, - SDL_GameController * > - - -Node32->Node28 - - - padToController + +unordered_map< int, + SDL_GameController * > + + +Node31->Node27 + + + padToController diff --git a/docs/classStageState__inherit__graph.map b/docs/classStageState__inherit__graph.map index c983d73c..90b1b3b0 100644 --- a/docs/classStageState__inherit__graph.map +++ b/docs/classStageState__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classStageState__inherit__graph.md5 b/docs/classStageState__inherit__graph.md5 index d252a5f9..eb475baf 100644 --- a/docs/classStageState__inherit__graph.md5 +++ b/docs/classStageState__inherit__graph.md5 @@ -1 +1 @@ -9c05eb1bdf6bc48cd3488fd3e386899e \ No newline at end of file +afe5fcc2146c54b8428bbdfd666b6ba0 \ No newline at end of file diff --git a/docs/classStageState__inherit__graph.svg b/docs/classStageState__inherit__graph.svg index 90bdcfec..f6166418 100644 --- a/docs/classStageState__inherit__graph.svg +++ b/docs/classStageState__inherit__graph.svg @@ -1,31 +1,31 @@ - - + StageState - + Node1 - -StageState + +StageState Node2 - -State + +State Node2->Node1 - - + + diff --git a/docs/classState-members.html b/docs/classState-members.html index 96a1f011..eb607325 100644 --- a/docs/classState-members.html +++ b/docs/classState-members.html @@ -3,7 +3,7 @@ - +Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- +
EmptyGameObject StageState::nullGameObjectGameObject StageState::nullGameObject
- + @@ -107,9 +107,9 @@
diff --git a/docs/classState.html b/docs/classState.html index ff2bb2b3..f2553650 100644 --- a/docs/classState.html +++ b/docs/classState.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe State @@ -31,7 +31,7 @@ - + @@ -100,12 +100,14 @@
Diagrama de Hierarquia para State:
-
+
+
[legenda]
Diagrama de colaboração para State:
-
+
+
[legenda]

@@ -527,9 +529,9 @@

Atributos

diff --git a/docs/classStateData-members.html b/docs/classStateData-members.html index db5b1ed6..3d17fb9b 100644 --- a/docs/classStateData-members.html +++ b/docs/classStateData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -96,9 +96,9 @@ diff --git a/docs/classStateData.html b/docs/classStateData.html index cebb11c6..785a9691 100644 --- a/docs/classStateData.html +++ b/docs/classStateData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe StateData @@ -31,7 +31,7 @@ - + @@ -99,12 +99,14 @@
Diagrama de Hierarquia para StateData:
-
+
+
[legenda]
Diagrama de colaboração para StateData:
-
+
+
[legenda]

@@ -184,9 +186,9 @@

Atributos

diff --git a/docs/classStateData__coll__graph.md5 b/docs/classStateData__coll__graph.md5 index 848a1983..31c9debc 100644 --- a/docs/classStateData__coll__graph.md5 +++ b/docs/classStateData__coll__graph.md5 @@ -1 +1 @@ -116f5a6e9415f85082cb41942853d743 \ No newline at end of file +9ce46cf47eac457991bdc332920fb707 \ No newline at end of file diff --git a/docs/classStateData__coll__graph.svg b/docs/classStateData__coll__graph.svg index b5129777..f2558646 100644 --- a/docs/classStateData__coll__graph.svg +++ b/docs/classStateData__coll__graph.svg @@ -1,30 +1,30 @@ - - + StateData - + Node1 - -StateData + +StateData Node2 - -int + +int Node2->Node1 - - - lifes -waveCount + + + lifes +waveCount diff --git a/docs/classStateData__inherit__graph.md5 b/docs/classStateData__inherit__graph.md5 index 4112a57a..cb44ce6d 100644 --- a/docs/classStateData__inherit__graph.md5 +++ b/docs/classStateData__inherit__graph.md5 @@ -1 +1 @@ -79bdea372acaee720ed8296e61fce1fc \ No newline at end of file +da29c168dad7a4f65926e783bae2c592 \ No newline at end of file diff --git a/docs/classStateData__inherit__graph.svg b/docs/classStateData__inherit__graph.svg index e65b2ee3..f922fc92 100644 --- a/docs/classStateData__inherit__graph.svg +++ b/docs/classStateData__inherit__graph.svg @@ -1,7 +1,7 @@ - - - - + + State - + Node1 - -State + +State Node2 - -vector< std::unique -_ptr< GameObject > > + +vector< std::unique +_ptr< GameObject > > Node2->Node1 - - - objectArray + + + objectArray Node3 - -bool + +bool Node3->Node1 - - - quitRequested -popRequested + + + quitRequested +popRequested diff --git a/docs/classState__inherit__graph.map b/docs/classState__inherit__graph.map index acb8a071..13390d77 100644 --- a/docs/classState__inherit__graph.map +++ b/docs/classState__inherit__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classState__inherit__graph.md5 b/docs/classState__inherit__graph.md5 index d8796610..5d157f1c 100644 --- a/docs/classState__inherit__graph.md5 +++ b/docs/classState__inherit__graph.md5 @@ -1 +1 @@ -49327c9a4410e4608c2ef199a751ea21 \ No newline at end of file +841341da08f07e3563c8ab13ac6b4d66 \ No newline at end of file diff --git a/docs/classState__inherit__graph.svg b/docs/classState__inherit__graph.svg index d99433f8..0f5848f3 100644 --- a/docs/classState__inherit__graph.svg +++ b/docs/classState__inherit__graph.svg @@ -1,57 +1,57 @@ - - + State - + Node1 - -State + +State Node2 - -EndState + +EndState Node1->Node2 - - + + Node3 - -StageState + +StageState Node1->Node3 - - + + Node4 - -TitleState + +TitleState Node1->Node4 - - + + diff --git a/docs/classText-members.html b/docs/classText-members.html index ac05e24d..f6a281fc 100644 --- a/docs/classText-members.html +++ b/docs/classText-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -118,9 +118,9 @@ diff --git a/docs/classText.html b/docs/classText.html index 73128fcc..6589233b 100644 --- a/docs/classText.html +++ b/docs/classText.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Text @@ -31,7 +31,7 @@ - + @@ -100,7 +100,8 @@
Diagrama de colaboração para Text:
-
+
+
[legenda]

@@ -786,9 +787,9 @@

Atributos

diff --git a/docs/classText__coll__graph.map b/docs/classText__coll__graph.map index c7f44b97..b2dbdf68 100644 --- a/docs/classText__coll__graph.map +++ b/docs/classText__coll__graph.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/classText__coll__graph.md5 b/docs/classText__coll__graph.md5 index d669c0ad..f866a6ee 100644 --- a/docs/classText__coll__graph.md5 +++ b/docs/classText__coll__graph.md5 @@ -1 +1 @@ -35eeaf0bb9ea0ac75c10a08651e48d5c \ No newline at end of file +942e010fc3f378109ea1dc41b378d390 \ No newline at end of file diff --git a/docs/classText__coll__graph.svg b/docs/classText__coll__graph.svg index 79e4bfe7..824f706e 100644 --- a/docs/classText__coll__graph.svg +++ b/docs/classText__coll__graph.svg @@ -1,151 +1,151 @@ - - + Text - + Node1 - -Text + +Text Node2 - -shared_ptr< TTF_Font > + +shared_ptr< TTF_Font > Node2->Node1 - - - font + + + font Node3 - -SDL_Color + +SDL_Color Node3->Node1 - - - color + + + color Node4 - -Rect + +Rect Node4->Node1 - - - box + + + box Node5 - -float + +float Node5->Node1 - - - timeShown -strobeFrequency + + + timeShown +strobeFrequency Node5->Node4 - - - w -x -h -y + + + w +x +h +y Node10 - -Timer + +Timer Node5->Node10 - - - time + + + time Node6 - -SDL_Texture * + +SDL_Texture * Node6->Node1 - - - texture + + + texture Node7 - -int + +int Node7->Node1 - - - fontSize + + + fontSize Node8 - -bool + +bool Node8->Node1 - - - isStrobe + + + isStrobe Node9 - -string + +string Node9->Node1 - - - fontFile -text + + + fontFile +text Node10->Node1 - - - textTime + + + textTime Node11 - -TextStyle + +TextStyle Node11->Node1 - - - style + + + style diff --git a/docs/classTileMap-members.html b/docs/classTileMap-members.html index d355920d..95a4153b 100644 --- a/docs/classTileMap-members.html +++ b/docs/classTileMap-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -96,17 +96,21 @@ displayCollisionInfoTileMapprotected gameObjectMatrixTileMapprotected GetDepth(void) const TileMap - GetHeight(void) const TileMap - GetSpawnPositions(void) const TileMap - GetTileMousePos(Vec2 const &mousePos, bool affecteedByZoom, int layer) const TileMap - GetTileSize(void) const TileMap - GetWidth(void) const TileMap - InsertGO(GameObject *obj)TileMap + GetGO(int index)TileMap + GetHeight(void) const TileMap + GetSpawnPositions(void) const TileMap + GetTileMousePos(Vec2 const &mousePos, bool affecteedByZoom, int layer) const TileMap + GetTileSize(void) const TileMap + GetWidth(void) const TileMap + InsertGO(GameObject *obj)TileMap + InsertGO(GameObject *obj, Vec2 initialPos)TileMap IsShowingCollisionInfo()TileMap Load(string file, std::vector< int > &target, bool setOfficialSize=false)TileMapprotected mapDepthTileMapprotected mapHeightTileMapprotected mapWidthTileMapprotected + RemoveGO(int position)TileMap + RemoveGO(void)TileMap Render(Vec2 pos=Vec2(0, 0), bool parallax=false, Vec2 mouse=Vec2(-1,-1)) const TileMap RenderLayer(int layer, Vec2 pos=Vec2(0, 0), bool parallax=false, Vec2 mouse=Vec2(-1,-1)) const TileMap SetTileSet(TileSet *tileSet)TileMapprotected @@ -117,9 +121,9 @@ diff --git a/docs/classTileMap.html b/docs/classTileMap.html index 62da4e6b..e01464ae 100644 --- a/docs/classTileMap.html +++ b/docs/classTileMap.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe TileMap @@ -31,7 +31,7 @@ - + @@ -100,7 +100,8 @@
Diagrama de colaboração para TileMap:
-
+
+
[legenda]
+ + + + + + + + + + + + @@ -369,6 +382,25 @@

Métodos

Informa o número de layers do tileMap.

Retorna o número de layers(profundidade) do tileMap.

+ + + +
+
+

@@ -135,6 +136,18 @@

void InsertGO (GameObject *obj)
 Insere GameObjct no tileMap. Mais...
 
void InsertGO (GameObject *obj, Vec2 initialPos)
 Insere GameObjct no tileMap ou o posiciona na posição passada caso não seja possivel. Mais...
 
void RemoveGO (int position)
 Remove GameObjct no tileMap. Mais...
 
void RemoveGO (void)
 Remove GameObjct no tileMap. Mais...
 
GameObjectGetGO (int index)
 Obtém GameObject de uma determinada posição do tileMap. Mais...
 
void ShowCollisionInfo (bool show)
 Ativa ou desativa a exibição na tela das informações do tileMap de colisão. Mais...
 
+ + + + + + + +
GameObject * TileMap::GetGO (int index)
+
+ +

Obtém GameObject de uma determinada posição do tileMap.

+

Faz-se checagem de limites para saber se a posição desejada existe.

+
@@ -517,6 +549,41 @@

Métodos

Utiliza a posição do mouse no momento(que deve ser a mesma do centro do GameObject) para identificar onde o GameObject deve ser colocado no tileMap de GameObjects. Então obj é colocado nessa posição, sua posição é alterada para se encaixar exatamente com o início da posição. Atualiza-se o tileMao de colisão para adicionar a informação que tem um GameObject na posição respectiva.

+ + + +
+
+ + + + + + + + + + + + + + + + + + +
void TileMap::InsertGO (GameObjectobj,
Vec2 initialPos 
)
+
+ +

Insere GameObjct no tileMap ou o posiciona na posição passada caso não seja possivel.

+
Parâmetros
+ + +
objGameObject a ser inserido no tileMap de GameObjects.
+
+
+

Utiliza a posição do mouse no momento(que deve ser a mesma do centro do GameObject) para identificar onde o GameObject deve ser colocado no tileMap de GameObjects. Então obj é colocado nessa posição, sua posição é alterada para se encaixar exatamente com o início da posição. Atualiza-se o tileMao de colisão para adicionar a informação que tem um GameObject na posição respectiva.

+
@@ -585,6 +652,50 @@

Métodos

O arquivo deve começar com 3 números: largura, altura e profundidade. Depois disso dever existir um números inteiros igual ao produto dos três números lidos organizados em layers, linhas e colunas. O argumento setOfficialSize deve ser verdadeiro se estiver lendo o arquivo de tileMap relativo com informações do tileSet.

+ + + +
+
+ + + + + + + + +
void TileMap::RemoveGO (int position)
+
+ +

Remove GameObjct no tileMap.

+
Parâmetros
+ + +
positionPosição que contém o Gameobject a ser retirado.
+
+
+

Atualiza-se o tileMap de colisão para adicionar a informação que tem um GameObject na posição respectiva.

+ +
+
+ +
+
+ + + + + + + + +
void TileMap::RemoveGO (void )
+
+ +

Remove GameObjct no tileMap.

+

Variação do RemoveGO que internamente faz a busca o GameObject que está debaixo do mouse para remover. Atualiza-se o tileMap de colisão para adicionar a informação que tem um GameObject na posição respectiva.

+
@@ -880,9 +991,9 @@

Atributos

diff --git a/docs/classTileMap__coll__graph.map b/docs/classTileMap__coll__graph.map index b318bccf..4a18b38c 100644 --- a/docs/classTileMap__coll__graph.map +++ b/docs/classTileMap__coll__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classTileMap__coll__graph.md5 b/docs/classTileMap__coll__graph.md5 index 3ed19e9b..3547d398 100644 --- a/docs/classTileMap__coll__graph.md5 +++ b/docs/classTileMap__coll__graph.md5 @@ -1 +1 @@ -a290c2236529382d9e6be94d6881990f \ No newline at end of file +22d1d7d9bbd5beeec0b1e7f7007cba2f \ No newline at end of file diff --git a/docs/classTileMap__coll__graph.svg b/docs/classTileMap__coll__graph.svg index d63814e0..75277282 100644 --- a/docs/classTileMap__coll__graph.svg +++ b/docs/classTileMap__coll__graph.svg @@ -1,190 +1,190 @@ - - - + + TileMap - + Node1 - -TileMap + +TileMap Node2 - -TileSet + +TileSet Node2->Node1 - - - tileSet + + + tileSet Node3 - -Sprite + +Sprite Node3->Node2 - - - tileSet + + + tileSet Node4 - -unsigned char + +unsigned char Node4->Node3 - - - alpha + + + alpha Node10 - -Color + +Color Node4->Node10 - - - g -r -b + + + g +r +b Node5 - -float + +float Node5->Node3 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node6 - -SDL_Rect + +SDL_Rect Node6->Node3 - - - clipRect + + + clipRect Node7 - -int + +int Node7->Node1 - - - mapDepth -mapHeight -mapWidth + + + mapDepth +mapHeight +mapWidth Node7->Node2 - - - tileHeight -rows -tileWidth -columns + + + tileHeight +rows +tileWidth +columns Node7->Node3 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node8 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node8->Node3 - - - texture + + + texture Node9 - -SDL_BlendMode + +SDL_BlendMode Node9->Node3 - - - blendMode + + + blendMode Node10->Node3 - - - colorMultiplier + + + colorMultiplier Node11 - -vector< int > + +vector< int > Node11->Node1 - - - tileMatrix + + + tileMatrix Node12 - -vector< GameObject * > + +vector< GameObject * > Node12->Node1 - - - gameObjectMatrix + + + gameObjectMatrix Node13 - -bool + +bool Node13->Node1 - - - displayCollisionInfo + + + displayCollisionInfo diff --git a/docs/classTileSet-members.html b/docs/classTileSet-members.html index c70ff386..702594e4 100644 --- a/docs/classTileSet-members.html +++ b/docs/classTileSet-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -102,9 +102,9 @@ diff --git a/docs/classTileSet.html b/docs/classTileSet.html index d4303aa8..c9c76f84 100644 --- a/docs/classTileSet.html +++ b/docs/classTileSet.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe TileSet @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
Diagrama de colaboração para TileSet:
-
+
+
[legenda]

@@ -374,9 +375,9 @@

Atributos

diff --git a/docs/classTileSet__coll__graph.map b/docs/classTileSet__coll__graph.map index c5e98a1b..d50e2946 100644 --- a/docs/classTileSet__coll__graph.map +++ b/docs/classTileSet__coll__graph.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/classTileSet__coll__graph.md5 b/docs/classTileSet__coll__graph.md5 index 81f8d828..86c0bd6e 100644 --- a/docs/classTileSet__coll__graph.md5 +++ b/docs/classTileSet__coll__graph.md5 @@ -1 +1 @@ -94205f4abfe5030eb8c2713bc6b0925a \ No newline at end of file +df0ba06f6e1636113d08fb8e33c4bad6 \ No newline at end of file diff --git a/docs/classTileSet__coll__graph.svg b/docs/classTileSet__coll__graph.svg index 96fed23c..b0aaa079 100644 --- a/docs/classTileSet__coll__graph.svg +++ b/docs/classTileSet__coll__graph.svg @@ -1,14 +1,14 @@ - - - + + TileSet - + Node1 @@ -17,119 +17,119 @@ Node2 - -Sprite + +Sprite Node2->Node1 - - - tileSet + + + tileSet Node3 - -unsigned char + +unsigned char Node3->Node2 - - - alpha + + + alpha Node9 - -Color + +Color Node3->Node9 - - - g -r -b + + + g +r +b Node4 - -float + +float Node4->Node2 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -SDL_Rect + +SDL_Rect Node5->Node2 - - - clipRect + + + clipRect Node6 - -int + +int Node6->Node1 - - - tileHeight -rows -tileWidth -columns + + + tileHeight +rows +tileWidth +columns Node6->Node2 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node7 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node7->Node2 - - - texture + + + texture Node8 - -SDL_BlendMode + +SDL_BlendMode Node8->Node2 - - - blendMode + + + blendMode Node9->Node2 - - - colorMultiplier + + + colorMultiplier diff --git a/docs/classTimer-members.html b/docs/classTimer-members.html index 2060409f..018eb87b 100644 --- a/docs/classTimer-members.html +++ b/docs/classTimer-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -98,9 +98,9 @@ diff --git a/docs/classTimer.html b/docs/classTimer.html index 62a648eb..0a3880b3 100644 --- a/docs/classTimer.html +++ b/docs/classTimer.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Timer @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
Diagrama de colaboração para Timer:
-
+
+
[legenda]

@@ -238,9 +239,9 @@

Atributos

diff --git a/docs/classTimer__coll__graph.md5 b/docs/classTimer__coll__graph.md5 index 3eade541..a61e08e0 100644 --- a/docs/classTimer__coll__graph.md5 +++ b/docs/classTimer__coll__graph.md5 @@ -1 +1 @@ -a060e85e41384645d41e0110e274e848 \ No newline at end of file +9cd637218f9e7c7b39f84515ea113644 \ No newline at end of file diff --git a/docs/classTimer__coll__graph.svg b/docs/classTimer__coll__graph.svg index 3f5810e4..d19a8858 100644 --- a/docs/classTimer__coll__graph.svg +++ b/docs/classTimer__coll__graph.svg @@ -1,29 +1,29 @@ - - - + + Timer - + Node1 - -Timer + +Timer Node2 - -float + +float Node2->Node1 - - - time + + + time diff --git a/docs/classTitleState-members.html b/docs/classTitleState-members.html index c900b2f9..3e5b808c 100644 --- a/docs/classTitleState-members.html +++ b/docs/classTitleState-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -109,9 +109,9 @@ diff --git a/docs/classTitleState.html b/docs/classTitleState.html index daf306ef..ac16b8f0 100644 --- a/docs/classTitleState.html +++ b/docs/classTitleState.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe TitleState @@ -31,7 +31,7 @@ - + @@ -96,12 +96,14 @@
Diagrama de Hierarquia para TitleState:
-
+
+
[legenda]
Diagrama de colaboração para TitleState:
-
+
+
[legenda]

@@ -328,9 +330,9 @@

Atributos

diff --git a/docs/classTitleState__coll__graph.map b/docs/classTitleState__coll__graph.map index 17ba456a..118fa923 100644 --- a/docs/classTitleState__coll__graph.map +++ b/docs/classTitleState__coll__graph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classTitleState__coll__graph.md5 b/docs/classTitleState__coll__graph.md5 index 88710aa8..c565eb3a 100644 --- a/docs/classTitleState__coll__graph.md5 +++ b/docs/classTitleState__coll__graph.md5 @@ -1 +1 @@ -9ba5614332419f199450d46b518bd2a9 \ No newline at end of file +8c4af2f68fbacdbf4767e7f0228b206d \ No newline at end of file diff --git a/docs/classTitleState__coll__graph.svg b/docs/classTitleState__coll__graph.svg index 018585fd..8b4472e2 100644 --- a/docs/classTitleState__coll__graph.svg +++ b/docs/classTitleState__coll__graph.svg @@ -1,163 +1,163 @@ - - - + + TitleState - + Node1 - -TitleState + +TitleState Node2 - -State + +State Node2->Node1 - - + + Node3 - -vector< std::unique -_ptr< GameObject > > + +vector< std::unique +_ptr< GameObject > > Node3->Node2 - - - objectArray + + + objectArray Node4 - -bool + +bool Node4->Node2 - - - quitRequested -popRequested + + + quitRequested +popRequested Node5 - -Sprite + +Sprite Node5->Node1 - - - bg + + + bg Node6 - -unsigned char + +unsigned char Node6->Node5 - - - alpha + + + alpha Node12 - -Color + +Color Node6->Node12 - - - g -r -b + + + g +r +b Node7 - -float + +float Node7->Node5 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node8 - -SDL_Rect + +SDL_Rect Node8->Node5 - - - clipRect + + + clipRect Node9 - -int + +int Node9->Node5 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node10 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node10->Node5 - - - texture + + + texture Node11 - -SDL_BlendMode + +SDL_BlendMode Node11->Node5 - - - blendMode + + + blendMode Node12->Node5 - - - colorMultiplier + + + colorMultiplier diff --git a/docs/classTitleState__inherit__graph.map b/docs/classTitleState__inherit__graph.map index 318c3fc8..1aff0e61 100644 --- a/docs/classTitleState__inherit__graph.map +++ b/docs/classTitleState__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classTitleState__inherit__graph.md5 b/docs/classTitleState__inherit__graph.md5 index 55e86e9e..a29dab18 100644 --- a/docs/classTitleState__inherit__graph.md5 +++ b/docs/classTitleState__inherit__graph.md5 @@ -1 +1 @@ -dca2415391fad9a0386fb465fde0b22e \ No newline at end of file +9fa182833a8ec14c31caa08a38ed85a7 \ No newline at end of file diff --git a/docs/classTitleState__inherit__graph.svg b/docs/classTitleState__inherit__graph.svg index c7ad3096..1365dc27 100644 --- a/docs/classTitleState__inherit__graph.svg +++ b/docs/classTitleState__inherit__graph.svg @@ -1,31 +1,31 @@ - - + TitleState - + Node1 - -TitleState + +TitleState Node2 - -State + +State Node2->Node1 - - + + diff --git a/docs/classTower-members.html b/docs/classTower-members.html index c4db0221..cc4ce3fb 100644 --- a/docs/classTower-members.html +++ b/docs/classTower-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -90,37 +90,40 @@

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

- - - - - + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + +
ARTS [Valor enumerado]Tower
boxGameObject
componentsGameObjectprotected
COMPUTATION [Valor enumerado]Tower
Damage(int damage)Tower
AddComponent(Component *component)GameObject
ARTS [Valor enumerado]Tower
boxGameObject
componentsGameObjectprotected
COMPUTATION [Valor enumerado]Tower
Damage(int damage)Tower
deadGameObjectprotected
ENGINEERING [Valor enumerado]Tower
GameObject(void)GameObject
GetWorldRenderedRect(void) const Towervirtual
hitpointsTowerprivate
Is(string type)Towervirtual
IsDead(void)Towervirtual
IsDead(void)Tower
isDragingTowerprivate
MEDICINE [Valor enumerado]Tower
NotifyCollision(GameObject &other)Towervirtual
Render(void)Towervirtual
RequestDelete(void)Towervirtual
rotationGameObject
SOCIOLOGY [Valor enumerado]Tower
spTowerprivate
Tower(TowerType, Vec2 pos, Vec2 tileSize, TileMap *tileMap)Tower
TowerType [Enumeração]Tower
TowerType typedefTower
Update(float dt)Towervirtual
~GameObject(void)GameObjectvirtual
~Tower()Tower
RemoveComponent(ComponentType type)GameObject
Render(void)Towervirtual
RequestDelete(void)Tower
rotationGameObject
SOCIOLOGY [Valor enumerado]Tower
spTowerprivate
Tower(TowerType, Vec2 pos, Vec2 tileSize)Tower
TowerType [Enumeração]Tower
TowerType typedefTower
Update(float dt)Towervirtual
~GameObject(void)GameObject
~Tower()Tower
diff --git a/docs/classTower.html b/docs/classTower.html index 0ff791a7..c888981e 100644 --- a/docs/classTower.html +++ b/docs/classTower.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Tower @@ -31,7 +31,7 @@ - + @@ -97,12 +97,14 @@
Diagrama de Hierarquia para Tower:
-
+
+
[legenda]
Diagrama de colaboração para Tower:
-
+
+
[legenda]

@@ -124,8 +126,8 @@

- - + + @@ -135,10 +137,8 @@ - - @@ -155,9 +155,21 @@ - + + + + + + + + + + + + +

Métodos Públicos

 Tower (TowerType, Vec2 pos, Vec2 tileSize, TileMap *tileMap)
 
 Tower (TowerType, Vec2 pos, Vec2 tileSize)
 
void Damage (int damage)
 
void Update (float dt)
 Renderiza o GameObject. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
void NotifyCollision (GameObject &other)
 Notifica Colisão. Mais...
 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
void AddComponent (Component *component)
 Adiciona componente a um gameobjet. Mais...
 
void RemoveComponent (ComponentType type)
 Remove componente a um gameobjet. Mais...
 
 ~GameObject (void)
 Destrutor. Mais...
 
bool IsDead (void)
 Informa se esse gameObject não precisa mais existir. Mais...
 
void RequestDelete (void)
 Solicita que o GameObject seja destruído. Mais...
 
@@ -178,6 +190,8 @@ + +

Atributos Privados

- Atributos Protegidos inherited from GameObject
std::vector< Component * > components
 
bool dead
 

Definições de Tipos

@@ -224,7 +238,7 @@

Enumerações

Construtores & Destrutores

- +
@@ -244,13 +258,7 @@

Construtores & Destrutores

- - - - - - - + @@ -319,7 +327,7 @@

Métodos

Obtém Rect informando a posição renderizada da animação.

Obtém Rect informando a posição renderizada, computando zoom, escala e posição da câmera.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -355,16 +363,13 @@

Métodos

Retorna
Verdadeiro se for do tipo perguntado, falso caso contrário;

É usado no tratamento de colisão para que se identifique com quem colidiu.

-

Implementa GameObject.

+

Reimplementação de GameObject.

-
Vec2 tileSize,
TileMaptileMap tileSize 
- - - - -
@@ -374,19 +379,8 @@

Métodos

bool Tower::IsDead
-
-virtual
-

Informa se esse gameObject não precisa mais existir.

-
Retorna
Verdadeiro se esse GameObject não é mais necessário, false caso contrário.
-

Deve ser usado no State que o contém para o eliminar da sua estrutura de manipulação de gameObject e destruí-lo.

- -

Implementa GameObject.

-
@@ -420,7 +414,7 @@

Métodos

Deve realizar as ações para tratamento da colisão.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -449,16 +443,13 @@

Métodos

Renderiza o GameObject.

Esse método deve ter a lógica necessário para ser renderizado na tela.

-

Implementa GameObject.

+

Reimplementação de GameObject.

- - - - - -
@@ -468,18 +459,8 @@

Métodos

void Tower::RequestDelete
-
-virtual
-

Solicita que o GameObject seja destruído.

-

Uma vez que esse método é chamado, futuras chamadas ao IsDead devem retornar verdadeiro.

- -

Implementa GameObject.

-
@@ -513,7 +494,7 @@

Métodos

No corpo método o GameObject deve atualizar seu estado, utilizando o argumento passado e quaisquer outras funcionalidades que necessitar.

-

Implementa GameObject.

+

Reimplementação de GameObject.

@@ -585,9 +566,9 @@

Atributos

diff --git a/docs/classTower__coll__graph.map b/docs/classTower__coll__graph.map index e6242c1e..9470a023 100644 --- a/docs/classTower__coll__graph.map +++ b/docs/classTower__coll__graph.map @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/docs/classTower__coll__graph.md5 b/docs/classTower__coll__graph.md5 index 154fadc5..338a7aed 100644 --- a/docs/classTower__coll__graph.md5 +++ b/docs/classTower__coll__graph.md5 @@ -1 +1 @@ -46a24232155de438f8e64394695b4a57 \ No newline at end of file +ce770e188e362912747bfa707860503e \ No newline at end of file diff --git a/docs/classTower__coll__graph.svg b/docs/classTower__coll__graph.svg index d73fc853..de4be583 100644 --- a/docs/classTower__coll__graph.svg +++ b/docs/classTower__coll__graph.svg @@ -1,196 +1,202 @@ - - - + + Tower - + Node1 - -Tower + +Tower Node2 - -GameObject + +GameObject Node2->Node1 - - + + Node3 - -Rect + +Rect Node3->Node2 - - - box + + + box Node4 - -float + +float Node4->Node2 - - - rotation + + + rotation Node4->Node3 - - - w -x -h -y + + + w +x +h +y - -Node6 - - -Sprite + +Node7 + + +Sprite - -Node4->Node6 - - - scaleY -frameTime -timeElapsed -scaleX + +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -vector< Component * > + +bool + + +Node5->Node1 + + + isDraging Node5->Node2 - - - components + + + dead - -Node6->Node1 - - - sp + +Node6 + +vector< Component * > - -Node7 - -unsigned char + +Node6->Node2 + + + components - -Node7->Node6 - - - alpha + +Node7->Node1 + + + sp - -Node12 - - -Color - + +Node8 + +unsigned char + +Node8->Node7 + + + alpha - -Node7->Node12 - - - g -r -b + +Node13 + + +Color + - -Node8 - -SDL_Rect - -Node8->Node6 - - - clipRect + +Node8->Node13 + + + g +r +b Node9 - -int - - -Node9->Node1 - - - hitpoints - - -Node9->Node6 - - - width -currentFrame -height -frameCount + +SDL_Rect + + +Node9->Node7 + + + clipRect Node10 - -shared_ptr< SDL_Texture > - - -Node10->Node6 - - - texture + +int + + +Node10->Node1 + + + hitpoints + + +Node10->Node7 + + + width +currentFrame +height +frameCount Node11 - -SDL_BlendMode - - -Node11->Node6 - - - blendMode + +shared_ptr< SDL_Texture > - -Node12->Node6 - - - colorMultiplier + +Node11->Node7 + + + texture - -Node13 - -bool - - -Node13->Node1 - - - isDraging + +Node12 + +SDL_BlendMode + + +Node12->Node7 + + + blendMode + + +Node13->Node7 + + + colorMultiplier diff --git a/docs/classTower__inherit__graph.map b/docs/classTower__inherit__graph.map index 41d22080..ce48d51d 100644 --- a/docs/classTower__inherit__graph.map +++ b/docs/classTower__inherit__graph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classTower__inherit__graph.md5 b/docs/classTower__inherit__graph.md5 index 3a9aa603..c0fef2f3 100644 --- a/docs/classTower__inherit__graph.md5 +++ b/docs/classTower__inherit__graph.md5 @@ -1 +1 @@ -0ffca2f9439dc9c3c239a80daa1895df \ No newline at end of file +59a6b9f0bfe5e9775063216a5951fb56 \ No newline at end of file diff --git a/docs/classTower__inherit__graph.svg b/docs/classTower__inherit__graph.svg index bb730981..5acf97e8 100644 --- a/docs/classTower__inherit__graph.svg +++ b/docs/classTower__inherit__graph.svg @@ -1,31 +1,31 @@ - - + Tower - + Node1 - -Tower + +Tower Node2 - -GameObject + +GameObject Node2->Node1 - - + + diff --git a/docs/classVec2-members.html b/docs/classVec2-members.html index 08232059..3f61a5c0 100644 --- a/docs/classVec2-members.html +++ b/docs/classVec2-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -115,9 +115,9 @@ diff --git a/docs/classVec2.html b/docs/classVec2.html index 6b469275..ca49d273 100644 --- a/docs/classVec2.html +++ b/docs/classVec2.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe Vec2 @@ -31,7 +31,7 @@ - + @@ -100,7 +100,8 @@
Diagrama de colaboração para Vec2:
-
+
+
[legenda]

@@ -647,9 +648,9 @@

Atributos

diff --git a/docs/classVec2__coll__graph.md5 b/docs/classVec2__coll__graph.md5 index eac29d1f..d9a7facb 100644 --- a/docs/classVec2__coll__graph.md5 +++ b/docs/classVec2__coll__graph.md5 @@ -1 +1 @@ -fd5fedc5a169df340feb9792fa7277fb \ No newline at end of file +759ab5b46dd1dfdbae83e5a4a967fc3e \ No newline at end of file diff --git a/docs/classVec2__coll__graph.svg b/docs/classVec2__coll__graph.svg index 3fd5fb4b..a38ebbfa 100644 --- a/docs/classVec2__coll__graph.svg +++ b/docs/classVec2__coll__graph.svg @@ -1,30 +1,30 @@ - - + Vec2 - + Node1 - -Vec2 + +Vec2 Node2 - -float + +float Node2->Node1 - - - x -y + + + x +y diff --git a/docs/classWaveManager-members.html b/docs/classWaveManager-members.html index 315d8c3a..18907ddc 100644 --- a/docs/classWaveManager-members.html +++ b/docs/classWaveManager-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
- + @@ -97,29 +97,30 @@ GetEnemiesLeft()WaveManager GetLifesLeft()WaveManager Is(ComponentType type) const WaveManagervirtual - NotifyEnemyGotKilled()WaveManager - NotifyEnemyGotToHisDestiny()WaveManager - playerLifesWaveManagerprivate - SpawnEnemy(int tileMapPosition, int enemyId, uint baseHP, uint endPoint)WaveManagerprivate - spawnGroupsWaveManagerprivate - spawnTimerWaveManagerprivate - StartWave()WaveManager - tileMapWaveManagerprivate - totalWavesWaveManagerprivate - Update(GameObject &associated, float dt)WaveManagervirtual - waveCountWaveManagerprivatestatic - waveIndexWaveManagerprivate - WaveManager(TileMap &tileMap, string waveFile)WaveManager - wavesAndEnemysDataWaveManagerprivate - waveTotalEnemiesWaveManagerprivate - ~Component(void)Componentinlinevirtual - ~WaveManager()WaveManager + maxNumberOfEnemiesInSpawnPointWaveManagerprivate + NotifyEnemyGotKilled()WaveManager + NotifyEnemyGotToHisDestiny()WaveManager + playerLifesWaveManagerprivate + SpawnEnemy(int tileMapPosition, int enemyId, uint baseHP, uint endPoint)WaveManagerprivate + spawnGroupsWaveManagerprivate + spawnTimerWaveManagerprivate + StartWave()WaveManager + tileMapWaveManagerprivate + totalWavesWaveManagerprivate + Update(GameObject &associated, float dt)WaveManagervirtual + waveCountWaveManagerprivatestatic + waveIndexWaveManagerprivate + WaveManager(TileMap &tileMap, string waveFile)WaveManager + wavesAndEnemysDataWaveManagerprivate + waveTotalEnemiesWaveManagerprivate + ~Component(void)Componentinlinevirtual + ~WaveManager()WaveManager diff --git a/docs/classWaveManager.html b/docs/classWaveManager.html index 1a446759..8e4779cf 100644 --- a/docs/classWaveManager.html +++ b/docs/classWaveManager.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Classe WaveManager @@ -31,7 +31,7 @@ - + @@ -101,12 +101,14 @@
Diagrama de Hierarquia para WaveManager:
-
+
+
[legenda]
Diagrama de colaboração para WaveManager:
-
+
+
[legenda]
- + @@ -178,6 +180,8 @@ + +

@@ -120,7 +122,7 @@

void Update (GameObject &associated, float dt)
 Atualiza estado. Atualiza o estado da wave atual. Mais...
 
bool Is (ComponentType type) const
bool Is (ComponentType type) const
 Tipo Retorna o tipo da componente se é igual a WAVE_MANAGER. true ou false. Mais...
 
void StartWave ()
 
int waveTotalEnemies
 
int maxNumberOfEnemiesInSpawnPoint
 
@@ -304,7 +308,7 @@

Métodos

- + @@ -471,7 +475,7 @@

Métodos

Atualiza estado. Atualiza o estado da wave atual.

Parâmetros

Atributos Privados Estáticos

bool WaveManager::Is (ComponentType ComponentType  type) const
- +
associated.So recebe este argumento por ser um componente. Mas como wave nao faz parte de um GameObject, ele recebe o parametro EmptyGameObject em que nao é usada.
associated.So recebe este argumento por ser um componente. Mas como wave nao faz parte de um GameObject, ele recebe o parametro EmptyGameObject em que nao é usada.
dttempo dt, é usado para fazer o spawn de tempos em tempos dos inimigos.
@@ -542,6 +546,26 @@

Atributos

+
+ + +
+
+ + + + + +
+ + + + +
int WaveManager::maxNumberOfEnemiesInSpawnPoint
+
+private
+
+
@@ -739,9 +763,9 @@

Atributos

diff --git a/docs/classWaveManager__coll__graph.map b/docs/classWaveManager__coll__graph.map index 58847d22..9d962627 100644 --- a/docs/classWaveManager__coll__graph.map +++ b/docs/classWaveManager__coll__graph.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/classWaveManager__coll__graph.md5 b/docs/classWaveManager__coll__graph.md5 index 7fe4ef7c..0010919e 100644 --- a/docs/classWaveManager__coll__graph.md5 +++ b/docs/classWaveManager__coll__graph.md5 @@ -1 +1 @@ -35db817d935a58b34cb1e35dafa12fcc \ No newline at end of file +380930b487830e46dcaaa1742ad3ec45 \ No newline at end of file diff --git a/docs/classWaveManager__coll__graph.svg b/docs/classWaveManager__coll__graph.svg index 520d118c..db0e0786 100644 --- a/docs/classWaveManager__coll__graph.svg +++ b/docs/classWaveManager__coll__graph.svg @@ -1,279 +1,281 @@ - - - + + WaveManager - + Node1 - -WaveManager + +WaveManager Node2 - -Component + +Component Node2->Node1 - - + + Node3 - -vector< vector< int > > + +vector< vector< int > > Node3->Node1 - - - spawnGroups + + + spawnGroups Node4 - -int + +int Node4->Node1 - - - totalWaves -waveTotalEnemies -playerLifes -enemiesLeft -waveIndex -waveCount -enemyIndex + + + maxNumberOfEnemiesInSpawn +Point +totalWaves +waveTotalEnemies +playerLifes +enemiesLeft +waveIndex +waveCount +enemyIndex Node6 - -TileMap + +TileMap Node4->Node6 - - - mapDepth -mapHeight -mapWidth + + + mapDepth +mapHeight +mapWidth Node7 - -TileSet + +TileSet Node4->Node7 - - - tileHeight -rows -tileWidth -columns + + + tileHeight +rows +tileWidth +columns Node8 - -Sprite + +Sprite Node4->Node8 - - - width -currentFrame -height -frameCount + + + width +currentFrame +height +frameCount Node5 - -bool + +bool Node5->Node1 - - - endWave + + + endWave Node5->Node6 - - - displayCollisionInfo + + + displayCollisionInfo Node6->Node1 - - - tileMap + + + tileMap Node7->Node6 - - - tileSet + + + tileSet Node8->Node7 - - - tileSet + + + tileSet Node9 - -unsigned char + +unsigned char Node9->Node8 - - - alpha + + + alpha Node14 - -Color + +Color Node9->Node14 - - - g -r -b + + + g +r +b Node10 - -float + +float Node10->Node8 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX Node18 - -Timer + +Timer Node10->Node18 - - - time + + + time Node11 - -SDL_Rect + +SDL_Rect Node11->Node8 - - - clipRect + + + clipRect Node12 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node12->Node8 - - - texture + + + texture Node13 - -SDL_BlendMode + +SDL_BlendMode Node13->Node8 - - - blendMode + + + blendMode Node14->Node8 - - - colorMultiplier + + + colorMultiplier Node15 - -vector< int > + +vector< int > Node15->Node6 - - - tileMatrix + + + tileMatrix Node16 - -vector< GameObject * > + +vector< GameObject * > Node16->Node6 - - - gameObjectMatrix + + + gameObjectMatrix Node17 - -shared_ptr< std::pair -< std::vector< WaveData - >, std::vector< EnemyData > > > + +shared_ptr< std::pair +< std::vector< WaveData + >, std::vector< EnemyData > > > Node17->Node1 - - - wavesAndEnemysData + + + wavesAndEnemysData Node18->Node1 - - - spawnTimer + + + spawnTimer diff --git a/docs/classWaveManager__inherit__graph.md5 b/docs/classWaveManager__inherit__graph.md5 index 607dd6fb..13f52604 100644 --- a/docs/classWaveManager__inherit__graph.md5 +++ b/docs/classWaveManager__inherit__graph.md5 @@ -1 +1 @@ -96435a7c0d224ef4248072a7e0cfaad6 \ No newline at end of file +d3aecbf283144d594189dac2eed7c6e4 \ No newline at end of file diff --git a/docs/classWaveManager__inherit__graph.svg b/docs/classWaveManager__inherit__graph.svg index b4c7c2d7..bfff73a3 100644 --- a/docs/classWaveManager__inherit__graph.svg +++ b/docs/classWaveManager__inherit__graph.svg @@ -1,7 +1,7 @@ - - - - - - -Projeto IDJ - Towers Of Madness: Lista dos Membros - - - - - - - - - -
-
- - - - - - -
-
Projeto IDJ - Towers Of Madness -
-
TowerDefenseLovecraftnianoZombicida
-
-
- - - - - - - - - -
- -
- -
-
-
-
emptyGameObject Lista dos Membros
-
-
- -

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

- - - - - - - - - - - - - - - -
boxGameObject
componentsGameObjectprotected
emptyGameObject()emptyGameObject
GameObject(void)GameObject
GetWorldRenderedRect(void) const =0GameObjectpure virtual
Is(string type)=0GameObjectpure virtual
IsDead(void)=0GameObjectpure virtual
NotifyCollision(GameObject &other)=0GameObjectpure virtual
Render(void)=0GameObjectpure virtual
RequestDelete(void)=0GameObjectpure virtual
rotationGameObject
Update(float dt)=0GameObjectpure virtual
~emptyGameObject()emptyGameObject
~GameObject(void)GameObjectvirtual
- - - - diff --git a/docs/classemptyGameObject.html b/docs/classemptyGameObject.html deleted file mode 100644 index e6f3bc5f..00000000 --- a/docs/classemptyGameObject.html +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - -Projeto IDJ - Towers Of Madness: Referência da Classe emptyGameObject - - - - - - - - - -
-
- - - - - - -
-
Projeto IDJ - Towers Of Madness -
-
TowerDefenseLovecraftnianoZombicida
-
-
- - - - - - - - - -
- -
- -
-
- -
-
Referência da Classe emptyGameObject
-
-
- -

#include <emptyGameObject.h>

-
-Diagrama de Hierarquia para emptyGameObject:
-
-
-
[legenda]
-
-Diagrama de colaboração para emptyGameObject:
-
-
-
[legenda]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Métodos Públicos

 emptyGameObject ()
 
 ~emptyGameObject ()
 
- Métodos Públicos inherited from GameObject
 GameObject (void)
 Construtor. Mais...
 
virtual ~GameObject (void)
 Destrutor. Mais...
 
virtual void Update (float dt)=0
 Atualizar estado. Mais...
 
virtual void Render (void)=0
 Renderiza o GameObject. Mais...
 
virtual bool IsDead (void)=0
 Informa se esse gameObject não precisa mais existir. Mais...
 
virtual void RequestDelete (void)=0
 Solicita que o GameObject seja destruído. Mais...
 
virtual void NotifyCollision (GameObject &other)=0
 Notifica Colisão. Mais...
 
virtual bool Is (string type)=0
 Informa que tipo de GameObject é. Mais...
 
virtual Rect GetWorldRenderedRect (void) const =0
 Obtém Rect informando a posição renderizada da animação. Mais...
 
- - - - - - - - - -

-Additional Inherited Members

- Atributos Públicos inherited from GameObject
Rect box
 
float rotation
 
- Atributos Protegidos inherited from GameObject
std::vector< Component * > components
 
-

Construtores & Destrutores

- -
-
- - - - - - - -
emptyGameObject::emptyGameObject ()
-
- -
-
- -
-
- - - - - - - -
emptyGameObject::~emptyGameObject ()
-
- -
-
-
A documentação para esta classe foi gerada a partir do seguinte arquivo: -
- - - - diff --git a/docs/classemptyGameObject__coll__graph.map b/docs/classemptyGameObject__coll__graph.map deleted file mode 100644 index 542ce211..00000000 --- a/docs/classemptyGameObject__coll__graph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classemptyGameObject__coll__graph.md5 b/docs/classemptyGameObject__coll__graph.md5 deleted file mode 100644 index 0e96cf25..00000000 --- a/docs/classemptyGameObject__coll__graph.md5 +++ /dev/null @@ -1 +0,0 @@ -e8533143e31e1962d18f68113797f28a \ No newline at end of file diff --git a/docs/classemptyGameObject__coll__graph.svg b/docs/classemptyGameObject__coll__graph.svg deleted file mode 100644 index 6bf7882f..00000000 --- a/docs/classemptyGameObject__coll__graph.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -emptyGameObject - - -Node1 - -emptyGameObject - - -Node2 - - -GameObject - - - - -Node2->Node1 - - - - -Node3 - - -Rect - - - - -Node3->Node2 - - - box - - -Node4 - -float - - -Node4->Node2 - - - rotation - - -Node4->Node3 - - - w -x -h -y - - -Node5 - -vector< Component * > - - -Node5->Node2 - - - components - - - diff --git a/docs/classemptyGameObject__inherit__graph.map b/docs/classemptyGameObject__inherit__graph.map deleted file mode 100644 index 6584368c..00000000 --- a/docs/classemptyGameObject__inherit__graph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classemptyGameObject__inherit__graph.md5 b/docs/classemptyGameObject__inherit__graph.md5 deleted file mode 100644 index b82cbcb4..00000000 --- a/docs/classemptyGameObject__inherit__graph.md5 +++ /dev/null @@ -1 +0,0 @@ -09d6b7ee497185c168b09dc41e928939 \ No newline at end of file diff --git a/docs/classemptyGameObject__inherit__graph.svg b/docs/classemptyGameObject__inherit__graph.svg deleted file mode 100644 index 3d5ebf5f..00000000 --- a/docs/classemptyGameObject__inherit__graph.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -emptyGameObject - - -Node1 - -emptyGameObject - - -Node2 - - -GameObject - - - - -Node2->Node1 - - - - - diff --git a/docs/classes.html b/docs/classes.html index a91794cf..0210f497 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Índice dos Componentes @@ -31,7 +31,7 @@ - + @@ -91,41 +91,41 @@ - - - - - - + + - - + - - + + + + - - + + + +
  A  
  E  
-
  H  
-
  S  
-
Timer   
TitleState   
ActionManager   EmptyGameObject   HitPoints   Sound   Tower   
AIGoDown   EndState   
  I  
+
  I  
SpawnPointData   
  V  
Animation   EndStateData   Sprite   
  C  
-
Enemy   InputManager   StageState   Vec2   
EnemyData   
  M  
+
Sprite   
ActionManager   EndState   InputManager   StageState   Vec2   
AIGoDown   EndStateData   
  M  
State   
  W  
Camera   EnemySpawnData   StateData   
Collision   
  G  
-
Music   
  T  
+
Animation   Enemy   StateData   
  C  
+
EnemyData   Music   
  T  
WaveData   
Color   
  R  
+
EnemySpawnData   
  R  
WaveManager   
Component   Game   Text   
  e  
-
Camera   
  G  
+
Text   
Collision   Rect   TileMap   
Color   Game   Resources   TileSet   
Component   GameObject   
  S  
+
Timer   
  D  
-
GameObject   Rect   TileMap   
GameResources   Resources   TileSet   emptyGameObject   
DragAndDrop   
GameResources   TitleState   
  H  
+
Sound   Tower   
DragAndDrop   
HitPoints   
A | C | D | E | G | H | I | M | R | S | T | V | W
diff --git a/docs/dir_000002_000001.html b/docs/dir_000002_000001.html index 90afefaf..1484927b 100644 --- a/docs/dir_000002_000001.html +++ b/docs/dir_000002_000001.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Relação Engine/src -> include @@ -31,7 +31,7 @@ - + @@ -79,12 +79,12 @@ +

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 0a86d2b4..caf392d0 100644 --- a/docs/dir_000004_000000.html +++ b/docs/dir_000004_000000.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Relação Game/include -> Engine @@ -31,7 +31,7 @@ - + @@ -79,12 +79,12 @@ +

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 5445352a..f75f79df 100644 --- a/docs/dir_000005_000000.html +++ b/docs/dir_000005_000000.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Relação Game/src -> Engine @@ -31,7 +31,7 @@ - + @@ -82,9 +82,9 @@

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
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 4f8e2416..7f0eeb15 100644 --- a/docs/dir_000005_000004.html +++ b/docs/dir_000005_000004.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Relação Game/src -> include @@ -31,7 +31,7 @@ - + @@ -82,9 +82,9 @@

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 c73b1284..35d4b889 100644 --- a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html +++ b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do diretório Engine @@ -31,7 +31,7 @@ - + @@ -86,7 +86,8 @@
Grafo de dependências do diretório Engine:
-
+
+

@@ -99,9 +100,9 @@ diff --git a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.map b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.map index 2a076b69..2e326523 100644 --- a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.map +++ b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.map @@ -1,6 +1,6 @@ - + diff --git a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.md5 b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.md5 index e683cf82..de4f18bb 100644 --- a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.md5 +++ b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.md5 @@ -1 +1 @@ -b5bb9c294f7ce7bbeae9d0d990108786 \ No newline at end of file +61719ef2d4da351f27c88492f8729ea9 \ No newline at end of file diff --git a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.svg b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.svg index 1eaa418f..6bb57ffd 100644 --- a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.svg +++ b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da_dep.svg @@ -1,7 +1,7 @@ - dir_b6dc9fbf5fd229481ae647194eb362ed->dir_1dfe4a86cee15d5d6902f8c724dcf913 - -47 + +50 diff --git a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html index bc20a4d4..02c5046f 100644 --- a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html +++ b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do diretório Engine/include @@ -31,7 +31,7 @@

- + @@ -86,7 +86,8 @@
Grafo de dependências do diretório include:
-
+
+
- + - + @@ -149,9 +150,9 @@ diff --git a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913_dep.svg b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913_dep.svg index c1e7a6d6..a2ab7665 100644 --- a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913_dep.svg +++ b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913_dep.svg @@ -1,7 +1,7 @@ - - +Projeto IDJ - Towers Of Madness: Referência do diretório Game/include @@ -31,7 +31,7 @@

@@ -105,9 +106,9 @@

 
arquivo  Component.h
 
arquivo  DragAndDrop.h
arquivo  ComponentType.h
 
arquivo  emptyGameObject.h
arquivo  DragAndDrop.h
 
arquivo  Error.h
 
- + @@ -86,15 +86,14 @@
Grafo de dependências do diretório include:
-
+
+
- - @@ -117,9 +116,9 @@ diff --git a/docs/dir_a56613a6b795b5624452287469afc550_dep.svg b/docs/dir_a56613a6b795b5624452287469afc550_dep.svg index 1a42a28a..f3952f3a 100644 --- a/docs/dir_a56613a6b795b5624452287469afc550_dep.svg +++ b/docs/dir_a56613a6b795b5624452287469afc550_dep.svg @@ -1,7 +1,7 @@ - - +Projeto IDJ - Towers Of Madness: Referência do diretório Engine/src @@ -31,7 +31,7 @@

Arquivos

arquivo  Defines.h
 
arquivo  EmptyGameObject.h
 
arquivo  EndState.h
 
arquivo  EndStateData.h
- + @@ -86,7 +86,8 @@
Grafo de dependências do diretório src:
-
+
+

@@ -139,9 +140,9 @@ diff --git a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.map b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.map index 1e526776..d7858e47 100644 --- a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.map +++ b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.map @@ -1,6 +1,6 @@ - + diff --git a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.md5 b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.md5 index ee8d6272..b88f146b 100644 --- a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.md5 +++ b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.md5 @@ -1 +1 @@ -2287b4e7baa5c8c9ed3619741150595f \ No newline at end of file +4f733e8dd936378ff869bc5a4c184786 \ No newline at end of file diff --git a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.svg b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.svg index 57c2998e..b8bab439 100644 --- a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.svg +++ b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed_dep.svg @@ -1,7 +1,7 @@ - dir_b6dc9fbf5fd229481ae647194eb362ed->dir_1dfe4a86cee15d5d6902f8c724dcf913 - -47 + +50 diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1.html b/docs/dir_c33286056d2acf479cd8641ef845fec1.html index 62ea5f62..749a3737 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1.html +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do diretório Game @@ -31,7 +31,7 @@

- + @@ -86,7 +86,8 @@
Grafo de dependências do diretório Game:
-
+
+

@@ -99,9 +100,9 @@ diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg index abfa7d0b..64dccaf9 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1_dep.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Referência do diretório Game/src @@ -31,7 +31,7 @@

- + @@ -86,7 +86,8 @@
Grafo de dependências do diretório src:
-
+
+

@@ -115,9 +116,9 @@ diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg index 8ece31c2..730d8315 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc_dep.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Lista de Arquivos @@ -31,7 +31,7 @@

- + @@ -96,8 +96,8 @@  Collision.h  Color.h  Component.h - DragAndDrop.h - emptyGameObject.h + ComponentType.h + DragAndDrop.h  Error.h  Game.h  GameObject.h @@ -142,35 +142,34 @@   Game   include  Defines.h - EmptyGameObject.h - EndState.h - EndStateData.h - Enemy.h - GameResources.h - StageState.h - TitleState.h - Tower.h - WaveData.h - WaveManager.h -  src - EndState.cpp - EndStateData.cpp - Enemy.cpp - GameResources.cpp - main.cpp - StageState.cpp - TitleState.cpp - Tower.cpp - WaveData.cpp - WaveManager.cpp + EndState.h + EndStateData.h + Enemy.h + GameResources.h + StageState.h + TitleState.h + Tower.h + WaveData.h + WaveManager.h +  src + EndState.cpp + EndStateData.cpp + Enemy.cpp + GameResources.cpp + main.cpp + StageState.cpp + TitleState.cpp + Tower.cpp + WaveData.cpp + WaveManager.cpp diff --git a/docs/functions.html b/docs/functions.html index eb3b3052..28476703 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -129,6 +129,9 @@

- a -

  • ActionManager() : ActionManager
  • +
  • AddComponent() +: GameObject +
  • AddObject() : State
  • @@ -144,6 +147,9 @@

    - a -

    • ARTS : Tower
    • +
    • associatedInitialPos +: DragAndDrop +
    • At() : TileMap
    • @@ -154,9 +160,9 @@

      - a -

        diff --git a/docs/functions_b.html b/docs/functions_b.html index 5b6f35c4..fa96d399 100644 --- a/docs/functions_b.html +++ b/docs/functions_b.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -158,9 +158,9 @@

        - b -

          diff --git a/docs/functions_c.html b/docs/functions_c.html index a6c3fc56..a96ff100 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -214,9 +214,9 @@

          - c -

            diff --git a/docs/functions_d.html b/docs/functions_d.html index ea9566b6..42b9e18c 100644 --- a/docs/functions_d.html +++ b/docs/functions_d.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -131,6 +131,7 @@

            - d -

            • dead : Enemy +, GameObject
            • displayCollisionInfo : TileMap @@ -145,7 +146,7 @@

              - d -

                : ActionManager
              • DragAndDrop() -: DragAndDrop +: DragAndDrop
              • dragOnHold : DragAndDrop @@ -157,9 +158,9 @@

                - d -

                  diff --git a/docs/functions_e.html b/docs/functions_e.html index 19c4d146..f454de2a 100644 --- a/docs/functions_e.html +++ b/docs/functions_e.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -126,12 +126,6 @@
                  Esta é a lista de todos os membros de classes com referências para a classe a que pertencem:

                  - e -

                    -
                  • EmptyGameObject() -: EmptyGameObject -
                  • -
                  • emptyGameObject() -: emptyGameObject -
                  • endPoint : Enemy , EnemySpawnData @@ -145,12 +139,12 @@

                    - e -

                    • endTimer : Animation
                    • -
                    • endWave -: WaveManager -
                    • EndWave() : WaveManager
                    • +
                    • endWave +: WaveManager +
                    • enemiesLeft : WaveManager
                    • @@ -184,9 +178,9 @@

                      - e -

                        diff --git a/docs/functions_enum.html b/docs/functions_enum.html index ec07f4e7..8fef47b6 100644 --- a/docs/functions_enum.html +++ b/docs/functions_enum.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Enumerações @@ -31,7 +31,7 @@ - + @@ -101,9 +101,9 @@ diff --git a/docs/functions_eval.html b/docs/functions_eval.html index 678d15d7..7434d96a 100644 --- a/docs/functions_eval.html +++ b/docs/functions_eval.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Valores enumerados @@ -31,7 +31,7 @@ - + @@ -113,9 +113,9 @@ diff --git a/docs/functions_f.html b/docs/functions_f.html index 70005701..43a77973 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -172,9 +172,9 @@

                        - f -

                          diff --git a/docs/functions_func.html b/docs/functions_func.html index a12a41ad..6146368f 100644 --- a/docs/functions_func.html +++ b/docs/functions_func.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -127,6 +127,9 @@

                          - a -

                          • ActionManager() : ActionManager
                          • +
                          • AddComponent() +: GameObject +
                          • AddObject() : State
                          • @@ -146,9 +149,9 @@

                            - a -

                              diff --git a/docs/functions_func_b.html b/docs/functions_func_b.html index 3b8f0aeb..b00dd356 100644 --- a/docs/functions_func_b.html +++ b/docs/functions_func_b.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -134,9 +134,9 @@

                              - b -

                                diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html index 4ee1de91..17197591 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -164,9 +164,9 @@

                                - c -

                                  diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index 38ad4a0c..387b12f5 100644 --- a/docs/functions_func_d.html +++ b/docs/functions_func_d.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -137,15 +137,15 @@

                                  - d -

                                  diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html index d5864e5f..9f1475fc 100644 --- a/docs/functions_func_e.html +++ b/docs/functions_func_e.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -124,12 +124,6 @@  

                                  - e -

                                    -
                                  • EmptyGameObject() -: EmptyGameObject -
                                  • -
                                  • emptyGameObject() -: emptyGameObject -
                                  • EndState() : EndState
                                  • @@ -140,7 +134,7 @@

                                    - e -

                                      : WaveManager
                                    • Enemy() -: Enemy +: Enemy
                                    • EnemyData() : EnemyData @@ -155,9 +149,9 @@

                                      - e -

                                        diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html index 05757b6c..e596da0b 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -143,9 +143,9 @@

                                        - f -

                                          diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index cc2336a7..4308124d 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -163,6 +163,9 @@

                                          - g -

                                          • GetFont() : Resources
                                          • +
                                          • GetGO() +: TileMap +
                                          • GetHeight() : Sprite , TileMap @@ -249,9 +252,8 @@

                                            - g -

                                            • GetWorldRenderedRect() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                            • GetZoom() @@ -261,9 +263,9 @@

                                              - g -

                                                diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index 7dce0fe1..cc15e044 100644 --- a/docs/functions_func_h.html +++ b/docs/functions_func_h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -131,9 +131,9 @@

                                                - h -

                                                  diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html index 99a0a32f..6e3e3566 100644 --- a/docs/functions_func_i.html +++ b/docs/functions_func_i.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -138,10 +138,9 @@

                                                  - i -

                                                    , Animation , Component , DragAndDrop -, EmptyGameObject , EndStateData , Enemy -, GameObject +, GameObject , HitPoints , StateData , Tower @@ -150,6 +149,9 @@

                                                    - i -

                                                    • IsButtonDown() : InputManager
                                                    • +
                                                    • IsButtonUp() +: InputManager +
                                                    • IsColliding() : Collision
                                                    • @@ -158,9 +160,8 @@

                                                      - i -

                                                      • IsDead() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                                      • IsFramerateLimited() @@ -172,12 +173,18 @@

                                                        - i -

                                                        • IsKeyDown() : InputManager
                                                        • +
                                                        • IsKeyUp() +: InputManager +
                                                        • IsMouseDown() : InputManager
                                                        • IsMouseScrolling() : InputManager
                                                        • +
                                                        • IsMouseUp() +: InputManager +
                                                        • IsOpen() : Music , Sound @@ -190,9 +197,9 @@

                                                          - i -

                                                            diff --git a/docs/functions_func_k.html b/docs/functions_func_k.html index 25063807..af0f16f3 100644 --- a/docs/functions_func_k.html +++ b/docs/functions_func_k.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -134,9 +134,9 @@

                                                            - k -

                                                              diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html index 4d1465a3..fdded572 100644 --- a/docs/functions_func_l.html +++ b/docs/functions_func_l.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -140,9 +140,9 @@

                                                              - l -

                                                                diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html index 3e1cd63f..c580696d 100644 --- a/docs/functions_func_m.html +++ b/docs/functions_func_m.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -149,9 +149,9 @@

                                                                - m -

                                                                  diff --git a/docs/functions_func_n.html b/docs/functions_func_n.html index c6faf169..fb2e1d3a 100644 --- a/docs/functions_func_n.html +++ b/docs/functions_func_n.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -132,9 +132,8 @@

                                                                  - n -

                                                                  • NotifyCollision() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                                                  • NotifyEnemyGotKilled() @@ -147,9 +146,9 @@

                                                                    - n -

                                                                      diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html index fcb24842..f5e34da8 100644 --- a/docs/functions_func_o.html +++ b/docs/functions_func_o.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -167,9 +167,9 @@

                                                                      - o -

                                                                        diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html index 59453d69..ac43a949 100644 --- a/docs/functions_func_p.html +++ b/docs/functions_func_p.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -144,9 +144,9 @@

                                                                        - p -

                                                                          diff --git a/docs/functions_func_q.html b/docs/functions_func_q.html index 2225f27b..5546953f 100644 --- a/docs/functions_func_q.html +++ b/docs/functions_func_q.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -132,9 +132,9 @@

                                                                          - q -

                                                                            diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html index 66637263..4e26c14d 100644 --- a/docs/functions_func_r.html +++ b/docs/functions_func_r.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -136,12 +136,17 @@

                                                                            - r -

                                                                            • RemakeTexture() : Text
                                                                            • +
                                                                            • RemoveComponent() +: GameObject +
                                                                            • +
                                                                            • RemoveGO() +: TileMap +
                                                                            • Render() : Animation -, EmptyGameObject , EndState , Enemy -, GameObject +, GameObject , Sprite , StageState , State @@ -159,9 +164,8 @@

                                                                              - r -

                                                                              • RequestDelete() : Animation -, EmptyGameObject -, Enemy -, GameObject +, Enemy +, GameObject , Tower
                                                                              • Resources() @@ -193,9 +197,9 @@

                                                                                - r -

                                                                                  diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index 76dce4a2..d56512eb 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -221,8 +221,7 @@

                                                                                  - s -

                                                                                    : Sound
                                                                                  • SpawnEnemy() -: StageState -, WaveManager +: WaveManager
                                                                                  • Sprite() : Sprite @@ -247,9 +246,9 @@

                                                                                    - s -

                                                                                      diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index 8cf4137c..36af7889 100644 --- a/docs/functions_func_t.html +++ b/docs/functions_func_t.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -140,15 +140,15 @@

                                                                                      - t -

                                                                                      diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html index 4596ce30..4e04d3bf 100644 --- a/docs/functions_func_u.html +++ b/docs/functions_func_u.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -136,10 +136,9 @@

                                                                                      - u -

                                                                                        , Camera , Component , DragAndDrop -, EmptyGameObject , EndState , Enemy -, GameObject +, GameObject , HitPoints , InputManager , Sprite @@ -161,9 +160,9 @@

                                                                                        - u -

                                                                                          diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html index 7f309461..ad11dc0c 100644 --- a/docs/functions_func_v.html +++ b/docs/functions_func_v.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -131,9 +131,9 @@

                                                                                          - v -

                                                                                            diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html index 8454b1fb..e33524dc 100644 --- a/docs/functions_func_w.html +++ b/docs/functions_func_w.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -134,9 +134,9 @@

                                                                                            - w -

                                                                                              diff --git a/docs/functions_func_z.html b/docs/functions_func_z.html index 42e7cde3..c5342986 100644 --- a/docs/functions_func_z.html +++ b/docs/functions_func_z.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -131,9 +131,9 @@

                                                                                              - z -

                                                                                                diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html index e5d556c3..7b4a5ed0 100644 --- a/docs/functions_func_~.html +++ b/docs/functions_func_~.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Funções @@ -31,7 +31,7 @@ - + @@ -127,12 +127,6 @@

                                                                                                - ~ -

                                                                                                • ~Component() : Component
                                                                                                • -
                                                                                                • ~EmptyGameObject() -: EmptyGameObject -
                                                                                                • -
                                                                                                • ~emptyGameObject() -: emptyGameObject -
                                                                                                • ~Enemy() : Enemy
                                                                                                • @@ -170,9 +164,9 @@

                                                                                                  - ~ -

                                                                                                    diff --git a/docs/functions_g.html b/docs/functions_g.html index d24fe59a..d736507d 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -171,6 +171,9 @@

                                                                                                    - g -

                                                                                                    • GetFont() : Resources
                                                                                                    • +
                                                                                                    • GetGO() +: TileMap +
                                                                                                    • GetHeight() : Sprite , TileMap @@ -257,9 +260,8 @@

                                                                                                      - g -

                                                                                                      • GetWorldRenderedRect() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                                                                                      • GetZoom() @@ -269,9 +271,9 @@

                                                                                                        - g -

                                                                                                          diff --git a/docs/functions_h.html b/docs/functions_h.html index b2726625..6808ae0a 100644 --- a/docs/functions_h.html +++ b/docs/functions_h.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -154,9 +154,9 @@

                                                                                                          - h -

                                                                                                            diff --git a/docs/functions_i.html b/docs/functions_i.html index da1f2a56..c1f3e0ce 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -142,7 +142,7 @@

                                                                                                            - i -

                                                                                                              : StageState
                                                                                                            • InsertGO() -: TileMap +: TileMap
                                                                                                            • instance : Game @@ -155,10 +155,9 @@

                                                                                                              - i -

                                                                                                                , Animation , Component , DragAndDrop -, EmptyGameObject , EndStateData , Enemy -, GameObject +, GameObject , HitPoints , StateData , Tower @@ -167,6 +166,9 @@

                                                                                                                - i -

                                                                                                                • IsButtonDown() : InputManager
                                                                                                                • +
                                                                                                                • IsButtonUp() +: InputManager +
                                                                                                                • IsColliding() : Collision
                                                                                                                • @@ -175,14 +177,10 @@

                                                                                                                  - i -

                                                                                                                  • IsDead() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                                                                                                  • -
                                                                                                                  • isDragging -: DragAndDrop -
                                                                                                                  • isDraging : Tower
                                                                                                                  • @@ -195,12 +193,18 @@

                                                                                                                    - i -

                                                                                                                    • IsKeyDown() : InputManager
                                                                                                                    • +
                                                                                                                    • IsKeyUp() +: InputManager +
                                                                                                                    • IsMouseDown() : InputManager
                                                                                                                    • IsMouseScrolling() : InputManager
                                                                                                                    • +
                                                                                                                    • IsMouseUp() +: InputManager +
                                                                                                                    • IsOpen() : Music , Sound @@ -216,9 +220,9 @@

                                                                                                                      - i -

                                                                                                                        diff --git a/docs/functions_k.html b/docs/functions_k.html index 16acc98e..a33f9387 100644 --- a/docs/functions_k.html +++ b/docs/functions_k.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -142,9 +142,9 @@

                                                                                                                        - k -

                                                                                                                          diff --git a/docs/functions_l.html b/docs/functions_l.html index 895ac859..af71d4b9 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -145,9 +145,9 @@

                                                                                                                          - l -

                                                                                                                            diff --git a/docs/functions_m.html b/docs/functions_m.html index 1b1ad01f..55693da1 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -144,6 +144,9 @@

                                                                                                                            - m -

                                                                                                                            • maxFramerate : Game
                                                                                                                            • +
                                                                                                                            • maxNumberOfEnemiesInSpawnPoint +: WaveManager +
                                                                                                                            • maxSpeed : Camera
                                                                                                                            • @@ -191,13 +194,13 @@

                                                                                                                              - m -

                                                                                                                              • music : EndState -, Music
                                                                                                                              • Music() -: Music +: Music
                                                                                                                              • music -: StageState +: Music +, StageState
                                                                                                                              • musicTable : Resources @@ -209,9 +212,9 @@

                                                                                                                                - m -

                                                                                                                                  diff --git a/docs/functions_n.html b/docs/functions_n.html index 86a5202e..6b710d3d 100644 --- a/docs/functions_n.html +++ b/docs/functions_n.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -137,9 +137,8 @@

                                                                                                                                  - n -

                                                                                                                                  • NotifyCollision() : Animation -, EmptyGameObject , Enemy -, GameObject +, GameObject , Tower
                                                                                                                                  • NotifyEnemyGotKilled() @@ -149,7 +148,7 @@

                                                                                                                                    - n -

                                                                                                                                      : WaveManager
                                                                                                                                    • nullGameObject -: StageState +: StageState
                                                                                                                                    • numberOfEnemies : EnemySpawnData @@ -158,9 +157,9 @@

                                                                                                                                      - n -

                                                                                                                                        diff --git a/docs/functions_o.html b/docs/functions_o.html index 467b43c1..b35d1f6d 100644 --- a/docs/functions_o.html +++ b/docs/functions_o.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -175,9 +175,9 @@

                                                                                                                                        - o -

                                                                                                                                          diff --git a/docs/functions_p.html b/docs/functions_p.html index c4d7bdfd..15f89311 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -164,9 +164,9 @@

                                                                                                                                          - p -

                                                                                                                                            diff --git a/docs/functions_q.html b/docs/functions_q.html index 96c655b5..d12cf7cf 100644 --- a/docs/functions_q.html +++ b/docs/functions_q.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -145,9 +145,9 @@

                                                                                                                                            - q -

                                                                                                                                              diff --git a/docs/functions_r.html b/docs/functions_r.html index f56d0ffe..1a91c7da 100644 --- a/docs/functions_r.html +++ b/docs/functions_r.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -138,15 +138,23 @@

                                                                                                                                              - r -

                                                                                                                                              • Rect() : Rect
                                                                                                                                              • +
                                                                                                                                              • redrag +: DragAndDrop +
                                                                                                                                              • RemakeTexture() : Text
                                                                                                                                              • +
                                                                                                                                              • RemoveComponent() +: GameObject +
                                                                                                                                              • +
                                                                                                                                              • RemoveGO() +: TileMap +
                                                                                                                                              • Render() : Animation -, EmptyGameObject , EndState , Enemy -, GameObject +, GameObject , Sprite , StageState , State @@ -167,9 +175,8 @@

                                                                                                                                                - r -

                                                                                                                                                • RequestDelete() : Animation -, EmptyGameObject -, Enemy -, GameObject +, Enemy +, GameObject , Tower
                                                                                                                                                • Resources() @@ -207,9 +214,9 @@

                                                                                                                                                  - r -

                                                                                                                                                    diff --git a/docs/functions_s.html b/docs/functions_s.html index 61018732..43d2b100 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -255,8 +255,7 @@

                                                                                                                                                    - s -

                                                                                                                                                      , Tower
                                                                                                                                                    • SpawnEnemy() -: StageState -, WaveManager +: WaveManager
                                                                                                                                                    • spawnGroups : StageState @@ -310,9 +309,9 @@

                                                                                                                                                      - s -

                                                                                                                                                        diff --git a/docs/functions_t.html b/docs/functions_t.html index 5af43190..a830536a 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -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
                                                                                                                                                        • @@ -143,7 +143,7 @@

                                                                                                                                                          - t -

                                                                                                                                                            : TileSet
                                                                                                                                                          • tileMap -: DragAndDrop +: DragAndDrop , StageState
                                                                                                                                                          • TileMap() @@ -158,11 +158,13 @@

                                                                                                                                                            - t -

                                                                                                                                                            • tileSet : StageState , TileMap -, TileSet
                                                                                                                                                            • TileSet() : TileSet
                                                                                                                                                            • +
                                                                                                                                                            • tileSet +: TileSet +
                                                                                                                                                            • tileWidth : TileSet
                                                                                                                                                            • @@ -188,7 +190,7 @@

                                                                                                                                                              - t -

                                                                                                                                                                : WaveManager
                                                                                                                                                              • Tower() -: Tower +: Tower
                                                                                                                                                              • TowerType : Tower @@ -200,9 +202,9 @@

                                                                                                                                                                - t -

                                                                                                                                                                  diff --git a/docs/functions_type.html b/docs/functions_type.html index 99482754..0991ae53 100644 --- a/docs/functions_type.html +++ b/docs/functions_type.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Definições de Tipos @@ -31,7 +31,7 @@ - + @@ -101,9 +101,9 @@ diff --git a/docs/functions_u.html b/docs/functions_u.html index e8116e0b..97059945 100644 --- a/docs/functions_u.html +++ b/docs/functions_u.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -138,10 +138,9 @@

                                                                                                                                                                  - u -

                                                                                                                                                                    , Camera , Component , DragAndDrop -, EmptyGameObject , EndState , Enemy -, GameObject +, GameObject , HitPoints , InputManager , Sprite @@ -166,9 +165,9 @@

                                                                                                                                                                    - u -

                                                                                                                                                                      diff --git a/docs/functions_v.html b/docs/functions_v.html index 76f74c85..93ac8e28 100644 --- a/docs/functions_v.html +++ b/docs/functions_v.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -133,9 +133,9 @@

                                                                                                                                                                      - v -

                                                                                                                                                                        diff --git a/docs/functions_vars.html b/docs/functions_vars.html index 22c104d3..0686d728 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros - Variáveis @@ -31,7 +31,7 @@ - + @@ -127,6 +127,9 @@

                                                                                                                                                                        - a -

                                                                                                                                                                        @@ -208,6 +211,7 @@

                                                                                                                                                                        - c -

                                                                                                                                                                          - d -

                                                                                                                                                                          • dead : Enemy +, GameObject
                                                                                                                                                                          • displayCollisionInfo : TileMap @@ -329,9 +333,6 @@

                                                                                                                                                                            - i -

                                                                                                                                                                            • instruction : EndState
                                                                                                                                                                            • -
                                                                                                                                                                            • isDragging -: DragAndDrop -
                                                                                                                                                                            • isDraging : Tower
                                                                                                                                                                            • @@ -371,6 +372,9 @@

                                                                                                                                                                              - m -

                                                                                                                                                                              • maxFramerate : Game
                                                                                                                                                                              • +
                                                                                                                                                                              • maxNumberOfEnemiesInSpawnPoint +: WaveManager +
                                                                                                                                                                              • maxSpeed : Camera
                                                                                                                                                                              • @@ -420,7 +424,7 @@

                                                                                                                                                                                - n -

                                                                                                                                                                                  : EnemyData
                                                                                                                                                                                • nullGameObject -: StageState +: StageState
                                                                                                                                                                                • numberOfEnemies : EnemySpawnData @@ -475,6 +479,9 @@

                                                                                                                                                                                  - r -

                                                                                                                                                                                  • r : Color
                                                                                                                                                                                  • +
                                                                                                                                                                                  • redrag +: DragAndDrop +
                                                                                                                                                                                  • renderer : Game
                                                                                                                                                                                  • @@ -557,7 +564,7 @@

                                                                                                                                                                                    - t -

                                                                                                                                                                                      : TileSet
                                                                                                                                                                                    • tileMap -: DragAndDrop +: DragAndDrop , StageState , WaveManager
                                                                                                                                                                                    • @@ -668,9 +675,9 @@

                                                                                                                                                                                      - z -

                                                                                                                                                                                        diff --git a/docs/functions_w.html b/docs/functions_w.html index e1677c96..2d9c2c46 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -173,9 +173,9 @@

                                                                                                                                                                                        - w -

                                                                                                                                                                                          diff --git a/docs/functions_x.html b/docs/functions_x.html index 44423b90..aff438db 100644 --- a/docs/functions_x.html +++ b/docs/functions_x.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -134,9 +134,9 @@

                                                                                                                                                                                          - x -

                                                                                                                                                                                            diff --git a/docs/functions_y.html b/docs/functions_y.html index c25563e6..477e7ee1 100644 --- a/docs/functions_y.html +++ b/docs/functions_y.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -134,9 +134,9 @@

                                                                                                                                                                                            - y -

                                                                                                                                                                                              diff --git a/docs/functions_z.html b/docs/functions_z.html index 6b991c5a..21ae14af 100644 --- a/docs/functions_z.html +++ b/docs/functions_z.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -139,9 +139,9 @@

                                                                                                                                                                                              - z -

                                                                                                                                                                                                diff --git a/docs/functions_~.html b/docs/functions_~.html index a58d0286..a081580f 100644 --- a/docs/functions_~.html +++ b/docs/functions_~.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Componentes Membros @@ -31,7 +31,7 @@ - + @@ -129,12 +129,6 @@

                                                                                                                                                                                                - ~ -

                                                                                                                                                                                                • ~Component() : Component
                                                                                                                                                                                                • -
                                                                                                                                                                                                • ~EmptyGameObject() -: EmptyGameObject -
                                                                                                                                                                                                • -
                                                                                                                                                                                                • ~emptyGameObject() -: emptyGameObject -
                                                                                                                                                                                                • ~Enemy() : Enemy
                                                                                                                                                                                                • @@ -172,9 +166,9 @@

                                                                                                                                                                                                  - ~ -

                                                                                                                                                                                                    diff --git a/docs/globals.html b/docs/globals.html index f3c4f3cb..4f15dccb 100644 --- a/docs/globals.html +++ b/docs/globals.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Arquivos Membros @@ -31,7 +31,7 @@ - + @@ -122,7 +122,7 @@

                                                                                                                                                                                                    - a -

                                                                                                                                                                                                      : Sprite.h
                                                                                                                                                                                                    • AI_GO_DOWN -: Component.h +: ComponentType.h
                                                                                                                                                                                                    • ALPHA_BLEND : Sprite.h @@ -196,10 +196,10 @@

                                                                                                                                                                                                      - c -

                                                                                                                                                                                                        : Component.h
                                                                                                                                                                                                      • COMPONENT_TYPE_SIZE -: Component.h +: ComponentType.h
                                                                                                                                                                                                      • ComponentType -: Component.h +: ComponentType.h
                                                                                                                                                                                                      • CONVERSAO_GRAUS_RADIANOS : Error.h @@ -218,7 +218,7 @@

                                                                                                                                                                                                        - d -

                                                                                                                                                                                                        @@ -243,7 +243,7 @@

                                                                                                                                                                                                        - e -

                                                                                                                                                                                                          : GameResources.cpp
                                                                                                                                                                                                        • ENEMY_MOVE_SPEED -: Enemy.cpp +: Enemy.h
                                                                                                                                                                                                        • ENEMY_TYPE_MAX_STRING_SIZE : GameResources.cpp @@ -289,7 +289,7 @@

                                                                                                                                                                                                          - h -

                                                                                                                                                                                                            , Tileset.cpp
                                                                                                                                                                                                          • HIT_POINTS -: Component.h +: ComponentType.h
                                                                                                                                                                                                          • HOSTILE : Enemy.h @@ -431,7 +431,7 @@

                                                                                                                                                                                                            - s -

                                                                                                                                                                                                              : Text.h
                                                                                                                                                                                                            • SIZE -: Component.h +: ComponentType.h
                                                                                                                                                                                                            • SOLID : Text.h @@ -498,7 +498,6 @@

                                                                                                                                                                                                              - u -

                                                                                                                                                                                                              • uint : Error.h , HitPoints.h -, Enemy.h , Tower.cpp
                                                                                                                                                                                                              • UP_ARROW_KEY @@ -519,7 +518,7 @@

                                                                                                                                                                                                                - w -

                                                                                                                                                                                                                  : GameResources.cpp
                                                                                                                                                                                                                • WAVE_MANAGER -: Component.h +: ComponentType.h
                                                                                                                                                                                                                • WAVE_NAME_MAX_LENGHT : GameResources.cpp @@ -531,9 +530,9 @@

                                                                                                                                                                                                                  - w -

                                                                                                                                                                                                                    diff --git a/docs/globals_defs.html b/docs/globals_defs.html index b4bdd5ee..f3a4dd6e 100644 --- a/docs/globals_defs.html +++ b/docs/globals_defs.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Arquivos Membros @@ -31,7 +31,7 @@ - + @@ -220,7 +220,7 @@

                                                                                                                                                                                                                    - e -

                                                                                                                                                                                                                      : GameResources.cpp
                                                                                                                                                                                                                    • ENEMY_MOVE_SPEED -: Enemy.cpp +: Enemy.h
                                                                                                                                                                                                                    • ENEMY_TYPE_MAX_STRING_SIZE : GameResources.cpp @@ -452,9 +452,9 @@

                                                                                                                                                                                                                      - w -

                                                                                                                                                                                                                      diff --git a/docs/graph_legend.html b/docs/graph_legend.html index fb0c19f7..331404c1 100644 --- a/docs/graph_legend.html +++ b/docs/graph_legend.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Legenda do Grafo @@ -31,7 +31,7 @@ - + @@ -80,42 +80,42 @@

                                                                                                                                                                                                                      Esta página explica como interpretar os grafos gerados pelo doxygen.

                                                                                                                                                                                                                      -

                                                                                                                                                                                                                      Considere o seguinte exemplo:

                                                                                                                                                                                                                      /*! Invisible class because of truncation */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class Invisible { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Truncated class, inheritance relation is hidden */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class Truncated : public Invisible { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /* Class not documented with doxygen comments */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class Undocumented { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Class that is inherited using public inheritance */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class PublicBase : public Truncated { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! A template class */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      template<class T> class Templ { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Class that is inherited using protected inheritance */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class ProtectedBase { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Class that is inherited using private inheritance */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class PrivateBase { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Class that is used by the Inherited class */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class Used { };
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      /*! Super class that inherits a number of other classes */
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      class Inherited : public PublicBase,
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      protected ProtectedBase,
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      private PrivateBase,
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      public Undocumented,
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      public Templ<int>
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      {
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      private:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      Used *m_usedClass;
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      };
                                                                                                                                                                                                                      +

                                                                                                                                                                                                                      Considere o seguinte exemplo:

                                                                                                                                                                                                                      1 /*! Invisible class because of truncation */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      2 class Invisible { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      3 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      4 /*! Truncated class, inheritance relation is hidden */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      5 class Truncated : public Invisible { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      6 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      7 /* Class not documented with doxygen comments */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      8 class Undocumented { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      9 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      10 /*! Class that is inherited using public inheritance */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      11 class PublicBase : public Truncated { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      12 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      13 /*! A template class */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      14 template<class T> class Templ { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      15 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      16 /*! Class that is inherited using protected inheritance */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      17 class ProtectedBase { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      18 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      19 /*! Class that is inherited using private inheritance */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      20 class PrivateBase { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      21 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      22 /*! Class that is used by the Inherited class */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      23 class Used { };
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      24 
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      25 /*! Super class that inherits a number of other classes */
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      26 class Inherited : public PublicBase,
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      27  protected ProtectedBase,
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      28  private PrivateBase,
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      29  public Undocumented,
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      30  public Templ<int>
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      31 {
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      32  private:
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      33  Used *m_usedClass;
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      34 };

                                                                                                                                                                                                                      Isto irá gerar o seguinte gráfo:

                                                                                                                                                                                                                      -

                                                                                                                                                                                                                      As caixas no grafo acima tem as seguintes interpretações:

                                                                                                                                                                                                                        +

                                                                                                                                                                                                                        As caixas no grafo acima tem as seguintes interpretações:

                                                                                                                                                                                                                        • Uma caixa inteiramente preta representa a estrutura ou a classe para qual o grafo foi gerado.
                                                                                                                                                                                                                        • @@ -138,9 +138,9 @@
                                                                                                                                                                                                                      diff --git a/docs/graph_legend.svg b/docs/graph_legend.svg index 5eaa7d7e..62f9453c 100644 --- a/docs/graph_legend.svg +++ b/docs/graph_legend.svg @@ -1,121 +1,121 @@ - - - + + Legenda do Grafo - + Node9 - -Inherited + +Inherited Node10 - -PublicBase + +PublicBase Node10->Node9 - - + + Node11 - -Truncated + +Truncated Node11->Node10 - - + + Node13 - -ProtectedBase + +ProtectedBase Node13->Node9 - - + + Node14 - -PrivateBase + +PrivateBase Node14->Node9 - - + + Node15 - -Undocumented + +Undocumented Node15->Node9 - - + + Node16 - -Templ< int > + +Templ< int > Node16->Node9 - - + + Node17 - -Templ< T > + +Templ< T > Node17->Node16 - - -< int > + + +< int > Node18 - -Used + +Used Node18->Node9 - - -m_usedClass + + +m_usedClass diff --git a/docs/hierarchy.html b/docs/hierarchy.html index 3606eb05..8b8c4e10 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Hierarquia de Classes @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -105,10 +105,8 @@  CGameClasse que modela o todo-poderoso Jogo  CGameObjectClasse virtual que especifica o funcionamento de um GameObject  CAnimationClasse que modela animações - CemptyGameObject - CEmptyGameObject - CEnemyClasse que modela inimigos - CTower + CEnemyClasse que modela inimigos + CTower  CGameResourcesClasse estática que gerencia recursos específicos do jogo  CInputManagerClasse que organiza entradas do usuário  CMusicClasse que modela músicas @@ -135,9 +133,9 @@ diff --git a/docs/index.html b/docs/index.html index 2b734b1e..68d66a1b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Página Principal @@ -31,7 +31,7 @@ - + @@ -82,9 +82,9 @@ diff --git a/docs/inherit_graph_0.svg b/docs/inherit_graph_0.svg index 44f75998..5619e1b6 100644 --- a/docs/inherit_graph_0.svg +++ b/docs/inherit_graph_0.svg @@ -1,7 +1,7 @@ - - + diff --git a/docs/inherit_graph_1.svg b/docs/inherit_graph_1.svg index 08987ac6..e6b1fa46 100644 --- a/docs/inherit_graph_1.svg +++ b/docs/inherit_graph_1.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Camera + +Camera diff --git a/docs/inherit_graph_10.svg b/docs/inherit_graph_10.svg index 4ee16829..a6b32ef3 100644 --- a/docs/inherit_graph_10.svg +++ b/docs/inherit_graph_10.svg @@ -1,7 +1,7 @@ - - + diff --git a/docs/inherit_graph_11.svg b/docs/inherit_graph_11.svg index fa014a88..de811e43 100644 --- a/docs/inherit_graph_11.svg +++ b/docs/inherit_graph_11.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Music + +Music diff --git a/docs/inherit_graph_12.svg b/docs/inherit_graph_12.svg index 8d44b63a..650c2010 100644 --- a/docs/inherit_graph_12.svg +++ b/docs/inherit_graph_12.svg @@ -1,7 +1,7 @@ - - - Node1 - + Sound diff --git a/docs/inherit_graph_15.svg b/docs/inherit_graph_15.svg index 029b49e0..e529be6a 100644 --- a/docs/inherit_graph_15.svg +++ b/docs/inherit_graph_15.svg @@ -1,7 +1,7 @@ - - Node1 - + Sprite diff --git a/docs/inherit_graph_17.map b/docs/inherit_graph_17.map index 085d35df..fbccc5d3 100644 --- a/docs/inherit_graph_17.map +++ b/docs/inherit_graph_17.map @@ -1,6 +1,6 @@ - - - + + + diff --git a/docs/inherit_graph_17.svg b/docs/inherit_graph_17.svg index 1a1568e6..6b58f898 100644 --- a/docs/inherit_graph_17.svg +++ b/docs/inherit_graph_17.svg @@ -1,14 +1,14 @@ - - + Gráfico de Hierarquia de Classes - + Node1 @@ -20,41 +20,41 @@ Node2 - -EndState + +EndState Node1->Node2 - - + + Node3 - -StageState + +StageState Node1->Node3 - - + + Node4 - -TitleState + +TitleState Node1->Node4 - - + + diff --git a/docs/inherit_graph_18.map b/docs/inherit_graph_18.map index a3a63a04..d45d7b30 100644 --- a/docs/inherit_graph_18.map +++ b/docs/inherit_graph_18.map @@ -1,4 +1,4 @@ - - + + diff --git a/docs/inherit_graph_18.svg b/docs/inherit_graph_18.svg index cff7d944..e20fbf2d 100644 --- a/docs/inherit_graph_18.svg +++ b/docs/inherit_graph_18.svg @@ -1,34 +1,34 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -StateData + +StateData Node2 - -EndStateData + +EndStateData Node1->Node2 - - + + diff --git a/docs/inherit_graph_19.svg b/docs/inherit_graph_19.svg index 60df2b31..05183798 100644 --- a/docs/inherit_graph_19.svg +++ b/docs/inherit_graph_19.svg @@ -1,7 +1,7 @@ - - - + diff --git a/docs/inherit_graph_20.svg b/docs/inherit_graph_20.svg index 0d0c4e81..b1cc02a5 100644 --- a/docs/inherit_graph_20.svg +++ b/docs/inherit_graph_20.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -TileMap + +TileMap diff --git a/docs/inherit_graph_21.map b/docs/inherit_graph_21.map index 4ecdae12..f151be83 100644 --- a/docs/inherit_graph_21.map +++ b/docs/inherit_graph_21.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_21.svg b/docs/inherit_graph_21.svg index 429a5381..72bcbb3f 100644 --- a/docs/inherit_graph_21.svg +++ b/docs/inherit_graph_21.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -TileSet + +TileSet diff --git a/docs/inherit_graph_22.map b/docs/inherit_graph_22.map index edaccd49..2929627b 100644 --- a/docs/inherit_graph_22.map +++ b/docs/inherit_graph_22.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_22.svg b/docs/inherit_graph_22.svg index 1b92826c..7964c7a0 100644 --- a/docs/inherit_graph_22.svg +++ b/docs/inherit_graph_22.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Timer + +Timer diff --git a/docs/inherit_graph_23.map b/docs/inherit_graph_23.map index 5713abb6..91873bff 100644 --- a/docs/inherit_graph_23.map +++ b/docs/inherit_graph_23.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_23.svg b/docs/inherit_graph_23.svg index b0fddd09..778728cf 100644 --- a/docs/inherit_graph_23.svg +++ b/docs/inherit_graph_23.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Vec2 + +Vec2 diff --git a/docs/inherit_graph_24.map b/docs/inherit_graph_24.map index bb2b0fb0..eb766fc5 100644 --- a/docs/inherit_graph_24.map +++ b/docs/inherit_graph_24.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_24.svg b/docs/inherit_graph_24.svg index 1592be90..bb059b7c 100644 --- a/docs/inherit_graph_24.svg +++ b/docs/inherit_graph_24.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -WaveData + +WaveData diff --git a/docs/inherit_graph_3.svg b/docs/inherit_graph_3.svg index e00aa0f7..6dcbe98d 100644 --- a/docs/inherit_graph_3.svg +++ b/docs/inherit_graph_3.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + diff --git a/docs/inherit_graph_4.svg b/docs/inherit_graph_4.svg index 2c6d2f1c..fffc2ded 100644 --- a/docs/inherit_graph_4.svg +++ b/docs/inherit_graph_4.svg @@ -1,73 +1,73 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Component + +Component Node2 - -AIGoDown + +AIGoDown Node1->Node2 - - + + Node3 - -DragAndDrop + +DragAndDrop Node1->Node3 - - + + Node4 - -HitPoints + +HitPoints Node1->Node4 - - + + Node5 - -WaveManager + +WaveManager Node1->Node5 - - + + diff --git a/docs/inherit_graph_5.svg b/docs/inherit_graph_5.svg index 3a0adddd..4246f438 100644 --- a/docs/inherit_graph_5.svg +++ b/docs/inherit_graph_5.svg @@ -1,7 +1,7 @@ - - Node1 - + EnemySpawnData diff --git a/docs/inherit_graph_7.map b/docs/inherit_graph_7.map index 44deec24..d9826d8f 100644 --- a/docs/inherit_graph_7.map +++ b/docs/inherit_graph_7.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_7.svg b/docs/inherit_graph_7.svg index 98472daa..92c6b9a6 100644 --- a/docs/inherit_graph_7.svg +++ b/docs/inherit_graph_7.svg @@ -1,19 +1,19 @@ - - + Gráfico de Hierarquia de Classes - + Node1 - -Game + +Game diff --git a/docs/inherit_graph_8.map b/docs/inherit_graph_8.map index 76d356b8..faf0d791 100644 --- a/docs/inherit_graph_8.map +++ b/docs/inherit_graph_8.map @@ -1,8 +1,6 @@ - - - - - - + + + + diff --git a/docs/inherit_graph_8.md5 b/docs/inherit_graph_8.md5 index f16ed5cc..b7c6a204 100644 --- a/docs/inherit_graph_8.md5 +++ b/docs/inherit_graph_8.md5 @@ -1 +1 @@ -9986ddd0ea13da46194d4caa80af6849 \ No newline at end of file +9243a3f4e20339427f7b5cccc3aa24db \ No newline at end of file diff --git a/docs/inherit_graph_8.svg b/docs/inherit_graph_8.svg index a995abb8..a743a272 100644 --- a/docs/inherit_graph_8.svg +++ b/docs/inherit_graph_8.svg @@ -1,86 +1,60 @@ - - - + + Gráfico de Hierarquia de Classes - + Node1 - -GameObject + +GameObject Node2 - -Animation + +Animation Node1->Node2 - - + + Node3 - - -emptyGameObject + + +Enemy Node1->Node3 - - + + Node4 - - -EmptyGameObject + + +Tower Node1->Node4 - - - - -Node5 - - -Enemy - - - - -Node1->Node5 - - - - -Node6 - - -Tower - - - - -Node1->Node6 - - + + diff --git a/docs/inherit_graph_9.svg b/docs/inherit_graph_9.svg index 421f8e12..caea42bb 100644 --- a/docs/inherit_graph_9.svg +++ b/docs/inherit_graph_9.svg @@ -1,7 +1,7 @@ - - + Projeto IDJ - Towers Of Madness: Hierarquia de Classes @@ -31,7 +31,7 @@ - + @@ -90,38 +90,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      diff --git a/docs/main_8cpp.html b/docs/main_8cpp.html index 3950cf70..ca2563f2 100644 --- a/docs/main_8cpp.html +++ b/docs/main_8cpp.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência do Arquivo Game/src/main.cpp @@ -31,7 +31,7 @@ - + @@ -97,7 +97,8 @@
                                                                                                                                                                                                                      Gráfico de dependência de inclusões para main.cpp:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +

                                                                                                                                                                                                                      @@ -135,9 +136,9 @@

                                                                                                                                                                                                                      Funções

                                                                                                                                                                                                                      diff --git a/docs/main_8cpp__incl.map b/docs/main_8cpp__incl.map index 9e2301e2..7f2998f2 100644 --- a/docs/main_8cpp__incl.map +++ b/docs/main_8cpp__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/main_8cpp__incl.md5 b/docs/main_8cpp__incl.md5 index 6d06c199..70a49b23 100644 --- a/docs/main_8cpp__incl.md5 +++ b/docs/main_8cpp__incl.md5 @@ -1 +1 @@ -b438fd92e84b1a5c8757361317d61d43 \ No newline at end of file +b028090ee11019998cc867ca840f92c6 \ No newline at end of file diff --git a/docs/main_8cpp__incl.svg b/docs/main_8cpp__incl.svg index 3aa02063..0cb107b5 100644 --- a/docs/main_8cpp__incl.svg +++ b/docs/main_8cpp__incl.svg @@ -1,187 +1,187 @@ - - + Game/src/main.cpp - + Node1 - -Game/src/main.cpp + +Game/src/main.cpp Node2 - -iostream + +iostream Node1->Node2 - - + + Node3 - -Game.h + +Game.h Node1->Node3 - - + + - -Node19 - - -TitleState.h + +Node20 + + +TitleState.h - -Node1->Node19 - - + +Node1->Node20 + + Node4 - -string + +string Node3->Node4 - - + + Node5 - -stack + +stack Node3->Node5 - - + + Node6 - -State.h + +State.h Node3->Node6 - - + + Node9 - -InputManager.h + +InputManager.h -Node3->Node9 - - +Node3->Node9 + + Node10 - -SDL_include.h + +SDL_include.h -Node3->Node10 - - +Node3->Node10 + + Node11 - -Vec2.h + +Vec2.h -Node3->Node11 - - +Node3->Node11 + + Node7 - -vector + +vector Node6->Node7 - - + + Node8 - -memory + +memory Node6->Node8 - - + + Node6->Node9 - - + + Node14 - -Resources.h + +Resources.h Node6->Node14 - - + + Node15 - -GameObject.h + +GameObject.h Node6->Node15 - - + + Node9->Node10 - - + + Node9->Node11 - - + + Node12 @@ -190,8 +190,8 @@ Node9->Node12 - - + + Node13 @@ -200,178 +200,196 @@ Node9->Node13 - - + + Node11->Node10 - - + + Node14->Node4 - - + + Node14->Node8 - - + + Node14->Node10 - - + + Node14->Node12 - - + + Node15->Node4 - - + + Node15->Node7 - - + + Node15->Node8 - - + + Node15->Node10 - - + + Node16 - -Component.h + +Component.h Node15->Node16 - - + + Node17 - - -Rect.h + + +ComponentType.h -Node15->Node17 - - +Node15->Node17 + + - -Node16->Node15 - - + +Node18 + + +Rect.h + - -Node17->Node10 - - - -Node17->Node11 - - + +Node15->Node18 + + - -Node18 - -cmath + +Node16->Node15 + + - -Node17->Node18 - - + +Node16->Node17 + + - -Node19->Node6 - - + +Node18->Node10 + + - -Node20 - - -ActionManager.h - + +Node18->Node11 + + + + +Node19 + +cmath + +Node18->Node19 + + - -Node19->Node20 - - + +Node20->Node6 + + Node21 - - -Sprite.h + + +ActionManager.h - -Node19->Node21 - - + +Node20->Node21 + + - -Node20->Node9 - - + +Node22 + + +Sprite.h + - -Node21->Node4 - - - -Node21->Node8 - - + +Node20->Node22 + + -Node21->Node9 - - - - -Node21->Node10 - - - - -Node21->Node17 - - - - -Node22 - +Node21->Node9 + + + + +Node22->Node4 + + + + +Node22->Node8 + + + + +Node22->Node9 + + + + +Node22->Node10 + + + + +Node22->Node18 + + + + +Node23 + Color.h - -Node21->Node22 - - + +Node22->Node23 + + diff --git a/docs/md_README.html b/docs/md_README.html index 0e11d430..f2c24bdb 100644 --- a/docs/md_README.html +++ b/docs/md_README.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: JogoIDJ @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -104,9 +104,9 @@ diff --git a/docs/pages.html b/docs/pages.html index 4f59b51f..be8af4c0 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Páginas relacionadas @@ -31,7 +31,7 @@ - + @@ -88,9 +88,9 @@ diff --git a/docs/search/all_0.html b/docs/search/all_0.html index 173bfb46..f835b4fb 100644 --- a/docs/search/all_0.html +++ b/docs/search/all_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_0.js b/docs/search/all_0.js index bfd607f2..b85cac83 100644 --- a/docs/search/all_0.js +++ b/docs/search/all_0.js @@ -3,9 +3,10 @@ var searchData= ['actionmanager',['ActionManager',['../classActionManager.html',1,'ActionManager'],['../classActionManager.html#a7d0c405d568795fba0c51f411e77b821',1,'ActionManager::ActionManager()']]], ['actionmanager_2ecpp',['ActionManager.cpp',['../ActionManager_8cpp.html',1,'']]], ['actionmanager_2eh',['ActionManager.h',['../ActionManager_8h.html',1,'']]], + ['addcomponent',['AddComponent',['../classGameObject.html#a6de86477e37962bcd4738b09c1c706aa',1,'GameObject']]], ['additive',['ADDITIVE',['../Sprite_8h.html#ad3bbb60a29cd7b3b6276b54595604209',1,'Sprite.h']]], ['addobject',['AddObject',['../classState.html#a431d5f711e028c788a9fdccaf99ff74e',1,'State']]], - ['ai_5fgo_5fdown',['AI_GO_DOWN',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a66311755e55435530832af716d0ff7c9',1,'Component.h']]], + ['ai_5fgo_5fdown',['AI_GO_DOWN',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a66311755e55435530832af716d0ff7c9',1,'ComponentType.h']]], ['aigodown',['AIGoDown',['../classAIGoDown.html',1,'AIGoDown'],['../classAIGoDown.html#a90facabcd1e46257246a23f3611d9aef',1,'AIGoDown::AIGoDown()']]], ['aigodown_2ecpp',['AIGoDown.cpp',['../AIGoDown_8cpp.html',1,'']]], ['aigodown_2eh',['AIGoDown.h',['../AIGoDown_8h.html',1,'']]], @@ -19,6 +20,7 @@ var searchData= ['arts',['ARTS',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174a5d359c59acf95d0a674fe1971f2f6730',1,'Tower']]], ['assert',['ASSERT',['../Error_8h.html#a092bd7bb2cb7fd9f483b6995cee61bc0',1,'Error.h']]], ['assert2',['ASSERT2',['../Error_8h.html#a28d79607639d01447db6950b24a81d77',1,'Error.h']]], + ['associatedinitialpos',['associatedInitialPos',['../classDragAndDrop.html#a8c14587e18912fc4efce09648c33114a',1,'DragAndDrop']]], ['at',['At',['../classTileMap.html#a3b8dec192ee9ccca2b4476821235cc0a',1,'TileMap']]], ['atlayer',['AtLayer',['../classTileMap.html#a8540f1f0249118c02cced90e0175c461',1,'TileMap']]] ]; diff --git a/docs/search/all_1.html b/docs/search/all_1.html index 6da38eef..4eb2f81b 100644 --- a/docs/search/all_1.html +++ b/docs/search/all_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_10.html b/docs/search/all_10.html index dbc71837..7aa1646b 100644 --- a/docs/search/all_10.html +++ b/docs/search/all_10.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_11.html b/docs/search/all_11.html index c95bcd6f..25c2470d 100644 --- a/docs/search/all_11.html +++ b/docs/search/all_11.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_11.js b/docs/search/all_11.js index 878512c7..7d7c1e6f 100644 --- a/docs/search/all_11.js +++ b/docs/search/all_11.js @@ -7,15 +7,18 @@ var searchData= ['rect',['Rect',['../classRect.html',1,'Rect'],['../classRect.html#a62fb6094640e8a5a9969382d404e9d5e',1,'Rect::Rect(void)'],['../classRect.html#a21e3f21b1579b6aea19ea88d89c019ef',1,'Rect::Rect(float x, float y, float w, float h)']]], ['rect_2ecpp',['Rect.cpp',['../Rect_8cpp.html',1,'']]], ['rect_2eh',['Rect.h',['../Rect_8h.html',1,'']]], + ['redrag',['redrag',['../classDragAndDrop.html#a6ebcb640a3261c648d2cb73918442956',1,'DragAndDrop']]], ['remaketexture',['RemakeTexture',['../classText.html#a5c794eef4ba7e0bd09a3039835f30e48',1,'Text']]], - ['render',['Render',['../classAnimation.html#a49749e3890cec3896e6f726323544c26',1,'Animation::Render()'],['../classGameObject.html#a976b9c0d72212389603802f95b3f3424',1,'GameObject::Render()'],['../classSprite.html#a9616074e0c4bc0c1e1285299c5dd63fe',1,'Sprite::Render()'],['../classState.html#ad1f023e61676d0cef92afbaba48ec7ca',1,'State::Render()'],['../classText.html#af32d96322e20f25f1a4ee99369d08a95',1,'Text::Render()'],['../classTileMap.html#a43569e73246f2b5253c537a12051ac90',1,'TileMap::Render()'],['../classTileSet.html#aa29b133eeedd4f9e63199e264cb931eb',1,'TileSet::Render()'],['../classEmptyGameObject.html#aa8f9d14b3814e1866b8dbfc7f85be02d',1,'EmptyGameObject::Render()'],['../classEndState.html#a1c876f3d062547988ac482f9c84d4b14',1,'EndState::Render()'],['../classEnemy.html#a85bf0c4d8e040cb7ac54b143d30ae30a',1,'Enemy::Render()'],['../classStageState.html#a6539a58d85b9367d6c027c3348f1b538',1,'StageState::Render()'],['../classTitleState.html#a5b7c34e4f33459f93e2b9f4bc95d83cf',1,'TitleState::Render()'],['../classTower.html#af9739625d2aa34927cb674cd0cec89d4',1,'Tower::Render()']]], + ['removecomponent',['RemoveComponent',['../classGameObject.html#ae165e3efb132b4a8ea2d666ae261bb31',1,'GameObject']]], + ['removego',['RemoveGO',['../classTileMap.html#a911e2833ea395e1c5b67d3fadbc84b9d',1,'TileMap::RemoveGO(int position)'],['../classTileMap.html#aafae8f5c077ee78cd8d9fc471ba6c82b',1,'TileMap::RemoveGO(void)']]], + ['render',['Render',['../classAnimation.html#a49749e3890cec3896e6f726323544c26',1,'Animation::Render()'],['../classGameObject.html#a29a3419ec8937f569294cd37bcad465c',1,'GameObject::Render()'],['../classSprite.html#a9616074e0c4bc0c1e1285299c5dd63fe',1,'Sprite::Render()'],['../classState.html#ad1f023e61676d0cef92afbaba48ec7ca',1,'State::Render()'],['../classText.html#af32d96322e20f25f1a4ee99369d08a95',1,'Text::Render()'],['../classTileMap.html#a43569e73246f2b5253c537a12051ac90',1,'TileMap::Render()'],['../classTileSet.html#aa29b133eeedd4f9e63199e264cb931eb',1,'TileSet::Render()'],['../classEndState.html#a1c876f3d062547988ac482f9c84d4b14',1,'EndState::Render()'],['../classEnemy.html#a85bf0c4d8e040cb7ac54b143d30ae30a',1,'Enemy::Render()'],['../classStageState.html#a6539a58d85b9367d6c027c3348f1b538',1,'StageState::Render()'],['../classTitleState.html#a5b7c34e4f33459f93e2b9f4bc95d83cf',1,'TitleState::Render()'],['../classTower.html#af9739625d2aa34927cb674cd0cec89d4',1,'Tower::Render()']]], ['renderarray',['RenderArray',['../classState.html#adabbfa20facdc24fa26e5813fd0af78a',1,'State']]], ['renderer',['renderer',['../classGame.html#ae5164c37c0dc74cfb56041174017bf57',1,'Game']]], ['renderlayer',['RenderLayer',['../classTileMap.html#aa87fcf8c31e0730c3a969a7e9abf838a',1,'TileMap']]], ['report_5fdebug',['REPORT_DEBUG',['../Error_8h.html#aed4d6f4696003d289daa853688d238ef',1,'Error.h']]], ['report_5fdebug2',['REPORT_DEBUG2',['../Error_8h.html#a468d7d0988cf3f74291cf0421aabbfa8',1,'Error.h']]], ['report_5fi_5fwas_5fhere',['REPORT_I_WAS_HERE',['../Error_8h.html#a15a48a3e28c4eb425e3340eae40894c5',1,'Error.h']]], - ['requestdelete',['RequestDelete',['../classAnimation.html#a59a64eaf59c06a25c78ae8702471bcb8',1,'Animation::RequestDelete()'],['../classGameObject.html#a46d006abbf903f075293cecb59a9dbea',1,'GameObject::RequestDelete()'],['../classEmptyGameObject.html#a494a837da78f42c6cb8e2352f0ec7f46',1,'EmptyGameObject::RequestDelete()'],['../classEnemy.html#a838f09716c8d78ef556a91beab886c74',1,'Enemy::RequestDelete()'],['../classTower.html#a27805c8845e1064625b01f44a7739b64',1,'Tower::RequestDelete()']]], + ['requestdelete',['RequestDelete',['../classAnimation.html#a59a64eaf59c06a25c78ae8702471bcb8',1,'Animation::RequestDelete()'],['../classGameObject.html#a5735ccbb4713c770acee8afd0fa604a7',1,'GameObject::RequestDelete()'],['../classEnemy.html#a9ab39adfb148fa2e09b5a50f1c930304',1,'Enemy::RequestDelete()'],['../classTower.html#a27805c8845e1064625b01f44a7739b64',1,'Tower::RequestDelete()']]], ['resources',['Resources',['../classResources.html',1,'Resources'],['../classResources.html#ab09435991b8c485f92e0aa1fd00828b9',1,'Resources::Resources()']]], ['resources_2ecpp',['Resources.cpp',['../Resources_8cpp.html',1,'']]], ['resources_2eh',['Resources.h',['../Resources_8h.html',1,'']]], diff --git a/docs/search/all_12.html b/docs/search/all_12.html index 1695554c..742f3d13 100644 --- a/docs/search/all_12.html +++ b/docs/search/all_12.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_12.js b/docs/search/all_12.js index a94001e9..e8ae3a06 100644 --- a/docs/search/all_12.js +++ b/docs/search/all_12.js @@ -34,7 +34,7 @@ var searchData= ['setzoomspeed',['SetZoomSpeed',['../classCamera.html#a4373a9b1baa7b98e4fe5859e0645baed',1,'Camera']]], ['shared',['SHARED',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a9c46e16a4ab019339596acadeefc8c53',1,'Text.h']]], ['showcollisioninfo',['ShowCollisionInfo',['../classTileMap.html#a31b1607f50b08cf2c49c71a8478ec07d',1,'TileMap']]], - ['size',['SIZE',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a4aa71180778b711338785695df5d7c52',1,'Component.h']]], + ['size',['SIZE',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a4aa71180778b711338785695df5d7c52',1,'ComponentType.h']]], ['sociology',['SOCIOLOGY',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174a7aed30226b0e67c35e6387a9701d0180',1,'Tower']]], ['solid',['SOLID',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a1b45f84e1f6603b52e5ef442836df9af',1,'Text.h']]], ['sound',['Sound',['../classSound.html',1,'Sound'],['../classSound.html#a539c205cdf06fe2c621fd77c37bcfac9',1,'Sound::Sound()'],['../classSound.html#af2c277cdc12b7df1de53e5b855e4f09c',1,'Sound::Sound(string file)'],['../classSound.html#a44bbda770ac76c7455b60d3d63b663a7',1,'Sound::sound()']]], @@ -44,7 +44,7 @@ var searchData= ['soundvolume',['soundVolume',['../classResources.html#aba29947d0dbb8e1a81a1d6b289c4d0f6',1,'Resources']]], ['sp',['sp',['../classAnimation.html#abf968c115c1d8c88da797215d58ad516',1,'Animation::sp()'],['../classEnemy.html#abcc409a6a5cdbc106ae12d8fb54e412a',1,'Enemy::sp()'],['../classTower.html#a48a882e7718850a2ecb72dbdaa183968',1,'Tower::sp()']]], ['spawn_5fpoint',['SPAWN_POINT',['../TileMap_8h.html#aaf7f10acd2b757134cd6abd1da486075',1,'TileMap.h']]], - ['spawnenemy',['SpawnEnemy',['../classStageState.html#a5812a63278bc2f2f911795f0184f1588',1,'StageState::SpawnEnemy()'],['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager::SpawnEnemy()']]], + ['spawnenemy',['SpawnEnemy',['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager']]], ['spawngroups',['spawnGroups',['../classStageState.html#a8ec235e907fe6fe1ed17605d259dc99b',1,'StageState::spawnGroups()'],['../classWaveManager.html#a09ade817ca7b744f1f00a6bf2eecbae6',1,'WaveManager::spawnGroups()']]], ['spawnpointdata',['SpawnPointData',['../structSpawnPointData.html',1,'']]], ['spawnpointsdata',['spawnPointsData',['../structWaveData.html#a138a3e0eed46e91e1024e9bbc9076061',1,'WaveData']]], diff --git a/docs/search/all_13.html b/docs/search/all_13.html index 7b82f9cc..32308a61 100644 --- a/docs/search/all_13.html +++ b/docs/search/all_13.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_13.js b/docs/search/all_13.js index 5cc4a860..5955a169 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#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',['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_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#a2365d8aea9a5503a49973c0176e96d39',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'],['../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_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'],['../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',['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_2ecpp',['Tileset.cpp',['../Tileset_8cpp.html',1,'']]], ['tileset_2eh',['Tileset.h',['../Tileset_8h.html',1,'']]], ['tilewidth',['tileWidth',['../classTileSet.html#a9ba9087a6da877f78af6cdf9afb0af7c',1,'TileSet']]], @@ -32,7 +32,7 @@ var searchData= ['titlestate_2eh',['TitleState.h',['../TitleState_8h.html',1,'']]], ['total_5ftower_5ftypes',['TOTAL_TOWER_TYPES',['../Tower_8h.html#ad4c81a3be23b7200388e5d00698cd9c2',1,'Tower.h']]], ['totalwaves',['totalWaves',['../classWaveManager.html#a6c2b7c73ad4a67834da8420fff2b1d48',1,'WaveManager']]], - ['tower',['Tower',['../classTower.html',1,'Tower'],['../classTower.html#a8528ad4b2a06e51f84a2dcb30b37f601',1,'Tower::Tower()']]], + ['tower',['Tower',['../classTower.html',1,'Tower'],['../classTower.html#ac491a13008b4cccadab89d00c0eabb7b',1,'Tower::Tower()']]], ['tower_2ecpp',['Tower.cpp',['../Tower_8cpp.html',1,'']]], ['tower_2eh',['Tower.h',['../Tower_8h.html',1,'']]], ['tower_5fbase_5fhp',['TOWER_BASE_HP',['../Tower_8h.html#a6a2af83ac78171fbd34362529674b253',1,'Tower.h']]], diff --git a/docs/search/all_14.html b/docs/search/all_14.html index fdd30767..9efc033b 100644 --- a/docs/search/all_14.html +++ b/docs/search/all_14.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_14.js b/docs/search/all_14.js index 6ac38682..674c8d8a 100644 --- a/docs/search/all_14.js +++ b/docs/search/all_14.js @@ -1,10 +1,10 @@ var searchData= [ - ['uint',['uint',['../Error_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Error.h'],['../HitPoints_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): HitPoints.h'],['../Enemy_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Enemy.h'],['../Tower_8cpp.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Tower.cpp']]], + ['uint',['uint',['../Error_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Error.h'],['../HitPoints_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): HitPoints.h'],['../Tower_8cpp.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Tower.cpp']]], ['unfollow',['Unfollow',['../classCamera.html#aa9ca7decdebf7147c9d6dc747e7d59e9',1,'Camera']]], ['up_5farrow_5fkey',['UP_ARROW_KEY',['../InputManager_8h.html#ad411242de334297d01bdadac8f47e90b',1,'InputManager.h']]], ['uparrowaction',['UpArrowAction',['../classActionManager.html#adfe15b32de9e9c3fab2e288c8c1d7c33',1,'ActionManager']]], - ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classEmptyGameObject.html#afeb72a98f8afd1c41edd14d2bcb6fad2',1,'EmptyGameObject::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()'],['../classTower.html#a989f960c934ba7678606bb0a635c21ef',1,'Tower::Update()'],['../classWaveManager.html#af03a0b16b8649875d370ecd97b607ebc',1,'WaveManager::Update()']]], + ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#ab26a16410c9065c8fb97cb005e8f16ab',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()'],['../classTower.html#a989f960c934ba7678606bb0a635c21ef',1,'Tower::Update()'],['../classWaveManager.html#af03a0b16b8649875d370ecd97b607ebc',1,'WaveManager::Update()']]], ['updatearray',['UpdateArray',['../classState.html#abb605ec5fe585d227fbf267e0e6c80a9',1,'State']]], ['updatecounter',['updateCounter',['../classInputManager.html#a96541a9ebd43184f92449f9daf94724f',1,'InputManager']]], ['updatestack',['UpdateStack',['../classGame.html#ae67b3fda973e4b05513d02c968b0ac17',1,'Game']]] diff --git a/docs/search/all_15.html b/docs/search/all_15.html index f4eba2f9..494e489d 100644 --- a/docs/search/all_15.html +++ b/docs/search/all_15.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_16.html b/docs/search/all_16.html index 25084b92..9894a6cb 100644 --- a/docs/search/all_16.html +++ b/docs/search/all_16.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_16.js b/docs/search/all_16.js index 7193755d..cdd94a3f 100644 --- a/docs/search/all_16.js +++ b/docs/search/all_16.js @@ -2,7 +2,7 @@ var searchData= [ ['w',['w',['../classRect.html#a049f7ee5e7eb0475229bf3ed9b3bad44',1,'Rect']]], ['wave_5fdata_5ffilename_5fmax_5fsize',['WAVE_DATA_FILENAME_MAX_SIZE',['../GameResources_8cpp.html#acba0378bce3efaced29b11b1da49216a',1,'GameResources.cpp']]], - ['wave_5fmanager',['WAVE_MANAGER',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a3aaf870ecb3dda4b45be77230383a524',1,'Component.h']]], + ['wave_5fmanager',['WAVE_MANAGER',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a3aaf870ecb3dda4b45be77230383a524',1,'ComponentType.h']]], ['wave_5fname_5fmax_5flenght',['WAVE_NAME_MAX_LENGHT',['../GameResources_8cpp.html#ac10bbdfcdd2b87dc3db7b89123ca2812',1,'GameResources.cpp']]], ['wavecount',['waveCount',['../classStateData.html#aa724dc9afb6b0b068e001c4b74b3dfd2',1,'StateData::waveCount()'],['../classWaveManager.html#a393dd32c231c18d444ed25cb5dcfa33a',1,'WaveManager::waveCount()']]], ['wavedata',['WaveData',['../structWaveData.html',1,'']]], diff --git a/docs/search/all_17.html b/docs/search/all_17.html index a8969eb1..5f44d686 100644 --- a/docs/search/all_17.html +++ b/docs/search/all_17.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_18.html b/docs/search/all_18.html index a023d06b..e2685e33 100644 --- a/docs/search/all_18.html +++ b/docs/search/all_18.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_19.html b/docs/search/all_19.html index 188751d3..387e7334 100644 --- a/docs/search/all_19.html +++ b/docs/search/all_19.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_1a.html b/docs/search/all_1a.html index 5799a73d..374b752c 100644 --- a/docs/search/all_1a.html +++ b/docs/search/all_1a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_1a.js b/docs/search/all_1a.js index cdb8ceab..fa1ce143 100644 --- a/docs/search/all_1a.js +++ b/docs/search/all_1a.js @@ -1,7 +1,6 @@ var searchData= [ ['_7ecomponent',['~Component',['../classComponent.html#ae18722fd3bbb40cef7daf1b94aabb397',1,'Component']]], - ['_7eemptygameobject',['~EmptyGameObject',['../classEmptyGameObject.html#a510f01a12592696921676200f125e3eb',1,'EmptyGameObject::~EmptyGameObject()'],['../classemptyGameObject.html#adc185127883e58d732e38a1796977f4e',1,'emptyGameObject::~emptyGameObject()']]], ['_7eenemy',['~Enemy',['../classEnemy.html#ac0eec4755e28c02688065f9657150ac3',1,'Enemy']]], ['_7egame',['~Game',['../classGame.html#ae3d112ca6e0e55150d2fdbc704474530',1,'Game']]], ['_7egameobject',['~GameObject',['../classGameObject.html#a3b086987a48c14ebe80939bd66d5f1c8',1,'GameObject']]], diff --git a/docs/search/all_2.html b/docs/search/all_2.html index 873a08c1..1596566d 100644 --- a/docs/search/all_2.html +++ b/docs/search/all_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_2.js b/docs/search/all_2.js index d7c76345..8cf5ac4c 100644 --- a/docs/search/all_2.js +++ b/docs/search/all_2.js @@ -39,9 +39,10 @@ var searchData= ['component',['Component',['../classComponent.html',1,'Component'],['../Component_8h.html#a5b6d014748674102c3db9f0270a12f60',1,'COMPONENT(): Component.h']]], ['component_2ecpp',['Component.cpp',['../Component_8cpp.html',1,'']]], ['component_2eh',['Component.h',['../Component_8h.html',1,'']]], - ['component_5ftype_5fsize',['COMPONENT_TYPE_SIZE',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a0afded8a801f33f6a572853b4bffa17b',1,'Component.h']]], + ['component_5ftype_5fsize',['COMPONENT_TYPE_SIZE',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a0afded8a801f33f6a572853b4bffa17b',1,'ComponentType.h']]], ['components',['components',['../classGameObject.html#adf77cf3872333bf5e3007ad98e8afd18',1,'GameObject']]], - ['componenttype',['ComponentType',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0',1,'Component.h']]], + ['componenttype',['ComponentType',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0',1,'ComponentType.h']]], + ['componenttype_2eh',['ComponentType.h',['../ComponentType_8h.html',1,'']]], ['computation',['COMPUTATION',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174ab86334aefa7228ebf61c4f4a42f69bee',1,'Tower']]], ['controllerleftstickstate',['controllerLeftStickState',['../classInputManager.html#a6792c10cb9eef8bfaa6a12b8405bad13',1,'InputManager']]], ['controllerrightstickstate',['controllerRightStickState',['../classInputManager.html#a39f7982405d422569fe99511ef4d1dce',1,'InputManager']]], diff --git a/docs/search/all_3.html b/docs/search/all_3.html index 6b0ef78d..aa03e903 100644 --- a/docs/search/all_3.html +++ b/docs/search/all_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_3.js b/docs/search/all_3.js index 1adc9962..7fe97fb4 100644 --- a/docs/search/all_3.js +++ b/docs/search/all_3.js @@ -1,7 +1,7 @@ var searchData= [ ['damage',['Damage',['../classTower.html#a106ad22999d0a1262223d120602cf9d8',1,'Tower']]], - ['dead',['dead',['../classEnemy.html#a4b1b61e7bc79aca01f3e4b3ef19cb787',1,'Enemy']]], + ['dead',['dead',['../classGameObject.html#a69b2c28686d4cce93cf49fa7a8a5cb88',1,'GameObject::dead()'],['../classEnemy.html#a4b1b61e7bc79aca01f3e4b3ef19cb787',1,'Enemy::dead()']]], ['debug',['DEBUG',['../Error_8h.html#ad72dbcf6d0153db1b8d8a58001feed83',1,'Error.h']]], ['defines_2eh',['Defines.h',['../Defines_8h.html',1,'']]], ['dificulty_5fconstant',['DIFICULTY_CONSTANT',['../Enemy_8h.html#a3cfe21310e1359350de0b98319b19a43',1,'Enemy.h']]], @@ -10,8 +10,8 @@ var searchData= ['dot',['Dot',['../classCollision.html#a8e858eea6ac033ac5e2a31946618c5c4',1,'Collision']]], ['down_5farrow_5fkey',['DOWN_ARROW_KEY',['../InputManager_8h.html#af2292687de6b9256a2664a7dacf9ae4a',1,'InputManager.h']]], ['downarrowaction',['DownArrowAction',['../classActionManager.html#a4e532467961545ed717e59158ea89990',1,'ActionManager']]], - ['drag_5fand_5fdrop',['DRAG_AND_DROP',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0ae768970fdd777e1da6c8ac0985b2e3f0',1,'Component.h']]], - ['draganddrop',['DragAndDrop',['../classDragAndDrop.html',1,'DragAndDrop'],['../classDragAndDrop.html#ae8bf1e903ebaceb56405f9ff26020c0b',1,'DragAndDrop::DragAndDrop()']]], + ['drag_5fand_5fdrop',['DRAG_AND_DROP',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0ae768970fdd777e1da6c8ac0985b2e3f0',1,'ComponentType.h']]], + ['draganddrop',['DragAndDrop',['../classDragAndDrop.html',1,'DragAndDrop'],['../classDragAndDrop.html#a4beb9046fb1c7055799ca5705ef49e92',1,'DragAndDrop::DragAndDrop()']]], ['draganddrop_2ecpp',['DragAndDrop.cpp',['../DragAndDrop_8cpp.html',1,'']]], ['draganddrop_2eh',['DragAndDrop.h',['../DragAndDrop_8h.html',1,'']]], ['dragonhold',['dragOnHold',['../classDragAndDrop.html#a8dbee0ad51c83c65d7fb3f29e917518b',1,'DragAndDrop']]], diff --git a/docs/search/all_4.html b/docs/search/all_4.html index 7639138b..004f31cd 100644 --- a/docs/search/all_4.html +++ b/docs/search/all_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_4.js b/docs/search/all_4.js index c0106ea8..c197667a 100644 --- a/docs/search/all_4.js +++ b/docs/search/all_4.js @@ -1,7 +1,5 @@ var searchData= [ - ['emptygameobject',['emptyGameObject',['../classemptyGameObject.html',1,'emptyGameObject'],['../classEmptyGameObject.html',1,'EmptyGameObject'],['../classEmptyGameObject.html#ac3590d6e9f0a10036903fa4f063ab164',1,'EmptyGameObject::EmptyGameObject()'],['../classemptyGameObject.html#ac31c7c7a23729ac8d5a078dde77e201f',1,'emptyGameObject::emptyGameObject()']]], - ['emptygameobject_2eh',['emptyGameObject.h',['../emptyGameObject_8h.html',1,'(Namespace global)'],['../EmptyGameObject_8h.html',1,'(Namespace global)']]], ['end_5fline',['END_LINE',['../Error_8h.html#a6fd2b788cc016acd19820ddb30e78c1f',1,'Error.h']]], ['end_5fstate_5fdelta_5fvolume',['END_STATE_DELTA_VOLUME',['../EndState_8h.html#a8c776b55093efb545c75f4a409cb93b6',1,'EndState.h']]], ['end_5fstate_5ffont_5fsize',['END_STATE_FONT_SIZE',['../EndState_8h.html#a072640bf35e47c51689c7e84ca5fe4b4',1,'EndState.h']]], @@ -21,7 +19,7 @@ var searchData= ['enemy_2eh',['Enemy.h',['../Enemy_8h.html',1,'']]], ['enemy_5fmax_5fname_5flenght',['ENEMY_MAX_NAME_LENGHT',['../GameResources_8cpp.html#a7d7daa95ffbbfd903316a4925c80e34b',1,'GameResources.cpp']]], ['enemy_5fmax_5fsprite_5fname_5flenght',['ENEMY_MAX_SPRITE_NAME_LENGHT',['../GameResources_8cpp.html#ab98fb479b08224afd21558786955fd5e',1,'GameResources.cpp']]], - ['enemy_5fmove_5fspeed',['ENEMY_MOVE_SPEED',['../Enemy_8cpp.html#ad1fc3c040531dd8cbbe7675e1db12fd3',1,'Enemy.cpp']]], + ['enemy_5fmove_5fspeed',['ENEMY_MOVE_SPEED',['../Enemy_8h.html#ad1fc3c040531dd8cbbe7675e1db12fd3',1,'Enemy.h']]], ['enemy_5ftype_5fmax_5fstring_5fsize',['ENEMY_TYPE_MAX_STRING_SIZE',['../GameResources_8cpp.html#a5d81999fe9db12aeaf11146381e3fbc0',1,'GameResources.cpp']]], ['enemy_5ftype_5fsize',['ENEMY_TYPE_SIZE',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea52cb0d4e9f1f7b966b59d26e46483514',1,'Enemy.h']]], ['enemydata',['EnemyData',['../structEnemyData.html',1,'EnemyData'],['../structEnemyData.html#ab1a2bd7f5b59acd6c05e54cab9bdb14e',1,'EnemyData::EnemyData()']]], diff --git a/docs/search/all_5.html b/docs/search/all_5.html index f7c2a0cb..9911cbc0 100644 --- a/docs/search/all_5.html +++ b/docs/search/all_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_6.html b/docs/search/all_6.html index f9532b1c..fae1aa5b 100644 --- a/docs/search/all_6.html +++ b/docs/search/all_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_6.js b/docs/search/all_6.js index ea337e11..3269c375 100644 --- a/docs/search/all_6.js +++ b/docs/search/all_6.js @@ -22,6 +22,7 @@ var searchData= ['getenemiesleft',['GetEnemiesLeft',['../classWaveManager.html#a7cefa420665f27cfbec19c34fbdba628',1,'WaveManager']]], ['getenemytypefromstring',['GetEnemyTypeFromString',['../classGameResources.html#af464a5b36f51029efbdc0eabf1ed89c9',1,'GameResources']]], ['getfont',['GetFont',['../classResources.html#a661a92ea82fb73e31092059d6fc383c3',1,'Resources']]], + ['getgo',['GetGO',['../classTileMap.html#a4694be5ef653fd6c67c9c045918c3c77',1,'TileMap']]], ['getheight',['GetHeight',['../classSprite.html#a2a5a7c73dd94f822b0a248de3621e5eb',1,'Sprite::GetHeight()'],['../classTileMap.html#a9fe48260088655aa252b4d40e60f1390',1,'TileMap::GetHeight()']]], ['getimage',['GetImage',['../classResources.html#a557aa346c974a8bce80017dbabd653d9',1,'Resources']]], ['getinstance',['GetInstance',['../classGame.html#a25d213802ed39215e3ab2cb04edf46c8',1,'Game::GetInstance()'],['../classInputManager.html#a1f095ed502f0bd09390d05cdc0acdcd9',1,'InputManager::GetInstance()']]], @@ -49,6 +50,6 @@ 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#a686136f4cf17c54345a7d28187b25893',1,'GameObject::GetWorldRenderedRect()'],['../classEmptyGameObject.html#a5f41e1fb299bf9b13d7cd68a88530fc5',1,'EmptyGameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]], + ['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']]] ]; diff --git a/docs/search/all_7.html b/docs/search/all_7.html index a707a71e..83cfc266 100644 --- a/docs/search/all_7.html +++ b/docs/search/all_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_7.js b/docs/search/all_7.js index 4dfc7356..909ebe40 100644 --- a/docs/search/all_7.js +++ b/docs/search/all_7.js @@ -6,8 +6,8 @@ var searchData= ['healthcolor',['healthColor',['../classHitPoints.html#a0dd7173baa10eb3bf0e67298d817a873',1,'HitPoints']]], ['height',['height',['../classSprite.html#a1f07c8f2080c193759aec0e13503d7ab',1,'Sprite']]], ['highlight',['HIGHLIGHT',['../Sprite_8cpp.html#ab814d2aa388b74d504673d0068cab196',1,'HIGHLIGHT(): Sprite.cpp'],['../Tileset_8cpp.html#ab814d2aa388b74d504673d0068cab196',1,'HIGHLIGHT(): Tileset.cpp']]], - ['hit_5fpoints',['HIT_POINTS',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a1c285fd3d6debf0339a8c8564d5abaeb',1,'Component.h']]], - ['hitpoints',['HitPoints',['../classHitPoints.html',1,'HitPoints'],['../classHitPoints.html#a0a1d7b160b586f2a971cf6ca51d6c4e7',1,'HitPoints::HitPoints()'],['../classTower.html#a0abb3e35e3d258ee29977075df34cab4',1,'Tower::hitpoints()']]], + ['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_2eh',['HitPoints.h',['../HitPoints_8h.html',1,'']]], ['hostile',['HOSTILE',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea5e344b55f70ed8001ac9e7bb5d226851',1,'Enemy.h']]], diff --git a/docs/search/all_8.html b/docs/search/all_8.html index 29aea2a4..ac76b1f5 100644 --- a/docs/search/all_8.html +++ b/docs/search/all_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_8.js b/docs/search/all_8.js index 6b73947c..a0ae6640 100644 --- a/docs/search/all_8.js +++ b/docs/search/all_8.js @@ -11,21 +11,23 @@ var searchData= ['inputmanager',['InputManager',['../classInputManager.html',1,'InputManager'],['../classInputManager.html#a8be46886da639b26d67181c29dab6d6c',1,'InputManager::InputManager()'],['../classGame.html#a57010b9ce85884e0f4059d8d8474e610',1,'Game::inputManager()'],['../classStageState.html#acbf7ba483ee1ae6fe7d20f22b5c721b3',1,'StageState::inputManager()']]], ['inputmanager_2ecpp',['InputManager.cpp',['../InputManager_8cpp.html',1,'']]], ['inputmanager_2eh',['InputManager.h',['../InputManager_8h.html',1,'']]], - ['insertgo',['InsertGO',['../classTileMap.html#a9370c61beefad2f657c022a0a2462336',1,'TileMap']]], + ['insertgo',['InsertGO',['../classTileMap.html#a9370c61beefad2f657c022a0a2462336',1,'TileMap::InsertGO(GameObject *obj)'],['../classTileMap.html#a916d38c429fe9d66b92c2687656c0e3c',1,'TileMap::InsertGO(GameObject *obj, Vec2 initialPos)']]], ['instance',['instance',['../classGame.html#aa469cdc0a30f4fd2d6d99b23f4fbf257',1,'Game']]], ['instruction',['instruction',['../classEndState.html#acbc4bcbbf722307b2ea222b5a85a0e8d',1,'EndState']]], - ['is',['Is',['../classAIGoDown.html#a3bc05633c885a17df20237b21eef67f2',1,'AIGoDown::Is()'],['../classAnimation.html#a166f36012f3092275648a74272e8ff0f',1,'Animation::Is()'],['../classComponent.html#a81f861605b8c887e7634e56424c21a2a',1,'Component::Is()'],['../classDragAndDrop.html#aa85e00937c061a0870dec8cb8b88832a',1,'DragAndDrop::Is()'],['../classGameObject.html#a3ddba599a800d774463c7082b7ef4801',1,'GameObject::Is()'],['../classHitPoints.html#a40320d864738f749dc4b8c012acdcc67',1,'HitPoints::Is()'],['../classStateData.html#a63b33546d704a06bf8f9df6b0590eae4',1,'StateData::Is()'],['../classEmptyGameObject.html#a8e1cfd111921c89b4a4a7d54c5b62875',1,'EmptyGameObject::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()'],['../classEnemy.html#a029a0d93da4adf4f638c47a84c41803b',1,'Enemy::Is()'],['../classTower.html#ad7d3cb08eafeb8350ee3292748862481',1,'Tower::Is()'],['../classWaveManager.html#a1f7b6ac70478d5ce9543cc988e6f5a10',1,'WaveManager::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()']]], + ['is',['Is',['../classAIGoDown.html#a3bc05633c885a17df20237b21eef67f2',1,'AIGoDown::Is()'],['../classAnimation.html#a166f36012f3092275648a74272e8ff0f',1,'Animation::Is()'],['../classComponent.html#a81f861605b8c887e7634e56424c21a2a',1,'Component::Is()'],['../classDragAndDrop.html#aa85e00937c061a0870dec8cb8b88832a',1,'DragAndDrop::Is()'],['../classGameObject.html#a3c4f6a6becd8452063e5064c44426442',1,'GameObject::Is()'],['../classHitPoints.html#a40320d864738f749dc4b8c012acdcc67',1,'HitPoints::Is()'],['../classStateData.html#a63b33546d704a06bf8f9df6b0590eae4',1,'StateData::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()'],['../classEnemy.html#a029a0d93da4adf4f638c47a84c41803b',1,'Enemy::Is()'],['../classTower.html#ad7d3cb08eafeb8350ee3292748862481',1,'Tower::Is()'],['../classWaveManager.html#a1f7b6ac70478d5ce9543cc988e6f5a10',1,'WaveManager::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()']]], ['isbuttondown',['IsButtonDown',['../classInputManager.html#ae8ab294770c3c7cedf5c7dcc59bb08d5',1,'InputManager']]], + ['isbuttonup',['IsButtonUp',['../classInputManager.html#adfe35729c6567be8627d84d4d014be58',1,'InputManager']]], ['iscolliding',['IsColliding',['../classCollision.html#a8bfb131379c86c409bf38c68ef25fae6',1,'Collision']]], ['iscontrollersticking',['IsControllerSticking',['../classInputManager.html#af7ad4c0ebb3f3dc902805feae8e0cff2',1,'InputManager']]], - ['isdead',['IsDead',['../classAnimation.html#ad1eaa9ff240cbcc114270ea174523702',1,'Animation::IsDead()'],['../classGameObject.html#a076afa2ea9190c49046f86a0946b4543',1,'GameObject::IsDead()'],['../classEmptyGameObject.html#a3bfcdf5cebf0b57ed941c326b69f3add',1,'EmptyGameObject::IsDead()'],['../classEnemy.html#ae5a8c620daad853579894fb72af5279e',1,'Enemy::IsDead()'],['../classTower.html#af187931f0dab9b34b18bd152a1d00484',1,'Tower::IsDead()']]], - ['isdragging',['isDragging',['../classDragAndDrop.html#ae70478ad1144137afdf8fefe453379c8',1,'DragAndDrop']]], + ['isdead',['IsDead',['../classAnimation.html#ad1eaa9ff240cbcc114270ea174523702',1,'Animation::IsDead()'],['../classGameObject.html#a64489eaccea42957d3aa8c33d1fa16ba',1,'GameObject::IsDead()'],['../classEnemy.html#ae5a8c620daad853579894fb72af5279e',1,'Enemy::IsDead()'],['../classTower.html#af187931f0dab9b34b18bd152a1d00484',1,'Tower::IsDead()']]], ['isdraging',['isDraging',['../classTower.html#a7a2b297edf481c2eb2eeaa8a83d20bf8',1,'Tower']]], ['isframeratelimited',['IsFramerateLimited',['../classGame.html#a3cee416ca88d258ceeab7c0eb3331b69',1,'Game']]], ['isinrect',['IsInRect',['../classVec2.html#a788dc85f57e20be80e85543e6996a4f1',1,'Vec2']]], ['iskeydown',['IsKeyDown',['../classInputManager.html#a97d25d372ab28dbc119b5a0919e38244',1,'InputManager']]], + ['iskeyup',['IsKeyUp',['../classInputManager.html#a0b9ab4448dcc8a220147bec9d44d6e23',1,'InputManager']]], ['ismousedown',['IsMouseDown',['../classInputManager.html#a410c6f6a0fa13dfd938d6d26a524fc19',1,'InputManager']]], ['ismousescrolling',['IsMouseScrolling',['../classInputManager.html#aeb81e9386db70d1cc204e45963ec9077',1,'InputManager']]], + ['ismouseup',['IsMouseUp',['../classInputManager.html#a97d0df155dc07d57b4f7c9e7f66b0f2e',1,'InputManager']]], ['isopen',['IsOpen',['../classMusic.html#a7dd0d191e358d600f0ea8a1db75f833d',1,'Music::IsOpen()'],['../classSound.html#ac9de1bdc5b8c1857140a279990803394',1,'Sound::IsOpen()'],['../classSprite.html#a9f1e62573dd91cb03dbad7aa54807b8c',1,'Sprite::IsOpen()']]], ['isshowingcollisioninfo',['IsShowingCollisionInfo',['../classTileMap.html#a9cdb06bdaca86adf9fc179ed5cf7b148',1,'TileMap']]], ['isstrobe',['isStrobe',['../classText.html#a5ebb0b4767c8487d440d9c36ae0c93cd',1,'Text']]] diff --git a/docs/search/all_9.html b/docs/search/all_9.html index 541103a7..fa614fd5 100644 --- a/docs/search/all_9.html +++ b/docs/search/all_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_a.html b/docs/search/all_a.html index 1b2f923a..92f50f3f 100644 --- a/docs/search/all_a.html +++ b/docs/search/all_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_b.html b/docs/search/all_b.html index fb4fc7f0..3b78c3b9 100644 --- a/docs/search/all_b.html +++ b/docs/search/all_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_c.html b/docs/search/all_c.html index 1ac00ee8..a7212b77 100644 --- a/docs/search/all_c.html +++ b/docs/search/all_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_c.js b/docs/search/all_c.js index 1a694102..8bdd6948 100644 --- a/docs/search/all_c.js +++ b/docs/search/all_c.js @@ -9,6 +9,7 @@ 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']]], + ['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']]], diff --git a/docs/search/all_d.html b/docs/search/all_d.html index 5f9a76d4..db7ae87a 100644 --- a/docs/search/all_d.html +++ b/docs/search/all_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_d.js b/docs/search/all_d.js index 972b629b..b2c2b333 100644 --- a/docs/search/all_d.js +++ b/docs/search/all_d.js @@ -4,9 +4,9 @@ var searchData= ['neutral',['NEUTRAL',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268eaf46d14eb9d5d71afc9f6e747689fcb56',1,'Enemy.h']]], ['norm',['Norm',['../classCollision.html#ab739e01f1393b68b28cb8b45f42bf2d4',1,'Collision']]], ['normalize',['Normalize',['../classVec2.html#ab37a161e393133ba7083d3f9386c0173',1,'Vec2']]], - ['notifycollision',['NotifyCollision',['../classAnimation.html#a611b21418311eb697ec4af1aaff92657',1,'Animation::NotifyCollision()'],['../classGameObject.html#aa627e6c2913983fc5f108c1c4d303eb8',1,'GameObject::NotifyCollision()'],['../classEmptyGameObject.html#ab91c856463a28d1795f73306556a9627',1,'EmptyGameObject::NotifyCollision()'],['../classEnemy.html#a805f30a2ffcc14e4875717ed0cfa58fc',1,'Enemy::NotifyCollision()'],['../classTower.html#a53579fcf0d8d7524ef63e41c8c66b2c5',1,'Tower::NotifyCollision()']]], + ['notifycollision',['NotifyCollision',['../classAnimation.html#a611b21418311eb697ec4af1aaff92657',1,'Animation::NotifyCollision()'],['../classGameObject.html#ab6f7263c38623812def797a179686b90',1,'GameObject::NotifyCollision()'],['../classEnemy.html#a805f30a2ffcc14e4875717ed0cfa58fc',1,'Enemy::NotifyCollision()'],['../classTower.html#a53579fcf0d8d7524ef63e41c8c66b2c5',1,'Tower::NotifyCollision()']]], ['notifyenemygotkilled',['NotifyEnemyGotKilled',['../classWaveManager.html#a565c7b86ea66365e8fbc552c5918ce82',1,'WaveManager']]], ['notifyenemygottohisdestiny',['NotifyEnemyGotToHisDestiny',['../classWaveManager.html#aa19e180ce6afba1fad0b92ab25a3dba5',1,'WaveManager']]], - ['nullgameobject',['nullGameObject',['../classStageState.html#a2ce0ac2e7b7bcc09d5b6b98905ae7f0c',1,'StageState']]], + ['nullgameobject',['nullGameObject',['../classStageState.html#ac699412f052e7954008dd7e7feb52e36',1,'StageState']]], ['numberofenemies',['numberOfEnemies',['../structEnemySpawnData.html#ab3ec9a12baad5ddbf06b1bba52768e0d',1,'EnemySpawnData']]] ]; diff --git a/docs/search/all_e.html b/docs/search/all_e.html index 9c2123a4..9fbe9605 100644 --- a/docs/search/all_e.html +++ b/docs/search/all_e.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/all_f.html b/docs/search/all_f.html index 519e1dfd..8eae322c 100644 --- a/docs/search/all_f.html +++ b/docs/search/all_f.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_0.html b/docs/search/classes_0.html index 5f5dbe4d..269ed70a 100644 --- a/docs/search/classes_0.html +++ b/docs/search/classes_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_1.html b/docs/search/classes_1.html index c3c6de82..c900a1d0 100644 --- a/docs/search/classes_1.html +++ b/docs/search/classes_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_2.html b/docs/search/classes_2.html index ed1f31a5..994cdd64 100644 --- a/docs/search/classes_2.html +++ b/docs/search/classes_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_3.html b/docs/search/classes_3.html index ac6a51c5..cdbc4c2b 100644 --- a/docs/search/classes_3.html +++ b/docs/search/classes_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_3.js b/docs/search/classes_3.js index 81f889d3..90d916e6 100644 --- a/docs/search/classes_3.js +++ b/docs/search/classes_3.js @@ -1,6 +1,5 @@ var searchData= [ - ['emptygameobject',['emptyGameObject',['../classemptyGameObject.html',1,'emptyGameObject'],['../classEmptyGameObject.html',1,'EmptyGameObject']]], ['endstate',['EndState',['../classEndState.html',1,'']]], ['endstatedata',['EndStateData',['../classEndStateData.html',1,'']]], ['enemy',['Enemy',['../classEnemy.html',1,'']]], diff --git a/docs/search/classes_4.html b/docs/search/classes_4.html index 61c4c44f..863c5cb9 100644 --- a/docs/search/classes_4.html +++ b/docs/search/classes_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_5.html b/docs/search/classes_5.html index 4432e261..1dfeeeb8 100644 --- a/docs/search/classes_5.html +++ b/docs/search/classes_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_6.html b/docs/search/classes_6.html index 2aaf5f1e..99f560d9 100644 --- a/docs/search/classes_6.html +++ b/docs/search/classes_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_7.html b/docs/search/classes_7.html index d24eb151..387c76f8 100644 --- a/docs/search/classes_7.html +++ b/docs/search/classes_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_8.html b/docs/search/classes_8.html index afce3019..e0f9fc55 100644 --- a/docs/search/classes_8.html +++ b/docs/search/classes_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_9.html b/docs/search/classes_9.html index e842fb5c..3f1d369c 100644 --- a/docs/search/classes_9.html +++ b/docs/search/classes_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_a.html b/docs/search/classes_a.html index a660ea3b..5c9534c5 100644 --- a/docs/search/classes_a.html +++ b/docs/search/classes_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_b.html b/docs/search/classes_b.html index 769c0bbb..bb1b746a 100644 --- a/docs/search/classes_b.html +++ b/docs/search/classes_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/classes_c.html b/docs/search/classes_c.html index 5109dbc0..706bcdd1 100644 --- a/docs/search/classes_c.html +++ b/docs/search/classes_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_0.html b/docs/search/defines_0.html index 101e0021..64a7232e 100644 --- a/docs/search/defines_0.html +++ b/docs/search/defines_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_1.html b/docs/search/defines_1.html index 7887fc05..8569fda4 100644 --- a/docs/search/defines_1.html +++ b/docs/search/defines_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_10.html b/docs/search/defines_10.html index c18eadf8..8d413249 100644 --- a/docs/search/defines_10.html +++ b/docs/search/defines_10.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_11.html b/docs/search/defines_11.html index 03fb9fb9..6090e52d 100644 --- a/docs/search/defines_11.html +++ b/docs/search/defines_11.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_2.html b/docs/search/defines_2.html index 20eacf73..990a9195 100644 --- a/docs/search/defines_2.html +++ b/docs/search/defines_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_3.html b/docs/search/defines_3.html index afa10382..b80fe31a 100644 --- a/docs/search/defines_3.html +++ b/docs/search/defines_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_4.html b/docs/search/defines_4.html index 43042cd2..d5111930 100644 --- a/docs/search/defines_4.html +++ b/docs/search/defines_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_4.js b/docs/search/defines_4.js index d850f793..b9e46c21 100644 --- a/docs/search/defines_4.js +++ b/docs/search/defines_4.js @@ -6,7 +6,7 @@ var searchData= ['endstatedata_5fh',['ENDSTATEDATA_H',['../EndStateData_8cpp.html#a9edd4bf921815da65de27af8a8ad6ff4',1,'EndStateData.cpp']]], ['enemy_5fmax_5fname_5flenght',['ENEMY_MAX_NAME_LENGHT',['../GameResources_8cpp.html#a7d7daa95ffbbfd903316a4925c80e34b',1,'GameResources.cpp']]], ['enemy_5fmax_5fsprite_5fname_5flenght',['ENEMY_MAX_SPRITE_NAME_LENGHT',['../GameResources_8cpp.html#ab98fb479b08224afd21558786955fd5e',1,'GameResources.cpp']]], - ['enemy_5fmove_5fspeed',['ENEMY_MOVE_SPEED',['../Enemy_8cpp.html#ad1fc3c040531dd8cbbe7675e1db12fd3',1,'Enemy.cpp']]], + ['enemy_5fmove_5fspeed',['ENEMY_MOVE_SPEED',['../Enemy_8h.html#ad1fc3c040531dd8cbbe7675e1db12fd3',1,'Enemy.h']]], ['enemy_5ftype_5fmax_5fstring_5fsize',['ENEMY_TYPE_MAX_STRING_SIZE',['../GameResources_8cpp.html#a5d81999fe9db12aeaf11146381e3fbc0',1,'GameResources.cpp']]], ['error',['Error',['../Error_8h.html#a787bf097960f03921a9b9e0195d27831',1,'Error.h']]], ['escape_5fkey',['ESCAPE_KEY',['../InputManager_8h.html#a4c2609b38a3373c688d3888fd50808a6',1,'InputManager.h']]], diff --git a/docs/search/defines_5.html b/docs/search/defines_5.html index 273d7969..9424ffea 100644 --- a/docs/search/defines_5.html +++ b/docs/search/defines_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_6.html b/docs/search/defines_6.html index 900bd17d..aba7a89b 100644 --- a/docs/search/defines_6.html +++ b/docs/search/defines_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_7.html b/docs/search/defines_7.html index b1a0f17f..4c0c9669 100644 --- a/docs/search/defines_7.html +++ b/docs/search/defines_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_8.html b/docs/search/defines_8.html index 4fc25ec9..fecc2bcd 100644 --- a/docs/search/defines_8.html +++ b/docs/search/defines_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_9.html b/docs/search/defines_9.html index 2d93ee71..e984abd6 100644 --- a/docs/search/defines_9.html +++ b/docs/search/defines_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_a.html b/docs/search/defines_a.html index d5ede9e1..d06b8e0b 100644 --- a/docs/search/defines_a.html +++ b/docs/search/defines_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_b.html b/docs/search/defines_b.html index 8ae4117d..1f32f028 100644 --- a/docs/search/defines_b.html +++ b/docs/search/defines_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_c.html b/docs/search/defines_c.html index a2e7d1cc..e6e90a76 100644 --- a/docs/search/defines_c.html +++ b/docs/search/defines_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_d.html b/docs/search/defines_d.html index a530f23d..c6e9df99 100644 --- a/docs/search/defines_d.html +++ b/docs/search/defines_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_e.html b/docs/search/defines_e.html index 204980e7..af1b8bd5 100644 --- a/docs/search/defines_e.html +++ b/docs/search/defines_e.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/defines_f.html b/docs/search/defines_f.html index 819402b4..b7898f3c 100644 --- a/docs/search/defines_f.html +++ b/docs/search/defines_f.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enums_0.html b/docs/search/enums_0.html index 912f13fa..0bb1abdf 100644 --- a/docs/search/enums_0.html +++ b/docs/search/enums_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enums_0.js b/docs/search/enums_0.js index 96c1c4c2..1082c606 100644 --- a/docs/search/enums_0.js +++ b/docs/search/enums_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['componenttype',['ComponentType',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0',1,'Component.h']]] + ['componenttype',['ComponentType',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0',1,'ComponentType.h']]] ]; diff --git a/docs/search/enums_1.html b/docs/search/enums_1.html index 40c66c03..352f718d 100644 --- a/docs/search/enums_1.html +++ b/docs/search/enums_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enums_2.html b/docs/search/enums_2.html index 7c277969..92b8ebd6 100644 --- a/docs/search/enums_2.html +++ b/docs/search/enums_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_0.html b/docs/search/enumvalues_0.html index dd83ed86..59c2a0d3 100644 --- a/docs/search/enumvalues_0.html +++ b/docs/search/enumvalues_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_0.js b/docs/search/enumvalues_0.js index f43401d7..66c54130 100644 --- a/docs/search/enumvalues_0.js +++ b/docs/search/enumvalues_0.js @@ -1,6 +1,6 @@ var searchData= [ - ['ai_5fgo_5fdown',['AI_GO_DOWN',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a66311755e55435530832af716d0ff7c9',1,'Component.h']]], + ['ai_5fgo_5fdown',['AI_GO_DOWN',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a66311755e55435530832af716d0ff7c9',1,'ComponentType.h']]], ['arquitet',['ARQUITET',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268eab5238f076f77f4e693c3182d85faa4f3',1,'Enemy.h']]], ['art',['ART',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea0d0ff84679ceb6728f823dff7e2ebe51',1,'Enemy.h']]], ['arts',['ARTS',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174a5d359c59acf95d0a674fe1971f2f6730',1,'Tower']]] diff --git a/docs/search/enumvalues_1.html b/docs/search/enumvalues_1.html index 58be88df..1c0ed2f7 100644 --- a/docs/search/enumvalues_1.html +++ b/docs/search/enumvalues_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_2.html b/docs/search/enumvalues_2.html index 3b460a2d..ea3d69eb 100644 --- a/docs/search/enumvalues_2.html +++ b/docs/search/enumvalues_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_2.js b/docs/search/enumvalues_2.js index a2e6b0d0..e2422db3 100644 --- a/docs/search/enumvalues_2.js +++ b/docs/search/enumvalues_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['component_5ftype_5fsize',['COMPONENT_TYPE_SIZE',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a0afded8a801f33f6a572853b4bffa17b',1,'Component.h']]], + ['component_5ftype_5fsize',['COMPONENT_TYPE_SIZE',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a0afded8a801f33f6a572853b4bffa17b',1,'ComponentType.h']]], ['computation',['COMPUTATION',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174ab86334aefa7228ebf61c4f4a42f69bee',1,'Tower']]] ]; diff --git a/docs/search/enumvalues_3.html b/docs/search/enumvalues_3.html index 07e1e9a0..8d55b4e2 100644 --- a/docs/search/enumvalues_3.html +++ b/docs/search/enumvalues_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_3.js b/docs/search/enumvalues_3.js index 9f1109e0..c16334a4 100644 --- a/docs/search/enumvalues_3.js +++ b/docs/search/enumvalues_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['drag_5fand_5fdrop',['DRAG_AND_DROP',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0ae768970fdd777e1da6c8ac0985b2e3f0',1,'Component.h']]] + ['drag_5fand_5fdrop',['DRAG_AND_DROP',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0ae768970fdd777e1da6c8ac0985b2e3f0',1,'ComponentType.h']]] ]; diff --git a/docs/search/enumvalues_4.html b/docs/search/enumvalues_4.html index 3baebf22..ed4a2dc8 100644 --- a/docs/search/enumvalues_4.html +++ b/docs/search/enumvalues_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_5.html b/docs/search/enumvalues_5.html index 998f17a5..75d8bfb1 100644 --- a/docs/search/enumvalues_5.html +++ b/docs/search/enumvalues_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_5.js b/docs/search/enumvalues_5.js index c0707cf9..9b542279 100644 --- a/docs/search/enumvalues_5.js +++ b/docs/search/enumvalues_5.js @@ -1,5 +1,5 @@ var searchData= [ - ['hit_5fpoints',['HIT_POINTS',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a1c285fd3d6debf0339a8c8564d5abaeb',1,'Component.h']]], + ['hit_5fpoints',['HIT_POINTS',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a1c285fd3d6debf0339a8c8564d5abaeb',1,'ComponentType.h']]], ['hostile',['HOSTILE',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea5e344b55f70ed8001ac9e7bb5d226851',1,'Enemy.h']]] ]; diff --git a/docs/search/enumvalues_6.html b/docs/search/enumvalues_6.html index ea05693d..4bd34917 100644 --- a/docs/search/enumvalues_6.html +++ b/docs/search/enumvalues_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_7.html b/docs/search/enumvalues_7.html index a73cafc3..e6ab61b8 100644 --- a/docs/search/enumvalues_7.html +++ b/docs/search/enumvalues_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_8.html b/docs/search/enumvalues_8.html index 70ef9dfe..88f8015a 100644 --- a/docs/search/enumvalues_8.html +++ b/docs/search/enumvalues_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_9.html b/docs/search/enumvalues_9.html index 33fd47d2..dec2236c 100644 --- a/docs/search/enumvalues_9.html +++ b/docs/search/enumvalues_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_9.js b/docs/search/enumvalues_9.js index da3248ee..afd32fb5 100644 --- a/docs/search/enumvalues_9.js +++ b/docs/search/enumvalues_9.js @@ -1,7 +1,7 @@ var searchData= [ ['shared',['SHARED',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a9c46e16a4ab019339596acadeefc8c53',1,'Text.h']]], - ['size',['SIZE',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a4aa71180778b711338785695df5d7c52',1,'Component.h']]], + ['size',['SIZE',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a4aa71180778b711338785695df5d7c52',1,'ComponentType.h']]], ['sociology',['SOCIOLOGY',['../classTower.html#a2a6d5a7ae2af5e4481abcb2d3b535174a7aed30226b0e67c35e6387a9701d0180',1,'Tower']]], ['solid',['SOLID',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a1b45f84e1f6603b52e5ef442836df9af',1,'Text.h']]] ]; diff --git a/docs/search/enumvalues_a.html b/docs/search/enumvalues_a.html index 97ddbde1..9f57daea 100644 --- a/docs/search/enumvalues_a.html +++ b/docs/search/enumvalues_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/enumvalues_a.js b/docs/search/enumvalues_a.js index d8926a15..47ed2b5e 100644 --- a/docs/search/enumvalues_a.js +++ b/docs/search/enumvalues_a.js @@ -1,4 +1,4 @@ var searchData= [ - ['wave_5fmanager',['WAVE_MANAGER',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a3aaf870ecb3dda4b45be77230383a524',1,'Component.h']]] + ['wave_5fmanager',['WAVE_MANAGER',['../ComponentType_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a3aaf870ecb3dda4b45be77230383a524',1,'ComponentType.h']]] ]; diff --git a/docs/search/files_0.html b/docs/search/files_0.html index e88cfb7e..354ee3b3 100644 --- a/docs/search/files_0.html +++ b/docs/search/files_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_1.html b/docs/search/files_1.html index 1c7c3bdc..fad688de 100644 --- a/docs/search/files_1.html +++ b/docs/search/files_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_1.js b/docs/search/files_1.js index f238b962..2a84980e 100644 --- a/docs/search/files_1.js +++ b/docs/search/files_1.js @@ -6,5 +6,6 @@ var searchData= ['color_2ecpp',['Color.cpp',['../Color_8cpp.html',1,'']]], ['color_2eh',['Color.h',['../Color_8h.html',1,'']]], ['component_2ecpp',['Component.cpp',['../Component_8cpp.html',1,'']]], - ['component_2eh',['Component.h',['../Component_8h.html',1,'']]] + ['component_2eh',['Component.h',['../Component_8h.html',1,'']]], + ['componenttype_2eh',['ComponentType.h',['../ComponentType_8h.html',1,'']]] ]; diff --git a/docs/search/files_2.html b/docs/search/files_2.html index 0c3a6796..47752f5c 100644 --- a/docs/search/files_2.html +++ b/docs/search/files_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_3.html b/docs/search/files_3.html index fd2c23a7..7a5f891a 100644 --- a/docs/search/files_3.html +++ b/docs/search/files_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_3.js b/docs/search/files_3.js index fbad3ee3..9389cbf7 100644 --- a/docs/search/files_3.js +++ b/docs/search/files_3.js @@ -1,6 +1,5 @@ var searchData= [ - ['emptygameobject_2eh',['emptyGameObject.h',['../emptyGameObject_8h.html',1,'(Namespace global)'],['../EmptyGameObject_8h.html',1,'(Namespace global)']]], ['endstate_2ecpp',['EndState.cpp',['../EndState_8cpp.html',1,'']]], ['endstate_2eh',['EndState.h',['../EndState_8h.html',1,'']]], ['endstatedata_2ecpp',['EndStateData.cpp',['../EndStateData_8cpp.html',1,'']]], diff --git a/docs/search/files_4.html b/docs/search/files_4.html index f97fb72e..f253167f 100644 --- a/docs/search/files_4.html +++ b/docs/search/files_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_5.html b/docs/search/files_5.html index 508a9728..b40e2835 100644 --- a/docs/search/files_5.html +++ b/docs/search/files_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_6.html b/docs/search/files_6.html index 50a8c277..ce886070 100644 --- a/docs/search/files_6.html +++ b/docs/search/files_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_7.html b/docs/search/files_7.html index 0425f893..edcbfb1c 100644 --- a/docs/search/files_7.html +++ b/docs/search/files_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_8.html b/docs/search/files_8.html index 9e9f9be8..72fa813e 100644 --- a/docs/search/files_8.html +++ b/docs/search/files_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_9.html b/docs/search/files_9.html index 1dc4ef63..00fcab44 100644 --- a/docs/search/files_9.html +++ b/docs/search/files_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_a.html b/docs/search/files_a.html index 49af28d6..91f989ad 100644 --- a/docs/search/files_a.html +++ b/docs/search/files_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_b.html b/docs/search/files_b.html index 2e7208f1..74c8aba4 100644 --- a/docs/search/files_b.html +++ b/docs/search/files_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/files_c.html b/docs/search/files_c.html index 680bd816..6f42fc30 100644 --- a/docs/search/files_c.html +++ b/docs/search/files_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_0.html b/docs/search/functions_0.html index 5c9991f4..acc7ebd7 100644 --- a/docs/search/functions_0.html +++ b/docs/search/functions_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_0.js b/docs/search/functions_0.js index ce3e9268..8e43c273 100644 --- a/docs/search/functions_0.js +++ b/docs/search/functions_0.js @@ -1,6 +1,7 @@ var searchData= [ ['actionmanager',['ActionManager',['../classActionManager.html#a7d0c405d568795fba0c51f411e77b821',1,'ActionManager']]], + ['addcomponent',['AddComponent',['../classGameObject.html#a6de86477e37962bcd4738b09c1c706aa',1,'GameObject']]], ['addobject',['AddObject',['../classState.html#a431d5f711e028c788a9fdccaf99ff74e',1,'State']]], ['aigodown',['AIGoDown',['../classAIGoDown.html#a90facabcd1e46257246a23f3611d9aef',1,'AIGoDown']]], ['animation',['Animation',['../classAnimation.html#a48d3ca5ecd4b4ca7f2f6fe10cf1f91d4',1,'Animation']]], diff --git a/docs/search/functions_1.html b/docs/search/functions_1.html index 6a368e68..a6935160 100644 --- a/docs/search/functions_1.html +++ b/docs/search/functions_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_10.html b/docs/search/functions_10.html index 6c7aad12..7b947d27 100644 --- a/docs/search/functions_10.html +++ b/docs/search/functions_10.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_10.js b/docs/search/functions_10.js index 8fbe3457..4911767e 100644 --- a/docs/search/functions_10.js +++ b/docs/search/functions_10.js @@ -4,10 +4,12 @@ var searchData= ['readweightdata',['ReadWeightData',['../classGameResources.html#a60015c6dfd57e0ecfd01788c9af0a018',1,'GameResources']]], ['rect',['Rect',['../classRect.html#a62fb6094640e8a5a9969382d404e9d5e',1,'Rect::Rect(void)'],['../classRect.html#a21e3f21b1579b6aea19ea88d89c019ef',1,'Rect::Rect(float x, float y, float w, float h)']]], ['remaketexture',['RemakeTexture',['../classText.html#a5c794eef4ba7e0bd09a3039835f30e48',1,'Text']]], - ['render',['Render',['../classAnimation.html#a49749e3890cec3896e6f726323544c26',1,'Animation::Render()'],['../classGameObject.html#a976b9c0d72212389603802f95b3f3424',1,'GameObject::Render()'],['../classSprite.html#a9616074e0c4bc0c1e1285299c5dd63fe',1,'Sprite::Render()'],['../classState.html#ad1f023e61676d0cef92afbaba48ec7ca',1,'State::Render()'],['../classText.html#af32d96322e20f25f1a4ee99369d08a95',1,'Text::Render()'],['../classTileMap.html#a43569e73246f2b5253c537a12051ac90',1,'TileMap::Render()'],['../classTileSet.html#aa29b133eeedd4f9e63199e264cb931eb',1,'TileSet::Render()'],['../classEmptyGameObject.html#aa8f9d14b3814e1866b8dbfc7f85be02d',1,'EmptyGameObject::Render()'],['../classEndState.html#a1c876f3d062547988ac482f9c84d4b14',1,'EndState::Render()'],['../classEnemy.html#a85bf0c4d8e040cb7ac54b143d30ae30a',1,'Enemy::Render()'],['../classStageState.html#a6539a58d85b9367d6c027c3348f1b538',1,'StageState::Render()'],['../classTitleState.html#a5b7c34e4f33459f93e2b9f4bc95d83cf',1,'TitleState::Render()'],['../classTower.html#af9739625d2aa34927cb674cd0cec89d4',1,'Tower::Render()']]], + ['removecomponent',['RemoveComponent',['../classGameObject.html#ae165e3efb132b4a8ea2d666ae261bb31',1,'GameObject']]], + ['removego',['RemoveGO',['../classTileMap.html#a911e2833ea395e1c5b67d3fadbc84b9d',1,'TileMap::RemoveGO(int position)'],['../classTileMap.html#aafae8f5c077ee78cd8d9fc471ba6c82b',1,'TileMap::RemoveGO(void)']]], + ['render',['Render',['../classAnimation.html#a49749e3890cec3896e6f726323544c26',1,'Animation::Render()'],['../classGameObject.html#a29a3419ec8937f569294cd37bcad465c',1,'GameObject::Render()'],['../classSprite.html#a9616074e0c4bc0c1e1285299c5dd63fe',1,'Sprite::Render()'],['../classState.html#ad1f023e61676d0cef92afbaba48ec7ca',1,'State::Render()'],['../classText.html#af32d96322e20f25f1a4ee99369d08a95',1,'Text::Render()'],['../classTileMap.html#a43569e73246f2b5253c537a12051ac90',1,'TileMap::Render()'],['../classTileSet.html#aa29b133eeedd4f9e63199e264cb931eb',1,'TileSet::Render()'],['../classEndState.html#a1c876f3d062547988ac482f9c84d4b14',1,'EndState::Render()'],['../classEnemy.html#a85bf0c4d8e040cb7ac54b143d30ae30a',1,'Enemy::Render()'],['../classStageState.html#a6539a58d85b9367d6c027c3348f1b538',1,'StageState::Render()'],['../classTitleState.html#a5b7c34e4f33459f93e2b9f4bc95d83cf',1,'TitleState::Render()'],['../classTower.html#af9739625d2aa34927cb674cd0cec89d4',1,'Tower::Render()']]], ['renderarray',['RenderArray',['../classState.html#adabbfa20facdc24fa26e5813fd0af78a',1,'State']]], ['renderlayer',['RenderLayer',['../classTileMap.html#aa87fcf8c31e0730c3a969a7e9abf838a',1,'TileMap']]], - ['requestdelete',['RequestDelete',['../classAnimation.html#a59a64eaf59c06a25c78ae8702471bcb8',1,'Animation::RequestDelete()'],['../classGameObject.html#a46d006abbf903f075293cecb59a9dbea',1,'GameObject::RequestDelete()'],['../classEmptyGameObject.html#a494a837da78f42c6cb8e2352f0ec7f46',1,'EmptyGameObject::RequestDelete()'],['../classEnemy.html#a838f09716c8d78ef556a91beab886c74',1,'Enemy::RequestDelete()'],['../classTower.html#a27805c8845e1064625b01f44a7739b64',1,'Tower::RequestDelete()']]], + ['requestdelete',['RequestDelete',['../classAnimation.html#a59a64eaf59c06a25c78ae8702471bcb8',1,'Animation::RequestDelete()'],['../classGameObject.html#a5735ccbb4713c770acee8afd0fa604a7',1,'GameObject::RequestDelete()'],['../classEnemy.html#a9ab39adfb148fa2e09b5a50f1c930304',1,'Enemy::RequestDelete()'],['../classTower.html#a27805c8845e1064625b01f44a7739b64',1,'Tower::RequestDelete()']]], ['resources',['Resources',['../classResources.html#ab09435991b8c485f92e0aa1fd00828b9',1,'Resources']]], ['restart',['Restart',['../classTimer.html#abd8c2f405fff4f81f39e651a362b4f60',1,'Timer']]], ['resume',['Resume',['../classState.html#ac6d3f8b50530eec89e1344bab93f1006',1,'State::Resume()'],['../classEndState.html#a27e54374f84da806d7bd8bfc985d41b9',1,'EndState::Resume()'],['../classStageState.html#a1ca42c08929c560284b04a08362e0c8c',1,'StageState::Resume()'],['../classTitleState.html#a97e07af49ceb37c838f435f8f12f0ce1',1,'TitleState::Resume()']]], diff --git a/docs/search/functions_11.html b/docs/search/functions_11.html index d6cc5752..3e296fd0 100644 --- a/docs/search/functions_11.html +++ b/docs/search/functions_11.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_11.js b/docs/search/functions_11.js index d5bbb879..57dc2cb2 100644 --- a/docs/search/functions_11.js +++ b/docs/search/functions_11.js @@ -32,7 +32,7 @@ var searchData= ['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)']]], - ['spawnenemy',['SpawnEnemy',['../classStageState.html#a5812a63278bc2f2f911795f0184f1588',1,'StageState::SpawnEnemy()'],['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager::SpawnEnemy()']]], + ['spawnenemy',['SpawnEnemy',['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager']]], ['sprite',['Sprite',['../classSprite.html#abee3d268d8e467d9e23bfe0693e64144',1,'Sprite::Sprite(void)'],['../classSprite.html#a944623d99293e5b8c7d06d12cd727fda',1,'Sprite::Sprite(std::string file, bool highlighted=false, float frameTime=1, int frameCount=1)']]], ['stagestate',['StageState',['../classStageState.html#a83447a9a485bd3cf9f2c0d293343ec42',1,'StageState']]], ['startaction',['StartAction',['../classActionManager.html#ae3da833a8f3d476ba588a9ed7e61aeac',1,'ActionManager']]], diff --git a/docs/search/functions_12.html b/docs/search/functions_12.html index 652c4d35..e955ea1c 100644 --- a/docs/search/functions_12.html +++ b/docs/search/functions_12.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_12.js b/docs/search/functions_12.js index bba6d0a4..35bd5002 100644 --- a/docs/search/functions_12.js +++ b/docs/search/functions_12.js @@ -5,5 +5,5 @@ var searchData= ['tileset',['TileSet',['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet']]], ['timer',['Timer',['../classTimer.html#af866f8d58d5ed1da7a0c61df4975be3e',1,'Timer']]], ['titlestate',['TitleState',['../classTitleState.html#a0694f4ac042f6baf1516c26e7385a570',1,'TitleState']]], - ['tower',['Tower',['../classTower.html#a8528ad4b2a06e51f84a2dcb30b37f601',1,'Tower']]] + ['tower',['Tower',['../classTower.html#ac491a13008b4cccadab89d00c0eabb7b',1,'Tower']]] ]; diff --git a/docs/search/functions_13.html b/docs/search/functions_13.html index f2550bb5..7a903254 100644 --- a/docs/search/functions_13.html +++ b/docs/search/functions_13.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_13.js b/docs/search/functions_13.js index 540577d4..09c1b5ff 100644 --- a/docs/search/functions_13.js +++ b/docs/search/functions_13.js @@ -2,7 +2,7 @@ var searchData= [ ['unfollow',['Unfollow',['../classCamera.html#aa9ca7decdebf7147c9d6dc747e7d59e9',1,'Camera']]], ['uparrowaction',['UpArrowAction',['../classActionManager.html#adfe15b32de9e9c3fab2e288c8c1d7c33',1,'ActionManager']]], - ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classEmptyGameObject.html#afeb72a98f8afd1c41edd14d2bcb6fad2',1,'EmptyGameObject::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()'],['../classTower.html#a989f960c934ba7678606bb0a635c21ef',1,'Tower::Update()'],['../classWaveManager.html#af03a0b16b8649875d370ecd97b607ebc',1,'WaveManager::Update()']]], + ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#ab26a16410c9065c8fb97cb005e8f16ab',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()'],['../classTower.html#a989f960c934ba7678606bb0a635c21ef',1,'Tower::Update()'],['../classWaveManager.html#af03a0b16b8649875d370ecd97b607ebc',1,'WaveManager::Update()']]], ['updatearray',['UpdateArray',['../classState.html#abb605ec5fe585d227fbf267e0e6c80a9',1,'State']]], ['updatestack',['UpdateStack',['../classGame.html#ae67b3fda973e4b05513d02c968b0ac17',1,'Game']]] ]; diff --git a/docs/search/functions_14.html b/docs/search/functions_14.html index c7ec3750..b6f5fe09 100644 --- a/docs/search/functions_14.html +++ b/docs/search/functions_14.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_15.html b/docs/search/functions_15.html index 314602fd..93c22ff1 100644 --- a/docs/search/functions_15.html +++ b/docs/search/functions_15.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_16.html b/docs/search/functions_16.html index eeee13d3..e9230bc3 100644 --- a/docs/search/functions_16.html +++ b/docs/search/functions_16.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_17.html b/docs/search/functions_17.html index d99fd313..5ca352ca 100644 --- a/docs/search/functions_17.html +++ b/docs/search/functions_17.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_17.js b/docs/search/functions_17.js index cdb8ceab..fa1ce143 100644 --- a/docs/search/functions_17.js +++ b/docs/search/functions_17.js @@ -1,7 +1,6 @@ var searchData= [ ['_7ecomponent',['~Component',['../classComponent.html#ae18722fd3bbb40cef7daf1b94aabb397',1,'Component']]], - ['_7eemptygameobject',['~EmptyGameObject',['../classEmptyGameObject.html#a510f01a12592696921676200f125e3eb',1,'EmptyGameObject::~EmptyGameObject()'],['../classemptyGameObject.html#adc185127883e58d732e38a1796977f4e',1,'emptyGameObject::~emptyGameObject()']]], ['_7eenemy',['~Enemy',['../classEnemy.html#ac0eec4755e28c02688065f9657150ac3',1,'Enemy']]], ['_7egame',['~Game',['../classGame.html#ae3d112ca6e0e55150d2fdbc704474530',1,'Game']]], ['_7egameobject',['~GameObject',['../classGameObject.html#a3b086987a48c14ebe80939bd66d5f1c8',1,'GameObject']]], diff --git a/docs/search/functions_2.html b/docs/search/functions_2.html index 8d8e80fc..c89c8628 100644 --- a/docs/search/functions_2.html +++ b/docs/search/functions_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_3.html b/docs/search/functions_3.html index 8cb1466d..22b84413 100644 --- a/docs/search/functions_3.html +++ b/docs/search/functions_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_3.js b/docs/search/functions_3.js index 026ed3b5..37f41311 100644 --- a/docs/search/functions_3.js +++ b/docs/search/functions_3.js @@ -4,5 +4,5 @@ var searchData= ['distanceto',['DistanceTo',['../classVec2.html#aaf7c998a9f97f4a79e3900289ac566e0',1,'Vec2']]], ['dot',['Dot',['../classCollision.html#a8e858eea6ac033ac5e2a31946618c5c4',1,'Collision']]], ['downarrowaction',['DownArrowAction',['../classActionManager.html#a4e532467961545ed717e59158ea89990',1,'ActionManager']]], - ['draganddrop',['DragAndDrop',['../classDragAndDrop.html#ae8bf1e903ebaceb56405f9ff26020c0b',1,'DragAndDrop']]] + ['draganddrop',['DragAndDrop',['../classDragAndDrop.html#a4beb9046fb1c7055799ca5705ef49e92',1,'DragAndDrop']]] ]; diff --git a/docs/search/functions_4.html b/docs/search/functions_4.html index 0f9e1ce2..9ff8609e 100644 --- a/docs/search/functions_4.html +++ b/docs/search/functions_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_4.js b/docs/search/functions_4.js index 501d8a7c..2222fa7d 100644 --- a/docs/search/functions_4.js +++ b/docs/search/functions_4.js @@ -1,6 +1,5 @@ var searchData= [ - ['emptygameobject',['EmptyGameObject',['../classEmptyGameObject.html#ac3590d6e9f0a10036903fa4f063ab164',1,'EmptyGameObject::EmptyGameObject()'],['../classemptyGameObject.html#ac31c7c7a23729ac8d5a078dde77e201f',1,'emptyGameObject::emptyGameObject()']]], ['endstate',['EndState',['../classEndState.html#a14303ccf71d755d28f5a0e79f40c69b4',1,'EndState']]], ['endstatedata',['EndStateData',['../classEndStateData.html#a3193e460f24f5cbd1098030864c75ddc',1,'EndStateData::EndStateData(bool playerVictory)'],['../classEndStateData.html#a3193e460f24f5cbd1098030864c75ddc',1,'EndStateData::EndStateData(bool playerVictory)']]], ['endwave',['EndWave',['../classWaveManager.html#a50348ec5262024b3f5386f849bf02172',1,'WaveManager']]], diff --git a/docs/search/functions_5.html b/docs/search/functions_5.html index b5cf850f..952376f0 100644 --- a/docs/search/functions_5.html +++ b/docs/search/functions_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_6.html b/docs/search/functions_6.html index b23d55a3..6ae30ebc 100644 --- a/docs/search/functions_6.html +++ b/docs/search/functions_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_6.js b/docs/search/functions_6.js index 00999c19..91910ff2 100644 --- a/docs/search/functions_6.js +++ b/docs/search/functions_6.js @@ -13,6 +13,7 @@ var searchData= ['getenemiesleft',['GetEnemiesLeft',['../classWaveManager.html#a7cefa420665f27cfbec19c34fbdba628',1,'WaveManager']]], ['getenemytypefromstring',['GetEnemyTypeFromString',['../classGameResources.html#af464a5b36f51029efbdc0eabf1ed89c9',1,'GameResources']]], ['getfont',['GetFont',['../classResources.html#a661a92ea82fb73e31092059d6fc383c3',1,'Resources']]], + ['getgo',['GetGO',['../classTileMap.html#a4694be5ef653fd6c67c9c045918c3c77',1,'TileMap']]], ['getheight',['GetHeight',['../classSprite.html#a2a5a7c73dd94f822b0a248de3621e5eb',1,'Sprite::GetHeight()'],['../classTileMap.html#a9fe48260088655aa252b4d40e60f1390',1,'TileMap::GetHeight()']]], ['getimage',['GetImage',['../classResources.html#a557aa346c974a8bce80017dbabd653d9',1,'Resources']]], ['getinstance',['GetInstance',['../classGame.html#a25d213802ed39215e3ab2cb04edf46c8',1,'Game::GetInstance()'],['../classInputManager.html#a1f095ed502f0bd09390d05cdc0acdcd9',1,'InputManager::GetInstance()']]], @@ -40,6 +41,6 @@ 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#a686136f4cf17c54345a7d28187b25893',1,'GameObject::GetWorldRenderedRect()'],['../classEmptyGameObject.html#a5f41e1fb299bf9b13d7cd68a88530fc5',1,'EmptyGameObject::GetWorldRenderedRect()'],['../classEnemy.html#ac7f63bc4fdfa5cf88f85eec8e9053df2',1,'Enemy::GetWorldRenderedRect()'],['../classTower.html#a70062b0fd7a5cc0f255173c93b431f99',1,'Tower::GetWorldRenderedRect()']]], + ['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']]] ]; diff --git a/docs/search/functions_7.html b/docs/search/functions_7.html index 809189f3..43f67184 100644 --- a/docs/search/functions_7.html +++ b/docs/search/functions_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_8.html b/docs/search/functions_8.html index da46f52f..52c9cfc3 100644 --- a/docs/search/functions_8.html +++ b/docs/search/functions_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_8.js b/docs/search/functions_8.js index 6814e735..bb0a471f 100644 --- a/docs/search/functions_8.js +++ b/docs/search/functions_8.js @@ -2,17 +2,20 @@ var searchData= [ ['inclination',['Inclination',['../classVec2.html#a416d5d762750e1392139242fdcedb952',1,'Vec2::Inclination(void) const '],['../classVec2.html#afdc96d9f65aa822008b9cabc1f571747',1,'Vec2::Inclination(Vec2 const &b) const ']]], ['inputmanager',['InputManager',['../classInputManager.html#a8be46886da639b26d67181c29dab6d6c',1,'InputManager']]], - ['insertgo',['InsertGO',['../classTileMap.html#a9370c61beefad2f657c022a0a2462336',1,'TileMap']]], - ['is',['Is',['../classAIGoDown.html#a3bc05633c885a17df20237b21eef67f2',1,'AIGoDown::Is()'],['../classAnimation.html#a166f36012f3092275648a74272e8ff0f',1,'Animation::Is()'],['../classComponent.html#a81f861605b8c887e7634e56424c21a2a',1,'Component::Is()'],['../classDragAndDrop.html#aa85e00937c061a0870dec8cb8b88832a',1,'DragAndDrop::Is()'],['../classGameObject.html#a3ddba599a800d774463c7082b7ef4801',1,'GameObject::Is()'],['../classHitPoints.html#a40320d864738f749dc4b8c012acdcc67',1,'HitPoints::Is()'],['../classStateData.html#a63b33546d704a06bf8f9df6b0590eae4',1,'StateData::Is()'],['../classEmptyGameObject.html#a8e1cfd111921c89b4a4a7d54c5b62875',1,'EmptyGameObject::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()'],['../classEnemy.html#a029a0d93da4adf4f638c47a84c41803b',1,'Enemy::Is()'],['../classTower.html#ad7d3cb08eafeb8350ee3292748862481',1,'Tower::Is()'],['../classWaveManager.html#a1f7b6ac70478d5ce9543cc988e6f5a10',1,'WaveManager::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()']]], + ['insertgo',['InsertGO',['../classTileMap.html#a9370c61beefad2f657c022a0a2462336',1,'TileMap::InsertGO(GameObject *obj)'],['../classTileMap.html#a916d38c429fe9d66b92c2687656c0e3c',1,'TileMap::InsertGO(GameObject *obj, Vec2 initialPos)']]], + ['is',['Is',['../classAIGoDown.html#a3bc05633c885a17df20237b21eef67f2',1,'AIGoDown::Is()'],['../classAnimation.html#a166f36012f3092275648a74272e8ff0f',1,'Animation::Is()'],['../classComponent.html#a81f861605b8c887e7634e56424c21a2a',1,'Component::Is()'],['../classDragAndDrop.html#aa85e00937c061a0870dec8cb8b88832a',1,'DragAndDrop::Is()'],['../classGameObject.html#a3c4f6a6becd8452063e5064c44426442',1,'GameObject::Is()'],['../classHitPoints.html#a40320d864738f749dc4b8c012acdcc67',1,'HitPoints::Is()'],['../classStateData.html#a63b33546d704a06bf8f9df6b0590eae4',1,'StateData::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()'],['../classEnemy.html#a029a0d93da4adf4f638c47a84c41803b',1,'Enemy::Is()'],['../classTower.html#ad7d3cb08eafeb8350ee3292748862481',1,'Tower::Is()'],['../classWaveManager.html#a1f7b6ac70478d5ce9543cc988e6f5a10',1,'WaveManager::Is()'],['../classEndStateData.html#abce01a73395040307914a4aa62741463',1,'EndStateData::Is()']]], ['isbuttondown',['IsButtonDown',['../classInputManager.html#ae8ab294770c3c7cedf5c7dcc59bb08d5',1,'InputManager']]], + ['isbuttonup',['IsButtonUp',['../classInputManager.html#adfe35729c6567be8627d84d4d014be58',1,'InputManager']]], ['iscolliding',['IsColliding',['../classCollision.html#a8bfb131379c86c409bf38c68ef25fae6',1,'Collision']]], ['iscontrollersticking',['IsControllerSticking',['../classInputManager.html#af7ad4c0ebb3f3dc902805feae8e0cff2',1,'InputManager']]], - ['isdead',['IsDead',['../classAnimation.html#ad1eaa9ff240cbcc114270ea174523702',1,'Animation::IsDead()'],['../classGameObject.html#a076afa2ea9190c49046f86a0946b4543',1,'GameObject::IsDead()'],['../classEmptyGameObject.html#a3bfcdf5cebf0b57ed941c326b69f3add',1,'EmptyGameObject::IsDead()'],['../classEnemy.html#ae5a8c620daad853579894fb72af5279e',1,'Enemy::IsDead()'],['../classTower.html#af187931f0dab9b34b18bd152a1d00484',1,'Tower::IsDead()']]], + ['isdead',['IsDead',['../classAnimation.html#ad1eaa9ff240cbcc114270ea174523702',1,'Animation::IsDead()'],['../classGameObject.html#a64489eaccea42957d3aa8c33d1fa16ba',1,'GameObject::IsDead()'],['../classEnemy.html#ae5a8c620daad853579894fb72af5279e',1,'Enemy::IsDead()'],['../classTower.html#af187931f0dab9b34b18bd152a1d00484',1,'Tower::IsDead()']]], ['isframeratelimited',['IsFramerateLimited',['../classGame.html#a3cee416ca88d258ceeab7c0eb3331b69',1,'Game']]], ['isinrect',['IsInRect',['../classVec2.html#a788dc85f57e20be80e85543e6996a4f1',1,'Vec2']]], ['iskeydown',['IsKeyDown',['../classInputManager.html#a97d25d372ab28dbc119b5a0919e38244',1,'InputManager']]], + ['iskeyup',['IsKeyUp',['../classInputManager.html#a0b9ab4448dcc8a220147bec9d44d6e23',1,'InputManager']]], ['ismousedown',['IsMouseDown',['../classInputManager.html#a410c6f6a0fa13dfd938d6d26a524fc19',1,'InputManager']]], ['ismousescrolling',['IsMouseScrolling',['../classInputManager.html#aeb81e9386db70d1cc204e45963ec9077',1,'InputManager']]], + ['ismouseup',['IsMouseUp',['../classInputManager.html#a97d0df155dc07d57b4f7c9e7f66b0f2e',1,'InputManager']]], ['isopen',['IsOpen',['../classMusic.html#a7dd0d191e358d600f0ea8a1db75f833d',1,'Music::IsOpen()'],['../classSound.html#ac9de1bdc5b8c1857140a279990803394',1,'Sound::IsOpen()'],['../classSprite.html#a9f1e62573dd91cb03dbad7aa54807b8c',1,'Sprite::IsOpen()']]], ['isshowingcollisioninfo',['IsShowingCollisionInfo',['../classTileMap.html#a9cdb06bdaca86adf9fc179ed5cf7b148',1,'TileMap']]] ]; diff --git a/docs/search/functions_9.html b/docs/search/functions_9.html index 8e89508c..cba1889e 100644 --- a/docs/search/functions_9.html +++ b/docs/search/functions_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_a.html b/docs/search/functions_a.html index 60387eb3..0c450eea 100644 --- a/docs/search/functions_a.html +++ b/docs/search/functions_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_b.html b/docs/search/functions_b.html index b7e2db8e..0bcb6260 100644 --- a/docs/search/functions_b.html +++ b/docs/search/functions_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_c.html b/docs/search/functions_c.html index 42d6c412..0f71ebc9 100644 --- a/docs/search/functions_c.html +++ b/docs/search/functions_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_c.js b/docs/search/functions_c.js index 6552430d..114dfec6 100644 --- a/docs/search/functions_c.js +++ b/docs/search/functions_c.js @@ -2,7 +2,7 @@ var searchData= [ ['norm',['Norm',['../classCollision.html#ab739e01f1393b68b28cb8b45f42bf2d4',1,'Collision']]], ['normalize',['Normalize',['../classVec2.html#ab37a161e393133ba7083d3f9386c0173',1,'Vec2']]], - ['notifycollision',['NotifyCollision',['../classAnimation.html#a611b21418311eb697ec4af1aaff92657',1,'Animation::NotifyCollision()'],['../classGameObject.html#aa627e6c2913983fc5f108c1c4d303eb8',1,'GameObject::NotifyCollision()'],['../classEmptyGameObject.html#ab91c856463a28d1795f73306556a9627',1,'EmptyGameObject::NotifyCollision()'],['../classEnemy.html#a805f30a2ffcc14e4875717ed0cfa58fc',1,'Enemy::NotifyCollision()'],['../classTower.html#a53579fcf0d8d7524ef63e41c8c66b2c5',1,'Tower::NotifyCollision()']]], + ['notifycollision',['NotifyCollision',['../classAnimation.html#a611b21418311eb697ec4af1aaff92657',1,'Animation::NotifyCollision()'],['../classGameObject.html#ab6f7263c38623812def797a179686b90',1,'GameObject::NotifyCollision()'],['../classEnemy.html#a805f30a2ffcc14e4875717ed0cfa58fc',1,'Enemy::NotifyCollision()'],['../classTower.html#a53579fcf0d8d7524ef63e41c8c66b2c5',1,'Tower::NotifyCollision()']]], ['notifyenemygotkilled',['NotifyEnemyGotKilled',['../classWaveManager.html#a565c7b86ea66365e8fbc552c5918ce82',1,'WaveManager']]], ['notifyenemygottohisdestiny',['NotifyEnemyGotToHisDestiny',['../classWaveManager.html#aa19e180ce6afba1fad0b92ab25a3dba5',1,'WaveManager']]] ]; diff --git a/docs/search/functions_d.html b/docs/search/functions_d.html index 9c3dedb4..38ec701b 100644 --- a/docs/search/functions_d.html +++ b/docs/search/functions_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_e.html b/docs/search/functions_e.html index bf05027f..4d09de77 100644 --- a/docs/search/functions_e.html +++ b/docs/search/functions_e.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/functions_f.html b/docs/search/functions_f.html index 540def9e..8abdab97 100644 --- a/docs/search/functions_f.html +++ b/docs/search/functions_f.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/pages_0.html b/docs/search/pages_0.html index bfaa626c..e58f796b 100644 --- a/docs/search/pages_0.html +++ b/docs/search/pages_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/pages_1.html b/docs/search/pages_1.html index f69d161f..747ee2e8 100644 --- a/docs/search/pages_1.html +++ b/docs/search/pages_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/typedefs_0.html b/docs/search/typedefs_0.html index 6b787b63..5d9c3462 100644 --- a/docs/search/typedefs_0.html +++ b/docs/search/typedefs_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/typedefs_1.html b/docs/search/typedefs_1.html index 5b1dfdaa..21777f46 100644 --- a/docs/search/typedefs_1.html +++ b/docs/search/typedefs_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/typedefs_2.html b/docs/search/typedefs_2.html index f8d7bac6..ec099e42 100644 --- a/docs/search/typedefs_2.html +++ b/docs/search/typedefs_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/typedefs_2.js b/docs/search/typedefs_2.js index 3756266a..ca6082fb 100644 --- a/docs/search/typedefs_2.js +++ b/docs/search/typedefs_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['uint',['uint',['../Error_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Error.h'],['../HitPoints_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): HitPoints.h'],['../Enemy_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Enemy.h'],['../Tower_8cpp.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Tower.cpp']]] + ['uint',['uint',['../Error_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Error.h'],['../HitPoints_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): HitPoints.h'],['../Tower_8cpp.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Tower.cpp']]] ]; diff --git a/docs/search/variables_0.html b/docs/search/variables_0.html index 4130da44..23705632 100644 --- a/docs/search/variables_0.html +++ b/docs/search/variables_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_0.js b/docs/search/variables_0.js index 083ead4d..e921abba 100644 --- a/docs/search/variables_0.js +++ b/docs/search/variables_0.js @@ -1,4 +1,5 @@ var searchData= [ - ['alpha',['alpha',['../classSprite.html#ab3e19ec07718672961d355c5e25ef3ee',1,'Sprite']]] + ['alpha',['alpha',['../classSprite.html#ab3e19ec07718672961d355c5e25ef3ee',1,'Sprite']]], + ['associatedinitialpos',['associatedInitialPos',['../classDragAndDrop.html#a8c14587e18912fc4efce09648c33114a',1,'DragAndDrop']]] ]; diff --git a/docs/search/variables_1.html b/docs/search/variables_1.html index d1d18e72..3c2833a1 100644 --- a/docs/search/variables_1.html +++ b/docs/search/variables_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_10.html b/docs/search/variables_10.html index f7f0cd00..fc985e68 100644 --- a/docs/search/variables_10.html +++ b/docs/search/variables_10.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_10.js b/docs/search/variables_10.js index fef6ae81..4b174713 100644 --- a/docs/search/variables_10.js +++ b/docs/search/variables_10.js @@ -1,6 +1,7 @@ var searchData= [ ['r',['r',['../structColor.html#ab9a9c7134511f9b116a6fcc81a303ba6',1,'Color']]], + ['redrag',['redrag',['../classDragAndDrop.html#a6ebcb640a3261c648d2cb73918442956',1,'DragAndDrop']]], ['renderer',['renderer',['../classGame.html#ae5164c37c0dc74cfb56041174017bf57',1,'Game']]], ['rotation',['rotation',['../classGameObject.html#ac55f6ebdf4cfbab508680ad7290fb26c',1,'GameObject']]], ['rows',['rows',['../classTileSet.html#abdfce26ff299e8904107edc22529e28f',1,'TileSet']]] diff --git a/docs/search/variables_11.html b/docs/search/variables_11.html index 98ec3342..5b1b4be6 100644 --- a/docs/search/variables_11.html +++ b/docs/search/variables_11.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_12.html b/docs/search/variables_12.html index 0fedab9d..24b987d0 100644 --- a/docs/search/variables_12.html +++ b/docs/search/variables_12.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_12.js b/docs/search/variables_12.js index 401cb5a6..a0b57154 100644 --- a/docs/search/variables_12.js +++ b/docs/search/variables_12.js @@ -4,7 +4,7 @@ var searchData= ['texttime',['textTime',['../classText.html#a7b4801a20d93b67e9c05fbf763ba282f',1,'Text']]], ['texture',['texture',['../classSprite.html#a9f90b14f1a69209da8babfa6745dc1fe',1,'Sprite::texture()'],['../classText.html#aea2a82ef1d8b4d448b6b3e524bce2cc2',1,'Text::texture()']]], ['tileheight',['tileHeight',['../classTileSet.html#a9409211e1c5560f969b737714be977c0',1,'TileSet']]], - ['tilemap',['tileMap',['../classDragAndDrop.html#a2365d8aea9a5503a49973c0176e96d39',1,'DragAndDrop::tileMap()'],['../classStageState.html#a194fde9f9ee450e63a6f1c94a79f6fc6',1,'StageState::tileMap()'],['../classWaveManager.html#a86c79df82bf76a105a472c879ee91aa9',1,'WaveManager::tileMap()']]], + ['tilemap',['tileMap',['../classDragAndDrop.html#a01c58a8cb41b8a635d1e1d4baf8abd00',1,'DragAndDrop::tileMap()'],['../classStageState.html#a194fde9f9ee450e63a6f1c94a79f6fc6',1,'StageState::tileMap()'],['../classWaveManager.html#a86c79df82bf76a105a472c879ee91aa9',1,'WaveManager::tileMap()']]], ['tilematrix',['tileMatrix',['../classTileMap.html#ac1d3ce0587c4e615682b71fd96295e0e',1,'TileMap']]], ['tileset',['tileSet',['../classTileMap.html#a24b2ea7aecfd795f1e13dfa9b0b3cb76',1,'TileMap::tileSet()'],['../classTileSet.html#adbd7ac102ce306e4f367c32cfa576979',1,'TileSet::tileSet()'],['../classStageState.html#ac1ef17645d0585767eaf96693a88d9bb',1,'StageState::tileSet()']]], ['tilewidth',['tileWidth',['../classTileSet.html#a9ba9087a6da877f78af6cdf9afb0af7c',1,'TileSet']]], diff --git a/docs/search/variables_13.html b/docs/search/variables_13.html index 6fcb1e96..3cfbeccc 100644 --- a/docs/search/variables_13.html +++ b/docs/search/variables_13.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_14.html b/docs/search/variables_14.html index e65a4225..44131cc1 100644 --- a/docs/search/variables_14.html +++ b/docs/search/variables_14.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_15.html b/docs/search/variables_15.html index 7e1ef8e6..74560ed1 100644 --- a/docs/search/variables_15.html +++ b/docs/search/variables_15.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_16.html b/docs/search/variables_16.html index 083d5570..9a272b59 100644 --- a/docs/search/variables_16.html +++ b/docs/search/variables_16.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_17.html b/docs/search/variables_17.html index 1de6ac27..76853d0f 100644 --- a/docs/search/variables_17.html +++ b/docs/search/variables_17.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_2.html b/docs/search/variables_2.html index e13398b6..7e969c3f 100644 --- a/docs/search/variables_2.html +++ b/docs/search/variables_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_3.html b/docs/search/variables_3.html index 64eadbb3..92d3b669 100644 --- a/docs/search/variables_3.html +++ b/docs/search/variables_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_3.js b/docs/search/variables_3.js index efce4720..32c55f6f 100644 --- a/docs/search/variables_3.js +++ b/docs/search/variables_3.js @@ -1,6 +1,6 @@ var searchData= [ - ['dead',['dead',['../classEnemy.html#a4b1b61e7bc79aca01f3e4b3ef19cb787',1,'Enemy']]], + ['dead',['dead',['../classGameObject.html#a69b2c28686d4cce93cf49fa7a8a5cb88',1,'GameObject::dead()'],['../classEnemy.html#a4b1b61e7bc79aca01f3e4b3ef19cb787',1,'Enemy::dead()']]], ['displaycollisioninfo',['displayCollisionInfo',['../classTileMap.html#a513f0605dd5fbd29705099aee423e600',1,'TileMap']]], ['dragonhold',['dragOnHold',['../classDragAndDrop.html#a8dbee0ad51c83c65d7fb3f29e917518b',1,'DragAndDrop']]], ['dt',['dt',['../classGame.html#a5184b0439c5cefb45050d0bfaca9ac97',1,'Game']]] diff --git a/docs/search/variables_4.html b/docs/search/variables_4.html index 709bda97..f838ce87 100644 --- a/docs/search/variables_4.html +++ b/docs/search/variables_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_5.html b/docs/search/variables_5.html index 431e30ba..6e29723e 100644 --- a/docs/search/variables_5.html +++ b/docs/search/variables_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_6.html b/docs/search/variables_6.html index 31afff69..88a3256b 100644 --- a/docs/search/variables_6.html +++ b/docs/search/variables_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_7.html b/docs/search/variables_7.html index 70a1e41f..407e327c 100644 --- a/docs/search/variables_7.html +++ b/docs/search/variables_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_8.html b/docs/search/variables_8.html index 332eb4c3..8c6c360a 100644 --- a/docs/search/variables_8.html +++ b/docs/search/variables_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_8.js b/docs/search/variables_8.js index bbe834c4..dbd79d61 100644 --- a/docs/search/variables_8.js +++ b/docs/search/variables_8.js @@ -4,7 +4,6 @@ var searchData= ['inputmanager',['inputManager',['../classGame.html#a57010b9ce85884e0f4059d8d8474e610',1,'Game::inputManager()'],['../classStageState.html#acbf7ba483ee1ae6fe7d20f22b5c721b3',1,'StageState::inputManager()']]], ['instance',['instance',['../classGame.html#aa469cdc0a30f4fd2d6d99b23f4fbf257',1,'Game']]], ['instruction',['instruction',['../classEndState.html#acbc4bcbbf722307b2ea222b5a85a0e8d',1,'EndState']]], - ['isdragging',['isDragging',['../classDragAndDrop.html#ae70478ad1144137afdf8fefe453379c8',1,'DragAndDrop']]], ['isdraging',['isDraging',['../classTower.html#a7a2b297edf481c2eb2eeaa8a83d20bf8',1,'Tower']]], ['isstrobe',['isStrobe',['../classText.html#a5ebb0b4767c8487d440d9c36ae0c93cd',1,'Text']]] ]; diff --git a/docs/search/variables_9.html b/docs/search/variables_9.html index fa13d0c3..5fd8eb12 100644 --- a/docs/search/variables_9.html +++ b/docs/search/variables_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_a.html b/docs/search/variables_a.html index e713de5a..7e3b130b 100644 --- a/docs/search/variables_a.html +++ b/docs/search/variables_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_b.html b/docs/search/variables_b.html index 8acc916a..3b2aa160 100644 --- a/docs/search/variables_b.html +++ b/docs/search/variables_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_b.js b/docs/search/variables_b.js index 76666494..2289c436 100644 --- a/docs/search/variables_b.js +++ b/docs/search/variables_b.js @@ -4,6 +4,7 @@ var searchData= ['mapheight',['mapHeight',['../classTileMap.html#a8fec89ca278b51de7f3e38831d9fb161',1,'TileMap']]], ['mapwidth',['mapWidth',['../classTileMap.html#ae2361e840eacaebbbbc91541ded00655',1,'TileMap']]], ['maxframerate',['maxFramerate',['../classGame.html#a5424a424548c7bdb04de05c5c836002d',1,'Game']]], + ['maxnumberofenemiesinspawnpoint',['maxNumberOfEnemiesInSpawnPoint',['../classWaveManager.html#a64c49de73005706f16187749699f9d0a',1,'WaveManager']]], ['maxspeed',['maxSpeed',['../classCamera.html#a1f02ea6332c710065fa256ed52acd6f1',1,'Camera']]], ['maxzoom',['maxZoom',['../classCamera.html#af418b7887d39c773d73cb179c497a8da',1,'Camera']]], ['minspeed',['minSpeed',['../classCamera.html#a6c5fe02b8b21a7c9784f970f08b4864a',1,'Camera']]], diff --git a/docs/search/variables_c.html b/docs/search/variables_c.html index 4a23328b..38a93132 100644 --- a/docs/search/variables_c.html +++ b/docs/search/variables_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_c.js b/docs/search/variables_c.js index c2037160..97f6594f 100644 --- a/docs/search/variables_c.js +++ b/docs/search/variables_c.js @@ -1,6 +1,6 @@ var searchData= [ ['name',['name',['../structEnemyData.html#ac9e9c1009aab94258d7c7a290ebd5937',1,'EnemyData']]], - ['nullgameobject',['nullGameObject',['../classStageState.html#a2ce0ac2e7b7bcc09d5b6b98905ae7f0c',1,'StageState']]], + ['nullgameobject',['nullGameObject',['../classStageState.html#ac699412f052e7954008dd7e7feb52e36',1,'StageState']]], ['numberofenemies',['numberOfEnemies',['../structEnemySpawnData.html#ab3ec9a12baad5ddbf06b1bba52768e0d',1,'EnemySpawnData']]] ]; diff --git a/docs/search/variables_d.html b/docs/search/variables_d.html index b6f37be8..b3e7548b 100644 --- a/docs/search/variables_d.html +++ b/docs/search/variables_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_e.html b/docs/search/variables_e.html index 82c5b73b..061adb26 100644 --- a/docs/search/variables_e.html +++ b/docs/search/variables_e.html @@ -1,7 +1,7 @@ - + diff --git a/docs/search/variables_f.html b/docs/search/variables_f.html index c2d548b2..3bffc912 100644 --- a/docs/search/variables_f.html +++ b/docs/search/variables_f.html @@ -1,7 +1,7 @@ - + diff --git a/docs/structColor-members.html b/docs/structColor-members.html index 92319a10..1a24645d 100644 --- a/docs/structColor-members.html +++ b/docs/structColor-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@ - + @@ -97,9 +97,9 @@ diff --git a/docs/structColor.html b/docs/structColor.html index a5547147..29236d50 100644 --- a/docs/structColor.html +++ b/docs/structColor.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Estrutura Color @@ -31,7 +31,7 @@ - + @@ -99,7 +99,8 @@
                                                                                                                                                                                                                      Diagrama de colaboração para Color:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      [legenda]

                                                                                                                                                                                                                      @@ -211,9 +212,9 @@

                                                                                                                                                                                                                      Atributos

                                                                                                                                                                                                                      diff --git a/docs/structColor__coll__graph.md5 b/docs/structColor__coll__graph.md5 index 1f45e805..51204128 100644 --- a/docs/structColor__coll__graph.md5 +++ b/docs/structColor__coll__graph.md5 @@ -1 +1 @@ -505a20342edac1d919da7c3c5fe84735 \ No newline at end of file +989f54a2cd150b36265960824be5ab63 \ No newline at end of file diff --git a/docs/structColor__coll__graph.svg b/docs/structColor__coll__graph.svg index b40a962d..fdf2399b 100644 --- a/docs/structColor__coll__graph.svg +++ b/docs/structColor__coll__graph.svg @@ -1,31 +1,31 @@ - - - + + Color - + Node1 - -Color + +Color Node2 - -unsigned char + +unsigned char Node2->Node1 - - - g -r -b + + + g +r +b diff --git a/docs/structEnemyData-members.html b/docs/structEnemyData-members.html index 5c6289bb..392eaba3 100644 --- a/docs/structEnemyData-members.html +++ b/docs/structEnemyData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -99,9 +99,9 @@ diff --git a/docs/structEnemyData.html b/docs/structEnemyData.html index 4d813bbc..ddb6550d 100644 --- a/docs/structEnemyData.html +++ b/docs/structEnemyData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Estrutura EnemyData @@ -31,7 +31,7 @@ - + @@ -96,7 +96,8 @@
                                                                                                                                                                                                                      Diagrama de colaboração para EnemyData:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      [legenda]

                                                                                                                                                                                                                      @@ -237,9 +238,9 @@

                                                                                                                                                                                                                      Atributos

                                                                                                                                                                                                                      diff --git a/docs/structEnemyData__coll__graph.md5 b/docs/structEnemyData__coll__graph.md5 index 5e5c7cdc..7e31d5a7 100644 --- a/docs/structEnemyData__coll__graph.md5 +++ b/docs/structEnemyData__coll__graph.md5 @@ -1 +1 @@ -6346181624c5f5ddc7861fc1eb563862 \ No newline at end of file +77074c974ab32846d1352b3dfd6caffd \ No newline at end of file diff --git a/docs/structEnemyData__coll__graph.svg b/docs/structEnemyData__coll__graph.svg index 9f2be51b..deda9c96 100644 --- a/docs/structEnemyData__coll__graph.svg +++ b/docs/structEnemyData__coll__graph.svg @@ -1,53 +1,53 @@ - - + EnemyData - + Node1 - -EnemyData + +EnemyData Node2 - -float + +float Node2->Node1 - - - scaleY -scaleX + + + scaleY +scaleX Node3 - -int + +int Node3->Node1 - - - enemyType + + + enemyType Node4 - -string + +string Node4->Node1 - - - spName -name + + + spName +name diff --git a/docs/structEnemySpawnData-members.html b/docs/structEnemySpawnData-members.html index 2f41b5ac..6ca64013 100644 --- a/docs/structEnemySpawnData-members.html +++ b/docs/structEnemySpawnData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -98,9 +98,9 @@ diff --git a/docs/structEnemySpawnData.html b/docs/structEnemySpawnData.html index 092c4e15..0d2ad8a0 100644 --- a/docs/structEnemySpawnData.html +++ b/docs/structEnemySpawnData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Estrutura EnemySpawnData @@ -31,7 +31,7 @@ - + @@ -96,7 +96,8 @@
                                                                                                                                                                                                                      Diagrama de colaboração para EnemySpawnData:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      [legenda]

                                                                                                                                                                                                                      @@ -217,9 +218,9 @@

                                                                                                                                                                                                                      Atributos

                                                                                                                                                                                                                      diff --git a/docs/structEnemySpawnData__coll__graph.md5 b/docs/structEnemySpawnData__coll__graph.md5 index 9c4ca45d..80ff00d5 100644 --- a/docs/structEnemySpawnData__coll__graph.md5 +++ b/docs/structEnemySpawnData__coll__graph.md5 @@ -1 +1 @@ -94c95c7e76829c15f1df88472a6fc917 \ No newline at end of file +cce84426407829c9081b97eeb30a2a96 \ No newline at end of file diff --git a/docs/structEnemySpawnData__coll__graph.svg b/docs/structEnemySpawnData__coll__graph.svg index 9b157ecd..a24f2a98 100644 --- a/docs/structEnemySpawnData__coll__graph.svg +++ b/docs/structEnemySpawnData__coll__graph.svg @@ -1,32 +1,32 @@ - - + EnemySpawnData - + Node1 - -EnemySpawnData + +EnemySpawnData Node2 - -int + +int Node2->Node1 - - - endPoint -baseHP -numberOfEnemies -enemyIndex + + + endPoint +baseHP +numberOfEnemies +enemyIndex diff --git a/docs/structSpawnPointData-members.html b/docs/structSpawnPointData-members.html index 4a24e0b2..2de4e1a3 100644 --- a/docs/structSpawnPointData-members.html +++ b/docs/structSpawnPointData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -94,9 +94,9 @@ diff --git a/docs/structSpawnPointData.html b/docs/structSpawnPointData.html index 02a2a426..47ad9376 100644 --- a/docs/structSpawnPointData.html +++ b/docs/structSpawnPointData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Estrutura SpawnPointData @@ -31,7 +31,7 @@ - + @@ -95,7 +95,8 @@
                                                                                                                                                                                                                      Diagrama de colaboração para SpawnPointData:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      [legenda]

                                                                                                                                                                                                                      @@ -122,9 +123,9 @@

                                                                                                                                                                                                                      Atributos

                                                                                                                                                                                                                      diff --git a/docs/structSpawnPointData__coll__graph.md5 b/docs/structSpawnPointData__coll__graph.md5 index 24cfb15a..506be145 100644 --- a/docs/structSpawnPointData__coll__graph.md5 +++ b/docs/structSpawnPointData__coll__graph.md5 @@ -1 +1 @@ -664fff338b6d1069252fc86621796be5 \ No newline at end of file +e5a0cb98a02834e577925f35af998bb7 \ No newline at end of file diff --git a/docs/structSpawnPointData__coll__graph.svg b/docs/structSpawnPointData__coll__graph.svg index 19ff313b..869f5f4d 100644 --- a/docs/structSpawnPointData__coll__graph.svg +++ b/docs/structSpawnPointData__coll__graph.svg @@ -1,29 +1,29 @@ - - - + + SpawnPointData - + Node1 - -SpawnPointData + +SpawnPointData Node2 - -vector< EnemySpawnData > + +vector< EnemySpawnData > Node2->Node1 - - - enemySpawnData + + + enemySpawnData diff --git a/docs/structWaveData-members.html b/docs/structWaveData-members.html index 325f55d9..64a9a167 100644 --- a/docs/structWaveData-members.html +++ b/docs/structWaveData-members.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista dos Membros @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -95,9 +95,9 @@ diff --git a/docs/structWaveData.html b/docs/structWaveData.html index bc2450e8..fa179990 100644 --- a/docs/structWaveData.html +++ b/docs/structWaveData.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Referência da Estrutura WaveData @@ -31,7 +31,7 @@ - + @@ -95,7 +95,8 @@
                                                                                                                                                                                                                      Diagrama de colaboração para WaveData:
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      [legenda]

                                                                                                                                                                                                                      @@ -136,9 +137,9 @@

                                                                                                                                                                                                                      Atributos

                                                                                                                                                                                                                      diff --git a/docs/structWaveData__coll__graph.md5 b/docs/structWaveData__coll__graph.md5 index 72cd7920..f80f1272 100644 --- a/docs/structWaveData__coll__graph.md5 +++ b/docs/structWaveData__coll__graph.md5 @@ -1 +1 @@ -de7f79e6f2e9ed9bcfa9229091018e95 \ No newline at end of file +9c73c61d1e0131acc6c9f0c5d1654de5 \ No newline at end of file diff --git a/docs/structWaveData__coll__graph.svg b/docs/structWaveData__coll__graph.svg index f78c2f0f..62ef32b4 100644 --- a/docs/structWaveData__coll__graph.svg +++ b/docs/structWaveData__coll__graph.svg @@ -1,40 +1,40 @@ - - - + + WaveData - + Node1 - -WaveData + +WaveData Node2 - -string + +string Node2->Node1 - - - waveName + + + waveName Node3 - -vector< SpawnPointData > + +vector< SpawnPointData > Node3->Node1 - - - spawnPointsData + + + spawnPointsData diff --git a/docs/todo.html b/docs/todo.html index 2d956006..b18d90fa 100644 --- a/docs/todo.html +++ b/docs/todo.html @@ -3,7 +3,7 @@ - + Projeto IDJ - Towers Of Madness: Lista de Futuras Atividades @@ -31,7 +31,7 @@
                                                                                                                                                                                                                      - + @@ -88,11 +88,21 @@
                                                                                                                                                                                                                      Verificar se usamos o nosso no lugar.
                                                                                                                                                                                                                      Membro Collision::Rotate (const Vec2 &p, float angle)
                                                                                                                                                                                                                      Verificar se usamos o nosso no lugar.
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      Membro DragAndDrop::DragAndDrop (TileMap *map, bool dragging=false, bool dragOnActionHold=true)
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      Membro DragAndDrop::DragAndDrop (TileMap &map, Vec2 associatedInitialPos, bool redrag=true, bool dragOnActionHold=true)
                                                                                                                                                                                                                      Implementar o dragOnActionHold.
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      Membro Enemy::Is (string type)
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      Membro Enemy::Enemy (Vec2 position, int enemyIndex, EnemyData enemyData, uint baseHP, uint endPoint)
                                                                                                                                                                                                                      +

                                                                                                                                                                                                                      Documentar!

                                                                                                                                                                                                                      +

                                                                                                                                                                                                                      Verificar se está sendo usado.

                                                                                                                                                                                                                      Parâmetros
                                                                                                                                                                                                                      + + + +
                                                                                                                                                                                                                      positionposição onde o inimigo deve ser instancido.
                                                                                                                                                                                                                      lifeQuantidade de vida que o inimigo deve ter.
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      Membro Enemy::Is (string type)
                                                                                                                                                                                                                      Verificar viabilidade de usar enum no lugar de string
                                                                                                                                                                                                                      -
                                                                                                                                                                                                                      Membro Enemy::NotifyCollision (GameObject &object)
                                                                                                                                                                                                                      +
                                                                                                                                                                                                                      Membro Enemy::NotifyCollision (GameObject &object)
                                                                                                                                                                                                                      Verificar viabilidade de tratar colisão em componentes.
                                                                                                                                                                                                                      Membro InputManager::MouseScroll (void) const
                                                                                                                                                                                                                      Fazer a correção dos sentidos de acordo com a direções. Essa correção só pode ser feita após a versão 2.0.4 da SDL2. Veja https://wiki.libsdl.org/SDL_MouseWheelEvent
                                                                                                                                                                                                                      @@ -128,9 +138,9 @@ diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db new file mode 100644 index 0000000000000000000000000000000000000000..c116c974432700d45d125cac0affed00beaaf01d GIT binary patch literal 260096 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 ORY?YOykl~4<^Kb5cmQYs literal 0 HcmV?d00001 From 77d9cb805bd38beb073acb3c5f4b0a14db8d24ce Mon Sep 17 00:00:00 2001 From: Gabriel Barbosa Date: Tue, 20 Jun 2017 21:48:54 -0300 Subject: [PATCH 2/2] Feature/camera optimization (#82) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Começa refatoração interna * Finaliza refatoração * Faz zoom ser a partir do centro do mouse * Atualiza documnetação * Corrige erros de português na documentação * Refatorado pequena parte do código. * Acrescenta documentação para GetLogZoom * Retirado uso de espaços desnecessários. * Documentação gerada! --- Engine/include/Camera.h | 59 +- Engine/include/InputManager.h | 2 +- Engine/include/Resources.h | 8 +- Engine/include/Sprite.h | 2 +- Engine/include/Vec2.h | 2 +- Engine/src/Camera.cpp | 71 +- Engine/src/DragAndDrop.cpp | 2 +- Engine/src/Text.cpp | 2 +- Engine/src/TileMap.cpp | 10 +- Game/src/EndState.cpp | 10 +- Game/src/StageState.cpp | 21 +- Game/src/TitleState.cpp | 2 +- docs/AIGoDown_8cpp.html | 2 +- docs/AIGoDown_8h.html | 2 +- docs/ActionManager_8cpp.html | 2 +- docs/ActionManager_8h.html | 2 +- docs/Animation_8cpp.html | 2 +- docs/Animation_8h.html | 2 +- docs/Camera_8cpp.html | 19 +- docs/Camera_8cpp__incl.map | 26 +- docs/Camera_8cpp__incl.md5 | 2 +- docs/Camera_8cpp__incl.svg | 277 +++---- docs/Camera_8h.html | 62 +- docs/Collision_8h.html | 2 +- docs/Color_8cpp.html | 2 +- docs/Color_8h.html | 2 +- docs/Color_8h__dep__incl.map | 2 +- docs/Color_8h__dep__incl.md5 | 2 +- docs/Color_8h__dep__incl.svg | 10 +- docs/ComponentType_8h.html | 2 +- docs/ComponentType_8h__dep__incl.map | 2 +- docs/ComponentType_8h__dep__incl.md5 | 2 +- docs/ComponentType_8h__dep__incl.svg | 6 +- docs/Component_8cpp.html | 2 +- docs/Component_8h.html | 2 +- docs/Component_8h__dep__incl.map | 2 +- docs/Component_8h__dep__incl.md5 | 2 +- docs/Component_8h__dep__incl.svg | 14 +- docs/Defines_8h.html | 2 +- docs/DragAndDrop_8cpp.html | 2 +- docs/DragAndDrop_8h.html | 2 +- docs/EndStateData_8cpp.html | 2 +- docs/EndStateData_8h.html | 2 +- docs/EndState_8cpp.html | 2 +- docs/EndState_8h.html | 2 +- docs/Enemy_8cpp.html | 2 +- docs/Enemy_8h.html | 2 +- docs/Error_8h.html | 2 +- docs/GameObject_8cpp.html | 2 +- docs/GameObject_8h.html | 4 +- docs/GameObject_8h__dep__incl.map | 76 +- docs/GameObject_8h__dep__incl.md5 | 2 +- docs/GameObject_8h__dep__incl.svg | 476 +++++------ docs/GameResources_8cpp.html | 2 +- docs/GameResources_8h.html | 2 +- docs/Game_8cpp.html | 2 +- docs/Game_8h.html | 2 +- docs/HItPoints_8cpp__incl.md5 | 1 - ...ItPoints_8cpp.html => HitPoints_8cpp.html} | 10 +- ...cpp__incl.map => HitPoints_8cpp__incl.map} | 2 +- docs/HitPoints_8cpp__incl.md5 | 1 + ...cpp__incl.svg => HitPoints_8cpp__incl.svg} | 8 +- docs/HitPoints_8h.html | 2 +- docs/HitPoints_8h__dep__incl.map | 4 +- docs/HitPoints_8h__dep__incl.md5 | 2 +- docs/HitPoints_8h__dep__incl.svg | 26 +- docs/InputManager_8cpp.html | 2 +- docs/InputManager_8h.html | 2 +- docs/InputManager_8h__dep__incl.map | 2 +- docs/InputManager_8h__dep__incl.md5 | 2 +- docs/InputManager_8h__dep__incl.svg | 18 +- docs/Music_8cpp.html | 2 +- docs/Music_8h.html | 2 +- docs/README_8md.html | 2 +- docs/Rect_8cpp.html | 2 +- docs/Rect_8h.html | 2 +- docs/Rect_8h__dep__incl.map | 2 +- docs/Rect_8h__dep__incl.md5 | 2 +- docs/Rect_8h__dep__incl.svg | 10 +- docs/Resources_8cpp.html | 2 +- docs/Resources_8h.html | 2 +- docs/SDL__include_8h.html | 4 +- docs/SDL__include_8h__dep__incl.map | 98 +-- docs/SDL__include_8h__dep__incl.md5 | 2 +- docs/SDL__include_8h__dep__incl.svg | 749 +++++++++--------- docs/Sound_8cpp.html | 2 +- docs/Sound_8h.html | 2 +- docs/Sprite_8cpp.html | 2 +- docs/Sprite_8h.html | 2 +- docs/Sprite_8h__dep__incl.map | 2 +- docs/Sprite_8h__dep__incl.md5 | 2 +- docs/Sprite_8h__dep__incl.svg | 10 +- docs/StageState_8cpp.html | 37 +- docs/StageState_8cpp__incl.map | 62 +- docs/StageState_8cpp__incl.md5 | 2 +- docs/StageState_8cpp__incl.svg | 683 ++++++++-------- docs/StageState_8h.html | 2 +- docs/StateData_8h.html | 2 +- docs/State_8cpp.html | 2 +- docs/State_8h.html | 2 +- docs/Text_8cpp.html | 2 +- docs/Text_8h.html | 2 +- docs/TileMap_8cpp.html | 2 +- docs/TileMap_8h.html | 2 +- docs/Tileset_8cpp.html | 2 +- docs/Tileset_8h.html | 2 +- docs/Timer_8cpp.html | 2 +- docs/Timer_8h.html | 2 +- docs/TitleState_8cpp.html | 2 +- docs/TitleState_8h.html | 2 +- docs/Tower_8cpp.html | 2 +- docs/Tower_8h.html | 2 +- docs/Vec2_8cpp.html | 2 +- docs/Vec2_8h.html | 2 +- docs/Vec2_8h__dep__incl.map | 2 +- docs/Vec2_8h__dep__incl.md5 | 2 +- docs/Vec2_8h__dep__incl.svg | 18 +- docs/WaveData_8cpp.html | 2 +- docs/WaveData_8h.html | 2 +- docs/WaveManager_8cpp.html | 2 +- docs/WaveManager_8h.html | 2 +- docs/annotated.html | 2 +- docs/classAIGoDown-members.html | 2 +- docs/classAIGoDown.html | 2 +- docs/classActionManager-members.html | 2 +- docs/classActionManager.html | 2 +- docs/classAnimation-members.html | 2 +- docs/classAnimation.html | 2 +- docs/classCamera-members.html | 48 +- docs/classCamera.html | 221 ++++-- docs/classCamera__coll__graph.map | 6 +- docs/classCamera__coll__graph.md5 | 2 +- docs/classCamera__coll__graph.svg | 114 +-- docs/classCollision-members.html | 2 +- docs/classCollision.html | 2 +- docs/classComponent-members.html | 2 +- docs/classComponent.html | 2 +- docs/classDragAndDrop-members.html | 2 +- docs/classDragAndDrop.html | 2 +- docs/classEndState-members.html | 2 +- docs/classEndState.html | 2 +- docs/classEndStateData-members.html | 2 +- docs/classEndStateData.html | 2 +- docs/classEnemy-members.html | 2 +- docs/classEnemy.html | 2 +- docs/classGame-members.html | 2 +- docs/classGame.html | 2 +- docs/classGameObject-members.html | 2 +- docs/classGameObject.html | 2 +- docs/classGameResources-members.html | 2 +- docs/classGameResources.html | 2 +- docs/classHitPoints-members.html | 2 +- docs/classHitPoints.html | 4 +- docs/classInputManager-members.html | 2 +- docs/classInputManager.html | 2 +- docs/classMusic-members.html | 2 +- docs/classMusic.html | 2 +- docs/classRect-members.html | 2 +- docs/classRect.html | 2 +- docs/classResources-members.html | 2 +- docs/classResources.html | 2 +- docs/classSound-members.html | 2 +- docs/classSound.html | 2 +- docs/classSprite-members.html | 2 +- docs/classSprite.html | 2 +- docs/classStageState-members.html | 2 +- docs/classStageState.html | 2 +- docs/classState-members.html | 2 +- docs/classState.html | 2 +- docs/classStateData-members.html | 2 +- docs/classStateData.html | 2 +- docs/classText-members.html | 2 +- docs/classText.html | 2 +- docs/classTileMap-members.html | 2 +- docs/classTileMap.html | 2 +- docs/classTileSet-members.html | 2 +- docs/classTileSet.html | 2 +- docs/classTimer-members.html | 2 +- docs/classTimer.html | 2 +- docs/classTitleState-members.html | 2 +- docs/classTitleState.html | 2 +- docs/classTower-members.html | 2 +- docs/classTower.html | 2 +- docs/classVec2-members.html | 2 +- docs/classVec2.html | 2 +- docs/classWaveManager-members.html | 2 +- docs/classWaveManager.html | 2 +- docs/classes.html | 2 +- docs/dir_000002_000001.html | 4 +- docs/dir_000004_000000.html | 2 +- docs/dir_000005_000000.html | 4 +- docs/dir_000005_000004.html | 2 +- .../dir_0b6ee6e7e9547e675db4add2e5de97da.html | 2 +- .../dir_1dfe4a86cee15d5d6902f8c724dcf913.html | 2 +- .../dir_a56613a6b795b5624452287469afc550.html | 2 +- .../dir_b6dc9fbf5fd229481ae647194eb362ed.html | 4 +- .../dir_c33286056d2acf479cd8641ef845fec1.html | 2 +- ...r_c33286056d2acf479cd8641ef845fec1_dep.map | 2 +- ...r_c33286056d2acf479cd8641ef845fec1_dep.md5 | 2 +- ...r_c33286056d2acf479cd8641ef845fec1_dep.svg | 4 +- .../dir_d858f423bf5825f9a3db826b6a54a3cc.html | 2 +- ...r_d858f423bf5825f9a3db826b6a54a3cc_dep.map | 2 +- ...r_d858f423bf5825f9a3db826b6a54a3cc_dep.md5 | 2 +- ...r_d858f423bf5825f9a3db826b6a54a3cc_dep.svg | 4 +- docs/files.html | 4 +- docs/functions.html | 2 +- docs/functions_b.html | 2 +- docs/functions_c.html | 8 +- docs/functions_d.html | 2 +- docs/functions_e.html | 2 +- docs/functions_enum.html | 2 +- docs/functions_eval.html | 2 +- docs/functions_f.html | 11 +- docs/functions_func.html | 2 +- docs/functions_func_b.html | 2 +- docs/functions_func_c.html | 2 +- docs/functions_func_d.html | 2 +- docs/functions_func_e.html | 2 +- docs/functions_func_f.html | 11 +- docs/functions_func_g.html | 11 +- docs/functions_func_h.html | 2 +- docs/functions_func_i.html | 2 +- docs/functions_func_k.html | 2 +- docs/functions_func_l.html | 2 +- docs/functions_func_m.html | 2 +- docs/functions_func_n.html | 2 +- docs/functions_func_o.html | 2 +- docs/functions_func_p.html | 2 +- docs/functions_func_q.html | 2 +- docs/functions_func_r.html | 2 +- docs/functions_func_s.html | 6 +- docs/functions_func_t.html | 2 +- docs/functions_func_u.html | 2 +- docs/functions_func_v.html | 2 +- docs/functions_func_w.html | 2 +- docs/functions_func_z.html | 2 +- docs/functions_func_~.html | 2 +- docs/functions_g.html | 11 +- docs/functions_h.html | 2 +- docs/functions_i.html | 2 +- docs/functions_k.html | 2 +- docs/functions_l.html | 5 +- docs/functions_m.html | 14 +- docs/functions_n.html | 2 +- docs/functions_o.html | 2 +- docs/functions_p.html | 2 +- docs/functions_q.html | 2 +- docs/functions_r.html | 2 +- docs/functions_s.html | 10 +- docs/functions_t.html | 14 +- docs/functions_type.html | 2 +- docs/functions_u.html | 2 +- docs/functions_v.html | 2 +- docs/functions_vars.html | 24 +- docs/functions_w.html | 4 +- docs/functions_x.html | 2 +- docs/functions_y.html | 2 +- docs/functions_z.html | 5 +- docs/functions_~.html | 2 +- docs/globals.html | 39 +- docs/globals_defs.html | 35 +- docs/globals_enum.html | 2 +- docs/globals_eval.html | 2 +- docs/globals_func.html | 2 +- docs/globals_type.html | 2 +- docs/graph_legend.html | 2 +- docs/hierarchy.html | 2 +- docs/index.html | 2 +- docs/inherits.html | 2 +- docs/main_8cpp.html | 2 +- docs/md_README.html | 2 +- docs/pages.html | 2 +- docs/search/all_12.js | 6 +- docs/search/all_13.js | 6 +- docs/search/all_16.js | 2 +- docs/search/all_19.js | 3 +- docs/search/all_2.js | 13 +- docs/search/all_5.js | 3 +- docs/search/all_6.js | 5 +- docs/search/all_7.js | 2 +- docs/search/all_8.js | 4 +- docs/search/all_b.js | 1 + docs/search/all_c.js | 4 +- docs/search/defines_2.js | 9 +- docs/search/defines_8.js | 4 +- docs/search/files_5.js | 2 +- docs/search/functions_11.js | 4 +- docs/search/functions_5.js | 3 +- docs/search/functions_6.js | 5 +- docs/search/variables_17.js | 3 +- docs/search/variables_2.js | 4 +- docs/search/variables_a.js | 3 +- docs/search/variables_b.js | 4 +- docs/structColor-members.html | 2 +- docs/structColor.html | 2 +- docs/structEnemyData-members.html | 2 +- docs/structEnemyData.html | 2 +- docs/structEnemySpawnData-members.html | 2 +- docs/structEnemySpawnData.html | 2 +- docs/structSpawnPointData-members.html | 2 +- docs/structSpawnPointData.html | 2 +- docs/structWaveData-members.html | 2 +- docs/structWaveData.html | 2 +- docs/todo.html | 2 +- doxygen_sqlite3.db | Bin 260096 -> 261120 bytes 305 files changed, 2118 insertions(+), 1935 deletions(-) delete mode 100644 docs/HItPoints_8cpp__incl.md5 rename docs/{HItPoints_8cpp.html => HitPoints_8cpp.html} (95%) rename docs/{HItPoints_8cpp__incl.map => HitPoints_8cpp__incl.map} (94%) create mode 100644 docs/HitPoints_8cpp__incl.md5 rename docs/{HItPoints_8cpp__incl.svg => HitPoints_8cpp__incl.svg} (98%) 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 c116c974432700d45d125cac0affed00beaaf01d..04c74d749fa0b97903d914cbbeb6b91e29389787 100644 GIT binary patch delta 18666 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 delta 17760 zcmaibcYGDa7XO}^o4YqRH-QLA2uVmnIt0=ygb)G*NJ8j6kef#DMS9r10R=(IDx-)L zdjo+eD|Vkgu`52`Q|!KH7dv7><@cT0y!!k6e%?RMeD}=kl(T1M&YU@S(@$MCebZ%E zJpFz=;R{Z`cKBRx^5~xey){icZ;k=|(r5$y(8vb;N5>_71E*)K4Iwq*^TRlgXA4^v zHnuElZfRvBtv5q*_(guPBi#2T4@dD|5`#c>{uZeAO^2`RtGxf;jTAh*XGqquSs-Q& z$fRPB{8W&KU{F?|f|?dbL1gPb8OEcRdgB)bfSkYPn#SiC#}K-I^0sOdnZ?qata$ zSUQ>di%pmDVC(CsSo)#E*W({N?#0=7VajNbzWE@1q8X@*PXX0l=RuF;O=-zS5LS zy2pBd!7R|h3-?i(_13~_D(gsF^d5O;YiuX2(`H-YzNuZz@Lm}jvEaIxq9`r8+M!l;-coflBS}fyyl|3rpBD2lBWEUB7bqSf1!W1^~BO{ZvX0O zix)4n5?03fDyGbuR##Wc7~Z$eE!h+n9{2yK{;0pOpt-9XTT{7uD$Ma_lH zdFX0(b9O7Ol!bj0eh{438R8heYF-%=mXqN0EPeobRw;Wn z*esJhJMJ%PX)11R&Xwb9%FE9$Z1fiw`n+j?ppkO+6)AzRRoVm^I<@pDEQEy}FJ?$5;nfAEpGW zV$F0G5oH}%^90=oWn2P!X6&+E{X7Be%`k(4P&6- zy7-cazSjHOWBZm3)4W6dMa@n5jXAB&MXd!b*?Fz4jkyKrePL@$aZXE1epB}F#mkyn ztTS68t#acX>+}^7ZYkvcnU>!iNrl$kW*x>P(3E7gP zCy#H-wI*EES2E&N(-jL=;L|27PLQHaXj-hkd`tg8cDnUkdmpN{erTU*d9KK?)^GmZ z7mDe_C{bfuDG>`-1cjI_eVx9=6j|?X@14@@Z^dY{3v*kWAcCBhyd0^w`OQ$>!X|&K zzaXcoWrg+1o`@c@b@dg~S1q2~oZ+aFZ|rz$=8n(8%oTl{YSStr#;PHwnYBwb?+m{` zFE_gdGoq=nC9kBQso5`U&ch^Z@#kQclvv{G(%9_G1V=$I1!X&B+5fD+rp`*-xxmx9 zcv-^QmSu}A-=4|V&pUlOLEeig2ZKtXFmpgZr*+JoXxVzS&diK@&AZI{dhcZ3rWw{K zaWX6rmf1%sK}Kc7MAgZ3bE45r^Dgk`H5V4=7Zns`XG4#(OA0Z4Tl0#Fatm|(g^i6x z1=er7%HsaBmrAMs-OaTdtSfde`Oj`H{ZdYV|BeN#;u03+Pe4JDLkNUw!C{!?zztG?ya#Ht@rMVNFG>~ zV{N=H#mYLMlVuehn8g}qcU*U14)H)^HgYm)n|04UiPj6(4PsMgcKEKJK$%K2v|bvE z2Km2!fz^4C6grB}nWiM=X^%H*(brq8_c{`-33rvVrK>x{U2`cc(46~!l_jGRW%pZS z_BXJ(i#ty2pGbQS-Jg=3-Pr7J%FAnR%*)GeZS@yt=jJpwXp%A1$hnp2S7Mb)|FNM=xY5noQ$l6&(y*iG*SCH%o^?KyGJ85;RV zwI_wKx<6b5`-id?YvAEbYxvQEwm%wGk{31p(N5Jrn6)?)a8~i0Svmec5^RzOm8$(I z=Kr%nbwu3zt;^%r*jF@F^J6I+&yAIZ)~fq|q=Jq`C--2Yb;)-WI66ZMj}~KBQ%~Jk zj(M)#Z6)0K52f-hZJ5S>qQ6^V4-{cbH>lJab1D#0;wW`=Rm3oB)BUm5FQ>kv;*KvL z>_*%SD(YBtUl4^!rR0>X@%5-68FM=lDm=EVBkR#KWYwO^w3a?FjRv5)4C{vnrgToQ zI*o0oIux!%O{L`>Pd`@*uyjzzLk};dz1zv<<=R?}T~7S1iB#!J~wR32d5NFQn)dgm^xw5s2I^2GZi zh=z5H{NN$R)3t?`{&;#uF-u@NeMPU*qjVQtOPgpB&7h%_N!_(ywGXwIwUgS7TD!Jz zcSVF{pB~AgQmj`_M|LcDJb@acqF|*&#c5g>O)Z633Dp{t9ToXM8FLpo8Ich(Bj!Kf zkZWglWcUB!&t0VW9b^7z?xVME5tZl z^ew$ckJGKRhc?n|8bp043ZwWy`;&Huc9phDYr!bQBLS-HnDx{YzURYLRMm0$hjWRB zcYN^CEJigQ6`wvu*pS?xZ=+Gx?$1p>quWG1)5lVmytoc6@P^##jT-U5$_T{JG1B zMqBTGdBIoPsV7Ad@o{45R*LDk_|;bOO-NTOcS?m;kYa^@9%bGB%~BfQ5&dl%(KxH( zyS+5FPVk!$H)}=BA712ce#7H@!@A>=>O|h?Wb(Ls!x=;SHvCS}Jx1(_UI4QoXc| z7K`IvdWII+YeQ&01+PNWSo^~>#J!OeCqhE$eOhUs3#B@u6=Gl)I_q7B{>y!=HbWeX zq*yVaEA(Woc&RJBL~F#2;dG2vi_w?SE#AwW%96@roRU4d(O13$8Xv)KLGMDf1DKQB zU022%nmE**=DCI&1JAQS4YvunA(n%`c}n= z@Nqm&Oo^qBiP`0G6i!6;*j_Y=k=wo_fhvfC#OH~$C}?CL$#B{Az3Hf%Jhm?bwUTZ> z+=oVxaOKmbV6W3~UbQ%uKyh|P0nH(Au(Qea9h)MKOYQ@OR71R3`AtpXN~2yB zK|bQzFWR@-r`mhk-<*9_Z+5{5)3%1{O$uCDsW&QcMX2sqU`wdppupx(eU<|4L-d&n z1VZ(C1jgrmdmw8kx3)x~pZ{9O@n=($rP=PGGHu9lSE@8yeA|yA+s0+N%jNUf{_a6Ct>Nx6 znO66650q(Drh9-)hjVwSN}0Pvro;NWi&fgkU8K?sccDtt-32lo9O}-OX}QatC(}XP zovTvj&XH+ZnmZe58}3cd|_LV%J|)+|erS?(QMejBf5InWkT6kIkZ0#6m`kXR|4G zL{O-1KqidH1q7)8vB|mtxd0ImBm<;P(hbN4ih2nM(gFG%Z$LgkzfBbVawxX#;%MD~ zK*0G02qFRceu8d5C_vw#Jj4R@?RedQV1T|EryCFr(APi^4$xOX5D(B7V|4=pl4y)> zKtvL`bpt|@C`dOTCZNwzGXzxu_z@sP1@s}h0AT_B13ZWe=iD))2Pg?(ETpm2vX=it{W}~G2P$_ov79grqI!mxgyG_wTr$^fm_1#wF=xEs;^Ptrciyg0*6EO%N01p^;HTS4AoaE zaKNRnP~gT9`f>&Khw95D5Lf0=*2qwOf#U8C)#od)t4g1zz|K&8t^!vN*XJm(W0*c$ zf$gDss{&UI)ms$U7P_~XB0@qtm(`IGNy7gQyIVno z$gahf_gO71rzpFAG}STcC60`t@3C1P9t#67R_q!_KU0joZ9L6&(MbFJWO{@lJu!_; zW}S>r5dG`vsf0gpo`l)w>ai`KY@p9vlqf!Lrhia^{Zb1x6N}FfMjJ~OQ)YviY!93R zE0dD!xpT1xVWe&I=t<^Fb&QXK$q{LZBFBvZeLaW=*$Wp^G*OCu#UdKPDBXT#2}}V> zvu7`(9-K1lO)KfojQZNcSIb?qkA3ADdX-Z@d-?{Nh!x2`zLCabt8Aw@U!EhB#3C&` z9%fmb7}buvTydbC+I=}rW>QtO7B9Z_Q4j0b7eS(WGc{7SIJ%iO`?8!8;aT1Ov&4)o zG>ZD$w{M}pV1*UyuB6YYz;4}2*+lua*aq|3TZ%VffJB#d6Nh(0;On;2m0o$qkcZZ4 zhiPZ*pe|UuMak9lMo5v9nN-`Yo1lYurFbWO6toJ-!0nfEQ)1RZeMpTMPX;LkL{&5iH3-)uA_IT!k&9Qg<%7-SMQ?^M#Dtr zjTp_)y$9$*aHUgyd5fsHntIuB2PrkkHylj(r=rUvqNRb`)1G?^?d3H4x#?4SgZ@PK(2Zom`X7f0 znnWJ$C+#2FE82b9b=n%3ZHeN~e_;dcrJJx{pM02(Q&5d+IrBBN{Q4twnTu-e&!3>B zjOy$ePth*e`1Y57rkgm8wRb&Bg+yZnQq0un&>)Q$8(zZ0uP@-_MB{8cY$f+rjoqMa zMQa;e?P115`|4My3*&xcf;jXlrBXj}`c>K@YW_lR(PTUQHF|-9C!rTo4QfU9YY;Z4mS>~PY6e^e=Azpb7r3So%wScDCPrOTcEV$nJL@5=b*C&|V zF(1(LG{gSn1DedpZA7JMt5{j8U_l@figZYswJM70U_w zIh3u@{^@f%LNr&ze@Q9g`E!^gb0l6%vmMrBU&2Ulb?~UKfLrWiUy+x=@Zz!R}h0*t`c}NO?2VxNB4s`Dr*noLmhRsuQ%3;$6PFxs_lWQmL!ZNlG+rP$|t zuoJ|LjrJWq*~c(~?47af3``&!xu+R%J0p=L!%Pz3r`juevvG`q?9<8Y00p}o;Urax zmy=m9dwVJy#c+IhJ)P|%atjnnw)gg7i?BduqjIlQl2j3%!~PN+?7SM2W9_~eXM1y5 z9^n8oD35ImqEPW{F?)!70*aDi-&MlKVn-BEv{cc10Q=RnGR5z72`w9~o3KyX(D1xa-IN9jba|m}CbyCZYVp28t3YUGE}H>nrXf(*~xpai|(d896knK{u3@L$H>NW>xhFpeBW?fEpDVj%xf0 z4Fj)1p`k#t6dDXPQ=xL8dW8l7%}}Te?@kB8elifuX^J@@R6N(8<>bxMjR}g82{c}z zzFyrJr%<0@-N4BXUn^s#Zj4bVos0fiEKUxlMlq6ssufDA*NssQO4f~$4uXeoghIV% z=th-;rt8LV2SM(`95huohANZ@8@5uRcr-u6LFiJ2gQn=lU?431@hDiXn7z=2K?-#N zDpM#7_WMAELctrLkgsmjx3S%I9nz{%qk*W5gGC5hp1lHXY`+-61w2OM!n=08) zE{YIqMzB59UHC?_H(?fjG7?^g%f$9k>`|D3)zvJ7U=&TRVUNMei>hU>QxEZVEqjHc z#N(scy|4tA)G_#7dfAVSVa){l?!j>^MT{KBmQbw3!W-k51##tZqM?SxiY3)7NUR^v zUV^DsJ%PnwnD*?6EP}%-+c1UQN!T0Hrm^>k?bk%t?zDaP7>{d9gP9}_&tU1WbDo>Q z`f+h#7PBz6Z4E4nf>WG@Bfdx+Z)9=ew4Z$doA1s>b_fSPdsH)PWia24x3V!TMBc;5 z&95S&pU9cUqV1HqtcF55Z=~XiV0-`x#c*XUo_&@)kITTguc7k+_B>h#Ob16_hWoUx{UYz)Dt6c@l4i zB^bYot)(1$-zs*I*no7gdmJT;hgP%6?xb8J*en%2*0Al~5~se5$%#&VFRfuqVYm%m z%l3MUoV=vj6wlEBh8gWsmzCgxqu zt`FI0mOGyysziK~!DB>9fKB7KXt&7hJnM?Ds!z7Ff$&F&vdy?m9curwnWa&PH1uH8 zB^g02qQAjn?Gaa?1sHSsR+bNMhCOf_yOo8E`se5EbOs822m26K-MJkMcKV3h-8&g) zHJ#4E%suS0;A-cMlrqOTIKX0kiRz>$uni{GC)Y3>b879Ny{s>z2_ok@w#z#nuRt$i zD$*Qp+9%hsCuy9x`+C*^Yi!m&hV#Q1vHb?zrB4&F``O=Vs<^bD-A+@)?Kd)kn1J#F z`0|s)a|hUNnkb)AY~vuzMXDDM9%ir646*YjY@^eK|7P|GtfTl_*tM{Z;DbvMZ{7l3 zooTPTl`Rf}0rkaQ>=z1YbVd=K6|u&#GeVBAa89ka#~s6p)nfNL4tF{=3#6%{<^($( z(&W4mlM|8VyiwAD%L0NVv~>XipD z#08?^6uTSFQ{RK^EX}h&evsY9;1%8R2)hKY=#EF(TjJ#hu=!v87<-|}raysY^7~p&83R+J~ zVTRYkY#aesd>*CaAlnTF`ET0y+GlVzzNS5^J*M6NuZuk0bhenY1-j{MF=z8Vrrcr} zoz-@D%z9UwgSYFZv&+2d(oMO`5S`(=>1;A*n8%!|UV2%(%41IHgxhp;vMTvlvd5gH zn2%{&J?2COAJwk(m~u~I^oX`uH=RxC;ZTn$Hzh_7N#5hZQy3bFA6*0*i5$CSGfqZ1mS+>RI>*S2^}xgRk)Cb@D$Vsx*Baz|oxRJP-6 zNk`ne>1;_yf^^f_lI}r+&X#mX7u}Rw64CA8IXlvAVY=z;NVkUSZKks&-GXdqOM;ul zbhf0MxW_D2?H$(IJ!Xl5hqQoh7ON@`ZS9e%qC)NKbu+<1 z>vS{TK`sRY$lwz*G zTsI>XS_c%N&|28G-5s<_H@i7#rEXrP&>B=2uFz_rt_oca)J36HD^7mM#xrr^H7qh~ zKE~?3S`>c5o|_=Uk%qGEa!M^`+u3f+^BdS9tk-w3d)a;L6nm6C$(~^^vRB#b>}~b| z`;?dvZUJ zlq`_c9FVj;kjz4mex)G&5ox1km4jpt0Vx;?QaB8xqza@|hE5HTk!%AefRrI%NE_4u zQr-+QScZC4ECd;{9Hep;$k25l!&HP?mC?rWFv4(yjxuDtSGC~<9c{>)*gB&t=okb@ zXxdmqMy!o9B0kmH+W$N@GOa$J5x z4y@6TBWp6sVv#f(a&Rq%99^p+M>fY84mwx7{}$`%lb>NBEd$kl7rwXIn>bMoF9O#nU87o0I8LL4JLsk(mWOeO^ta>xf&#w1aQk&F<9j5HqPE%^b z9#iUpWlH&8V@eIU)=U81Ys#2PVM^&=XUf4|Z%RGbXUgHJ(7Q}I*1OF{ z(0j~Q&?BZC@lkUT=)I==)W=P!{U=NrYuI7Rao=ZNzV}lEMXj~BeahDInq=*`#{b42 z;0O3-zL?M8MZ7y_n9XO|ori;inH%k#AJ}T54fb6Z z*i~4&?ZTgN1b`o6)-P--hack9Z_+qt_G7;@T&xFOo54Tr;&L2U5jhbCF8_nAGe7mP zi-})i6fBBe{O(|nV~4!QOng+UmtBTmN` z*7+3G!>d`o(9WkwWaJ*K2PUU zSQmu$`Si{wU#M3*=1X^XK6*nCSLqAteDVZ)wWA>}^+dsL-CJhA8Ny8lCrN!6hf~sL zH+1J485|?;Me^O`wUFyN`8XULH}&Q(Q8&9TiFXhV zhd5v)*{LbK8{vqEvqg$ME0yca8|zdYKfg$f&EU~uYdU`v-nkJO{2&gPI8mfn-<)%a z@IL&zV8qVIQ-O1o!1Z!pSzB+rER#>g;ZTTvd}Bz0Qy;)VoBjuj8BCSHZW1^!pb#$Kj3|!gt}k36JGL95qq(3VGComlAgnS<+jXY9AR6 zQFxLymP0-*86j>iqdAZ#5SpAJ#*KhvbM5ev=yhmyAV+$f5!P9NU^JchLgi~3Rg zygjCxm*MunzPbh>%Q#lQTPvUQZB%j|_q!r|EWdygre_>~mx}C9#_{jrT@i0h;HN_d zI3Fmn1fS^eR32+TJCP$krPO|V66O$G{+CbTaF-6U#Z*2Cm&o>4(|9A%P%(A}KS`Cs zQ_qjl5c^a;$DFPZ56|Qe;aItP7Bp#uUDd#^B5#!=m6&oT@<{yT=eyYObgSmwWO1~S zAHYcxm1T%kP5eiy6^okrQK}JfE&M5O=h-i@vYQH85_&8DhDM2>TKN{78QW%~OWrX~ z^(p0=_+S~(av>zK|#4(%t&tqZE6}B0h};PjrS}(IVbo z#$)WiE#Zi-nIL{&%Fohx`;BEhiQz!_>k57e2f|-h^6zMp{q-syMc!PE&LglSQoCJr zeTMh;E(_GlPEcLBIBDGMP57c!RZD4v$Jxu zv-@XwLoO`{%y4QRAO^k66UFnZ`B3lt!1RAIAHTp8$9aQ;{eKi{_dm_mb_RQ=BRV?6 z8+>VDKt&Nzo!qLl7*TPM$0mC{!G9QSXPvpa+hsDiIX%07c2Plw*K?`e6PRlMw1)eb z?b^gg=rmH)Ucpaw9j)EUa@+n;w1!g(pm*!$;XT_+ic$qIJTgfdH4jx%kanHNlx|oFg~yz$V1~BWV@gLXqjTD|9#cAE zCA`LCwkr6AW_e8Mie>bvw#Q>iUo4|fwA~(4I%6f=otgEAp09z%DUr5ZGv`ITaS)3@@av!PU9DjqVYAd@wGUrsQ$ckFV96!FL!!+ z_zv`Rm6PMTljnO@I$sf&Ip;B5{CDz!2;(|%Ct_`vi*s^3nRoGGTn?#m?f~v7B@(Pn zm3_%)&%*P0k*=YBP|&I9OF5s@&c!n)_&g7DYEF|=ytkOq!OL;+xW9updz;%eCofUF zd;)n_-GfmD+QhT>@Y!L3jZR*Q6pu5p#Iz%P01Ipo;s~G10_$bL4AJ)}YFy`Z%sTq7 zj$zj9pVsbk#(nW5gcKsxeKD?J4%xhcH(+M~$PkN<@e=Yl z<<1;KIbFDqW45`)`s0WY4ieuS=Sw}Ve|BFD?Wz;JbngSas%;GjLm4 z#Rjrmmd0ZL<-Ylp-i7<-IeLulqdRf;cP#?!+Gr)srv_Y~kD_vzjD08pMx&1yZdAX* zo$4Ffi-@ayKszD@f}h7|3(|rSuwuapz7Y_s_8^b3A*c<19%7@l?H*&jQ{bvfIsBwMV;)G?L< zwn>cEm!JT;ckKv|vDkrk0WOlSu@TyST(YPdMkL{q#X-d$W4@|ugnWNqC)|x|7AGGe zL312b;4x-Pgo>{A7_ES4>CWLEqa{ddllYF|xM@*kn<{bBqEI7HqeAm5J%-{+x z6tglFS1k@I##M`hvOGq;>PICO31dbl#7L(*ukS6xWs54>ROT_JN+#lRwt_oFaT~#% z>=eBg%t?wl4``x7Ymp5vg6#3_fa4vw2l?YvepwbSXBuHej@ZZR;dU7%tv`t$PLxSIjnw9^C7UhmpsiEb}mrEHGZ=i(0Ue$ zh|?hLc5OH+&g3)Olf;WJqIbPT|CjhoSk*gT;&&46DPBfj8(zi=7%y=XO7?Qr!1`yf z2F5u{&7;p?1&wuZ;lkxrNzU9JF7gClL~Mly0GY)V7PZAoh6) zVk4&07#dCkDF;Ef(hnZ2{jQzI`TK3{RoF0(qL2Uj!M&^|R@5N4mmQR=o0wNvQlnCJ zQ%x(1iU~H=q+;5g+VNl$vnrS|1iByBO*O4(#xmF^&a|3=_01fiYM3!yH>(sHKTbD? zD>NoVH-|YW$zu+ch>el2R65K$IG`1(&GMKPD!W!@4|bR#9M(SpXLc>r~u|#Z`tRDZxz>tRxg$r7t@?yB49fWS? ztAgdSV4lOoC~_SH$>jjG;e3R5vK4dS0QjI4D#6?RC1NG=?S2ju1v3>Y#05lOh4OMe zW*=2BTiXvWbSFFtFSN?f&eF{^h5BW}39V2X#*m^4rfF@cJ=x*nyCo@tNdhH zXQGl&vUbE{CUinLx#OLpNpM6f6bZSaI{QP&Ws8;EPtsjq8VSg*dKOx&on@tEPF(E)Lua z80Nq$07D&k1EBAp76BqPLcoUQ53biKa0_6t0}lgwWImgQt-{nD?$)u0`H);%4-}+O z<5-XBasS#d$T~lzOed#ZpTqob=E?25oOVIf3d=&c#lQ|p_ zPF1*zY6lZPf4jP*rMfh=IEm7a`2Z@A3vr6L;bUHa>*6yX^VuF1LP&M+4k+vN6CBfX z<*MU{nVBO-y#X^b+gauE#ON!r_`UN69}G`Hud}?_qkIlj*SXBzeHKerKk@!qK56g! zJfiIsKgw@`skn=8;p_P_KAYF`aeM?H#PfJMJoA^qb@MCx7M}aJ;l)4A9#)Ifezu2Q ziR-%Z!7XQhmc*i27x?2Y!Uy;&NKqb^uDn1>BmT2c+ggm%x;YODqA? zF95|w^9isO15jKKwE=I}13p!D>0~|N=u@jgcXmd1n$za`-lL!BQ80;}O z0$~u>g1JF42lvp;^$wb;o9i5e)qJgkuw1Wk5Z2h$4#FaOxr4Aau5u7|m6Z;{`mjQw zw!v7amOIP{-CX7%%=@KEP=n>sbV(<~(R4BL(X*@4J?0_@ZcEqAh3c*JUb?x!L5Vmg ztC!NXlQ<`LLL8arcEasACo9;NuHBD=awi)tw06S#a8T}q=t6U6yK%bNq?%X^)TmHP z9FECOb_bXZiW!F<%#w)3$z^Y*!-T}@9RxYeP^c{qi~n?o2|-PB5M(k{p~XFMqYNa! z2H<4LWIdt!<|LKhvr0E7Dzqp{Hzz362sB=ys0!U2=O74ttb;~6##xax&IYp37ZBa? zHSW&C5wKdcyCM$OUb%?>foCAvXXFn&Hz@kjs`f!*@CCk_%EYM)SZW43OU*F3X7v`e zKk|_t8Tbp|Mv=pM{6|*KkNZBkoudCFcXJzPt;STDh2ZlK)Ne>Kl5T;nAgR=C%5C>th zRXAv-ComWYpWvZHPoP{f*;HBgAeBEgLJyQV2&>OP96vFOrcTiV0~B*og&rt%5GpTm z5SlJ_5MC*A&_q2@sL&AP7C2~%Cy*}@8zS4wbC?)Gu7hIqK#qgL^nhb@3<+t|1CG@( zq{0)BRtGx%;6zVAS{)K51qWbu;D4J~WjA>OeU*~;kqeSzdGwLXlw*1H(N5`sbk#zi z3{N1fv*=MzAhi=dpa)V^etf1LNLDBh=+ii>U5rKE~b9UIjf8iD%)=fB!t!aVB};XP(_PyMNx0#7p(R