From 440df6a2f749fd5ce3603d87d33f7fe31586b5cf Mon Sep 17 00:00:00 2001 From: Daniel Marcos Date: Tue, 20 Jun 2017 22:08:05 -0300 Subject: [PATCH] feature/Lightning (#81) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Acrescenta canal alfa em Color * Relâmpago implementado * Cria função de lightning e automatiza chamada * Re-gerado documentação * Merge branch 'dev' of https://github.com/Anders1232/EngineIDJ into feature/Lightning # Conflicts: # Game/include/StageState.h # Game/src/StageState.cpp * Remove linhas duplicadas * Reduzido zoom inicial, dado que o tileMap está muito grande(o que é bom) --- Engine/include/Color.h | 6 +- Engine/include/Game.h | 7 + Engine/include/Sprite.h | 1 - Engine/src/Color.cpp | 2 +- Engine/src/Game.cpp | 4 + Engine/src/Sprite.cpp | 4 +- Game/include/StageState.h | 6 + Game/src/StageState.cpp | 70 ++- Game/src/Tower.cpp | 3 +- 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 | 2 +- docs/Camera_8h.html | 2 +- docs/Collision_8h.html | 2 +- docs/Color_8cpp.html | 2 +- docs/Color_8h.html | 2 +- docs/ComponentType_8h.html | 2 +- docs/Component_8cpp.html | 2 +- docs/Component_8h.html | 2 +- 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 | 2 +- docs/GameResources_8cpp.html | 2 +- docs/GameResources_8h.html | 2 +- docs/Game_8cpp.html | 2 +- docs/Game_8h.html | 2 +- docs/HitPoints_8cpp.html | 2 +- docs/HitPoints_8h.html | 2 +- docs/InputManager_8cpp.html | 2 +- docs/InputManager_8h.html | 2 +- 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/Resources_8cpp.html | 2 +- docs/Resources_8h.html | 2 +- docs/SDL__include_8h.html | 2 +- docs/Sound_8cpp.html | 2 +- docs/Sound_8h.html | 2 +- docs/Sprite_8cpp.html | 2 +- docs/Sprite_8h.html | 2 +- docs/StageState_8cpp.html | 48 +- 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/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 | 4 +- docs/classAnimation__coll__graph.map | 10 +- docs/classAnimation__coll__graph.md5 | 2 +- docs/classAnimation__coll__graph.svg | 227 ++++--- docs/classCamera-members.html | 2 +- docs/classCamera.html | 2 +- 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 | 4 +- docs/classDragAndDrop__coll__graph.map | 12 +- docs/classDragAndDrop__coll__graph.md5 | 2 +- docs/classDragAndDrop__coll__graph.svg | 261 ++++---- docs/classEndState-members.html | 2 +- docs/classEndState.html | 4 +- docs/classEndStateData-members.html | 2 +- docs/classEndStateData.html | 2 +- docs/classEndState__coll__graph.map | 14 +- docs/classEndState__coll__graph.md5 | 2 +- docs/classEndState__coll__graph.svg | 353 ++++++----- docs/classEnemy-members.html | 2 +- docs/classEnemy.html | 4 +- docs/classEnemy__coll__graph.map | 6 +- docs/classEnemy__coll__graph.md5 | 2 +- docs/classEnemy__coll__graph.svg | 237 ++++--- docs/classGame-members.html | 49 +- docs/classGame.html | 25 +- 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/classHitPoints__coll__graph.map | 6 +- docs/classHitPoints__coll__graph.md5 | 2 +- docs/classHitPoints__coll__graph.svg | 155 +++-- 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 | 65 +- docs/classSprite.html | 19 +- docs/classSprite__coll__graph.map | 2 +- docs/classSprite__coll__graph.md5 | 2 +- docs/classSprite__coll__graph.svg | 123 ++-- docs/classStageState-members.html | 51 +- docs/classStageState.html | 118 +++- docs/classStageState__coll__graph.map | 26 +- docs/classStageState__coll__graph.md5 | 2 +- docs/classStageState__coll__graph.svg | 591 +++++++++--------- 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 | 4 +- docs/classTileMap__coll__graph.map | 6 +- docs/classTileMap__coll__graph.md5 | 2 +- docs/classTileMap__coll__graph.svg | 149 +++-- docs/classTileSet-members.html | 2 +- docs/classTileSet.html | 4 +- docs/classTileSet__coll__graph.map | 4 +- docs/classTileSet__coll__graph.md5 | 2 +- docs/classTileSet__coll__graph.svg | 151 +++-- docs/classTimer-members.html | 2 +- docs/classTimer.html | 2 +- docs/classTitleState-members.html | 2 +- docs/classTitleState.html | 4 +- docs/classTitleState__coll__graph.map | 4 +- docs/classTitleState__coll__graph.md5 | 2 +- docs/classTitleState__coll__graph.svg | 165 +++-- docs/classTower-members.html | 2 +- docs/classTower.html | 4 +- docs/classTower__coll__graph.map | 6 +- docs/classTower__coll__graph.md5 | 2 +- docs/classTower__coll__graph.svg | 213 +++---- docs/classVec2-members.html | 2 +- docs/classVec2.html | 2 +- docs/classWaveManager-members.html | 2 +- docs/classWaveManager.html | 4 +- docs/classWaveManager__coll__graph.map | 10 +- docs/classWaveManager__coll__graph.md5 | 2 +- docs/classWaveManager__coll__graph.svg | 307 +++++---- docs/classes.html | 2 +- docs/dir_000002_000001.html | 2 +- docs/dir_000004_000000.html | 2 +- docs/dir_000005_000000.html | 2 +- docs/dir_000005_000004.html | 2 +- .../dir_0b6ee6e7e9547e675db4add2e5de97da.html | 2 +- .../dir_1dfe4a86cee15d5d6902f8c724dcf913.html | 2 +- .../dir_a56613a6b795b5624452287469afc550.html | 2 +- .../dir_b6dc9fbf5fd229481ae647194eb362ed.html | 2 +- .../dir_c33286056d2acf479cd8641ef845fec1.html | 2 +- .../dir_d858f423bf5825f9a3db826b6a54a3cc.html | 2 +- docs/files.html | 2 +- docs/functions.html | 8 +- docs/functions_b.html | 2 +- docs/functions_c.html | 4 +- docs/functions_d.html | 2 +- docs/functions_e.html | 2 +- docs/functions_enum.html | 2 +- docs/functions_eval.html | 2 +- docs/functions_f.html | 2 +- docs/functions_func.html | 2 +- docs/functions_func_b.html | 2 +- docs/functions_func_c.html | 4 +- docs/functions_func_d.html | 2 +- docs/functions_func_e.html | 2 +- docs/functions_func_f.html | 2 +- docs/functions_func_g.html | 5 +- 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 | 8 +- 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 | 5 +- docs/functions_h.html | 2 +- docs/functions_i.html | 5 +- docs/functions_k.html | 2 +- docs/functions_l.html | 8 +- docs/functions_m.html | 2 +- docs/functions_n.html | 2 +- docs/functions_o.html | 2 +- docs/functions_p.html | 8 +- docs/functions_q.html | 10 +- docs/functions_r.html | 2 +- docs/functions_s.html | 14 +- docs/functions_t.html | 6 +- docs/functions_type.html | 2 +- docs/functions_u.html | 2 +- docs/functions_v.html | 2 +- docs/functions_vars.html | 15 +- docs/functions_w.html | 2 +- docs/functions_x.html | 2 +- docs/functions_y.html | 2 +- docs/functions_z.html | 2 +- docs/functions_~.html | 2 +- docs/globals.html | 11 +- docs/globals_defs.html | 11 +- 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_0.js | 2 +- docs/search/all_10.js | 2 +- docs/search/all_12.js | 3 +- docs/search/all_13.js | 2 +- docs/search/all_2.js | 2 +- docs/search/all_6.js | 1 + docs/search/all_8.js | 3 +- docs/search/all_b.js | 2 + docs/search/all_c.js | 3 + docs/search/all_f.js | 2 +- docs/search/defines_a.js | 3 + docs/search/functions_11.js | 3 +- docs/search/functions_2.js | 2 +- docs/search/functions_6.js | 1 + docs/search/variables_0.js | 2 +- docs/search/variables_8.js | 1 + docs/search/variables_a.js | 2 + docs/structColor-members.html | 11 +- docs/structColor.html | 40 +- docs/structColor__coll__graph.md5 | 2 +- docs/structColor__coll__graph.svg | 19 +- 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 261120 -> 264192 bytes 287 files changed, 2239 insertions(+), 1947 deletions(-) diff --git a/Engine/include/Color.h b/Engine/include/Color.h index 5b522045..8a294a73 100644 --- a/Engine/include/Color.h +++ b/Engine/include/Color.h @@ -11,15 +11,17 @@ struct Color { unsigned char r;/**< Canal R */ unsigned char g;/**< Canal G */ unsigned char b;/**< Canal B */ + unsigned char a;/**< Canal A */ /** - \brief Cria um tipo para armazenar a cor [R,G,B] + \brief Cria um tipo para armazenar a cor [R,G,B,A] \param Intensidade do Canal Vermelho (Red) da cor \param Intensidade do Canal Verde (Green) da cor \param Intensidade do Canal Azul (Blue) da cor + \param Intensidade do Canal Alfa (Alpha) da cor Essa struct representa uma cor de 8 bits. Ou seja, cada canal pode receber um número entre 0 (inclusive) e 255 (inclusive). */ - Color( unsigned char r, unsigned char g, unsigned char b ); + Color( unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255 ); }; #endif // COLOR_H diff --git a/Engine/include/Game.h b/Engine/include/Game.h index dff02cdc..116cc962 100644 --- a/Engine/include/Game.h +++ b/Engine/include/Game.h @@ -153,6 +153,13 @@ class Game { Retorna se o controle de framerate está limitando o framerate a um máximo ou não. */ bool IsFramerateLimited(void) const; + /** + \brief Obtém referência do SDL_Window + \return Referncia para SDL_Window + + Retorna a referência do SDL_Window do Game + */ + SDL_Window* GetWindow(void) const; /** \brief Define as dimensões da janela corrente \param size Vec2(x, y) que representa os novos tamanhos da janela. diff --git a/Engine/include/Sprite.h b/Engine/include/Sprite.h index 7a958738..c700d2fb 100644 --- a/Engine/include/Sprite.h +++ b/Engine/include/Sprite.h @@ -177,7 +177,6 @@ class Sprite { void Scale(float scale); Color colorMultiplier;/**< A cor a ser usada para multiplicar a sprite.*/ SDL_BlendMode blendMode;/**< O modo de mistura da sprite com as inferiores.*/ - unsigned char alpha;/**< A transparência da textura.*/ private: std::shared_ptr texture;/**< Ponteiro para a textura manejada pelo sprite.*/ int width;/**< Largura da textura em pixels.*/ diff --git a/Engine/src/Color.cpp b/Engine/src/Color.cpp index 06feaef6..2fab8961 100644 --- a/Engine/src/Color.cpp +++ b/Engine/src/Color.cpp @@ -1,4 +1,4 @@ #include "Color.h" -Color::Color( unsigned char r, unsigned char g, unsigned char b ) : r(r), g(g), b(b) { +Color::Color( unsigned char r, unsigned char g, unsigned char b, unsigned char a ) : r(r), g(g), b(b), a(a) { } diff --git a/Engine/src/Game.cpp b/Engine/src/Game.cpp index ddc3f7ad..a062ae6e 100644 --- a/Engine/src/Game.cpp +++ b/Engine/src/Game.cpp @@ -226,6 +226,10 @@ bool Game::IsFramerateLimited(void) const { return capFramerate; } +SDL_Window* Game::GetWindow(void) const { + return window; +} + void Game::SetWindowDimensions(Vec2 size){ SDL_SetWindowSize(window, size.x, size.y); SetWindowCentered(); diff --git a/Engine/src/Sprite.cpp b/Engine/src/Sprite.cpp index dfb63141..782d8ba3 100644 --- a/Engine/src/Sprite.cpp +++ b/Engine/src/Sprite.cpp @@ -14,7 +14,7 @@ Sprite::Sprite(void): Sprite("", false, 0, 1) {} Sprite::Sprite(std::string file, bool highlighted, float frameTime, int frameCount) : colorMultiplier(255, 255, 255), blendMode(ALPHA_BLEND) - , alpha(255), frameCount(frameCount) + , frameCount(frameCount) , currentFrame(0), timeElapsed(0) , frameTime(frameTime), scaleX(1.), scaleY(1.) { if(highlighted){ @@ -80,7 +80,7 @@ void Sprite::Render(Rect world, float angle, bool isCoordOnWorld) const { if(isOutOfBounds) return; } - if( -1 == SDL_SetTextureAlphaMod( texture.get(), alpha ) ) { + if( -1 == SDL_SetTextureAlphaMod( texture.get(), colorMultiplier.a ) ) { CHECK_SDL_ERROR; } diff --git a/Game/include/StageState.h b/Game/include/StageState.h index 72cf563f..9be82985 100644 --- a/Game/include/StageState.h +++ b/Game/include/StageState.h @@ -15,6 +15,7 @@ #include "Tileset.h" #include "Timer.h" #include "WaveManager.h" + using std::vector; class StageState: public State { @@ -25,6 +26,7 @@ class StageState: public State { void Render(void) const; void Pause(void); void Resume(void); + void ShowLightning(float dt); private: Sprite bg; TileSet tileSet; @@ -32,9 +34,13 @@ class StageState: public State { InputManager &inputManager; Music music; vector> *spawnGroups; + bool isLightning; + Timer lightningTimer; + Color lightningColor; WaveManager waveManager; GameObject nullGameObject; vector waves;//vetor de waves a ser lido no arquivo + void SpawnEnemy(int tileMapPosition); }; #include "EndState.h" diff --git a/Game/src/StageState.cpp b/Game/src/StageState.cpp index d09791c6..287f8409 100644 --- a/Game/src/StageState.cpp +++ b/Game/src/StageState.cpp @@ -22,15 +22,24 @@ #define CAM_START_X 300 #define CAM_START_Y 300 #define CAM_START_ZOOM -1.75 +#define MAX_TIME_LIGHTINING_RISE 0.1 +#define MAX_TIME_LIGHTINING 0.3 +#define MAX_TIME_LIGHTINING_FADE 2 StageState::StageState(void) - : State(), - bg("img/ocean.jpg"), - tileSet(120, 120,"img/map/tileset_v2.png"), - tileMap("map/tileMap.txt", &tileSet), - inputManager(InputManager::GetInstance()), - music("audio/stageState.ogg"), - waveManager(tileMap, "assets/wave&enemyData.txt") { + : State() + , bg("img/ocean.jpg") + , tileSet(120, 120,"img/map/tileset_v2.png") + , tileMap("map/tileMap.txt", &tileSet) + , inputManager(InputManager::GetInstance()) + , music("audio/stageState.ogg") + , isLightning(false) + , lightningTimer() + , lightningColor(255, 255, 255, 0) + , waveManager(tileMap, "assets/wave&enemyData.txt") { + + REPORT_I_WAS_HERE; + tileMap = TileMap(std::string("map/tileMap.txt"), &tileSet); REPORT_I_WAS_HERE; spawnGroups = tileMap.GetSpawnPositions(); @@ -131,6 +140,18 @@ void StageState::Update(float dt) { if(InputManager::GetInstance().IsKeyDown('.')){ Resources::ChangeSoundVolume(STAGE_STATE_DELTA_VOLUME); } + + if(isLightning){ + ShowLightning(dt); + } + else{ + isLightning = false; + lightningTimer.Update(dt); + if(lightningTimer.Get() > rand() % 80 + 20){ + isLightning = true; + lightningTimer.Restart(); + } + } REPORT_DEBUG("\tFrame rate: " << Game::GetInstance().GetCurrentFramerate() << "/" << Game::GetInstance().GetMaxFramerate()); } @@ -150,8 +171,43 @@ void StageState::Render(void) const { tileMap.Render(Vec2(0,0), false, highlighted ? Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()) : Vec2(-1, -1)); REPORT_I_WAS_HERE; State::RenderArray(); + + if(isLightning){ + SDL_SetRenderDrawColor(Game::GetInstance().GetRenderer(), lightningColor.r, lightningColor.g, lightningColor.b, lightningColor.a); + SDL_SetRenderDrawBlendMode(Game::GetInstance().GetRenderer(), SDL_BLENDMODE_BLEND); + SDL_RenderFillRect(Game::GetInstance().GetRenderer(), NULL); + } } 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.0) )); +} + +void StageState::ShowLightning(float dt){ + isLightning = true; + lightningTimer.Update(dt); + + if(lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE){ + lightningColor.a += 256 * dt / MAX_TIME_LIGHTINING_RISE; + } + else if(lightningTimer.Get() >= MAX_TIME_LIGHTINING_RISE && lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING){ + lightningColor.a = 255; + } + else if(lightningTimer.Get() >= MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING && lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING+MAX_TIME_LIGHTINING_FADE){ + float fullTime = (MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING+MAX_TIME_LIGHTINING_FADE) - (MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING); + lightningColor.a -= 256* ((dt / fullTime) + 1); + } + else{ + lightningColor.a = 0; + isLightning = false; + lightningTimer.Restart(); + } +} diff --git a/Game/src/Tower.cpp b/Game/src/Tower.cpp index dddcfcdc..a4190fab 100644 --- a/Game/src/Tower.cpp +++ b/Game/src/Tower.cpp @@ -19,8 +19,7 @@ Tower::Tower(TowerType type, Vec2 pos, Vec2 tileSize) box.y = pos.y; sp.ScaleX(tileSize.x/sp.GetWidth()); sp.ScaleY(tileSize.y/sp.GetHeight()); - sp.colorMultiplier = Color( 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX ); - sp.alpha = 127*(float)rand()/RAND_MAX+127; + sp.colorMultiplier = Color( 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX ); box.w = sp.GetWidth(); box.h = sp.GetHeight(); } diff --git a/docs/AIGoDown_8cpp.html b/docs/AIGoDown_8cpp.html index 79d9af40..7594517d 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 fc67939d..d1eb1f92 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 aeaa5b61..c62661b4 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 7f2a9ce2..6fec669d 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 d2aec85b..11db99d6 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 0be439ba..679b851f 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 feac3fd4..2b5d3471 100644 --- a/docs/Camera_8cpp.html +++ b/docs/Camera_8cpp.html @@ -124,7 +124,7 @@

Definições e macros

diff --git a/docs/Camera_8h.html b/docs/Camera_8h.html index f639ed6e..a1dcaa23 100644 --- a/docs/Camera_8h.html +++ b/docs/Camera_8h.html @@ -233,7 +233,7 @@

Definições e macros

diff --git a/docs/Collision_8h.html b/docs/Collision_8h.html index 2f730637..c908a2ae 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 c1d7c3d3..a239242b 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 d36c7f83..439697bc 100644 --- a/docs/Color_8h.html +++ b/docs/Color_8h.html @@ -107,7 +107,7 @@ diff --git a/docs/ComponentType_8h.html b/docs/ComponentType_8h.html index 32134155..f4f592c5 100644 --- a/docs/ComponentType_8h.html +++ b/docs/ComponentType_8h.html @@ -146,7 +146,7 @@

Enumerações

diff --git a/docs/Component_8cpp.html b/docs/Component_8cpp.html index f5925829..98ab27f7 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 88b33148..49053f12 100644 --- a/docs/Component_8h.html +++ b/docs/Component_8h.html @@ -134,7 +134,7 @@

Definições e macros

diff --git a/docs/Defines_8h.html b/docs/Defines_8h.html index bbd4c69d..60e15234 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 80a69459..5baa4806 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 a6f590f9..9d22a30b 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 35dce4b7..85fdc603 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 4649f812..d5a2695f 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 6ef38fac..393f1ae3 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 d31bc0bb..cf89829f 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 9dde970b..373a620a 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 2a608314..ee6e5b28 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 e25d3fae..575ad920 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 e1a7e77b..5ea1e0ca 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 46541c09..d4393765 100644 --- a/docs/GameObject_8h.html +++ b/docs/GameObject_8h.html @@ -167,7 +167,7 @@

Definições e macros

diff --git a/docs/GameResources_8cpp.html b/docs/GameResources_8cpp.html index ae88f116..865a790e 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 5ce60277..6f23b53c 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 e32be88b..beb30ba6 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 3b8f7408..acea0243 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.html b/docs/HitPoints_8cpp.html index 4b6cd51e..d9d666ac 100644 --- a/docs/HitPoints_8cpp.html +++ b/docs/HitPoints_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/HitPoints_8h.html b/docs/HitPoints_8h.html index 96141296..b7c858a3 100644 --- a/docs/HitPoints_8h.html +++ b/docs/HitPoints_8h.html @@ -133,7 +133,7 @@

Definições dos tipos

diff --git a/docs/InputManager_8cpp.html b/docs/InputManager_8cpp.html index c480fb05..e0c6ca3d 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 343f2b90..3978d583 100644 --- a/docs/InputManager_8h.html +++ b/docs/InputManager_8h.html @@ -318,7 +318,7 @@

Definições e macros

diff --git a/docs/Music_8cpp.html b/docs/Music_8cpp.html index d19b991e..3b259633 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 7b7c0196..4acbd8c2 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 4ce977f2..1817fa12 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 ff419d76..8622f4f3 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 b29b2e5a..dbeafc6b 100644 --- a/docs/Rect_8h.html +++ b/docs/Rect_8h.html @@ -149,7 +149,7 @@

Definições e macros

diff --git a/docs/Resources_8cpp.html b/docs/Resources_8cpp.html index 24a1b686..974b115e 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 71e72703..73a6ba45 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 cb219149..f3956bbf 100644 --- a/docs/SDL__include_8h.html +++ b/docs/SDL__include_8h.html @@ -98,7 +98,7 @@ diff --git a/docs/Sound_8cpp.html b/docs/Sound_8cpp.html index 5fcd270e..4abf68cf 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 54c93645..05563353 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 d9bb783f..4201ada1 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 4bddc90a..41c1ecb4 100644 --- a/docs/Sprite_8h.html +++ b/docs/Sprite_8h.html @@ -194,7 +194,7 @@

Definições e macros

diff --git a/docs/StageState_8cpp.html b/docs/StageState_8cpp.html index 4b81c983..3339417d 100644 --- a/docs/StageState_8cpp.html +++ b/docs/StageState_8cpp.html @@ -129,8 +129,14 @@   #define CAM_START_Y   300   -#define CAM_START_ZOOM   -1.75 +#define CAM_START_ZOOM   0.3   +#define MAX_TIME_LIGHTINING_RISE   0.1 +  +#define MAX_TIME_LIGHTINING   0.3 +  +#define MAX_TIME_LIGHTINING_FADE   2 + 

Definições e macros

@@ -162,7 +168,7 @@

Definições e macros

- +
#define CAM_START_ZOOM   -1.75#define CAM_START_ZOOM   0.3
@@ -203,6 +209,42 @@

Definições e macros

+
+ + +
+
+ + + + +
#define MAX_TIME_LIGHTINING   0.3
+
+ +
+
+ +
+
+ + + + +
#define MAX_TIME_LIGHTINING_FADE   2
+
+ +
+
+ +
+
+ + + + +
#define MAX_TIME_LIGHTINING_RISE   0.1
+
+
@@ -268,7 +310,7 @@

Definições e macros

diff --git a/docs/StageState_8h.html b/docs/StageState_8h.html index b1365509..c240a0ad 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 52c10b9c..5a78041b 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 98f9fbb7..1ba0dce3 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 2adced74..61d8ee77 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 afc29c3a..51907ed0 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 d649c0b2..73501d77 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 dfd40a7a..e3b53413 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 4850899a..927f7cef 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 855818e1..ce77bbba 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 da16c946..f57a377a 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 2b6ce430..cf4f179c 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 d52390d8..e83a8f11 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 666697a4..a1170466 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 bed2f6ad..de293f35 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 2bfd2046..d789c3f3 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 645b4709..25eb0522 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 40fa8455..24c342f4 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 66af3cbd..28184881 100644 --- a/docs/Vec2_8h.html +++ b/docs/Vec2_8h.html @@ -147,7 +147,7 @@

Definições e macros

diff --git a/docs/WaveData_8cpp.html b/docs/WaveData_8cpp.html index c92098e5..bf99a2ea 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 2821d6b9..de9730ae 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 99d95f2c..a14d8720 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 2acd72e6..6b263047 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 6ac55978..f75e099f 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 b8ac8971..9cbb101f 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 8c9f6e7e..48715eca 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 78a6bbba..8490d47d 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 56b970bc..122f2aca 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 166e3f68..09965e60 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 7fa8b7f5..0122c03f 100644 --- a/docs/classAnimation.html +++ b/docs/classAnimation.html @@ -105,7 +105,7 @@
Diagrama de colaboração para Animation:
-
+
[legenda]
@@ -532,7 +532,7 @@

Atributos

diff --git a/docs/classAnimation__coll__graph.map b/docs/classAnimation__coll__graph.map index 29d19c72..3d30b8a5 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 7e19ed3b..6b98c13a 100644 --- a/docs/classAnimation__coll__graph.md5 +++ b/docs/classAnimation__coll__graph.md5 @@ -1 +1 @@ -86af3f19ccd0a2fc206e882890e32f4f \ No newline at end of file +81d45a3465cf74340edb2ccae9a90b94 \ No newline at end of file diff --git a/docs/classAnimation__coll__graph.svg b/docs/classAnimation__coll__graph.svg index 27c5b289..c3fad612 100644 --- a/docs/classAnimation__coll__graph.svg +++ b/docs/classAnimation__coll__graph.svg @@ -4,219 +4,214 @@ - - + + 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 Node7 - -Sprite + +Sprite -Node4->Node7 - - - scaleY -frameTime -timeElapsed -scaleX +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node14 - -Timer + +Timer -Node4->Node14 - - - time +Node4->Node14 + + + time Node5 - -bool + +bool -Node5->Node1 - - - oneTimeOnly +Node5->Node1 + + + oneTimeOnly Node5->Node2 - - - dead + + + dead Node6 - -vector< Component * > + +vector< Component * > Node6->Node2 - - - components + + + components Node7->Node1 - - - sp + + + sp Node8 - -unsigned char + +SDL_Rect -Node8->Node7 - - - alpha - - -Node13 - - -Color - - - - -Node8->Node13 - - - g -r -b +Node8->Node7 + + + clipRect Node9 - -SDL_Rect + +int Node9->Node7 - - - clipRect + + + width +currentFrame +height +frameCount Node10 - -int + +shared_ptr< SDL_Texture > Node10->Node7 - - - width -currentFrame -height -frameCount + + + texture Node11 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node11->Node7 - - - texture + + + blendMode Node12 - -SDL_BlendMode + + +Color + + Node12->Node7 - - - blendMode + + + colorMultiplier - -Node13->Node7 - - - colorMultiplier + +Node13 + +unsigned char + + +Node13->Node12 + + + g +a +r +b -Node14->Node1 - - - endTimer +Node14->Node1 + + + endTimer diff --git a/docs/classCamera-members.html b/docs/classCamera-members.html index fd07a329..7dc76397 100644 --- a/docs/classCamera-members.html +++ b/docs/classCamera-members.html @@ -122,7 +122,7 @@
diff --git a/docs/classCamera.html b/docs/classCamera.html index b45389fd..f851a907 100644 --- a/docs/classCamera.html +++ b/docs/classCamera.html @@ -1057,7 +1057,7 @@

Atributos

diff --git a/docs/classCollision-members.html b/docs/classCollision-members.html index 6eb1e9b2..be541569 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 e7c436fa..36313c54 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 e3f04ab6..19a384b4 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 6cabb7e6..08adafed 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 3734c01a..ce916bb2 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 74104fad..b5959d62 100644 --- a/docs/classDragAndDrop.html +++ b/docs/classDragAndDrop.html @@ -105,7 +105,7 @@
Diagrama de colaboração para DragAndDrop:
-
+
[legenda]
@@ -364,7 +364,7 @@

Atributos

diff --git a/docs/classDragAndDrop__coll__graph.map b/docs/classDragAndDrop__coll__graph.map index 5a5363be..ee5d6792 100644 --- a/docs/classDragAndDrop__coll__graph.map +++ b/docs/classDragAndDrop__coll__graph.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/classDragAndDrop__coll__graph.md5 b/docs/classDragAndDrop__coll__graph.md5 index 9847a1cf..a2141c1d 100644 --- a/docs/classDragAndDrop__coll__graph.md5 +++ b/docs/classDragAndDrop__coll__graph.md5 @@ -1 +1 @@ -32a599361bb528821820fc1ed038bcaf \ No newline at end of file +0ea212716ee795bb7fe55bc228f6cccf \ No newline at end of file diff --git a/docs/classDragAndDrop__coll__graph.svg b/docs/classDragAndDrop__coll__graph.svg index 2cdd237b..c3826a37 100644 --- a/docs/classDragAndDrop__coll__graph.svg +++ b/docs/classDragAndDrop__coll__graph.svg @@ -4,242 +4,237 @@ - - + + DragAndDrop - + Node1 - -DragAndDrop + +DragAndDrop Node2 - -Component + +Component Node2->Node1 - - + + Node3 - -Vec2 + +Vec2 Node3->Node1 - - - associatedInitialPos + + + associatedInitialPos Node4 - -float + +float Node4->Node3 - - - x -y + + + x +y Node7 - -Sprite + +Sprite -Node4->Node7 - - - scaleY -frameTime -timeElapsed -scaleX +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -TileMap + +TileMap Node5->Node1 - - - tileMap + + + tileMap Node6 - -TileSet + +TileSet Node6->Node5 - - - tileSet + + + tileSet Node7->Node6 - - - tileSet + + + tileSet Node8 - -unsigned char + +SDL_Rect -Node8->Node7 - - - alpha - - -Node13 - - -Color - - - - -Node8->Node13 - - - g -r -b +Node8->Node7 + + + clipRect Node9 - -SDL_Rect + +int + + +Node9->Node5 + + + mapDepth +mapHeight +mapWidth + + +Node9->Node6 + + + tileHeight +rows +tileWidth +columns Node9->Node7 - - - clipRect + + + width +currentFrame +height +frameCount Node10 - -int - - -Node10->Node5 - - - mapDepth -mapHeight -mapWidth - - -Node10->Node6 - - - tileHeight -rows -tileWidth -columns + +shared_ptr< SDL_Texture > Node10->Node7 - - - width -currentFrame -height -frameCount + + + texture Node11 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node11->Node7 - - - texture + + + blendMode Node12 - -SDL_BlendMode + + +Color + + Node12->Node7 - - - blendMode + + + colorMultiplier - -Node13->Node7 - - - colorMultiplier + +Node13 + +unsigned char + + +Node13->Node12 + + + g +a +r +b Node14 - -vector< int > + +vector< int > -Node14->Node5 - - - tileMatrix +Node14->Node5 + + + tileMatrix Node15 - -vector< GameObject * > + +vector< GameObject * > -Node15->Node5 - - - gameObjectMatrix +Node15->Node5 + + + gameObjectMatrix Node16 - -bool + +bool -Node16->Node1 - - - dragOnHold -redrag +Node16->Node1 + + + dragOnHold +redrag -Node16->Node5 - - - displayCollisionInfo +Node16->Node5 + + + displayCollisionInfo diff --git a/docs/classEndState-members.html b/docs/classEndState-members.html index bf19c95d..5187716d 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 9bcf6d49..0ab71aaf 100644 --- a/docs/classEndState.html +++ b/docs/classEndState.html @@ -102,7 +102,7 @@
Diagrama de colaboração para EndState:
-
+
[legenda]
@@ -371,7 +371,7 @@

Atributos

diff --git a/docs/classEndStateData-members.html b/docs/classEndStateData-members.html index e62724d0..ecd11aed 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 be03cf71..c364440c 100644 --- a/docs/classEndStateData.html +++ b/docs/classEndStateData.html @@ -252,7 +252,7 @@

Atributos

diff --git a/docs/classEndState__coll__graph.map b/docs/classEndState__coll__graph.map index cfe9d6b0..cee50393 100644 --- a/docs/classEndState__coll__graph.map +++ b/docs/classEndState__coll__graph.map @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/docs/classEndState__coll__graph.md5 b/docs/classEndState__coll__graph.md5 index 9b4e5a24..7f8db372 100644 --- a/docs/classEndState__coll__graph.md5 +++ b/docs/classEndState__coll__graph.md5 @@ -1 +1 @@ -7f730f4d239aa4685eeb69f602d32cad \ No newline at end of file +2c3048198fade34d224a23c6cd38c0ac \ No newline at end of file diff --git a/docs/classEndState__coll__graph.svg b/docs/classEndState__coll__graph.svg index f6b5f1d5..2837c3a3 100644 --- a/docs/classEndState__coll__graph.svg +++ b/docs/classEndState__coll__graph.svg @@ -4,317 +4,312 @@ - - + + 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 +Node4->Node15 + + + 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 + +float Node8->Node7 - - - alpha - - -Node14 - - -Color - - - - -Node8->Node14 - - - g -r -b - - -Node9 - -float - - -Node9->Node7 - - - scaleY -frameTime -timeElapsed -scaleX - - -Node9->Node15 - - - timeShown -strobeFrequency + + + scaleY +frameTime +timeElapsed +scaleX + + +Node8->Node15 + + + timeShown +strobeFrequency Node18 - -Rect + +Rect - -Node9->Node18 - - - w -x -h -y + +Node8->Node18 + + + w +x +h +y Node21 - -Timer + +Timer - -Node9->Node21 - - - time + +Node8->Node21 + + + time + + +Node9 + +SDL_Rect + + +Node9->Node7 + + + clipRect Node10 - -SDL_Rect + +int Node10->Node7 - - - clipRect + + + width +currentFrame +height +frameCount + + +Node10->Node15 + + + fontSize Node11 - -int + +shared_ptr< SDL_Texture > Node11->Node7 - - - width -currentFrame -height -frameCount - - -Node11->Node15 - - - fontSize + + + texture Node12 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node12->Node7 - - - texture + + + blendMode Node13 - -SDL_BlendMode + + +Color + + Node13->Node7 - - - blendMode + + + colorMultiplier - -Node14->Node7 - - - colorMultiplier + +Node14 + +unsigned char + + +Node14->Node13 + + + g +a +r +b -Node15->Node1 - - - instruction +Node15->Node1 + + + instruction Node16 - -shared_ptr< TTF_Font > + +shared_ptr< TTF_Font > -Node16->Node15 - - - font +Node16->Node15 + + + font Node17 - -SDL_Color + +SDL_Color -Node17->Node15 - - - color +Node17->Node15 + + + color -Node18->Node15 - - - box +Node18->Node15 + + + box Node19 - -SDL_Texture * + +SDL_Texture * -Node19->Node15 - - - texture +Node19->Node15 + + + texture Node20 - -string + +string -Node20->Node15 - - - fontFile -text +Node20->Node15 + + + fontFile +text -Node21->Node15 - - - textTime +Node21->Node15 + + + textTime Node22 - -TextStyle + +TextStyle -Node22->Node15 - - - style +Node22->Node15 + + + style diff --git a/docs/classEnemy-members.html b/docs/classEnemy-members.html index 4d694296..2073eabd 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 3539e793..98a54078 100644 --- a/docs/classEnemy.html +++ b/docs/classEnemy.html @@ -105,7 +105,7 @@
Diagrama de colaboração para Enemy:
-
+
[legenda]
@@ -730,7 +730,7 @@

Atributos

diff --git a/docs/classEnemy__coll__graph.map b/docs/classEnemy__coll__graph.map index 852b73a5..1e6a37f0 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 b237c0c2..a745c873 100644 --- a/docs/classEnemy__coll__graph.md5 +++ b/docs/classEnemy__coll__graph.md5 @@ -1 +1 @@ -edc80d7e12513a72fcd49a192d17537d \ No newline at end of file +b01b7ca6ebc0e3816bfa1b9c2242161b \ No newline at end of file diff --git a/docs/classEnemy__coll__graph.svg b/docs/classEnemy__coll__graph.svg index c3e06777..063c96b6 100644 --- a/docs/classEnemy__coll__graph.svg +++ b/docs/classEnemy__coll__graph.svg @@ -4,217 +4,212 @@ - - + + 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 Node8 - -Sprite + +Sprite -Node4->Node8 - - - scaleY -frameTime -timeElapsed -scaleX +Node4->Node8 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -bool + +bool -Node5->Node1 - - - dead +Node5->Node1 + + + dead Node5->Node2 - - - dead + + + dead Node6 - -vector< Component * > + +vector< Component * > Node6->Node2 - - - components + + + components Node7 - -EnemyType + +EnemyType Node7->Node1 - - - type + + + type Node8->Node1 - - - pantsSpName -headSpName -spName -bodySpName -sp + + + pantsSpName +headSpName +spName +bodySpName +sp Node9 - -unsigned char + +SDL_Rect -Node9->Node8 - - - alpha - - -Node14 - - -Color - - - - -Node9->Node14 - - - g -r -b +Node9->Node8 + + + clipRect Node10 - -SDL_Rect + +int + + +Node10->Node1 + + + endPoint +baseHP +quant +enemyIndex Node10->Node8 - - - clipRect + + + width +currentFrame +height +frameCount Node11 - -int - - -Node11->Node1 - - - endPoint -baseHP -quant -enemyIndex + +shared_ptr< SDL_Texture > Node11->Node8 - - - width -currentFrame -height -frameCount + + + texture Node12 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node12->Node8 - - - texture + + + blendMode Node13 - -SDL_BlendMode + + +Color + + Node13->Node8 - - - blendMode - - -Node14->Node8 - - - colorMultiplier + + + colorMultiplier + + +Node14 + +unsigned char + + +Node14->Node13 + + + g +a +r +b diff --git a/docs/classGame-members.html b/docs/classGame-members.html index 5522abb7..54108da5 100644 --- a/docs/classGame-members.html +++ b/docs/classGame-members.html @@ -102,33 +102,34 @@
GetInstance(void)Game
static - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
GetMaxFramerate(void) const Game
GetRenderer(void) const Game
GetWindowBorderless(void) const Game
GetWindowDimensions(void) const Game
GetWindowFullscreen(void) const Game
GetWindowMaximized(void) const Game
inputManagerGameprivate
instanceGameprivatestatic
IsFramerateLimited(void) const Game
LimitFramerate(bool limit)Game
maxFramerateGameprivate
Push(State *state)Game
rendererGameprivate
Run(void)Game
SetMaxFramerate(signed long int newMaxFramerate)Game
SetWindowBorderless(bool isBorderless)Game
SetWindowCentered(void)Game
SetWindowDimensions(Vec2 size)Game
SetWindowFullscreen(bool isFullScreen)Game
SetWindowMaximized(void)Game
stateStackGameprivate
storedStateGameprivate
UpdateStack(void)Gameprivate
windowGameprivate
~Game()Game
GetWindow(void) const Game
GetWindowBorderless(void) const Game
GetWindowDimensions(void) const Game
GetWindowFullscreen(void) const Game
GetWindowMaximized(void) const Game
inputManagerGameprivate
instanceGameprivatestatic
IsFramerateLimited(void) const Game
LimitFramerate(bool limit)Game
maxFramerateGameprivate
Push(State *state)Game
rendererGameprivate
Run(void)Game
SetMaxFramerate(signed long int newMaxFramerate)Game
SetWindowBorderless(bool isBorderless)Game
SetWindowCentered(void)Game
SetWindowDimensions(Vec2 size)Game
SetWindowFullscreen(bool isFullScreen)Game
SetWindowMaximized(void)Game
stateStackGameprivate
storedStateGameprivate
UpdateStack(void)Gameprivate
windowGameprivate
~Game()Game
diff --git a/docs/classGame.html b/docs/classGame.html index 3ba46ce5..d5aedcb7 100644 --- a/docs/classGame.html +++ b/docs/classGame.html @@ -147,6 +147,9 @@ bool IsFramerateLimited (void) const  Retorna se o framerate está sendo limitado ou não. Mais...
  +SDL_Window * GetWindow (void) const + Obtém referência do SDL_Window. Mais...
+  void SetWindowDimensions (Vec2 size)  Define as dimensões da janela corrente. Mais...
  @@ -445,6 +448,26 @@

Métodos

Retorna
Referncia para SDL_Renderer

Retorna a referência do SDL_Renderer do Game

+ + + +
+
+ + + + + + + + +
SDL_Window * Game::GetWindow (void ) const
+
+ +

Obtém referência do SDL_Window.

+
Retorna
Referncia para SDL_Window
+

Retorna a referência do SDL_Window do Game

+
@@ -1034,7 +1057,7 @@

Atributos

diff --git a/docs/classGameObject-members.html b/docs/classGameObject-members.html index 82289d7e..46f0b54d 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 4e60d9b6..9c4b9bf8 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 14a443da..4f929818 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 1429c9d9..891513f8 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 51e15547..041e115c 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 6688b009..cb85f53b 100644 --- a/docs/classHitPoints.html +++ b/docs/classHitPoints.html @@ -102,7 +102,7 @@
Diagrama de colaboração para HitPoints:
-
+
[legenda]
@@ -313,7 +313,7 @@

Atributos

diff --git a/docs/classHitPoints__coll__graph.map b/docs/classHitPoints__coll__graph.map index 8c41b24e..2cd3ff7a 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 a378c002..cf280a4d 100644 --- a/docs/classHitPoints__coll__graph.md5 +++ b/docs/classHitPoints__coll__graph.md5 @@ -1 +1 @@ -8680104172eaf9b0400e8a6da9198efd \ No newline at end of file +bb994b9768722260f56abfa2a416c77a \ No newline at end of file diff --git a/docs/classHitPoints__coll__graph.svg b/docs/classHitPoints__coll__graph.svg index 438f8704..31bcaf93 100644 --- a/docs/classHitPoints__coll__graph.svg +++ b/docs/classHitPoints__coll__graph.svg @@ -4,143 +4,138 @@ - - + + HitPoints - + Node1 - -HitPoints + +HitPoints Node2 - -Component + +Component Node2->Node1 - - + + Node3 - -Sprite + +Sprite Node3->Node1 - - - healthColor -healthBar + + + healthColor +healthBar Node4 - -unsigned char + +float Node4->Node3 - - - alpha - - -Node10 - - -Color - - - - -Node4->Node10 - - - g -r -b + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -float + +SDL_Rect Node5->Node3 - - - scaleY -frameTime -timeElapsed -scaleX + + + clipRect Node6 - -SDL_Rect + +int + + +Node6->Node1 + + + hp Node6->Node3 - - - clipRect + + + width +currentFrame +height +frameCount Node7 - -int - - -Node7->Node1 - - - hp + +shared_ptr< SDL_Texture > Node7->Node3 - - - width -currentFrame -height -frameCount + + + texture Node8 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node8->Node3 - - - texture + + + blendMode Node9 - -SDL_BlendMode + + +Color + + Node9->Node3 - - - blendMode - - -Node10->Node3 - - - colorMultiplier + + + colorMultiplier + + +Node10 + +unsigned char + + +Node10->Node9 + + + g +a +r +b diff --git a/docs/classInputManager-members.html b/docs/classInputManager-members.html index 3723b368..4b2e7715 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 7c129baa..61cb5f11 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 3ca6f47c..34ac59ed 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 00e09a7a..847954b3 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 a96624cf..d5fb79c8 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 cb57b57d..969a6e8e 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 8f9ac11e..2517b768 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 0f4450a9..31188ef4 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 f86798ef..2a86858a 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 f5a7f7f1..0fbad4e6 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 c43dce2b..29d98c1c 100644 --- a/docs/classSprite-members.html +++ b/docs/classSprite-members.html @@ -90,43 +90,42 @@

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

- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
alphaSprite
blendModeSprite
clipRectSpriteprivate
colorMultiplierSprite
currentFrameSpriteprivate
frameCountSpriteprivate
frameTimeSpriteprivate
GetHeight(void) const Sprite
GetTexture(void) const Sprite
GetWidth(void) const Sprite
heightSpriteprivate
IsOpen(void) const Sprite
Open(std::string file)Sprite
Render(Rect world, float angle=0, bool isCoordOnWorld=true) const Sprite
Scale(float scale)Sprite
scaleXSpriteprivate
ScaleX(float scale)Sprite
scaleYSpriteprivate
blendModeSprite
clipRectSpriteprivate
colorMultiplierSprite
currentFrameSpriteprivate
frameCountSpriteprivate
frameTimeSpriteprivate
GetHeight(void) const Sprite
GetTexture(void) const Sprite
GetWidth(void) const Sprite
heightSpriteprivate
IsOpen(void) const Sprite
Open(std::string file)Sprite
Render(Rect world, float angle=0, bool isCoordOnWorld=true) const Sprite
Scale(float scale)Sprite
scaleXSpriteprivate
ScaleX(float scale)Sprite
ScaleY(float scale)Sprite
SetClip(int x, int y, int w, int h)Sprite
SetFrame(int frame)Sprite
SetFrameCount(int frameCount)Sprite
SetFrameTime(float frameTime)Sprite
SetScale(float scale)Sprite
SetScaleX(float scale)Sprite
SetScaleY(float scale)Sprite
Sprite(void)Sprite
Sprite(std::string file, bool highlighted=false, float frameTime=1, int frameCount=1)Sprite
textureSpriteprivate
timeElapsedSpriteprivate
Update(float dt)Sprite
widthSpriteprivate
~Sprite()Sprite
scaleYSpriteprivate
SetClip(int x, int y, int w, int h)Sprite
SetFrame(int frame)Sprite
SetFrameCount(int frameCount)Sprite
SetFrameTime(float frameTime)Sprite
SetScale(float scale)Sprite
SetScaleX(float scale)Sprite
SetScaleY(float scale)Sprite
Sprite(void)Sprite
Sprite(std::string file, bool highlighted=false, float frameTime=1, int frameCount=1)Sprite
textureSpriteprivate
timeElapsedSpriteprivate
Update(float dt)Sprite
widthSpriteprivate
~Sprite()Sprite
diff --git a/docs/classSprite.html b/docs/classSprite.html index 39f23c7d..b2748db7 100644 --- a/docs/classSprite.html +++ b/docs/classSprite.html @@ -100,7 +100,7 @@
Diagrama de colaboração para Sprite:
-
+
[legenda]
@@ -173,8 +173,6 @@ - -
 
SDL_BlendMode blendMode
 
unsigned char alpha
 
@@ -742,19 +740,6 @@

Métodos

Atributos

- -
-
-

Atributos Privados

- - - -
unsigned char Sprite::alpha
-
-

A transparência da textura.

- -
-
@@ -998,7 +983,7 @@

Atributos

diff --git a/docs/classSprite__coll__graph.map b/docs/classSprite__coll__graph.map index a3c670f3..2812c50d 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 0e05cefa..db023cf1 100644 --- a/docs/classSprite__coll__graph.md5 +++ b/docs/classSprite__coll__graph.md5 @@ -1 +1 @@ -27d035ec1a82a2aa371fd8f45de03a53 \ No newline at end of file +e42eec19bf1e2867b389062978916aeb \ No newline at end of file diff --git a/docs/classSprite__coll__graph.svg b/docs/classSprite__coll__graph.svg index 76b51cb3..75d100f8 100644 --- a/docs/classSprite__coll__graph.svg +++ b/docs/classSprite__coll__graph.svg @@ -4,109 +4,104 @@ - - + + Sprite - + Node1 - -Sprite + +Sprite Node2 - -unsigned char + +float Node2->Node1 - - - alpha - - -Node8 - - -Color - - - - -Node2->Node8 - - - g -r -b + + + scaleY +frameTime +timeElapsed +scaleX Node3 - -float + +SDL_Rect Node3->Node1 - - - scaleY -frameTime -timeElapsed -scaleX + + + clipRect Node4 - -SDL_Rect + +int Node4->Node1 - - - clipRect + + + width +currentFrame +height +frameCount Node5 - -int + +shared_ptr< SDL_Texture > Node5->Node1 - - - width -currentFrame -height -frameCount + + + texture Node6 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node6->Node1 - - - texture + + + blendMode Node7 - -SDL_BlendMode + + +Color + + Node7->Node1 - - - blendMode - - -Node8->Node1 - - - colorMultiplier + + + colorMultiplier + + +Node8 + +unsigned char + + +Node8->Node7 + + + g +a +r +b diff --git a/docs/classStageState-members.html b/docs/classStageState-members.html index 5e5c9a75..6a80898f 100644 --- a/docs/classStageState-members.html +++ b/docs/classStageState-members.html @@ -93,32 +93,37 @@
AddObject(GameObject *object)State
virtual bgStageStateprivate inputManagerStageStateprivate - musicStageStateprivate - nullGameObjectStageStateprivate - objectArrayStateprotected - Pause(void)StageStatevirtual - popRequestedStateprotected - PopRequested(void)State - quitRequestedStateprotected - QuitRequested(void)State - Render(void) const StageStatevirtual - RenderArray(void) const Stateprotectedvirtual - Resume(void)StageStatevirtual - 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 + isLightningStageStateprivate + lightningColorStageStateprivate + lightningTimerStageStateprivate + musicStageStateprivate + nullGameObjectStageStateprivate + objectArrayStateprotected + Pause(void)StageStatevirtual + popRequestedStateprotected + PopRequested(void)State + quitRequestedStateprotected + QuitRequested(void)State + Render(void) const StageStatevirtual + RenderArray(void) const Stateprotectedvirtual + Resume(void)StageStatevirtual + ShowLightning(float dt)StageState + 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
diff --git a/docs/classStageState.html b/docs/classStageState.html index 8a1dfe74..f6fb2750 100644 --- a/docs/classStageState.html +++ b/docs/classStageState.html @@ -85,6 +85,7 @@
@@ -102,7 +103,7 @@
Diagrama de colaboração para StageState:
-
+
[legenda]
@@ -124,6 +125,8 @@ + + @@ -141,6 +144,11 @@
void Resume (void)
 Despausa o State. Mais...
 
void ShowLightning (float dt)
 
- Métodos Públicos inherited from State
 State (void)
 Construtor. Mais...
 Informa se o state solicitou que o jogo seja fechado. Mais...
 
+ + + +

+Métodos Privados

void SpawnEnemy (int tileMapPosition)
 
@@ -155,6 +163,12 @@ + + + + + + @@ -299,6 +313,46 @@

Métodos

Implementa State.

+ + + +
+
+

Atributos Privados

Sprite bg
 
vector< vector< int > > * spawnGroups
 
bool isLightning
 
Timer lightningTimer
 
Color lightningColor
 
WaveManager waveManager
 
GameObject nullGameObject
+ + + + + + + +
void StageState::ShowLightning (float dt)
+
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void StageState::SpawnEnemy (int tileMapPosition)
+
+private
+
+
@@ -375,6 +429,66 @@

Atributos

+
+ + +
+
+ + + + + +
+ + + + +
bool StageState::isLightning
+
+private
+
+ +
+
+ +
+
+ + + + + +
+ + + + +
Color StageState::lightningColor
+
+private
+
+ +
+
+ +
+
+ + + + + +
+ + + + +
Timer StageState::lightningTimer
+
+private
+
+
@@ -524,7 +638,7 @@

Atributos

diff --git a/docs/classStageState__coll__graph.map b/docs/classStageState__coll__graph.map index 5afcc8fc..60aea187 100644 --- a/docs/classStageState__coll__graph.map +++ b/docs/classStageState__coll__graph.map @@ -1,15 +1,15 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/classStageState__coll__graph.md5 b/docs/classStageState__coll__graph.md5 index 43bc0a17..052c51fc 100644 --- a/docs/classStageState__coll__graph.md5 +++ b/docs/classStageState__coll__graph.md5 @@ -1 +1 @@ -100339d7c1c2563e0fd3a1fea9755d5f \ No newline at end of file +8e57084baae03d0d52f0e99492c57f61 \ No newline at end of file diff --git a/docs/classStageState__coll__graph.svg b/docs/classStageState__coll__graph.svg index 8a173a00..fc8d918c 100644 --- a/docs/classStageState__coll__graph.svg +++ b/docs/classStageState__coll__graph.svg @@ -4,532 +4,545 @@ - - + + 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->Node1 + + + isLightning Node4->Node2 - - - quitRequested -popRequested + + + quitRequested +popRequested Node8 - -GameObject + +GameObject Node4->Node8 - - - dead + + + dead Node20 - -WaveManager + +WaveManager -Node4->Node20 - - - endWave +Node4->Node20 + + + endWave Node22 - -TileMap + +TileMap -Node4->Node22 - - - displayCollisionInfo +Node4->Node22 + + + displayCollisionInfo Node27 - -InputManager + +InputManager Node4->Node27 - - - quitRequested -mouseState + + + quitRequested +mouseState Node5 - -vector< vector< int > > + +vector< vector< int > > Node5->Node1 - - - spawnGroups + + + spawnGroups -Node5->Node20 - - - spawnGroups +Node5->Node20 + + + spawnGroups Node6 - -Music + +Music Node6->Node1 - - - music + + + music Node7 - -shared_ptr< Mix_Music > + +shared_ptr< Mix_Music > Node7->Node6 - - - music + + + music Node8->Node1 - - - nullGameObject + + + nullGameObject Node9 - -Rect + +Rect Node9->Node8 - - - box + + + box Node10 - -float + +float Node10->Node8 - - - rotation + + + rotation Node10->Node9 - - - w -x -h -y + + + w +x +h +y Node12 - -Sprite + +Sprite -Node10->Node12 - - - scaleY -frameTime -timeElapsed -scaleX +Node10->Node12 + + + scaleY +frameTime +timeElapsed +scaleX Node26 - -Timer + +Timer -Node10->Node26 - - - time +Node10->Node26 + + + time Node28 - -Vec2 + +Vec2 Node10->Node28 - - - x -y + + + x +y Node11 - -vector< Component * > + +vector< Component * > Node11->Node8 - - - components + + + components Node12->Node1 - - - bg + + + bg Node19 - -TileSet + +TileSet -Node12->Node19 - - - tileSet +Node12->Node19 + + + tileSet Node13 - -unsigned char + +SDL_Rect -Node13->Node12 - - - alpha - - -Node18 - - -Color - - - - -Node13->Node18 - - - g -r -b +Node13->Node12 + + + clipRect Node14 - -SDL_Rect + +int Node14->Node12 - - - clipRect + + + width +currentFrame +height +frameCount + + +Node14->Node19 + + + tileHeight +rows +tileWidth +columns + + +Node14->Node20 + + + maxNumberOfEnemiesInSpawn +Point +totalWaves +waveTotalEnemies +playerLifes +enemiesLeft +waveIndex +waveCount +enemyIndex + + +Node14->Node22 + + + mapDepth +mapHeight +mapWidth + + +Node14->Node27 + + + mouseX +mouseY +controllerStickUpdate +mouseScroolUpdate +updateCounter +mouseUpdate Node15 - -int + +shared_ptr< SDL_Texture > 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 + + + texture Node16 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node16->Node12 - - - texture + + + blendMode Node17 - -SDL_BlendMode + + +Color + + + + +Node17->Node1 + + + lightningColor Node17->Node12 - - - blendMode + + + colorMultiplier - -Node18->Node12 - - - colorMultiplier + +Node18 + +unsigned char + + +Node18->Node17 + + + g +a +r +b -Node19->Node1 - - - tileSet +Node19->Node1 + + + tileSet -Node19->Node22 - - - tileSet +Node19->Node22 + + + tileSet -Node20->Node1 - - - waveManager +Node20->Node1 + + + waveManager Node21 - -Component + +Component -Node21->Node20 - - +Node21->Node20 + + Node22->Node1 - - - tileMap + + + tileMap -Node22->Node20 - - - tileMap +Node22->Node20 + + + tileMap Node23 - -vector< int > + +vector< int > Node23->Node1 - - - waves + + + waves -Node23->Node22 - - - tileMatrix +Node23->Node22 + + + tileMatrix Node24 - -vector< GameObject * > + +vector< GameObject * > -Node24->Node22 - - - gameObjectMatrix +Node24->Node22 + + + gameObjectMatrix Node25 - -shared_ptr< std::pair -< std::vector< WaveData - >, std::vector< EnemyData > > > + +shared_ptr< std::pair +< std::vector< WaveData + >, std::vector< EnemyData > > > -Node25->Node20 - - - wavesAndEnemysData +Node25->Node20 + + + wavesAndEnemysData + + +Node26->Node1 + + + lightningTimer -Node26->Node20 - - - spawnTimer +Node26->Node20 + + + spawnTimer Node27->Node1 - - - inputManager + + + inputManager Node28->Node27 - - - controllerLeftStickState -controllerRightStickState -mouseScroolState + + + controllerLeftStickState +controllerRightStickState +mouseScroolState Node29 - -unordered_map< int, - int > + +unordered_map< int, + int > Node29->Node27 - - - controllerUpdate -keyUpdate + + + controllerUpdate +keyUpdate Node30 - -unordered_map< int, - bool > + +unordered_map< int, + bool > Node30->Node27 - - - keyState -controllerState + + + keyState +controllerState Node31 - -unordered_map< int, - SDL_GameController * > + +unordered_map< int, + SDL_GameController * > Node31->Node27 - - - padToController + + + padToController diff --git a/docs/classState-members.html b/docs/classState-members.html index 3c953bbd..558df7bb 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 ce87cbdd..81dc5fcc 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 ae117910..c8390252 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 6f629a6f..99a3ea8a 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 19eb09ef..db1c5911 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 1fb32952..326fbb15 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 ea631e48..3e337705 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 fafa046d..b48a62ad 100644 --- a/docs/classTileMap.html +++ b/docs/classTileMap.html @@ -100,7 +100,7 @@
Diagrama de colaboração para TileMap:
-
+
[legenda]
@@ -991,7 +991,7 @@

Atributos

diff --git a/docs/classTileMap__coll__graph.map b/docs/classTileMap__coll__graph.map index 4a18b38c..f675cf62 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 3547d398..4aadab4e 100644 --- a/docs/classTileMap__coll__graph.md5 +++ b/docs/classTileMap__coll__graph.md5 @@ -1 +1 @@ -22d1d7d9bbd5beeec0b1e7f7007cba2f \ No newline at end of file +c98def3ef2b99b109e49e6f9e037fd08 \ No newline at end of file diff --git a/docs/classTileMap__coll__graph.svg b/docs/classTileMap__coll__graph.svg index 75277282..e8e60a8b 100644 --- a/docs/classTileMap__coll__graph.svg +++ b/docs/classTileMap__coll__graph.svg @@ -4,11 +4,11 @@ - - + + TileMap - + Node1 @@ -31,84 +31,57 @@ Node3 - -Sprite + +Sprite Node3->Node2 - - - tileSet + + + tileSet Node4 - -unsigned char + +float Node4->Node3 - - - alpha - - -Node10 - - -Color - - - - -Node4->Node10 - - - g -r -b + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -float + +SDL_Rect Node5->Node3 - - - scaleY -frameTime -timeElapsed -scaleX + + + clipRect Node6 - -SDL_Rect - - -Node6->Node3 - - - clipRect - - -Node7 int - -Node7->Node1 + +Node6->Node1 mapDepth mapHeight mapWidth - -Node7->Node2 + +Node6->Node2 tileHeight @@ -116,42 +89,64 @@ tileWidth columns + +Node6->Node3 + + + width +currentFrame +height +frameCount + + +Node7 + +shared_ptr< SDL_Texture > + Node7->Node3 - - - width -currentFrame -height -frameCount + + + texture Node8 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node8->Node3 - - - texture + + + blendMode Node9 - -SDL_BlendMode + + +Color + + Node9->Node3 - - - blendMode + + + colorMultiplier - -Node10->Node3 - - - colorMultiplier + +Node10 + +unsigned char + + +Node10->Node9 + + + g +a +r +b Node11 @@ -159,7 +154,7 @@ vector< int > -Node11->Node1 +Node11->Node1 tileMatrix @@ -170,7 +165,7 @@ vector< GameObject * > -Node12->Node1 +Node12->Node1 gameObjectMatrix @@ -181,7 +176,7 @@ bool -Node13->Node1 +Node13->Node1 displayCollisionInfo diff --git a/docs/classTileSet-members.html b/docs/classTileSet-members.html index 095ef10c..4ccc9928 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 57d95dd1..a5171dea 100644 --- a/docs/classTileSet.html +++ b/docs/classTileSet.html @@ -99,7 +99,7 @@
Diagrama de colaboração para TileSet:
-
+
[legenda]
@@ -375,7 +375,7 @@

Atributos

diff --git a/docs/classTileSet__coll__graph.map b/docs/classTileSet__coll__graph.map index d50e2946..647fbcfe 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 86c0bd6e..6732b65e 100644 --- a/docs/classTileSet__coll__graph.md5 +++ b/docs/classTileSet__coll__graph.md5 @@ -1 +1 @@ -df0ba06f6e1636113d08fb8e33c4bad6 \ No newline at end of file +32fa0cbad5885c14c16c40e675b37485 \ No newline at end of file diff --git a/docs/classTileSet__coll__graph.svg b/docs/classTileSet__coll__graph.svg index b0aaa079..f3a5742d 100644 --- a/docs/classTileSet__coll__graph.svg +++ b/docs/classTileSet__coll__graph.svg @@ -4,132 +4,127 @@ - - + + TileSet - + Node1 - -TileSet + +TileSet Node2 - -Sprite + +Sprite Node2->Node1 - - - tileSet + + + tileSet Node3 - -unsigned char + +float Node3->Node2 - - - alpha - - -Node9 - - -Color - - - - -Node3->Node9 - - - g -r -b + + + scaleY +frameTime +timeElapsed +scaleX Node4 - -float + +SDL_Rect Node4->Node2 - - - scaleY -frameTime -timeElapsed -scaleX + + + clipRect Node5 - -SDL_Rect + +int + + +Node5->Node1 + + + tileHeight +rows +tileWidth +columns Node5->Node2 - - - clipRect + + + width +currentFrame +height +frameCount Node6 - -int - - -Node6->Node1 - - - tileHeight -rows -tileWidth -columns + +shared_ptr< SDL_Texture > Node6->Node2 - - - width -currentFrame -height -frameCount + + + texture Node7 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node7->Node2 - - - texture + + + blendMode Node8 - -SDL_BlendMode + + +Color + + Node8->Node2 - - - blendMode - - -Node9->Node2 - - - colorMultiplier + + + colorMultiplier + + +Node9 + +unsigned char + + +Node9->Node8 + + + g +a +r +b diff --git a/docs/classTimer-members.html b/docs/classTimer-members.html index f42ab50a..547d6952 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 a68cca26..5842b8de 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 4943a135..27213895 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 b042f01e..be192a6c 100644 --- a/docs/classTitleState.html +++ b/docs/classTitleState.html @@ -102,7 +102,7 @@
Diagrama de colaboração para TitleState:
-
+
[legenda]
@@ -330,7 +330,7 @@

Atributos

diff --git a/docs/classTitleState__coll__graph.map b/docs/classTitleState__coll__graph.map index 118fa923..8530786e 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 c565eb3a..e2d39ba0 100644 --- a/docs/classTitleState__coll__graph.md5 +++ b/docs/classTitleState__coll__graph.md5 @@ -1 +1 @@ -8c4af2f68fbacdbf4767e7f0228b206d \ No newline at end of file +d955f942c8ac1221644ca5913c732739 \ No newline at end of file diff --git a/docs/classTitleState__coll__graph.svg b/docs/classTitleState__coll__graph.svg index 8b4472e2..c386e813 100644 --- a/docs/classTitleState__coll__graph.svg +++ b/docs/classTitleState__coll__graph.svg @@ -4,160 +4,155 @@ - - + + 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 + +float Node6->Node5 - - - alpha - - -Node12 - - -Color - - - - -Node6->Node12 - - - g -r -b + + + scaleY +frameTime +timeElapsed +scaleX Node7 - -float + +SDL_Rect Node7->Node5 - - - scaleY -frameTime -timeElapsed -scaleX + + + clipRect Node8 - -SDL_Rect + +int Node8->Node5 - - - clipRect + + + width +currentFrame +height +frameCount Node9 - -int + +shared_ptr< SDL_Texture > Node9->Node5 - - - width -currentFrame -height -frameCount + + + texture Node10 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node10->Node5 - - - texture + + + blendMode Node11 - -SDL_BlendMode + + +Color + + Node11->Node5 - - - blendMode - - -Node12->Node5 - - - colorMultiplier + + + colorMultiplier + + +Node12 + +unsigned char + + +Node12->Node11 + + + g +a +r +b diff --git a/docs/classTower-members.html b/docs/classTower-members.html index d2f3756d..633780ac 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 4ad2cf62..3901b69a 100644 --- a/docs/classTower.html +++ b/docs/classTower.html @@ -103,7 +103,7 @@
Diagrama de colaboração para Tower:
-
+
[legenda]
@@ -566,7 +566,7 @@

Atributos

diff --git a/docs/classTower__coll__graph.map b/docs/classTower__coll__graph.map index 9470a023..0d506e04 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 338a7aed..68fddf3a 100644 --- a/docs/classTower__coll__graph.md5 +++ b/docs/classTower__coll__graph.md5 @@ -1 +1 @@ -ce770e188e362912747bfa707860503e \ No newline at end of file +6e395ce24f1047182f2a0108de96fe08 \ No newline at end of file diff --git a/docs/classTower__coll__graph.svg b/docs/classTower__coll__graph.svg index de4be583..f7827d08 100644 --- a/docs/classTower__coll__graph.svg +++ b/docs/classTower__coll__graph.svg @@ -4,199 +4,194 @@ - - + + 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 Node7 - -Sprite + +Sprite -Node4->Node7 - - - scaleY -frameTime -timeElapsed -scaleX +Node4->Node7 + + + scaleY +frameTime +timeElapsed +scaleX Node5 - -bool + +bool -Node5->Node1 - - - isDraging +Node5->Node1 + + + isDraging Node5->Node2 - - - dead + + + dead Node6 - -vector< Component * > + +vector< Component * > Node6->Node2 - - - components + + + components Node7->Node1 - - - sp + + + sp Node8 - -unsigned char + +SDL_Rect -Node8->Node7 - - - alpha - - -Node13 - - -Color - - - - -Node8->Node13 - - - g -r -b +Node8->Node7 + + + clipRect Node9 - -SDL_Rect + +int + + +Node9->Node1 + + + hitpoints Node9->Node7 - - - clipRect + + + width +currentFrame +height +frameCount Node10 - -int - - -Node10->Node1 - - - hitpoints + +shared_ptr< SDL_Texture > Node10->Node7 - - - width -currentFrame -height -frameCount + + + texture Node11 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node11->Node7 - - - texture + + + blendMode Node12 - -SDL_BlendMode + + +Color + + Node12->Node7 - - - blendMode - - -Node13->Node7 - - - colorMultiplier + + + colorMultiplier + + +Node13 + +unsigned char + + +Node13->Node12 + + + g +a +r +b diff --git a/docs/classVec2-members.html b/docs/classVec2-members.html index e4b99d91..60563a66 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 a62d0fc0..10c269a2 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 2905a15a..26bad237 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 272f68bc..99ce5366 100644 --- a/docs/classWaveManager.html +++ b/docs/classWaveManager.html @@ -107,7 +107,7 @@
Diagrama de colaboração para WaveManager:
-
+
[legenda]
@@ -763,7 +763,7 @@

Atributos

diff --git a/docs/classWaveManager__coll__graph.map b/docs/classWaveManager__coll__graph.map index 9d962627..838c2af6 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 0010919e..4c93b757 100644 --- a/docs/classWaveManager__coll__graph.md5 +++ b/docs/classWaveManager__coll__graph.md5 @@ -1 +1 @@ -380930b487830e46dcaaa1742ad3ec45 \ No newline at end of file +a3a903bcb3691de665e7093802e9227c \ No newline at end of file diff --git a/docs/classWaveManager__coll__graph.svg b/docs/classWaveManager__coll__graph.svg index db0e0786..6c9eb885 100644 --- a/docs/classWaveManager__coll__graph.svg +++ b/docs/classWaveManager__coll__graph.svg @@ -4,278 +4,273 @@ - - + + 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 - - - maxNumberOfEnemiesInSpawn -Point -totalWaves -waveTotalEnemies -playerLifes -enemiesLeft -waveIndex -waveCount -enemyIndex + + + maxNumberOfEnemiesInSpawn +Point +totalWaves +waveTotalEnemies +playerLifes +enemiesLeft +waveIndex +waveCount +enemyIndex Node6 - -TileMap + +TileMap -Node4->Node6 - - - mapDepth -mapHeight -mapWidth +Node4->Node6 + + + mapDepth +mapHeight +mapWidth Node7 - -TileSet + +TileSet -Node4->Node7 - - - tileHeight -rows -tileWidth -columns +Node4->Node7 + + + tileHeight +rows +tileWidth +columns Node8 - -Sprite + +Sprite -Node4->Node8 - - - width -currentFrame -height -frameCount +Node4->Node8 + + + width +currentFrame +height +frameCount Node5 - -bool + +bool Node5->Node1 - - - endWave + + + endWave -Node5->Node6 - - - displayCollisionInfo +Node5->Node6 + + + displayCollisionInfo Node6->Node1 - - - tileMap + + + tileMap Node7->Node6 - - - tileSet + + + tileSet Node8->Node7 - - - tileSet + + + tileSet Node9 - -unsigned char + +float Node9->Node8 - - - alpha + + + scaleY +frameTime +timeElapsed +scaleX - -Node14 - - -Color + +Node18 + + +Timer - -Node9->Node14 - - - g -r -b + +Node9->Node18 + + + time Node10 - -float + +SDL_Rect Node10->Node8 - - - scaleY -frameTime -timeElapsed -scaleX - - -Node18 - - -Timer - - - - -Node10->Node18 - - - time + + + clipRect Node11 - -SDL_Rect + +shared_ptr< SDL_Texture > -Node11->Node8 - - - clipRect +Node11->Node8 + + + texture Node12 - -shared_ptr< SDL_Texture > + +SDL_BlendMode Node12->Node8 - - - texture + + + blendMode Node13 - -SDL_BlendMode + + +Color + + Node13->Node8 - - - blendMode + + + colorMultiplier - -Node14->Node8 - - - colorMultiplier + +Node14 + +unsigned char + + +Node14->Node13 + + + g +a +r +b Node15 - -vector< int > + +vector< int > -Node15->Node6 - - - tileMatrix +Node15->Node6 + + + tileMatrix Node16 - -vector< GameObject * > + +vector< GameObject * > -Node16->Node6 - - - gameObjectMatrix +Node16->Node6 + + + 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 +Node17->Node1 + + + wavesAndEnemysData -Node18->Node1 - - - spawnTimer +Node18->Node1 + + + spawnTimer diff --git a/docs/classes.html b/docs/classes.html index 812bb177..d693439b 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 1dfd7aec..821f017c 100644 --- a/docs/dir_000002_000001.html +++ b/docs/dir_000002_000001.html @@ -82,7 +82,7 @@

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 7ee26163..873ea4a7 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 bad59245..032c5d0f 100644 --- a/docs/dir_000005_000000.html +++ b/docs/dir_000005_000000.html @@ -82,7 +82,7 @@

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 3360a667..baa5aafa 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 7a34bec4..620a08c5 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 43b9c3b8..564630e6 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 08c39320..a52c3941 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 815a4f53..d0678cbb 100644 --- a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html +++ b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html @@ -140,7 +140,7 @@ diff --git a/docs/dir_c33286056d2acf479cd8641ef845fec1.html b/docs/dir_c33286056d2acf479cd8641ef845fec1.html index 066638b3..99c03c8d 100644 --- a/docs/dir_c33286056d2acf479cd8641ef845fec1.html +++ b/docs/dir_c33286056d2acf479cd8641ef845fec1.html @@ -100,7 +100,7 @@ diff --git a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html index b7726ffd..19cb5c51 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html @@ -116,7 +116,7 @@ diff --git a/docs/files.html b/docs/files.html index 9457ca46..500b2458 100644 --- a/docs/files.html +++ b/docs/files.html @@ -167,7 +167,7 @@ diff --git a/docs/functions.html b/docs/functions.html index 519bf386..1e23f861 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -126,6 +126,9 @@
Esta é a lista de todos os membros de classes com referências para a classe a que pertencem:

- a -

    +
  • a +: Color +
  • ActionManager() : ActionManager
  • @@ -138,9 +141,6 @@

    - a -

    • AIGoDown() : AIGoDown
    • -
    • alpha -: Sprite -
    • Animation() : Animation
    • @@ -160,7 +160,7 @@

      - a -

        diff --git a/docs/functions_b.html b/docs/functions_b.html index 10a4a0af..401e2171 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 fe128088..c5d158a0 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -169,7 +169,7 @@

          - c -

            : Sprite
          • Color() -: Color +: Color
          • color : Text @@ -214,7 +214,7 @@

            - c -

              diff --git a/docs/functions_d.html b/docs/functions_d.html index ab5f428a..a141f4d3 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 6f70ceeb..7ffe98cc 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 83ca5ca5..086b8a2b 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 4a09fc23..de61944b 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 40f82f6f..d632af6d 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -175,7 +175,7 @@

                  - f -

                    diff --git a/docs/functions_func.html b/docs/functions_func.html index 26b49692..e49e26fe 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 b5484f76..f9e5999b 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 308a1660..88e1e77b 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -158,13 +158,13 @@

                        - c -

                        diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index e8bb9f24..75a26619 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 50551cb2..9c34ba0e 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 a2c19a47..7e8f0161 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -146,7 +146,7 @@

                            - f -

                              diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index 7e9596a8..55b1d2fe 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -244,6 +244,9 @@

                              - g -

                                : Sprite , TileMap +
                              • GetWindow() +: Game +
                              • GetWindowBorderless() : Game
                              • @@ -266,7 +269,7 @@

                                - g -

                                  diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index 092f3d65..a9f7e44e 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 4d812196..a8df4af4 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 3d6f590d..ce91755f 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 1da0953a..b1c58ceb 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 cd513c39..a7b5dece 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 9777418c..d690adfb 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 27bf6547..358dc179 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 5a2a5a8a..c7126f34 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 b761f3ea..5109a714 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 244ff6d4..1ca4f888 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 308d70bc..3446fc2d 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -217,11 +217,15 @@

                                                      - s -

                                                      • ShowCollisionInfo() : TileMap
                                                      • +
                                                      • ShowLightning() +: StageState +
                                                      • Sound() : Sound
                                                      • SpawnEnemy() -: WaveManager +: StageState +, WaveManager
                                                      • Sprite() : Sprite @@ -246,7 +250,7 @@

                                                        - s -

                                                          diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index 1e94a63f..dc795b9c 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 f4271dc4..ed14b6b6 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 353a97c2..a6f3fe45 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 f2c0c7d7..d043cfa6 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 fc5f8b9d..2a700833 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 5d1eead7..3a27806c 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 8f3fca14..7874bad7 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -252,6 +252,9 @@

                                                                      - g -

                                                                        : Sprite , TileMap +
                                                                      • GetWindow() +: Game +
                                                                      • GetWindowBorderless() : Game
                                                                      • @@ -274,7 +277,7 @@

                                                                        - g -

                                                                          diff --git a/docs/functions_h.html b/docs/functions_h.html index a9a63201..8b0bcdfa 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 7824d3f0..14c94a0b 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -196,6 +196,9 @@

                                                                            - i -

                                                                            • IsKeyUp() : InputManager
                                                                            • +
                                                                            • isLightning +: StageState +
                                                                            • IsMouseDown() : InputManager
                                                                            • @@ -220,7 +223,7 @@

                                                                              - i -

                                                                                diff --git a/docs/functions_k.html b/docs/functions_k.html index fb62a197..15f81712 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 044b4310..1828bc69 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -135,6 +135,12 @@

                                                                                  - l -

                                                                                  • lifes : StateData
                                                                                  • +
                                                                                  • lightningColor +: StageState +
                                                                                  • +
                                                                                  • lightningTimer +: StageState +
                                                                                  • LimitFramerate() : Game
                                                                                  • @@ -148,7 +154,7 @@

                                                                                    - l -

                                                                                      diff --git a/docs/functions_m.html b/docs/functions_m.html index e526b8aa..f51e8fcf 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -212,7 +212,7 @@

                                                                                      - m -

                                                                                        diff --git a/docs/functions_n.html b/docs/functions_n.html index 43cc9bda..9e711629 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 cdc156b7..7bbaa774 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 b99be848..328f5a33 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -148,12 +148,12 @@

                                                                                            - p -

                                                                                            • playerVictory : EndStateData
                                                                                            • -
                                                                                            • PopRequested() -: State -
                                                                                            • popRequested : State
                                                                                            • +
                                                                                            • PopRequested() +: State +
                                                                                            • pos : Camera
                                                                                            • @@ -164,7 +164,7 @@

                                                                                              - p -

                                                                                                diff --git a/docs/functions_q.html b/docs/functions_q.html index 8690cabf..118d2de3 100644 --- a/docs/functions_q.html +++ b/docs/functions_q.html @@ -129,23 +129,23 @@

                                                                                                - q -

                                                                                                diff --git a/docs/functions_r.html b/docs/functions_r.html index 83b0b2f9..a88f2854 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 740c3784..2fe1d7be 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -229,17 +229,20 @@

                                                                                                  - s -

                                                                                                  • ShowCollisionInfo() : TileMap
                                                                                                  • +
                                                                                                  • ShowLightning() +: StageState +
                                                                                                  • SOCIOLOGY : Tower
                                                                                                  • Sound() -: Sound +: Sound
                                                                                                  • sound : Sound
                                                                                                  • Sound() -: Sound +: Sound
                                                                                                  • soundTable : Resources @@ -253,7 +256,8 @@

                                                                                                    - s -

                                                                                                      , Tower
                                                                                                    • SpawnEnemy() -: WaveManager +: StageState +, WaveManager
                                                                                                    • spawnGroups : StageState @@ -273,7 +277,7 @@

                                                                                                      - s -

                                                                                                        , EnemyData
                                                                                                      • Sprite() -: Sprite +: Sprite
                                                                                                      • StageState() : StageState @@ -307,7 +311,7 @@

                                                                                                        - s -

                                                                                                          diff --git a/docs/functions_t.html b/docs/functions_t.html index a0637243..17aea662 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -158,11 +158,13 @@

                                                                                                          - t -

                                                                                                          • tileSet : StageState , TileMap -, TileSet
                                                                                                          • TileSet() : TileSet
                                                                                                          • +
                                                                                                          • tileSet +: TileSet +
                                                                                                          • tileWidth : TileSet
                                                                                                          • @@ -200,7 +202,7 @@

                                                                                                            - t -

                                                                                                              diff --git a/docs/functions_type.html b/docs/functions_type.html index 59947cff..e57973e5 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 569a4d01..90223022 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 d00fdfa4..2626df64 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 648a6aa4..9971b4fd 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -124,8 +124,8 @@  

                                                                                                                  - a -

                                                                                                                    -
                                                                                                                  • alpha -: Sprite +
                                                                                                                  • a +: Color
                                                                                                                  • associatedInitialPos : DragAndDrop @@ -336,6 +336,9 @@

                                                                                                                    - i -

                                                                                                                    • isDraging : Tower
                                                                                                                    • +
                                                                                                                    • isLightning +: StageState +
                                                                                                                    • isStrobe : Text
                                                                                                                    • @@ -356,6 +359,12 @@

                                                                                                                      - l -

                                                                                                                      • lifes : StateData
                                                                                                                      • +
                                                                                                                      • lightningColor +: StageState +
                                                                                                                      • +
                                                                                                                      • lightningTimer +: StageState +
                                                                                                                      • logZoomSpeed : Camera
                                                                                                                      • @@ -675,7 +684,7 @@

                                                                                                                        - z -

                                                                                                                          diff --git a/docs/functions_w.html b/docs/functions_w.html index 0e37c909..0bbc1cd3 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -173,7 +173,7 @@

                                                                                                                          - w -

                                                                                                                            diff --git a/docs/functions_x.html b/docs/functions_x.html index 5828113e..4ee930ac 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 83827edd..1219295b 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 d5d356fa..9b4eb11f 100644 --- a/docs/functions_z.html +++ b/docs/functions_z.html @@ -136,7 +136,7 @@

                                                                                                                                - z -

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

                                                                                                                                  - ~ -

                                                                                                                                    diff --git a/docs/globals.html b/docs/globals.html index a40a030e..a3450d50 100644 --- a/docs/globals.html +++ b/docs/globals.html @@ -373,6 +373,15 @@

                                                                                                                                    - m -

                                                                                                                                    • MARGEM_ERRO_COMPARACAO : Vec2.h
                                                                                                                                    • +
                                                                                                                                    • MAX_TIME_LIGHTINING +: StageState.cpp +
                                                                                                                                    • +
                                                                                                                                    • MAX_TIME_LIGHTINING_FADE +: StageState.cpp +
                                                                                                                                    • +
                                                                                                                                    • MAX_TIME_LIGHTINING_RISE +: StageState.cpp +
                                                                                                                                    • MIDDLE_MOUSE_BUTTON : InputManager.h
                                                                                                                                    • @@ -535,7 +544,7 @@

                                                                                                                                      - w -

                                                                                                                                        diff --git a/docs/globals_defs.html b/docs/globals_defs.html index 48385456..0978f453 100644 --- a/docs/globals_defs.html +++ b/docs/globals_defs.html @@ -332,6 +332,15 @@

                                                                                                                                        - m -

                                                                                                                                        • MARGEM_ERRO_COMPARACAO : Vec2.h
                                                                                                                                        • +
                                                                                                                                        • MAX_TIME_LIGHTINING +: StageState.cpp +
                                                                                                                                        • +
                                                                                                                                        • MAX_TIME_LIGHTINING_FADE +: StageState.cpp +
                                                                                                                                        • +
                                                                                                                                        • MAX_TIME_LIGHTINING_RISE +: StageState.cpp +
                                                                                                                                        • MIDDLE_MOUSE_BUTTON : InputManager.h
                                                                                                                                        • @@ -457,7 +466,7 @@

                                                                                                                                          - w -

                                                                                                                                            diff --git a/docs/globals_enum.html b/docs/globals_enum.html index 9241ef2b..078e231a 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 9f715506..c2854005 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 9f1f06c6..6685f7d3 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 7f5f1282..450e87f1 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 ca0b8c48..d3ffd986 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 f8a4c23f..4c384c87 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -133,7 +133,7 @@ diff --git a/docs/index.html b/docs/index.html index 5b76c0c7..45d75f0c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,7 +82,7 @@ diff --git a/docs/inherits.html b/docs/inherits.html index 55ffe20e..b0a4c0f7 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 9e884bfe..d24ca55f 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 dde58d76..829ca236 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 253c9522..a1d802b3 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -88,7 +88,7 @@ diff --git a/docs/search/all_0.js b/docs/search/all_0.js index b85cac83..49f929a6 100644 --- a/docs/search/all_0.js +++ b/docs/search/all_0.js @@ -1,5 +1,6 @@ var searchData= [ + ['a',['a',['../structColor.html#a39bb1f3f9a514ac1a581ca27fddebebc',1,'Color']]], ['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,'']]], @@ -10,7 +11,6 @@ var searchData= ['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,'']]], - ['alpha',['alpha',['../classSprite.html#ab3e19ec07718672961d355c5e25ef3ee',1,'Sprite']]], ['alpha_5fblend',['ALPHA_BLEND',['../Sprite_8h.html#a53c3481913568ddca94dffc38c36a1fb',1,'Sprite.h']]], ['animation',['Animation',['../classAnimation.html',1,'Animation'],['../classAnimation.html#a48d3ca5ecd4b4ca7f2f6fe10cf1f91d4',1,'Animation::Animation()']]], ['animation_2ecpp',['Animation.cpp',['../Animation_8cpp.html',1,'']]], diff --git a/docs/search/all_10.js b/docs/search/all_10.js index cebbecc8..6b4929e5 100644 --- a/docs/search/all_10.js +++ b/docs/search/all_10.js @@ -2,5 +2,5 @@ var searchData= [ ['quant',['quant',['../classEnemy.html#a22cded603d9d52cd2bf7ff0ea64ff768',1,'Enemy']]], ['quimic',['QUIMIC',['../Enemy_8h.html#ac3e413a86119db4b031458c7259e268ea2b2a960417c6d570d98035e819043a59',1,'Enemy.h']]], - ['quitrequested',['quitRequested',['../classInputManager.html#a078d1f2f8af5f17005f21f7407dbca57',1,'InputManager::quitRequested()'],['../classState.html#aa96884ddc05e8f23841298af662ae733',1,'State::quitRequested()'],['../classInputManager.html#a0c96a7ae70931d034a78a8e97b70dd27',1,'InputManager::QuitRequested()'],['../classState.html#a1645048aadaadad50404ff1868e11bb2',1,'State::QuitRequested()']]] + ['quitrequested',['QuitRequested',['../classInputManager.html#a0c96a7ae70931d034a78a8e97b70dd27',1,'InputManager::QuitRequested()'],['../classState.html#a1645048aadaadad50404ff1868e11bb2',1,'State::QuitRequested()'],['../classInputManager.html#a078d1f2f8af5f17005f21f7407dbca57',1,'InputManager::quitRequested()'],['../classState.html#aa96884ddc05e8f23841298af662ae733',1,'State::quitRequested()']]] ]; diff --git a/docs/search/all_12.js b/docs/search/all_12.js index 85dc0f9a..040434cc 100644 --- a/docs/search/all_12.js +++ b/docs/search/all_12.js @@ -34,6 +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']]], + ['showlightning',['ShowLightning',['../classStageState.html#aaae782ee54ae1d767579e4b86e928ead',1,'StageState']]], ['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']]], @@ -44,7 +45,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',['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager']]], + ['spawnenemy',['SpawnEnemy',['../classStageState.html#a5812a63278bc2f2f911795f0184f1588',1,'StageState::SpawnEnemy()'],['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager::SpawnEnemy()']]], ['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.js b/docs/search/all_13.js index 0cf03ece..7a639654 100644 --- a/docs/search/all_13.js +++ b/docs/search/all_13.js @@ -14,7 +14,7 @@ var searchData= ['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']]], diff --git a/docs/search/all_2.js b/docs/search/all_2.js index 72ed0336..06eb1b5b 100644 --- a/docs/search/all_2.js +++ b/docs/search/all_2.js @@ -31,7 +31,7 @@ var searchData= ['collision',['Collision',['../classCollision.html',1,'']]], ['collision_2eh',['Collision.h',['../Collision_8h.html',1,'']]], ['collision_5flayer',['COLLISION_LAYER',['../TileMap_8h.html#a22d205877ba623d755a2c7306a45170a',1,'TileMap.h']]], - ['color',['Color',['../structColor.html',1,'Color'],['../classText.html#ab0f771bd18d8e968f7aaee4a4e26e385',1,'Text::color()'],['../structColor.html#a01fc8b90de599a12365e87b9a0719264',1,'Color::Color()']]], + ['color',['Color',['../structColor.html',1,'Color'],['../classText.html#ab0f771bd18d8e968f7aaee4a4e26e385',1,'Text::color()'],['../structColor.html#a1f9035eaa8f9eb07c55359e60e895b73',1,'Color::Color()']]], ['color_2ecpp',['Color.cpp',['../Color_8cpp.html',1,'']]], ['color_2eh',['Color.h',['../Color_8h.html',1,'']]], ['color_5fmodulation',['COLOR_MODULATION',['../Sprite_8h.html#af80a45759a911ffaa1db89816b1820ee',1,'Sprite.h']]], diff --git a/docs/search/all_6.js b/docs/search/all_6.js index 571ea853..36433516 100644 --- a/docs/search/all_6.js +++ b/docs/search/all_6.js @@ -48,6 +48,7 @@ var searchData= ['getwavedata',['GetWaveData',['../classGameResources.html#a703acf6508012a262661bfaac5efa7fc',1,'GameResources']]], ['getweightdata',['GetWeightData',['../classGameResources.html#afaa372572900c7ab1c7d8e5862d4de34',1,'GameResources']]], ['getwidth',['GetWidth',['../classSprite.html#ad3d43826d2f41185964ec4a1eb492248',1,'Sprite::GetWidth()'],['../classTileMap.html#a072dbe1dbd793712baefe154c3058ab2',1,'TileMap::GetWidth()']]], + ['getwindow',['GetWindow',['../classGame.html#a37fe21c58692aca137c2d8530bb0ed29',1,'Game']]], ['getwindowborderless',['GetWindowBorderless',['../classGame.html#a1462f830e61a7ece6075391faf9d2765',1,'Game']]], ['getwindowdimensions',['GetWindowDimensions',['../classGame.html#adbeb87bbabcc73f936e149c2d83d9d33',1,'Game']]], ['getwindowfullscreen',['GetWindowFullscreen',['../classGame.html#ab578fc018939b5c1fe15b993856828ad',1,'Game']]], diff --git a/docs/search/all_8.js b/docs/search/all_8.js index 41a72ed9..aef8fda6 100644 --- a/docs/search/all_8.js +++ b/docs/search/all_8.js @@ -8,7 +8,7 @@ var searchData= ['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']]], ['input_5fmanager',['INPUT_MANAGER',['../Camera_8cpp.html#ad2c7741149bf2d26ce3649737749d3ff',1,'Camera.cpp']]], - ['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',['InputManager',['../classInputManager.html',1,'InputManager'],['../classGame.html#a57010b9ce85884e0f4059d8d8474e610',1,'Game::inputManager()'],['../classStageState.html#acbf7ba483ee1ae6fe7d20f22b5c721b3',1,'StageState::inputManager()'],['../classInputManager.html#a8be46886da639b26d67181c29dab6d6c',1,'InputManager::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(GameObject *obj)'],['../classTileMap.html#a916d38c429fe9d66b92c2687656c0e3c',1,'TileMap::InsertGO(GameObject *obj, Vec2 initialPos)']]], @@ -25,6 +25,7 @@ var searchData= ['isinrect',['IsInRect',['../classVec2.html#a788dc85f57e20be80e85543e6996a4f1',1,'Vec2']]], ['iskeydown',['IsKeyDown',['../classInputManager.html#a97d25d372ab28dbc119b5a0919e38244',1,'InputManager']]], ['iskeyup',['IsKeyUp',['../classInputManager.html#a0b9ab4448dcc8a220147bec9d44d6e23',1,'InputManager']]], + ['islightning',['isLightning',['../classStageState.html#a586760c599ce19a6743bafc5f63b3c02',1,'StageState']]], ['ismousedown',['IsMouseDown',['../classInputManager.html#a410c6f6a0fa13dfd938d6d26a524fc19',1,'InputManager']]], ['ismousescrolling',['IsMouseScrolling',['../classInputManager.html#aeb81e9386db70d1cc204e45963ec9077',1,'InputManager']]], ['ismouseup',['IsMouseUp',['../classInputManager.html#a97d0df155dc07d57b4f7c9e7f66b0f2e',1,'InputManager']]], diff --git a/docs/search/all_b.js b/docs/search/all_b.js index 6a08c6f3..ac75a61d 100644 --- a/docs/search/all_b.js +++ b/docs/search/all_b.js @@ -8,6 +8,8 @@ var searchData= ['leftarrowaction',['LeftArrowAction',['../classActionManager.html#afb4776f0e58c20d5c09c7e437298ae1b',1,'ActionManager']]], ['leftshoulderaction',['LeftShoulderAction',['../classActionManager.html#a61be8917bbd2964348cb99087f71bc99',1,'ActionManager']]], ['lifes',['lifes',['../classStateData.html#a4cfaba2a0f99c715f37607b068617210',1,'StateData']]], + ['lightningcolor',['lightningColor',['../classStageState.html#ab9c135b5484327f9ded7e0a5d067cd20',1,'StageState']]], + ['lightningtimer',['lightningTimer',['../classStageState.html#aa53aa34e27fb6460a4c921ef6d56f04e',1,'StageState']]], ['limitframerate',['LimitFramerate',['../classGame.html#a3fb091ff0a082d2652a98fee63c62b83',1,'Game']]], ['load',['Load',['../classTileMap.html#a57d5a9e280c52b74e8e1f0c3a2c876b7',1,'TileMap']]], ['logzoomspeed',['logZoomSpeed',['../classCamera.html#ab9c22201b3c224e7c0f6e7a6733c33ff',1,'Camera']]], diff --git a/docs/search/all_c.js b/docs/search/all_c.js index 49350e66..7cca112d 100644 --- a/docs/search/all_c.js +++ b/docs/search/all_c.js @@ -8,6 +8,9 @@ var searchData= ['mapheight',['mapHeight',['../classTileMap.html#a8fec89ca278b51de7f3e38831d9fb161',1,'TileMap']]], ['mapwidth',['mapWidth',['../classTileMap.html#ae2361e840eacaebbbbc91541ded00655',1,'TileMap']]], ['margem_5ferro_5fcomparacao',['MARGEM_ERRO_COMPARACAO',['../Vec2_8h.html#a1759b83db156ac7ed195b3e04757ee14',1,'Vec2.h']]], + ['max_5ftime_5flightining',['MAX_TIME_LIGHTINING',['../StageState_8cpp.html#a6cd38758a40bb76ae2cf9d5eedc46672',1,'StageState.cpp']]], + ['max_5ftime_5flightining_5ffade',['MAX_TIME_LIGHTINING_FADE',['../StageState_8cpp.html#a5dc2fcc508e5031c49437abc405df1cd',1,'StageState.cpp']]], + ['max_5ftime_5flightining_5frise',['MAX_TIME_LIGHTINING_RISE',['../StageState_8cpp.html#a1ae6a2fad6e7d4d6932b99af02f1b53f',1,'StageState.cpp']]], ['maxframerate',['maxFramerate',['../classGame.html#a5424a424548c7bdb04de05c5c836002d',1,'Game']]], ['maxlogzoom',['maxLogZoom',['../classCamera.html#af7e88a28816f95f04e96417cd156cabb',1,'Camera']]], ['maxnumberofenemiesinspawnpoint',['maxNumberOfEnemiesInSpawnPoint',['../classWaveManager.html#a64c49de73005706f16187749699f9d0a',1,'WaveManager']]], diff --git a/docs/search/all_f.js b/docs/search/all_f.js index f6f0c75b..1ea65b01 100644 --- a/docs/search/all_f.js +++ b/docs/search/all_f.js @@ -7,7 +7,7 @@ var searchData= ['play',['Play',['../classMusic.html#a0b0eeff26dedfaab92bd127bce028b9a',1,'Music::Play()'],['../classSound.html#a2719199f31d8abfc0bd9a6814e4e169d',1,'Sound::Play()']]], ['playerlifes',['playerLifes',['../classWaveManager.html#a2a4504185bcd0bb15d6843c2e26685f5',1,'WaveManager']]], ['playervictory',['playerVictory',['../classEndStateData.html#aa26994b44ccac743a141c9709c526302',1,'EndStateData']]], - ['poprequested',['PopRequested',['../classState.html#af898168550c4a26b71e4f9ddb0e1f338',1,'State::PopRequested(void)'],['../classState.html#a9d7c1082cc6592646acec05a6e46f145',1,'State::popRequested()']]], + ['poprequested',['popRequested',['../classState.html#a9d7c1082cc6592646acec05a6e46f145',1,'State::popRequested()'],['../classState.html#af898168550c4a26b71e4f9ddb0e1f338',1,'State::PopRequested(void)']]], ['pos',['pos',['../classCamera.html#a748c4e2867e34f45a431a1d2dcc6fee2',1,'Camera']]], ['push',['Push',['../classGame.html#ab5637c16d9580f8ec08b5830baff35bd',1,'Game']]] ]; diff --git a/docs/search/defines_a.js b/docs/search/defines_a.js index 96d1d5b7..3b282a9f 100644 --- a/docs/search/defines_a.js +++ b/docs/search/defines_a.js @@ -1,6 +1,9 @@ var searchData= [ ['margem_5ferro_5fcomparacao',['MARGEM_ERRO_COMPARACAO',['../Vec2_8h.html#a1759b83db156ac7ed195b3e04757ee14',1,'Vec2.h']]], + ['max_5ftime_5flightining',['MAX_TIME_LIGHTINING',['../StageState_8cpp.html#a6cd38758a40bb76ae2cf9d5eedc46672',1,'StageState.cpp']]], + ['max_5ftime_5flightining_5ffade',['MAX_TIME_LIGHTINING_FADE',['../StageState_8cpp.html#a5dc2fcc508e5031c49437abc405df1cd',1,'StageState.cpp']]], + ['max_5ftime_5flightining_5frise',['MAX_TIME_LIGHTINING_RISE',['../StageState_8cpp.html#a1ae6a2fad6e7d4d6932b99af02f1b53f',1,'StageState.cpp']]], ['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']]], ['mixer_5fchuck_5fsize',['MIXER_CHUCK_SIZE',['../Game_8h.html#aa464e7a29fa5110de8238c0cfb4458a2',1,'Game.h']]], diff --git a/docs/search/functions_11.js b/docs/search/functions_11.js index cc06ad78..79e6f3be 100644 --- a/docs/search/functions_11.js +++ b/docs/search/functions_11.js @@ -31,8 +31,9 @@ var searchData= ['setzoomlimits',['SetZoomLimits',['../classCamera.html#a51ddbb2a2da01b556b61c5f418a9377e',1,'Camera']]], ['setzoomspeed',['SetZoomSpeed',['../classCamera.html#a4373a9b1baa7b98e4fe5859e0645baed',1,'Camera']]], ['showcollisioninfo',['ShowCollisionInfo',['../classTileMap.html#a31b1607f50b08cf2c49c71a8478ec07d',1,'TileMap']]], + ['showlightning',['ShowLightning',['../classStageState.html#aaae782ee54ae1d767579e4b86e928ead',1,'StageState']]], ['sound',['Sound',['../classSound.html#a539c205cdf06fe2c621fd77c37bcfac9',1,'Sound::Sound()'],['../classSound.html#af2c277cdc12b7df1de53e5b855e4f09c',1,'Sound::Sound(string file)']]], - ['spawnenemy',['SpawnEnemy',['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager']]], + ['spawnenemy',['SpawnEnemy',['../classStageState.html#a5812a63278bc2f2f911795f0184f1588',1,'StageState::SpawnEnemy()'],['../classWaveManager.html#aab65a107a231828cf45d1da8d9bb1566',1,'WaveManager::SpawnEnemy()']]], ['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_2.js b/docs/search/functions_2.js index d1162239..b6dd66b3 100644 --- a/docs/search/functions_2.js +++ b/docs/search/functions_2.js @@ -11,5 +11,5 @@ var searchData= ['clearmusic',['ClearMusic',['../classResources.html#a37aa5ada5adf925b8862f65d207244d1',1,'Resources']]], ['clearresources',['ClearResources',['../classResources.html#a6a704f9988d9189d2d028ab5dcc64496',1,'Resources']]], ['clearsound',['ClearSound',['../classResources.html#a07885930484a8dd953c2e144ac8be6c5',1,'Resources']]], - ['color',['Color',['../structColor.html#a01fc8b90de599a12365e87b9a0719264',1,'Color']]] + ['color',['Color',['../structColor.html#a1f9035eaa8f9eb07c55359e60e895b73',1,'Color']]] ]; diff --git a/docs/search/functions_6.js b/docs/search/functions_6.js index d8699d43..aca973d6 100644 --- a/docs/search/functions_6.js +++ b/docs/search/functions_6.js @@ -39,6 +39,7 @@ var searchData= ['getwavedata',['GetWaveData',['../classGameResources.html#a703acf6508012a262661bfaac5efa7fc',1,'GameResources']]], ['getweightdata',['GetWeightData',['../classGameResources.html#afaa372572900c7ab1c7d8e5862d4de34',1,'GameResources']]], ['getwidth',['GetWidth',['../classSprite.html#ad3d43826d2f41185964ec4a1eb492248',1,'Sprite::GetWidth()'],['../classTileMap.html#a072dbe1dbd793712baefe154c3058ab2',1,'TileMap::GetWidth()']]], + ['getwindow',['GetWindow',['../classGame.html#a37fe21c58692aca137c2d8530bb0ed29',1,'Game']]], ['getwindowborderless',['GetWindowBorderless',['../classGame.html#a1462f830e61a7ece6075391faf9d2765',1,'Game']]], ['getwindowdimensions',['GetWindowDimensions',['../classGame.html#adbeb87bbabcc73f936e149c2d83d9d33',1,'Game']]], ['getwindowfullscreen',['GetWindowFullscreen',['../classGame.html#ab578fc018939b5c1fe15b993856828ad',1,'Game']]], diff --git a/docs/search/variables_0.js b/docs/search/variables_0.js index e921abba..198e0058 100644 --- a/docs/search/variables_0.js +++ b/docs/search/variables_0.js @@ -1,5 +1,5 @@ var searchData= [ - ['alpha',['alpha',['../classSprite.html#ab3e19ec07718672961d355c5e25ef3ee',1,'Sprite']]], + ['a',['a',['../structColor.html#a39bb1f3f9a514ac1a581ca27fddebebc',1,'Color']]], ['associatedinitialpos',['associatedInitialPos',['../classDragAndDrop.html#a8c14587e18912fc4efce09648c33114a',1,'DragAndDrop']]] ]; diff --git a/docs/search/variables_8.js b/docs/search/variables_8.js index dbd79d61..7a4ecac2 100644 --- a/docs/search/variables_8.js +++ b/docs/search/variables_8.js @@ -5,5 +5,6 @@ var searchData= ['instance',['instance',['../classGame.html#aa469cdc0a30f4fd2d6d99b23f4fbf257',1,'Game']]], ['instruction',['instruction',['../classEndState.html#acbc4bcbbf722307b2ea222b5a85a0e8d',1,'EndState']]], ['isdraging',['isDraging',['../classTower.html#a7a2b297edf481c2eb2eeaa8a83d20bf8',1,'Tower']]], + ['islightning',['isLightning',['../classStageState.html#a586760c599ce19a6743bafc5f63b3c02',1,'StageState']]], ['isstrobe',['isStrobe',['../classText.html#a5ebb0b4767c8487d440d9c36ae0c93cd',1,'Text']]] ]; diff --git a/docs/search/variables_a.js b/docs/search/variables_a.js index 091edd70..188f4085 100644 --- a/docs/search/variables_a.js +++ b/docs/search/variables_a.js @@ -1,5 +1,7 @@ var searchData= [ ['lifes',['lifes',['../classStateData.html#a4cfaba2a0f99c715f37607b068617210',1,'StateData']]], + ['lightningcolor',['lightningColor',['../classStageState.html#ab9c135b5484327f9ded7e0a5d067cd20',1,'StageState']]], + ['lightningtimer',['lightningTimer',['../classStageState.html#aa53aa34e27fb6460a4c921ef6d56f04e',1,'StageState']]], ['logzoomspeed',['logZoomSpeed',['../classCamera.html#ab9c22201b3c224e7c0f6e7a6733c33ff',1,'Camera']]] ]; diff --git a/docs/structColor-members.html b/docs/structColor-members.html index 803c283a..5938ead4 100644 --- a/docs/structColor-members.html +++ b/docs/structColor-members.html @@ -90,14 +90,15 @@

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

                                                                                                                                            - - - - + + + + +
                                                                                                                                            bColor
                                                                                                                                            Color(unsigned char r, unsigned char g, unsigned char b)Color
                                                                                                                                            gColor
                                                                                                                                            rColor
                                                                                                                                            aColor
                                                                                                                                            bColor
                                                                                                                                            Color(unsigned char r, unsigned char g, unsigned char b, unsigned char a=255)Color
                                                                                                                                            gColor
                                                                                                                                            rColor
                                                                                                                                            diff --git a/docs/structColor.html b/docs/structColor.html index c8bb8451..dbe3a7b8 100644 --- a/docs/structColor.html +++ b/docs/structColor.html @@ -99,15 +99,15 @@
                                                                                                                                            Diagrama de colaboração para Color:
                                                                                                                                            -
                                                                                                                                            +
                                                                                                                                            [legenda]
                                                                                                                                            - - - + + +

                                                                                                                                            Métodos Públicos

                                                                                                                                             Color (unsigned char r, unsigned char g, unsigned char b)
                                                                                                                                             Cria um tipo para armazenar a cor [R,G,B]. Mais...
                                                                                                                                             
                                                                                                                                             Color (unsigned char r, unsigned char g, unsigned char b, unsigned char a=255)
                                                                                                                                             Cria um tipo para armazenar a cor [R,G,B,A]. Mais...
                                                                                                                                             
                                                                                                                                            @@ -117,12 +117,14 @@ + +

                                                                                                                                            Atributos Públicos

                                                                                                                                             
                                                                                                                                            unsigned char b
                                                                                                                                             
                                                                                                                                            unsigned char a
                                                                                                                                             

                                                                                                                                            Descrição Detalhada

                                                                                                                                            Struct para armazenar informações de cor.

                                                                                                                                            Cor é uma struct cujo único propósito é permitir o armazenamento de informações de cor em uma variável só.

                                                                                                                                            Construtores & Destrutores

                                                                                                                                            - +
                                                                                                                                            @@ -142,7 +144,13 @@ - + + + + + + + @@ -152,12 +160,13 @@
                                                                                                                                            unsigned char b b,
                                                                                                                                            unsigned char a = 255 
                                                                                                                                            -

                                                                                                                                            Cria um tipo para armazenar a cor [R,G,B].

                                                                                                                                            +

                                                                                                                                            Cria um tipo para armazenar a cor [R,G,B,A].

                                                                                                                                            Parâmetros
                                                                                                                                            - + +
                                                                                                                                            Intensidadedo Canal Vermelho (Red) da cor
                                                                                                                                            Intensidadedo Canal Verde (Green) da cor
                                                                                                                                            Intensidadedo Canal Azul (Blue) da cor
                                                                                                                                            Intensidadedo Canal Azul (Blue) da cor
                                                                                                                                            Intensidadedo Canal Alfa (Alpha) da cor
                                                                                                                                            @@ -166,6 +175,19 @@

                                                                                                                                            Atributos

                                                                                                                                            + +
                                                                                                                                            +
                                                                                                                                            + + + + +
                                                                                                                                            unsigned char Color::a
                                                                                                                                            +
                                                                                                                                            +

                                                                                                                                            Canal A

                                                                                                                                            + +
                                                                                                                                            +
                                                                                                                                            @@ -212,7 +234,7 @@

                                                                                                                                            Atributos

                                                                                                                                            diff --git a/docs/structColor__coll__graph.md5 b/docs/structColor__coll__graph.md5 index 51204128..82ead5ad 100644 --- a/docs/structColor__coll__graph.md5 +++ b/docs/structColor__coll__graph.md5 @@ -1 +1 @@ -989f54a2cd150b36265960824be5ab63 \ No newline at end of file +5f310621bb19fc967e8a4b64d839ce4a \ No newline at end of file diff --git a/docs/structColor__coll__graph.svg b/docs/structColor__coll__graph.svg index fdf2399b..1ba0b667 100644 --- a/docs/structColor__coll__graph.svg +++ b/docs/structColor__coll__graph.svg @@ -4,11 +4,11 @@ - - + + Color - + Node1 @@ -16,14 +16,15 @@ Node2 - -unsigned char + +unsigned char Node2->Node1 - - - g + + + g +a r b diff --git a/docs/structEnemyData-members.html b/docs/structEnemyData-members.html index a11847e3..f5d4d22b 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 e7abf5b0..e8e9f5e3 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 4b44b7b8..54c09b86 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 9e823c94..e4bac3b5 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 4c57d2c9..3c77e645 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 d7acc7c4..dc99c2fe 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 6a682d84..339238d2 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 ded2782f..9fd447ec 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 d4dbffaf..d1457dfd 100644 --- a/docs/todo.html +++ b/docs/todo.html @@ -138,7 +138,7 @@ diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db index 04c74d749fa0b97903d914cbbeb6b91e29389787..ecca6b0cb173f0a616f88c53906bf2a5b1f56db3 100644 GIT binary patch delta 14994 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 Kb5+043I87!$p9Px delta 13722 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