From 6d9ff8bca289d7a183cc25b5b67bbf780cafbe87 Mon Sep 17 00:00:00 2001 From: Daniel Marcos Date: Wed, 31 May 2017 15:08:56 -0300 Subject: [PATCH] features/TemporizacaoTexto (#49) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Acrescenta funcionalidade ao Text Novo atributo (Timer* textTime) permite que o texto pisque em um tempo padrão. O parâmetro acrescentado no construtor (Timer* delay) seta esse novo atributo como nullptr por padrão, caso não haja necessidade de o texto piscar. * Corrige alterações feitas em Text Acrescenta dois defines (em caso de ser um texto que pisca): um para o tempo padrão em que o texto será renderizado em 1 (um) ciclo de piscagem e outro para o tempo padrão total de um ciclo de piscagem. Acrescenta dois atributos float que definem os valores do tempo a ser renderizado durante um ciclo de piscagem e do tempo total de um ciclo de piscagem. Acrescenta dois métodos públicos de Set para Text que alteram os valores dos novos atributos. Acrescenta um atributo protegido em State que guarda o tempo de piscagem dos textos de cada estado filho. Esse atributo só é definido por seus filhos. Os valores padrão dos tempos de mostragem do texto e total do ciclo de piscagem são setados no contrutor com os defines criados para isso. Em EndState, foi definido um tempo para piscagem do texto informativo a fim de demonstrar um exemplo de como se usa a opção. * Corrige modo de tratar piscagem de texto Retira timer dos estados e trata tudo no próprio text. Retira todo timer de texto fora da classe text e acrescenta flag no construtor de text isStrobing para deterimnar se o texto deve piscar. * Adiciona linha em branco ao final do arquivo * Acrescenta documentação Acrescenta documentação de Render e altera documentação de SetTimeShown e de SetStrobeFrequency. * Documentação atualizada --- Engine/include/Text.h | 37 +- Engine/include/Timer.h | 2 +- Engine/src/Text.cpp | 45 +- Engine/src/Timer.cpp | 2 +- Game/src/EndState.cpp | 6 +- docs/AIGoDown_8cpp.html | 2 +- docs/AIGoDown_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/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 | 4 +- docs/EndState_8cpp__incl.map | 42 +- docs/EndState_8cpp__incl.md5 | 2 +- docs/EndState_8cpp__incl.svg | 581 +++++++++--------- docs/EndState_8h.html | 4 +- docs/EndState_8h__incl.map | 40 +- docs/EndState_8h__incl.md5 | 2 +- docs/EndState_8h__incl.svg | 573 ++++++++--------- docs/Enemy_8cpp.html | 2 +- docs/Enemy_8h.html | 2 +- docs/Error_8h.html | 2 +- docs/Face_8cpp.html | 2 +- docs/Face_8h.html | 2 +- docs/GameObject_8cpp.html | 2 +- docs/GameObject_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/Sound_8cpp.html | 2 +- docs/Sound_8h.html | 2 +- docs/Sprite_8cpp.html | 2 +- docs/Sprite_8h.html | 2 +- docs/StageState_8cpp.html | 2 +- docs/StageState_8cpp__incl.map | 32 +- docs/StageState_8cpp__incl.md5 | 2 +- docs/StageState_8cpp__incl.svg | 417 ++++++------- docs/StageState_8h.html | 4 +- docs/StageState_8h__incl.map | 40 +- docs/StageState_8h__incl.md5 | 2 +- docs/StageState_8h__incl.svg | 397 ++++++------ docs/StateData_8h.html | 2 +- docs/State_8cpp.html | 2 +- docs/State_8h.html | 2 +- docs/Text_8cpp.html | 4 +- docs/Text_8cpp__incl.map | 17 +- docs/Text_8cpp__incl.md5 | 2 +- docs/Text_8cpp__incl.svg | 235 +++---- docs/Text_8h.html | 38 +- docs/Text_8h__incl.map | 15 +- docs/Text_8h__incl.md5 | 2 +- docs/Text_8h__incl.svg | 227 +++---- 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 | 4 +- docs/Timer_8h__dep__incl.map | 22 +- docs/Timer_8h__dep__incl.md5 | 2 +- docs/Timer_8h__dep__incl.svg | 203 +++--- docs/TitleState_8cpp.html | 4 +- docs/TitleState_8cpp__incl.map | 42 +- docs/TitleState_8cpp__incl.md5 | 2 +- docs/TitleState_8cpp__incl.svg | 419 ++++++------- docs/TitleState_8h.html | 2 +- docs/Vec2_8cpp.html | 2 +- docs/Vec2_8h.html | 2 +- docs/Wave_8cpp.html | 2 +- docs/Wave_8h.html | 2 +- docs/annotated.html | 2 +- docs/classAIGoDown-members.html | 2 +- docs/classAIGoDown.html | 2 +- docs/classAnimation-members.html | 2 +- docs/classAnimation.html | 2 +- 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 | 2 +- docs/classEndState-members.html | 2 +- docs/classEndState.html | 4 +- docs/classEndStateData-members.html | 2 +- docs/classEndStateData.html | 2 +- docs/classEndState__coll__graph.map | 13 +- docs/classEndState__coll__graph.md5 | 2 +- docs/classEndState__coll__graph.svg | 313 +++++----- docs/classEnemy-members.html | 2 +- docs/classEnemy.html | 2 +- docs/classFace-members.html | 2 +- docs/classFace.html | 2 +- docs/classGame-members.html | 2 +- docs/classGame.html | 2 +- docs/classGameObject-members.html | 2 +- docs/classGameObject.html | 2 +- docs/classHitPoints-members.html | 2 +- docs/classHitPoints.html | 2 +- docs/classInputManager-members.html | 2 +- docs/classInputManager.html | 2 +- docs/classMusic-members.html | 2 +- docs/classMusic.html | 2 +- docs/classRect-members.html | 2 +- docs/classRect.html | 2 +- docs/classResources-members.html | 2 +- docs/classResources.html | 2 +- docs/classSound-members.html | 2 +- docs/classSound.html | 2 +- docs/classSprite-members.html | 2 +- docs/classSprite.html | 2 +- docs/classStageState-members.html | 2 +- docs/classStageState.html | 2 +- docs/classState-members.html | 2 +- docs/classState.html | 2 +- docs/classStateData-members.html | 2 +- docs/classStateData.html | 2 +- docs/classText-members.html | 27 +- docs/classText.html | 187 +++++- docs/classText__coll__graph.map | 3 +- docs/classText__coll__graph.md5 | 2 +- docs/classText__coll__graph.svg | 144 +++-- docs/classTileMap-members.html | 2 +- docs/classTileMap.html | 2 +- docs/classTileSet-members.html | 2 +- docs/classTileSet.html | 2 +- docs/classTimer-members.html | 4 +- docs/classTimer.html | 12 +- docs/classTitleState-members.html | 2 +- docs/classTitleState.html | 2 +- docs/classVec2-members.html | 2 +- docs/classVec2.html | 2 +- docs/classWave-members.html | 2 +- docs/classWave.html | 2 +- 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 | 2 +- docs/functions_b.html | 2 +- docs/functions_c.html | 2 +- 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_c.html | 2 +- docs/functions_func_d.html | 2 +- docs/functions_func_e.html | 2 +- docs/functions_func_f.html | 2 +- docs/functions_func_g.html | 4 +- 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 | 12 +- docs/functions_func_t.html | 4 +- docs/functions_func_u.html | 3 +- 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 | 4 +- docs/functions_h.html | 2 +- docs/functions_i.html | 5 +- docs/functions_k.html | 2 +- docs/functions_l.html | 2 +- docs/functions_m.html | 2 +- docs/functions_n.html | 2 +- docs/functions_o.html | 2 +- docs/functions_p.html | 2 +- docs/functions_q.html | 10 +- docs/functions_r.html | 2 +- docs/functions_s.html | 18 +- docs/functions_t.html | 14 +- docs/functions_u.html | 3 +- docs/functions_v.html | 2 +- docs/functions_vars.html | 14 +- 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 | 8 +- docs/globals_defs.html | 8 +- 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_10.js | 2 +- docs/search/all_12.js | 5 +- docs/search/all_13.js | 9 +- docs/search/all_14.js | 2 +- docs/search/all_2.js | 2 +- docs/search/all_6.js | 2 +- docs/search/all_8.js | 3 +- docs/search/all_c.js | 1 + docs/search/defines_9.js | 1 + docs/search/defines_d.js | 1 + docs/search/functions_10.js | 2 + docs/search/functions_11.js | 2 +- docs/search/functions_12.js | 2 +- docs/search/functions_5.js | 2 +- docs/search/variables_10.js | 1 + docs/search/variables_11.js | 2 + docs/search/variables_8.js | 3 +- docs/structColor-members.html | 2 +- docs/structColor.html | 2 +- docs/todo.html | 2 +- doxygen_sqlite3.db | Bin 201728 -> 204800 bytes 253 files changed, 2587 insertions(+), 2095 deletions(-) diff --git a/Engine/include/Text.h b/Engine/include/Text.h index 316307f1..7764aea2 100644 --- a/Engine/include/Text.h +++ b/Engine/include/Text.h @@ -19,10 +19,14 @@ #endif #include "Rect.h" +#include "Timer.h" #include #include using std::string; +#define MIN_TIME_SHOWN (0.15) +#define TEXT_FREQUENCY (0.25) + /** \brief Informa como o texto será rendeizaddo. @@ -49,6 +53,7 @@ class Text { \param fontSize Tamanho da fonte. \param style Como o texto será renderizado, veja TextStyle para mais informações. \param color Cor do texto renderizado. + \param isStrobing define se tempo deve piscar. \param x Coordenada x a partir do qual o texto deve ser renderizado. \param y Coordenada y a partir do qual o texto deve ser renderizado. @@ -60,6 +65,7 @@ class Text { int fontSize, TextStyle style, SDL_Color color, + bool isStrobing = false, int x= 0, int y=0 ); @@ -69,6 +75,17 @@ class Text { Destrói o Text, a textura interna também é destruída para não ter memory leak. */ ~Text(); + /** + \brief Update + + Atualiza o textTime. + */ + void Update(float dt); + /** + \brief Renderiza Texto. + + Renderiza o texto na posição informada. Checa se o texto deve piscar e trata esta piscagem com o tempo textTime. + */ void Render(int CameraX=0, int cameraY=0) const; /** \brief Altera a posição do texto na tela @@ -110,11 +127,23 @@ class Text { Obtém o tamanho do texto em pixels. */ Vec2 GetSize(void)const; + /** + \brief Altera tempo mostrado enquanto pisca. + + Altera o tempo em que o texto vai ser renderizado a cada ciclo de piscagem. + */ + void SetTimeShown(float newTime); + /** + \brief Altera tempo de piscagem. + + Altera o tempo total de cada ciclo de piscagem (tempo de texto sendo renderizado + tempo sem renderização). + */ + void SetStrobeFrequency(float fullTime); private: /** - \brief Cria a textura que contém p texto + \brief Cria a textura que contém o texto - Se existir um textura anteriormente a mesma e destruída. Então uma nova é feita com base no estado atual do Text. + Se existir um textura anteriormente, esta é destruída. Então uma nova é feita com base no estado atual do Text. */ void RemakeTexture(void); std::shared_ptr font;/**< Ponteiro para a fonte.*/ @@ -123,8 +152,12 @@ class Text { TextStyle style;/**< Forma com a qual o texto está texturizado*/ int fontSize;/**< Tamanho da fonte do texto.*/ SDL_Color color;/**< Cor do texto,*/ + Timer textTime;/**< Tempo para piscagem do texto*/ Rect box;/**< Posição a partir da qual o texto deve ser renderizado.*/ string fontFile; /**< String com o nome do arquivo com a fonte. É necessário para o caso em que a fonte seja modificada.*/ + bool isStrobe;/**< Flag que determina se o texto deve piscar*/ + float strobeFrequency;/**< Tempo de um ciclo da piscagem. Seu valor é TEXT_FREQUENCY por padrão.*/ + float timeShown;/**< Tempo em que o texto é mostrado na piscagem. Seu valor é MIN_TIME_SHOWN por padrão.*/ }; diff --git a/Engine/include/Timer.h b/Engine/include/Timer.h index 51721309..6d23952b 100644 --- a/Engine/include/Timer.h +++ b/Engine/include/Timer.h @@ -33,7 +33,7 @@ class Timer { Obtém o tempo cronometrado até o momento em segundos. */ - float Get(void); + float Get(void) const; private: float time;/**< Variável que conta o tempo.*/ }; diff --git a/Engine/src/Text.cpp b/Engine/src/Text.cpp index 9288edd8..a230dc8c 100644 --- a/Engine/src/Text.cpp +++ b/Engine/src/Text.cpp @@ -4,15 +4,20 @@ Text::Text( string fontFile, int fontSize, TextStyle style, SDL_Color color, + bool isStrobing, int x, int y ) - : font(Resources::GetFont(fontFile, fontSize)), + :font(Resources::GetFont(fontFile, fontSize)), texture(nullptr), text(" "), style(style), fontSize(fontSize), color(color), - fontFile(fontFile){ + textTime(), + fontFile(fontFile), + isStrobe(isStrobing), + strobeFrequency(TEXT_FREQUENCY), + timeShown(MIN_TIME_SHOWN){ box.x= x; box.y= y; RemakeTexture(); @@ -24,17 +29,26 @@ Text::~Text() { } } +void Text::Update(float dt){ + textTime.Update(dt); + if(textTime.Get() >= strobeFrequency){ + textTime.Restart(); + } +} + void Text::Render(int cameraX, int cameraY) const { - SDL_Rect srcRect; - srcRect.x= 0; - srcRect.y= 0; - srcRect.w= box.w; - srcRect.h= box.h; - SDL_Rect destRect= (SDL_Rect)(box- Vec2(cameraX, cameraY)); -// std::cout << WHERE << " srcRect.x=" << srcRect.x<< " srcRect.y=" << srcRect.y<< " srcRect.w=" << srcRect.w<< " srcRect.h=" << srcRect.h << "\n"; -// std::cout << WHERE << " destRect.x=" << destRect.x<< " destRect.y=" << destRect.y<< " destRect.w=" << destRect.w<< " destRect.h=" << destRect.h << "\n"; - if(0 !=SDL_RenderCopy(Game::GetInstance().GetRenderer(), texture, &srcRect, &destRect) ) { - Error("Render error: " << SDL_GetError()); + if(isStrobe ? textTime.Get() < timeShown : true){ + SDL_Rect srcRect; + srcRect.x= 0; + srcRect.y= 0; + srcRect.w= box.w; + srcRect.h= box.h; + SDL_Rect destRect= (SDL_Rect)(box- Vec2(cameraX, cameraY)); + // std::cout << WHERE << " srcRect.x=" << srcRect.x<< " srcRect.y=" << srcRect.y<< " srcRect.w=" << srcRect.w<< " srcRect.h=" << srcRect.h << "\n"; + // std::cout << WHERE << " destRect.x=" << destRect.x<< " destRect.y=" << destRect.y<< " destRect.w=" << destRect.w<< " destRect.h=" << destRect.h << "\n"; + if(0 !=SDL_RenderCopy(Game::GetInstance().GetRenderer(), texture, &srcRect, &destRect) ) { + Error("Render error: " << SDL_GetError()); + } } } @@ -104,3 +118,10 @@ Vec2 Text::GetSize(void)const { return Vec2(box.w, box.h); } +void Text::SetTimeShown(float newTime){ + timeShown = newTime; +} + +void Text::SetStrobeFrequency(float fullTime){ + strobeFrequency = fullTime; +} diff --git a/Engine/src/Timer.cpp b/Engine/src/Timer.cpp index a8126d4d..c3f31924 100644 --- a/Engine/src/Timer.cpp +++ b/Engine/src/Timer.cpp @@ -12,7 +12,7 @@ void Timer::Restart(void) { time=0; } -float Timer::Get(void) { +float Timer::Get(void) const { return time; } diff --git a/Game/src/EndState.cpp b/Game/src/EndState.cpp index 9a44de71..a83bacdd 100644 --- a/Game/src/EndState.cpp +++ b/Game/src/EndState.cpp @@ -6,10 +6,13 @@ EndState::EndState(EndStateData stateData) instruction( "font/Call me maybe.ttf", END_STATE_FONT_SIZE, BLENDED, - {255, 255, 255, 255} + {255, 255, 255, 255}, + true ) { music.Play(0); instruction.SetText("Press Esc to go to menu or Space to play again!"); + instruction.SetTimeShown(0.6); + instruction.SetStrobeFrequency(1.0); bg.Render(0, 0); Vec2 pos= Game::GetInstance().GetWindowDimensions(); @@ -21,6 +24,7 @@ EndState::EndState(EndStateData stateData) } void EndState::Update(float dt) { + instruction.Update(dt); InputManager &inputManager= InputManager::GetInstance(); if(inputManager.QuitRequested()) { quitRequested= true; diff --git a/docs/AIGoDown_8cpp.html b/docs/AIGoDown_8cpp.html index e32c4d9c..6ae06a14 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 490765e8..898e54b5 100644 --- a/docs/AIGoDown_8h.html +++ b/docs/AIGoDown_8h.html @@ -114,7 +114,7 @@ diff --git a/docs/Animation_8cpp.html b/docs/Animation_8cpp.html index b0a8377d..c9541ba4 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 79a7c839..29fa754f 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 36045be8..c04f4ca4 100644 --- a/docs/Camera_8cpp.html +++ b/docs/Camera_8cpp.html @@ -137,7 +137,7 @@

Definições e macros

diff --git a/docs/Camera_8h.html b/docs/Camera_8h.html index b2a9b7e4..7349d91c 100644 --- a/docs/Camera_8h.html +++ b/docs/Camera_8h.html @@ -176,7 +176,7 @@

Definições e macros

diff --git a/docs/Collision_8h.html b/docs/Collision_8h.html index 64a91274..ed862c55 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 97f90fa2..b43db249 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 4eca2ce9..1cd77d81 100644 --- a/docs/Color_8h.html +++ b/docs/Color_8h.html @@ -107,7 +107,7 @@ diff --git a/docs/Component_8cpp.html b/docs/Component_8cpp.html index 79a71df6..6bb12838 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 14795fd1..f275e37d 100644 --- a/docs/Component_8h.html +++ b/docs/Component_8h.html @@ -170,7 +170,7 @@

Enumerações

diff --git a/docs/Defines_8h.html b/docs/Defines_8h.html index b4613e9d..caf06ae2 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 b3de6817..05ba3da5 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 a3da67b5..d80465e1 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 b01eedc1..e3917a2e 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 0a905eae..64a787ae 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 2d927414..09295d70 100644 --- a/docs/EndState_8cpp.html +++ b/docs/EndState_8cpp.html @@ -93,13 +93,13 @@
Gráfico de dependência de inclusões para EndState.cpp:
-
+
diff --git a/docs/EndState_8cpp__incl.map b/docs/EndState_8cpp__incl.map index 78f3d97a..c303070a 100644 --- a/docs/EndState_8cpp__incl.map +++ b/docs/EndState_8cpp__incl.map @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/EndState_8cpp__incl.md5 b/docs/EndState_8cpp__incl.md5 index ad2ed042..ac556746 100644 --- a/docs/EndState_8cpp__incl.md5 +++ b/docs/EndState_8cpp__incl.md5 @@ -1 +1 @@ -0c817ec713841b9e8b73184708352c37 \ No newline at end of file +a3843f7d4f73ece6b6d3d9f47632fac8 \ No newline at end of file diff --git a/docs/EndState_8cpp__incl.svg b/docs/EndState_8cpp__incl.svg index 549efb92..625e5de1 100644 --- a/docs/EndState_8cpp__incl.svg +++ b/docs/EndState_8cpp__incl.svg @@ -4,119 +4,119 @@ - + Game/src/EndState.cpp - + Node1 - -Game/src/EndState.cpp + +Game/src/EndState.cpp Node2 - -EndState.h + +EndState.h Node1->Node2 - - + + Node3 - -GameObject.h + +GameObject.h Node2->Node3 - - + + Node11 - -Sprite.h + +Sprite.h Node2->Node11 - - + + Node13 - -Music.h + +Music.h Node2->Node13 - - + + Node19 - -Text.h + +Text.h Node2->Node19 - - + + - -Node23 - - -InputManager.h + +Node24 + + +InputManager.h - -Node2->Node23 - - + +Node2->Node24 + + - -Node24 - - -EndStateData.h + +Node25 + + +EndStateData.h - -Node2->Node24 - - + +Node2->Node25 + + - -Node27 - - -StageState.h + +Node28 + + +StageState.h - -Node2->Node27 - - + +Node2->Node28 + + Node4 @@ -125,412 +125,417 @@ Node3->Node4 - - + + Node5 - -memory + +memory Node3->Node5 - - + + Node6 - -Rect.h + +Rect.h Node3->Node6 - - + + Node9 - -string + +string Node3->Node9 - - + + Node10 - -Component.h + +Component.h Node3->Node10 - - + + Node7 - -Vec2.h + +Vec2.h Node6->Node7 - - + + Node8 - -cmath + +cmath Node6->Node8 - - + + Node10->Node3 - - + + Node11->Node5 - - + + Node11->Node9 - - + + Node12 - -Color.h + +Color.h Node11->Node12 - - + + Node13->Node9 - - + + Node14 - -Resources.h + +Resources.h Node13->Node14 - - + + Node16 - -Error.h + +Error.h Node13->Node16 - - + + Node14->Node5 - - + + Node14->Node9 - - + + Node15 - -unordered_map + +unordered_map Node14->Node15 - - + + Node17 - -iostream + +iostream Node16->Node17 - - + + Node18 - -stdlib.h + +stdlib.h Node16->Node18 - - + + -Node19->Node5 - - +Node19->Node5 + + Node19->Node6 - - + + -Node19->Node9 - - +Node19->Node9 + + -Node19->Node14 - - +Node19->Node14 + + -Node19->Node16 - - +Node19->Node16 + + Node20 - - -Game.h + + +Timer.h -Node19->Node20 - - - - -Node20->Node7 - - - - -Node20->Node9 - - +Node19->Node20 + + Node21 - -stack + + +Game.h + - -Node20->Node21 - - + + +Node19->Node21 + + + + +Node21->Node7 + + + + +Node21->Node9 + + Node22 - - -State.h - - + +stack - -Node20->Node22 - - + +Node21->Node22 + + - -Node20->Node23 - - + +Node23 + + +State.h + - -Node22->Node3 - - - -Node22->Node4 - - + +Node21->Node23 + + - -Node22->Node5 - - + +Node21->Node24 + + - -Node23->Node7 - - + +Node23->Node3 + + - -Node25 - - -StateData.h - + +Node23->Node4 + + + +Node23->Node5 + + - -Node24->Node25 - - + +Node24->Node7 + + Node26 - - -Defines.h + + +StateData.h - -Node24->Node26 - - + +Node25->Node26 + + - -Node27->Node2 - - - - -Node27->Node3 - - - - -Node27->Node4 - - - - -Node27->Node5 - - + +Node27 + + +Defines.h + - -Node27->Node11 - - - -Node27->Node13 - - + +Node25->Node27 + + - -Node27->Node22 - - + +Node28->Node2 + + - -Node27->Node23 - - + +Node28->Node3 + + - -Node28 - - -Tileset.h - + +Node28->Node4 + + + +Node28->Node5 + + - -Node27->Node28 - - + +Node28->Node11 + + + + +Node28->Node13 + + + + +Node28->Node20 + + + + +Node28->Node23 + + + + +Node28->Node24 + + Node29 - - -TileMap.h + + +Tileset.h - -Node27->Node29 - - + +Node28->Node29 + + Node30 - - -Timer.h + + +TileMap.h - -Node27->Node30 - - - - -Node28->Node9 - - - - -Node28->Node11 - - - - -Node29->Node3 - - - - -Node29->Node4 - - - - -Node29->Node7 - - + +Node28->Node30 + + -Node29->Node9 - - - - -Node29->Node28 - - +Node29->Node9 + + + + +Node29->Node11 + + + + +Node30->Node3 + + + + +Node30->Node4 + + + + +Node30->Node7 + + + + +Node30->Node9 + + + + +Node30->Node29 + + diff --git a/docs/EndState_8h.html b/docs/EndState_8h.html index db449e76..38bbe4b3 100644 --- a/docs/EndState_8h.html +++ b/docs/EndState_8h.html @@ -102,7 +102,7 @@
Gráfico de dependência de inclusões para EndState.h:
-
+
@@ -138,7 +138,7 @@

Definições e macros

diff --git a/docs/EndState_8h__incl.map b/docs/EndState_8h__incl.map index 06b74299..78295f7d 100644 --- a/docs/EndState_8h__incl.map +++ b/docs/EndState_8h__incl.map @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/EndState_8h__incl.md5 b/docs/EndState_8h__incl.md5 index 9e6dced2..d1f707df 100644 --- a/docs/EndState_8h__incl.md5 +++ b/docs/EndState_8h__incl.md5 @@ -1 +1 @@ -51bde5e2405ebe9a6ba7b7dd712f0762 \ No newline at end of file +9ffaec420723893a7093f20f2db23af5 \ No newline at end of file diff --git a/docs/EndState_8h__incl.svg b/docs/EndState_8h__incl.svg index 458f7bbf..de46598b 100644 --- a/docs/EndState_8h__incl.svg +++ b/docs/EndState_8h__incl.svg @@ -4,106 +4,106 @@ - + Game/include/EndState.h - + Node1 - -Game/include/EndState.h + +Game/include/EndState.h Node2 - -GameObject.h + +GameObject.h Node1->Node2 - - + + Node10 - -Sprite.h + +Sprite.h Node1->Node10 - - + + Node12 - -Music.h + +Music.h Node1->Node12 - - + + Node18 - -Text.h + +Text.h Node1->Node18 - - + + - -Node22 - - -InputManager.h + +Node23 + + +InputManager.h - -Node1->Node22 - - + +Node1->Node23 + + - -Node23 - - -EndStateData.h + +Node24 + + +EndStateData.h - -Node1->Node23 - - + +Node1->Node24 + + - -Node26 - - -StageState.h + +Node27 + + +StageState.h - -Node1->Node26 - - + +Node1->Node27 + + Node3 @@ -112,412 +112,417 @@ Node2->Node3 - - + + Node4 - -memory + +memory Node2->Node4 - - + + Node5 - -Rect.h + +Rect.h Node2->Node5 - - + + Node8 - -string + +string Node2->Node8 - - + + Node9 - -Component.h + +Component.h Node2->Node9 - - + + Node6 - -Vec2.h + +Vec2.h Node5->Node6 - - + + Node7 - -cmath + +cmath Node5->Node7 - - + + Node9->Node2 - - + + Node10->Node4 - - + + Node10->Node8 - - + + Node11 - -Color.h + +Color.h Node10->Node11 - - + + Node12->Node8 - - + + Node13 - -Resources.h + +Resources.h Node12->Node13 - - + + Node15 - -Error.h + +Error.h Node12->Node15 - - + + Node13->Node4 - - + + Node13->Node8 - - + + Node14 - -unordered_map + +unordered_map Node13->Node14 - - + + Node16 - -iostream + +iostream Node15->Node16 - - + + Node17 - -stdlib.h + +stdlib.h Node15->Node17 - - + + -Node18->Node4 - - +Node18->Node4 + + Node18->Node5 - - + + -Node18->Node8 - - +Node18->Node8 + + -Node18->Node13 - - +Node18->Node13 + + -Node18->Node15 - - +Node18->Node15 + + Node19 - - -Game.h + + +Timer.h -Node18->Node19 - - - - -Node19->Node6 - - - - -Node19->Node8 - - +Node18->Node19 + + Node20 - -stack + + +Game.h + - -Node19->Node20 - - + + +Node18->Node20 + + + + +Node20->Node6 + + + + +Node20->Node8 + + Node21 - - -State.h - - + +stack - -Node19->Node21 - - + +Node20->Node21 + + - -Node19->Node22 - - + +Node22 + + +State.h + - -Node21->Node2 - - - -Node21->Node3 - - + +Node20->Node22 + + - -Node21->Node4 - - + +Node20->Node23 + + - -Node22->Node6 - - + +Node22->Node2 + + - -Node24 - - -StateData.h - + +Node22->Node3 + + + +Node22->Node4 + + - -Node23->Node24 - - + +Node23->Node6 + + Node25 - - -Defines.h + + +StateData.h - -Node23->Node25 - - + +Node24->Node25 + + - -Node26->Node1 - - - - -Node26->Node2 - - - - -Node26->Node3 - - - - -Node26->Node4 - - + +Node26 + + +Defines.h + - -Node26->Node10 - - - -Node26->Node12 - - + +Node24->Node26 + + - -Node26->Node21 - - + +Node27->Node1 + + - -Node26->Node22 - - + +Node27->Node2 + + - -Node27 - - -Tileset.h - + +Node27->Node3 + + + +Node27->Node4 + + - -Node26->Node27 - - + +Node27->Node10 + + + + +Node27->Node12 + + + + +Node27->Node19 + + + + +Node27->Node22 + + + + +Node27->Node23 + + Node28 - - -TileMap.h + + +Tileset.h - -Node26->Node28 - - + +Node27->Node28 + + Node29 - - -Timer.h + + +TileMap.h - -Node26->Node29 - - - - -Node27->Node8 - - - - -Node27->Node10 - - - - -Node28->Node2 - - - - -Node28->Node3 - - - - -Node28->Node6 - - + +Node27->Node29 + + -Node28->Node8 - - - - -Node28->Node27 - - +Node28->Node8 + + + + +Node28->Node10 + + + + +Node29->Node2 + + + + +Node29->Node3 + + + + +Node29->Node6 + + + + +Node29->Node8 + + + + +Node29->Node28 + + diff --git a/docs/Enemy_8cpp.html b/docs/Enemy_8cpp.html index 608f3744..3962ceef 100644 --- a/docs/Enemy_8cpp.html +++ b/docs/Enemy_8cpp.html @@ -123,7 +123,7 @@

Definições e macros

diff --git a/docs/Enemy_8h.html b/docs/Enemy_8h.html index 91b89db7..f6eff07c 100644 --- a/docs/Enemy_8h.html +++ b/docs/Enemy_8h.html @@ -152,7 +152,7 @@

Definições e macros

diff --git a/docs/Error_8h.html b/docs/Error_8h.html index 9a8488c6..345e2ad1 100644 --- a/docs/Error_8h.html +++ b/docs/Error_8h.html @@ -358,7 +358,7 @@

Definições dos tipos

diff --git a/docs/Face_8cpp.html b/docs/Face_8cpp.html index 58a7bb06..e8ffd184 100644 --- a/docs/Face_8cpp.html +++ b/docs/Face_8cpp.html @@ -123,7 +123,7 @@

Definições dos tipos

diff --git a/docs/Face_8h.html b/docs/Face_8h.html index e5949390..0823203f 100644 --- a/docs/Face_8h.html +++ b/docs/Face_8h.html @@ -135,7 +135,7 @@

Definições e macros

diff --git a/docs/GameObject_8cpp.html b/docs/GameObject_8cpp.html index 8742097d..8779de67 100644 --- a/docs/GameObject_8cpp.html +++ b/docs/GameObject_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/GameObject_8h.html b/docs/GameObject_8h.html index 2c54c78d..6100d7a5 100644 --- a/docs/GameObject_8h.html +++ b/docs/GameObject_8h.html @@ -140,7 +140,7 @@

Definições e macros

diff --git a/docs/Game_8cpp.html b/docs/Game_8cpp.html index 9a5bc103..c6f4d556 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 5a73ced3..06426132 100644 --- a/docs/Game_8h.html +++ b/docs/Game_8h.html @@ -151,7 +151,7 @@

Definições e macros

diff --git a/docs/HItPoints_8cpp.html b/docs/HItPoints_8cpp.html index 25b67541..7db271ea 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 690930e0..502ebfaa 100644 --- a/docs/HitPoints_8h.html +++ b/docs/HitPoints_8h.html @@ -114,7 +114,7 @@ diff --git a/docs/InputManager_8cpp.html b/docs/InputManager_8cpp.html index ee4e3efc..2a641c3e 100644 --- a/docs/InputManager_8cpp.html +++ b/docs/InputManager_8cpp.html @@ -129,7 +129,7 @@

Definições e macros

diff --git a/docs/InputManager_8h.html b/docs/InputManager_8h.html index 72e77ace..eb376edb 100644 --- a/docs/InputManager_8h.html +++ b/docs/InputManager_8h.html @@ -287,7 +287,7 @@

Definições e macros

diff --git a/docs/Music_8cpp.html b/docs/Music_8cpp.html index b7537339..7cc2d4e7 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 64de47d7..1dc2560b 100644 --- a/docs/Music_8h.html +++ b/docs/Music_8h.html @@ -135,7 +135,7 @@

Definições e macros

diff --git a/docs/README_8md.html b/docs/README_8md.html index e8fc886b..c26b9f06 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 a260031d..c031dc33 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 e66736ed..a860be87 100644 --- a/docs/Rect_8h.html +++ b/docs/Rect_8h.html @@ -115,7 +115,7 @@ diff --git a/docs/Resources_8cpp.html b/docs/Resources_8cpp.html index 725b6667..3741b9fe 100644 --- a/docs/Resources_8cpp.html +++ b/docs/Resources_8cpp.html @@ -101,7 +101,7 @@ diff --git a/docs/Resources_8h.html b/docs/Resources_8h.html index a13bdfde..95c492f1 100644 --- a/docs/Resources_8h.html +++ b/docs/Resources_8h.html @@ -116,7 +116,7 @@ diff --git a/docs/Sound_8cpp.html b/docs/Sound_8cpp.html index 06103bd9..4e7aefda 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 928b3802..10773588 100644 --- a/docs/Sound_8h.html +++ b/docs/Sound_8h.html @@ -115,7 +115,7 @@ diff --git a/docs/Sprite_8cpp.html b/docs/Sprite_8cpp.html index 206aa613..7493e41d 100644 --- a/docs/Sprite_8cpp.html +++ b/docs/Sprite_8cpp.html @@ -138,7 +138,7 @@

Definições e macros

diff --git a/docs/Sprite_8h.html b/docs/Sprite_8h.html index 33f0960d..8bdde468 100644 --- a/docs/Sprite_8h.html +++ b/docs/Sprite_8h.html @@ -163,7 +163,7 @@

Definições e macros

diff --git a/docs/StageState_8cpp.html b/docs/StageState_8cpp.html index 981dcca5..b0b2cbcf 100644 --- a/docs/StageState_8cpp.html +++ b/docs/StageState_8cpp.html @@ -169,7 +169,7 @@

Definições e macros

diff --git a/docs/StageState_8cpp__incl.map b/docs/StageState_8cpp__incl.map index e7111db2..ec0f9503 100644 --- a/docs/StageState_8cpp__incl.map +++ b/docs/StageState_8cpp__incl.map @@ -1,28 +1,28 @@ - - + + - + - - + + - + - + - - - + + + - + - - - - - + + + + + diff --git a/docs/StageState_8cpp__incl.md5 b/docs/StageState_8cpp__incl.md5 index 594b7dbe..b97f1c68 100644 --- a/docs/StageState_8cpp__incl.md5 +++ b/docs/StageState_8cpp__incl.md5 @@ -1 +1 @@ -737d2fd78624f124a5f0ca3562f54000 \ No newline at end of file +c66fe9f3cad9d5cb990880d775e57c2d \ No newline at end of file diff --git a/docs/StageState_8cpp__incl.svg b/docs/StageState_8cpp__incl.svg index 1dfa3958..8e66bf13 100644 --- a/docs/StageState_8cpp__incl.svg +++ b/docs/StageState_8cpp__incl.svg @@ -11,34 +11,34 @@ Node1 - -Game/src/StageState.cpp + +Game/src/StageState.cpp Node2 - -StageState.h + +StageState.h Node1->Node2 - - + + Node20 - -Error.h + +Error.h -Node1->Node20 - - +Node1->Node20 + + Node26 @@ -49,22 +49,22 @@ -Node1->Node26 - - +Node1->Node26 + + Node28 - -EndStateData.h + +EndStateData.h -Node1->Node28 - - +Node1->Node28 + + Node31 @@ -75,8 +75,8 @@ -Node1->Node31 - +Node1->Node31 + @@ -88,45 +88,45 @@ -Node1->Node32 - +Node1->Node32 + Node34 - -Face.h + +Face.h -Node1->Node34 - - +Node1->Node34 + + Node35 - -Enemy.h + +Enemy.h -Node1->Node35 - - +Node1->Node35 + + Node3 - -vector + +vector Node2->Node3 - - + + Node4 @@ -135,7 +135,7 @@ Node2->Node4 - + @@ -148,21 +148,21 @@ Node2->Node5 - - + + Node8 - -GameObject.h + +GameObject.h Node2->Node8 - - + + Node13 @@ -174,21 +174,21 @@ Node2->Node13 - - + + Node14 - -TileMap.h + +TileMap.h Node2->Node14 - - + + Node15 @@ -200,8 +200,8 @@ Node2->Node15 - - + + Node16 @@ -213,47 +213,47 @@ Node2->Node16 - - + + Node17 - -Music.h + +Music.h Node2->Node17 - - + + Node23 - -Timer.h + +Timer.h Node2->Node23 - - + + Node24 - -EndState.h + +EndState.h Node2->Node24 - - + + Node5->Node4 @@ -285,18 +285,18 @@ Node8->Node3 - - + + Node8->Node4 - - + + Node8->Node7 - - + + Node9 @@ -308,21 +308,21 @@ Node8->Node9 - - + + Node12 - -Component.h + +Component.h Node8->Node12 - - + + Node10 @@ -349,8 +349,8 @@ Node12->Node8 - - + + Node13->Node5 @@ -364,28 +364,28 @@ Node14->Node3 - - + + Node14->Node7 - - + + Node14->Node8 - - + + Node14->Node10 - - + + Node14->Node13 - - + + Node15->Node10 @@ -394,8 +394,8 @@ Node16->Node3 - - + + Node16->Node4 @@ -404,41 +404,41 @@ Node16->Node8 - - + + Node17->Node7 - - + + Node18 - -Resources.h + +Resources.h Node17->Node18 - - + + Node17->Node20 - - + + Node18->Node4 - - + + Node18->Node7 - - + + Node19 @@ -447,119 +447,124 @@ Node18->Node19 - - + + Node21 - -iostream + +iostream Node20->Node21 - - + + Node22 - -stdlib.h + +stdlib.h Node20->Node22 - - + + -Node24->Node2 - - +Node24->Node2 + + Node24->Node5 - - + + Node24->Node8 - - + + -Node24->Node15 - - +Node24->Node15 + + Node24->Node17 - - + + Node25 - -Text.h + +Text.h Node24->Node25 - - + + -Node24->Node28 - - +Node24->Node28 + + -Node25->Node4 - +Node25->Node4 + -Node25->Node7 - +Node25->Node7 + Node25->Node9 - - + + -Node25->Node18 - - +Node25->Node18 + + -Node25->Node20 - - +Node25->Node20 + + + + +Node25->Node23 + + -Node25->Node26 - - +Node25->Node26 + + -Node26->Node7 +Node26->Node7 -Node26->Node10 +Node26->Node10 -Node26->Node15 +Node26->Node15 -Node26->Node16 +Node26->Node16 @@ -569,53 +574,53 @@ stack -Node26->Node27 +Node26->Node27 Node29 - -StateData.h + +StateData.h -Node28->Node29 - - +Node28->Node29 + + Node30 - -Defines.h + +Defines.h -Node28->Node30 - - +Node28->Node30 + + -Node31->Node8 - - +Node31->Node8 + + -Node31->Node10 +Node31->Node10 -Node32->Node9 +Node32->Node9 -Node32->Node11 +Node32->Node11 @@ -625,72 +630,72 @@ algorithm -Node32->Node33 +Node32->Node33 -Node34->Node5 - - +Node34->Node5 + + -Node34->Node8 - - +Node34->Node8 + + -Node34->Node9 - +Node34->Node9 + -Node34->Node14 - - +Node34->Node14 + + -Node35->Node5 - - +Node35->Node5 + + -Node35->Node8 - - +Node35->Node8 + + -Node35->Node9 - - +Node35->Node9 + + -Node35->Node14 - - +Node35->Node14 + + -Node35->Node23 - - +Node35->Node23 + + Node36 - -Wave.h + +Wave.h -Node35->Node36 - - +Node35->Node36 + + -Node36->Node8 - - +Node36->Node8 + + diff --git a/docs/StageState_8h.html b/docs/StageState_8h.html index d4d52132..0a21a53d 100644 --- a/docs/StageState_8h.html +++ b/docs/StageState_8h.html @@ -105,7 +105,7 @@
Gráfico de dependência de inclusões para StageState.h:
-
+
@@ -123,7 +123,7 @@
diff --git a/docs/StageState_8h__incl.map b/docs/StageState_8h__incl.map index ec43d52d..c25ccb9a 100644 --- a/docs/StageState_8h__incl.map +++ b/docs/StageState_8h__incl.map @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/StageState_8h__incl.md5 b/docs/StageState_8h__incl.md5 index d85d47f0..c311ad84 100644 --- a/docs/StageState_8h__incl.md5 +++ b/docs/StageState_8h__incl.md5 @@ -1 +1 @@ -f6c0f8f8ee8cdbc1dad2a3d7d1ddfbeb \ No newline at end of file +2f3d8c525e1fb5d8d0a39edaabdd1f0d \ No newline at end of file diff --git a/docs/StageState_8h__incl.svg b/docs/StageState_8h__incl.svg index 598666bc..d0d389ba 100644 --- a/docs/StageState_8h__incl.svg +++ b/docs/StageState_8h__incl.svg @@ -4,11 +4,11 @@ - + Game/include/StageState.h - + Node1 @@ -16,508 +16,513 @@ Node2 - -vector + +vector Node1->Node2 - - + + Node3 - -memory + +memory Node1->Node3 - - + + Node4 - -Sprite.h + +Sprite.h Node1->Node4 - - + + Node7 - -GameObject.h + +GameObject.h Node1->Node7 - - + + Node12 - -Tileset.h + +Tileset.h Node1->Node12 - - + + Node13 - -TileMap.h + +TileMap.h Node1->Node13 - - + + Node14 - -InputManager.h + +InputManager.h Node1->Node14 - - + + Node15 - -State.h + +State.h Node1->Node15 - - + + Node16 - -Music.h + +Music.h Node1->Node16 - - + + Node22 - -Timer.h + +Timer.h Node1->Node22 - - + + Node23 - -EndState.h + +EndState.h Node1->Node23 - - + + Node4->Node3 - - + + Node5 - -Color.h + +Color.h Node4->Node5 - - + + Node6 - -string + +string Node4->Node6 - - + + Node7->Node2 - - + + Node7->Node3 - - + + Node7->Node6 - - + + Node8 - -Rect.h + +Rect.h Node7->Node8 - - + + Node11 - -Component.h + +Component.h Node7->Node11 - - + + Node9 - -Vec2.h + +Vec2.h Node8->Node9 - - + + Node10 - -cmath + +cmath Node8->Node10 - - + + Node11->Node7 - - + + Node12->Node4 - - + + Node12->Node6 - - + + Node13->Node2 - - + + Node13->Node6 - - + + Node13->Node7 - - + + Node13->Node9 - - + + Node13->Node12 - - + + Node14->Node9 - - + + Node15->Node2 - - + + Node15->Node3 - - + + Node15->Node7 - - + + Node16->Node6 - - + + Node17 - -Resources.h + +Resources.h Node16->Node17 - - + + Node19 - -Error.h + +Error.h Node16->Node19 - - + + Node17->Node3 - - + + Node17->Node6 - - + + Node18 - -unordered_map + +unordered_map Node17->Node18 - - + + Node20 - -iostream + +iostream Node19->Node20 - - + + Node21 - -stdlib.h + +stdlib.h Node19->Node21 - - + + -Node23->Node1 - - +Node23->Node1 + + Node23->Node4 - - + + Node23->Node7 - - + + -Node23->Node14 - - +Node23->Node14 + + Node23->Node16 - - + + Node24 - -Text.h + +Text.h Node23->Node24 - - + + Node27 - -EndStateData.h + +EndStateData.h -Node23->Node27 - - +Node23->Node27 + + -Node24->Node3 - - +Node24->Node3 + + -Node24->Node6 - - +Node24->Node6 + + Node24->Node8 - - + + -Node24->Node17 - - +Node24->Node17 + + -Node24->Node19 - - +Node24->Node19 + + + + +Node24->Node22 + + Node25 - -Game.h + +Game.h -Node24->Node25 - - +Node24->Node25 + + -Node25->Node6 - - +Node25->Node6 + + -Node25->Node9 - - +Node25->Node9 + + -Node25->Node14 - - +Node25->Node14 + + -Node25->Node15 - - +Node25->Node15 + + Node26 - -stack + +stack -Node25->Node26 - - +Node25->Node26 + + Node28 - -StateData.h + +StateData.h -Node27->Node28 - - +Node27->Node28 + + Node29 - -Defines.h + +Defines.h -Node27->Node29 - - +Node27->Node29 + + diff --git a/docs/StateData_8h.html b/docs/StateData_8h.html index 9d18bf19..d94467df 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 48f98f9b..0879ec6b 100644 --- a/docs/State_8cpp.html +++ b/docs/State_8cpp.html @@ -99,7 +99,7 @@
diff --git a/docs/State_8h.html b/docs/State_8h.html index ad39fca9..a2255c08 100644 --- a/docs/State_8h.html +++ b/docs/State_8h.html @@ -116,7 +116,7 @@ diff --git a/docs/Text_8cpp.html b/docs/Text_8cpp.html index 6844f5b3..eda733e2 100644 --- a/docs/Text_8cpp.html +++ b/docs/Text_8cpp.html @@ -93,13 +93,13 @@
Gráfico de dependência de inclusões para Text.cpp:
-
+
diff --git a/docs/Text_8cpp__incl.map b/docs/Text_8cpp__incl.map index b8b47b08..7fa4c26a 100644 --- a/docs/Text_8cpp__incl.map +++ b/docs/Text_8cpp__incl.map @@ -1,12 +1,13 @@ - + - - - + + + + - - - - + + + + diff --git a/docs/Text_8cpp__incl.md5 b/docs/Text_8cpp__incl.md5 index d35320b3..8df5da1e 100644 --- a/docs/Text_8cpp__incl.md5 +++ b/docs/Text_8cpp__incl.md5 @@ -1 +1 @@ -917caca78983972466955cb7167c46fa \ No newline at end of file +82588e00c57d3dc92a80de9a754c9b17 \ No newline at end of file diff --git a/docs/Text_8cpp__incl.svg b/docs/Text_8cpp__incl.svg index 25f992ab..4dfb11b8 100644 --- a/docs/Text_8cpp__incl.svg +++ b/docs/Text_8cpp__incl.svg @@ -4,28 +4,28 @@ - + Engine/src/Text.cpp - + Node1 - -Engine/src/Text.cpp + +Engine/src/Text.cpp Node2 - -Text.h + +Text.h Node1->Node2 - - + + Node3 @@ -37,67 +37,80 @@ Node2->Node3 - - + + Node6 - -memory + + +Timer.h + + Node2->Node6 - - + + Node7 - -string + +memory Node2->Node7 - - + + Node8 - + +string + + +Node2->Node8 + + + + +Node9 + Resources.h - -Node2->Node8 - - + +Node2->Node9 + + - -Node10 - + +Node11 + Game.h - -Node2->Node10 - - + +Node2->Node11 + + - -Node17 - - -Error.h + +Node18 + + +Error.h - -Node2->Node17 - - + +Node2->Node18 + + Node4 @@ -122,162 +135,162 @@ - -Node8->Node6 + +Node9->Node7 - -Node8->Node7 + +Node9->Node8 - -Node9 + +Node10 unordered_map - -Node8->Node9 + +Node9->Node10 - -Node10->Node4 + +Node11->Node4 - -Node10->Node7 + +Node11->Node8 - -Node11 + +Node12 stack - -Node10->Node11 + +Node11->Node12 - -Node12 - + +Node13 + State.h - -Node10->Node12 + +Node11->Node13 - -Node16 - + +Node17 + InputManager.h - -Node10->Node16 + +Node11->Node17 - -Node12->Node6 + +Node13->Node7 - -Node13 - + +Node14 + GameObject.h - -Node12->Node13 + +Node13->Node14 - -Node14 + +Node15 vector - -Node12->Node14 + +Node13->Node15 - -Node13->Node3 + +Node14->Node3 - -Node13->Node6 + +Node14->Node7 - -Node13->Node7 + +Node14->Node8 - -Node13->Node14 + +Node14->Node15 - -Node15 - + +Node16 + Component.h - -Node13->Node15 + +Node14->Node16 - -Node15->Node13 + +Node16->Node14 - -Node16->Node4 + +Node17->Node4 - -Node18 - -iostream - - -Node17->Node18 - - - Node19 - -stdlib.h - - -Node17->Node19 - - + +iostream + + +Node18->Node19 + + + + +Node20 + +stdlib.h + + +Node18->Node20 + + diff --git a/docs/Text_8h.html b/docs/Text_8h.html index 2af60683..5fe9daab 100644 --- a/docs/Text_8h.html +++ b/docs/Text_8h.html @@ -87,12 +87,14 @@
Referência do Arquivo Text.h
#include "Rect.h"
+#include "Timer.h"
#include <memory>
#include <string>
#include "Resources.h"
@@ -101,7 +103,7 @@
Gráfico de dependência de inclusões para Text.h:
-
+
@@ -117,6 +119,13 @@  Classe que modela textos. Mais...
  + + + + + +

+Definições e Macros

#define MIN_TIME_SHOWN   (0.15)
 
#define TEXT_FREQUENCY   (0.25)
 

Enumerações

enum  TextStyle { SOLID, @@ -126,6 +135,31 @@
 Informa como o texto será rendeizaddo. Mais...
 
+

Definições e macros

+ +
+
+ + + + +
#define MIN_TIME_SHOWN   (0.15)
+
+ +
+
+ +
+
+ + + + +
#define TEXT_FREQUENCY   (0.25)
+
+ +
+

Enumerações

@@ -156,7 +190,7 @@

Enumerações

diff --git a/docs/Text_8h__incl.map b/docs/Text_8h__incl.map index 1efdaf17..033d4bf0 100644 --- a/docs/Text_8h__incl.map +++ b/docs/Text_8h__incl.map @@ -1,11 +1,12 @@ - - - + + + + - - - - + + + + diff --git a/docs/Text_8h__incl.md5 b/docs/Text_8h__incl.md5 index e5e57cf5..de31be44 100644 --- a/docs/Text_8h__incl.md5 +++ b/docs/Text_8h__incl.md5 @@ -1 +1 @@ -69e4350e303bec3d5f3a66019a757304 \ No newline at end of file +2231c6b96158d2f20c7b718efe28d681 \ No newline at end of file diff --git a/docs/Text_8h__incl.svg b/docs/Text_8h__incl.svg index 594d51f4..b9c3d91d 100644 --- a/docs/Text_8h__incl.svg +++ b/docs/Text_8h__incl.svg @@ -4,15 +4,15 @@ - + Engine/include/Text.h - + Node1 - -Engine/include/Text.h + +Engine/include/Text.h Node2 @@ -24,67 +24,80 @@ Node1->Node2 - - + + Node5 - -memory + + +Timer.h + + Node1->Node5 - - + + Node6 - -string + +memory Node1->Node6 - - + + Node7 - + +string + + +Node1->Node7 + + + + +Node8 + Resources.h - -Node1->Node7 - - + +Node1->Node8 + + - -Node9 - + +Node10 + Game.h - -Node1->Node9 - - + +Node1->Node10 + + - -Node16 - - -Error.h + +Node17 + + +Error.h - -Node1->Node16 - - + +Node1->Node17 + + Node3 @@ -109,162 +122,162 @@ - -Node7->Node5 + +Node8->Node6 - -Node7->Node6 + +Node8->Node7 - -Node8 + +Node9 unordered_map - -Node7->Node8 + +Node8->Node9 - -Node9->Node3 + +Node10->Node3 - -Node9->Node6 + +Node10->Node7 - -Node10 + +Node11 stack - -Node9->Node10 + +Node10->Node11 - -Node11 - + +Node12 + State.h - -Node9->Node11 + +Node10->Node12 - -Node15 - + +Node16 + InputManager.h - -Node9->Node15 + +Node10->Node16 - -Node11->Node5 + +Node12->Node6 - -Node12 - + +Node13 + GameObject.h - -Node11->Node12 + +Node12->Node13 - -Node13 + +Node14 vector - -Node11->Node13 + +Node12->Node14 - -Node12->Node2 + +Node13->Node2 - -Node12->Node5 + +Node13->Node6 - -Node12->Node6 + +Node13->Node7 - -Node12->Node13 + +Node13->Node14 - -Node14 - + +Node15 + Component.h - -Node12->Node14 + +Node13->Node15 - -Node14->Node12 + +Node15->Node13 - -Node15->Node3 + +Node16->Node3 - -Node17 - -iostream - - -Node16->Node17 - - - Node18 - -stdlib.h - - -Node16->Node18 - - + +iostream + + +Node17->Node18 + + + + +Node19 + +stdlib.h + + +Node17->Node19 + + diff --git a/docs/TileMap_8cpp.html b/docs/TileMap_8cpp.html index 1cafd1ad..84f1b5ac 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 d2789e51..7b7e75fd 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 7d3b9b95..c57c3c5b 100644 --- a/docs/Tileset_8cpp.html +++ b/docs/Tileset_8cpp.html @@ -102,7 +102,7 @@
diff --git a/docs/Tileset_8h.html b/docs/Tileset_8h.html index 7e58b798..1b654060 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 f16e133b..e45ca4bc 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 b46ed320..6d7744f9 100644 --- a/docs/Timer_8h.html +++ b/docs/Timer_8h.html @@ -94,7 +94,7 @@
Este grafo mostra quais arquivos estão direta ou indiretamente relacionados com este arquivo:
-
+
@@ -107,7 +107,7 @@ diff --git a/docs/Timer_8h__dep__incl.map b/docs/Timer_8h__dep__incl.map index 2cca010c..8a748cf4 100644 --- a/docs/Timer_8h__dep__incl.map +++ b/docs/Timer_8h__dep__incl.map @@ -1,12 +1,14 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/Timer_8h__dep__incl.md5 b/docs/Timer_8h__dep__incl.md5 index 3c4f31ba..b29ee671 100644 --- a/docs/Timer_8h__dep__incl.md5 +++ b/docs/Timer_8h__dep__incl.md5 @@ -1 +1 @@ -6515959adc9f6121be8a658df2c03014 \ No newline at end of file +675e30780dc0e28ee46b606ca191aa38 \ No newline at end of file diff --git a/docs/Timer_8h__dep__incl.svg b/docs/Timer_8h__dep__incl.svg index 494c8149..a7658bfe 100644 --- a/docs/Timer_8h__dep__incl.svg +++ b/docs/Timer_8h__dep__incl.svg @@ -4,155 +4,186 @@ - - + + Engine/include/Timer.h - + Node1 - -Engine/include/Timer.h + +Engine/include/Timer.h Node2 - -Engine/include/Animation.h + +Engine/include/Animation.h Node1->Node2 - - + + Node4 - - -Engine/src/Timer.cpp + + +Engine/include/Text.h Node1->Node4 - - + + - -Node5 - - -Game/include/StageState.h + +Node7 + + +Game/include/StageState.h - -Node1->Node5 - - + +Node1->Node7 + + - -Node10 - - -Game/include/Enemy.h + +Node11 + + +Engine/src/Timer.cpp - -Node1->Node10 - - + +Node1->Node11 + + + + +Node12 + + +Game/include/Enemy.h + + + + +Node1->Node12 + + Node3 - -Engine/src/Animation.cpp + +Engine/src/Animation.cpp Node2->Node3 - - + + + + +Node5 + + +Engine/src/Text.cpp + + + + +Node4->Node5 + + Node6 - -Game/include/EndState.h + +Game/include/EndState.h - -Node5->Node6 - - + +Node4->Node6 + + + + +Node6->Node7 + + + + +Node10 + + +Game/src/EndState.cpp + + + + +Node6->Node10 + + + + +Node7->Node6 + + Node8 - -Game/src/StageState.cpp + +Game/src/StageState.cpp - -Node5->Node8 - - + +Node7->Node8 + + Node9 - -Game/src/TitleState.cpp - - - - -Node5->Node9 - - - - -Node6->Node5 - - - - -Node7 - - -Game/src/EndState.cpp + +Game/src/TitleState.cpp - -Node6->Node7 - - + +Node7->Node9 + + - -Node10->Node8 - - + +Node12->Node8 + + - -Node11 - - -Game/src/Enemy.cpp + +Node13 + + +Game/src/Enemy.cpp - -Node10->Node11 - - + +Node12->Node13 + + diff --git a/docs/TitleState_8cpp.html b/docs/TitleState_8cpp.html index 72971de4..d5fade38 100644 --- a/docs/TitleState_8cpp.html +++ b/docs/TitleState_8cpp.html @@ -96,13 +96,13 @@
Gráfico de dependência de inclusões para TitleState.cpp:
-
+
diff --git a/docs/TitleState_8cpp__incl.map b/docs/TitleState_8cpp__incl.map index 9b69fed9..d55c51f5 100644 --- a/docs/TitleState_8cpp__incl.map +++ b/docs/TitleState_8cpp__incl.map @@ -1,24 +1,24 @@ - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/docs/TitleState_8cpp__incl.md5 b/docs/TitleState_8cpp__incl.md5 index d1c7b8c6..46b8aaf5 100644 --- a/docs/TitleState_8cpp__incl.md5 +++ b/docs/TitleState_8cpp__incl.md5 @@ -1 +1 @@ -728792e3e2c4038b45e27aacb9837d29 \ No newline at end of file +27f91356b31c96aaf9d68a5b86ff409c \ No newline at end of file diff --git a/docs/TitleState_8cpp__incl.svg b/docs/TitleState_8cpp__incl.svg index 4b93db79..8ac8574d 100644 --- a/docs/TitleState_8cpp__incl.svg +++ b/docs/TitleState_8cpp__incl.svg @@ -4,67 +4,67 @@ - + Game/src/TitleState.cpp - + Node1 - -Game/src/TitleState.cpp + +Game/src/TitleState.cpp Node2 - -TitleState.h + +TitleState.h Node1->Node2 - - + + Node14 - -InputManager.h + +InputManager.h Node1->Node14 - - + + Node15 - -Game.h + +Game.h Node1->Node15 - - + + Node17 - -StageState.h + +StageState.h Node1->Node17 - - + + Node3 @@ -76,494 +76,499 @@ Node2->Node3 - - + + Node12 - -Sprite.h + +Sprite.h Node2->Node12 - - + + Node4 - -GameObject.h + +GameObject.h Node3->Node4 - - + + Node5 - -vector + +vector Node3->Node5 - - + + Node6 - -memory + +memory Node3->Node6 - - + + Node4->Node5 - - + + Node4->Node6 - - + + Node7 - -Rect.h + +Rect.h Node4->Node7 - - + + Node10 - -string + +string Node4->Node10 - - + + Node11 - -Component.h + +Component.h Node4->Node11 - - + + Node8 - -Vec2.h + +Vec2.h Node7->Node8 - - + + Node9 - -cmath + +cmath Node7->Node9 - - + + Node11->Node4 - - + + Node12->Node6 - - + + Node12->Node10 - - + + Node13 - -Color.h + +Color.h Node12->Node13 - - + + Node14->Node8 - - + + Node15->Node3 - - + + Node15->Node8 - - + + Node15->Node10 - - + + Node15->Node14 - - + + Node16 - -stack + +stack Node15->Node16 - - + + Node17->Node3 - - + + Node17->Node4 - - + + Node17->Node5 - - + + Node17->Node6 - - + + Node17->Node12 - - + + Node17->Node14 - - + + Node18 - -Tileset.h + +Tileset.h Node17->Node18 - - + + Node19 - -TileMap.h + +TileMap.h Node17->Node19 - - + + Node20 - -Music.h + +Music.h Node17->Node20 - - + + Node26 - -Timer.h + +Timer.h Node17->Node26 - - + + Node27 - -EndState.h + +EndState.h Node17->Node27 - - + + Node18->Node10 - - + + Node18->Node12 - - + + Node19->Node4 - - + + Node19->Node5 - - + + Node19->Node8 - - + + Node19->Node10 - - + + Node19->Node18 - - + + Node20->Node10 - - + + Node21 - -Resources.h + +Resources.h Node20->Node21 - - + + Node23 - -Error.h + +Error.h Node20->Node23 - - + + Node21->Node6 - - + + Node21->Node10 - - + + Node22 - -unordered_map + +unordered_map Node21->Node22 - - + + Node24 - -iostream + +iostream Node23->Node24 - - + + Node25 - -stdlib.h + +stdlib.h Node23->Node25 - - + + Node27->Node4 - - + + Node27->Node12 - - + + -Node27->Node14 - - +Node27->Node14 + + -Node27->Node17 - - +Node27->Node17 + + Node27->Node20 - - + + Node28 - -Text.h + +Text.h Node27->Node28 - - + + Node29 - -EndStateData.h + +EndStateData.h -Node27->Node29 - - +Node27->Node29 + + -Node28->Node6 - - +Node28->Node6 + + Node28->Node7 - - + + -Node28->Node10 - - +Node28->Node10 + + -Node28->Node15 - - +Node28->Node15 + + -Node28->Node21 - - +Node28->Node21 + + -Node28->Node23 - - +Node28->Node23 + + + + +Node28->Node26 + + Node30 - -StateData.h + +StateData.h -Node29->Node30 - - +Node29->Node30 + + Node31 - -Defines.h + +Defines.h -Node29->Node31 - - +Node29->Node31 + + diff --git a/docs/TitleState_8h.html b/docs/TitleState_8h.html index d6756de6..abf7f0b0 100644 --- a/docs/TitleState_8h.html +++ b/docs/TitleState_8h.html @@ -114,7 +114,7 @@ diff --git a/docs/Vec2_8cpp.html b/docs/Vec2_8cpp.html index 2ed06b03..63c13030 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 22701b4f..1afed2a5 100644 --- a/docs/Vec2_8h.html +++ b/docs/Vec2_8h.html @@ -126,7 +126,7 @@

Definições e macros

diff --git a/docs/Wave_8cpp.html b/docs/Wave_8cpp.html index 51183177..f3616651 100644 --- a/docs/Wave_8cpp.html +++ b/docs/Wave_8cpp.html @@ -99,7 +99,7 @@ diff --git a/docs/Wave_8h.html b/docs/Wave_8h.html index 28dd4479..9e15977c 100644 --- a/docs/Wave_8h.html +++ b/docs/Wave_8h.html @@ -113,7 +113,7 @@ diff --git a/docs/annotated.html b/docs/annotated.html index 367c01ec..3bbef857 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -124,7 +124,7 @@ diff --git a/docs/classAIGoDown-members.html b/docs/classAIGoDown-members.html index 680111ca..a9f8d883 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 ad5d1968..9ff0663f 100644 --- a/docs/classAIGoDown.html +++ b/docs/classAIGoDown.html @@ -264,7 +264,7 @@

Atributos

diff --git a/docs/classAnimation-members.html b/docs/classAnimation-members.html index b49fb0c3..dc3564ea 100644 --- a/docs/classAnimation-members.html +++ b/docs/classAnimation-members.html @@ -110,7 +110,7 @@ diff --git a/docs/classAnimation.html b/docs/classAnimation.html index 7a5e267e..83943aad 100644 --- a/docs/classAnimation.html +++ b/docs/classAnimation.html @@ -538,7 +538,7 @@

Atributos

diff --git a/docs/classCamera-members.html b/docs/classCamera-members.html index ad4f72be..2786a0bd 100644 --- a/docs/classCamera-members.html +++ b/docs/classCamera-members.html @@ -111,7 +111,7 @@ diff --git a/docs/classCamera.html b/docs/classCamera.html index 30e6dbfb..37a54725 100644 --- a/docs/classCamera.html +++ b/docs/classCamera.html @@ -693,7 +693,7 @@

Atributos

diff --git a/docs/classCollision-members.html b/docs/classCollision-members.html index 91dc2c84..bb88e991 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 3896aacf..44b2ed08 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 f705dd45..184c0422 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 e8e5e2db..cbae8548 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 f3681439..0c7f0b7d 100644 --- a/docs/classDragAndDrop-members.html +++ b/docs/classDragAndDrop-members.html @@ -100,7 +100,7 @@ diff --git a/docs/classDragAndDrop.html b/docs/classDragAndDrop.html index a34bcdbe..84a30f9d 100644 --- a/docs/classDragAndDrop.html +++ b/docs/classDragAndDrop.html @@ -334,7 +334,7 @@

Atributos

diff --git a/docs/classEndState-members.html b/docs/classEndState-members.html index 7188bf85..63aad0b9 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 8473bd8e..353ffbeb 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 c14d394d..904acdf5 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 35a6cc33..1b62b84b 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 7ed937f8..cfe9d6b0 100644 --- a/docs/classEndState__coll__graph.map +++ b/docs/classEndState__coll__graph.map @@ -1,8 +1,9 @@ - - - - - - + + + + + + + diff --git a/docs/classEndState__coll__graph.md5 b/docs/classEndState__coll__graph.md5 index 9012ea45..9b4e5a24 100644 --- a/docs/classEndState__coll__graph.md5 +++ b/docs/classEndState__coll__graph.md5 @@ -1 +1 @@ -252fcc6e0b12415ea95114f99568bc43 \ No newline at end of file +7f730f4d239aa4685eeb69f602d32cad \ No newline at end of file diff --git a/docs/classEndState__coll__graph.svg b/docs/classEndState__coll__graph.svg index 8e7d6d32..f6b5f1d5 100644 --- a/docs/classEndState__coll__graph.svg +++ b/docs/classEndState__coll__graph.svg @@ -4,284 +4,317 @@ - - + + 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 + + + + +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 + +unsigned char Node8->Node7 - - - alpha + + + alpha Node14 - -Color + +Color Node8->Node14 - - - g -r -b + + + g +r +b Node9 - -float + +float Node9->Node7 - - - scaleY -frameTime -timeElapsed -scaleX + + + scaleY +frameTime +timeElapsed +scaleX + + +Node9->Node15 + + + timeShown +strobeFrequency Node18 - -Rect + +Rect Node9->Node18 - - - w -x -h -y + + + w +x +h +y + + +Node21 + + +Timer + + + + +Node9->Node21 + + + time Node10 - -SDL_Rect + +SDL_Rect Node10->Node7 - - - clipRect + + + clipRect Node11 - -int + +int Node11->Node7 - - - width -currentFrame -height -frameCount - - -Node15 - - -Text - - + + + width +currentFrame +height +frameCount -Node11->Node15 - - - fontSize +Node11->Node15 + + + fontSize Node12 - -shared_ptr< SDL_Texture > + +shared_ptr< SDL_Texture > Node12->Node7 - - - texture + + + texture Node13 - -SDL_BlendMode + +SDL_BlendMode Node13->Node7 - - - blendMode + + + blendMode Node14->Node7 - - - colorMultiplier + + + colorMultiplier Node15->Node1 - - - instruction + + + instruction Node16 - -shared_ptr< TTF_Font > + +shared_ptr< TTF_Font > Node16->Node15 - - - font + + + font Node17 - -SDL_Color + +SDL_Color Node17->Node15 - - - color + + + color Node18->Node15 - - - box + + + box Node19 - -SDL_Texture * + +SDL_Texture * Node19->Node15 - - - texture + + + texture Node20 - -string + +string -Node20->Node15 - - - fontFile -text - - -Node21 - -TextStyle +Node20->Node15 + + + fontFile +text -Node21->Node15 - - - style +Node21->Node15 + + + textTime + + +Node22 + +TextStyle + + +Node22->Node15 + + + style diff --git a/docs/classEnemy-members.html b/docs/classEnemy-members.html index 51f4730f..bfcb3ba0 100644 --- a/docs/classEnemy-members.html +++ b/docs/classEnemy-members.html @@ -117,7 +117,7 @@ diff --git a/docs/classEnemy.html b/docs/classEnemy.html index e26c784f..a6c641c0 100644 --- a/docs/classEnemy.html +++ b/docs/classEnemy.html @@ -551,7 +551,7 @@

Atributos

diff --git a/docs/classFace-members.html b/docs/classFace-members.html index f4889787..a7d4acc6 100644 --- a/docs/classFace-members.html +++ b/docs/classFace-members.html @@ -111,7 +111,7 @@ diff --git a/docs/classFace.html b/docs/classFace.html index c3de49f4..6a570973 100644 --- a/docs/classFace.html +++ b/docs/classFace.html @@ -524,7 +524,7 @@

Atributos

diff --git a/docs/classGame-members.html b/docs/classGame-members.html index 2185e533..a4502290 100644 --- a/docs/classGame-members.html +++ b/docs/classGame-members.html @@ -120,7 +120,7 @@ diff --git a/docs/classGame.html b/docs/classGame.html index d2964aa0..a959113d 100644 --- a/docs/classGame.html +++ b/docs/classGame.html @@ -838,7 +838,7 @@

Atributos

diff --git a/docs/classGameObject-members.html b/docs/classGameObject-members.html index dd563018..1e435cb8 100644 --- a/docs/classGameObject-members.html +++ b/docs/classGameObject-members.html @@ -105,7 +105,7 @@ diff --git a/docs/classGameObject.html b/docs/classGameObject.html index 3e29149c..1fb1b5ae 100644 --- a/docs/classGameObject.html +++ b/docs/classGameObject.html @@ -474,7 +474,7 @@

Atributos

diff --git a/docs/classHitPoints-members.html b/docs/classHitPoints-members.html index fede6145..70ef0d18 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 513be5b7..73f93a89 100644 --- a/docs/classHitPoints.html +++ b/docs/classHitPoints.html @@ -313,7 +313,7 @@

Atributos

diff --git a/docs/classInputManager-members.html b/docs/classInputManager-members.html index 5ea44d81..2c22a985 100644 --- a/docs/classInputManager-members.html +++ b/docs/classInputManager-members.html @@ -119,7 +119,7 @@ diff --git a/docs/classInputManager.html b/docs/classInputManager.html index 4a7633fb..31468a1d 100644 --- a/docs/classInputManager.html +++ b/docs/classInputManager.html @@ -803,7 +803,7 @@

Atributos

diff --git a/docs/classMusic-members.html b/docs/classMusic-members.html index 45623289..ba192ca8 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 c282097b..6285ef52 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 499188a9..d3d4e014 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 21674d93..e643e1af 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 fc9ce5a7..6a7befb4 100644 --- a/docs/classResources-members.html +++ b/docs/classResources-members.html @@ -107,7 +107,7 @@ diff --git a/docs/classResources.html b/docs/classResources.html index a1b200d9..c5c8c01e 100644 --- a/docs/classResources.html +++ b/docs/classResources.html @@ -570,7 +570,7 @@

Atributos

diff --git a/docs/classSound-members.html b/docs/classSound-members.html index a35b6c3b..ad2ba5a3 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 e1a3989f..99c31a7f 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 5662e748..e8e7c332 100644 --- a/docs/classSprite-members.html +++ b/docs/classSprite-members.html @@ -126,7 +126,7 @@ diff --git a/docs/classSprite.html b/docs/classSprite.html index ad36a5b5..bc57a905 100644 --- a/docs/classSprite.html +++ b/docs/classSprite.html @@ -998,7 +998,7 @@

Atributos

diff --git a/docs/classStageState-members.html b/docs/classStageState-members.html index 1b6b762b..06a68487 100644 --- a/docs/classStageState-members.html +++ b/docs/classStageState-members.html @@ -117,7 +117,7 @@ diff --git a/docs/classStageState.html b/docs/classStageState.html index 7b9f66dd..dacb9485 100644 --- a/docs/classStageState.html +++ b/docs/classStageState.html @@ -510,7 +510,7 @@

Atributos

diff --git a/docs/classState-members.html b/docs/classState-members.html index 735882da..1e1ecd8b 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 74ce6585..c138b8dd 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 03d80fcb..d7fe547a 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 7dac7c8c..477796cf 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 fe63851d..45613a2b 100644 --- a/docs/classText-members.html +++ b/docs/classText-members.html @@ -96,22 +96,29 @@ fontFileTextprivate fontSizeTextprivate GetSize(void) const Text - RemakeTexture(void)Textprivate - Render(int CameraX=0, int cameraY=0) const Text - SetColor(SDL_Color color)Text - SetFontSize(int fontSize)Text - SetPos(int x, int y, bool centerX=false, bool centerY=false)Text + isStrobeTextprivate + RemakeTexture(void)Textprivate + Render(int CameraX=0, int cameraY=0) const Text + SetColor(SDL_Color color)Text + SetFontSize(int fontSize)Text + SetPos(int x, int y, bool centerX=false, bool centerY=false)Text + SetStrobeFrequency(float fullTime)Text SetStyle(TextStyle style)Text SetText(string text)Text + SetTimeShown(float newTime)Text + strobeFrequencyTextprivate styleTextprivate - Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, int x=0, int y=0)Text - textTextprivate - textureTextprivate - ~Text()Text + textTextprivate + Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, bool isStrobing=false, int x=0, int y=0)Text + textTimeTextprivate + textureTextprivate + timeShownTextprivate + Update(float dt)Text + ~Text()Text diff --git a/docs/classText.html b/docs/classText.html index 2608656a..2bc8986a 100644 --- a/docs/classText.html +++ b/docs/classText.html @@ -100,19 +100,23 @@
Diagrama de colaboração para Text:
-
+
[legenda]
- - - + + + + + + + @@ -132,11 +136,17 @@ + + + + + +

Métodos Públicos

 Text (string fontFile, int fontSize, TextStyle style, SDL_Color color, int x=0, int y=0)
 Construtor. Mais...
 
 Text (string fontFile, int fontSize, TextStyle style, SDL_Color color, bool isStrobing=false, int x=0, int y=0)
 Construtor. Mais...
 
 ~Text ()
 Destrutor. Mais...
 
void Update (float dt)
 Update. Mais...
 
void Render (int CameraX=0, int cameraY=0) const
 Renderiza Texto. Mais...
 
void SetPos (int x, int y, bool centerX=false, bool centerY=false)
 Altera a posição do texto na tela. Mais...
Vec2 GetSize (void) const
 Obtém o tamanho do texto. Mais...
 
void SetTimeShown (float newTime)
 Altera tempo mostrado enquanto pisca. Mais...
 
void SetStrobeFrequency (float fullTime)
 Altera tempo de piscagem. Mais...
 
- +

Métodos Privados

void RemakeTexture (void)
 Cria a textura que contém p texto. Mais...
 Cria a textura que contém o texto. Mais...
 
+ + + + + + + +

@@ -153,16 +163,24 @@

 
SDL_Color color
 
Timer textTime
 
Rect box
 
string fontFile
 
bool isStrobe
 
float strobeFrequency
 
float timeShown
 

Descrição Detalhada

Classe que modela textos.

Os textos são lidos a partir de arquivos ttf, renderizados com base em um TextStyle, com um tamanho pré-informado e a partir de uma coordena (x, y). Internamente gerencia uma textura desse texto pré-renderizado.

Construtores & Destrutores

- +
@@ -190,6 +208,12 @@ + + + + + + @@ -217,6 +241,7 @@ +
SDL_Color  color,
bool isStrobing = false,
fontSizeTamanho da fonte.
styleComo o texto será renderizado, veja TextStyle para mais informações.
colorCor do texto renderizado.
isStrobingdefine se tempo deve piscar.
xCoordenada x a partir do qual o texto deve ser renderizado.
yCoordenada y a partir do qual o texto deve ser renderizado.
@@ -286,8 +311,8 @@

Métodos

-

Cria a textura que contém p texto.

-

Se existir um textura anteriormente a mesma e destruída. Então uma nova é feita com base no estado atual do Text.

+

Cria a textura que contém o texto.

+

Se existir um textura anteriormente, esta é destruída. Então uma nova é feita com base no estado atual do Text.

@@ -315,6 +340,9 @@

Métodos

+

Renderiza Texto.

+

Renderiza o texto na posição informada. Checa se o texto deve piscar e trata esta piscagem com o tempo textTime.

+
@@ -401,6 +429,25 @@

Métodos

Altera a posição do texto na tela. Se centerX for verdadeiro o argumento y é ignorado. Caso contrário o argumento x será usado como coordenada x a partir do qual o texto será renderizado. Altera a posição do texto na tela. Se centerY for verdadeiro o argumento y é ignorado. Caso contrário o argumento y será usado como coordenada y a partir do qual o texto será renderizado.

+ + + +
+
+ + + + + + + + +
void Text::SetStrobeFrequency (float fullTime)
+
+ +

Altera tempo de piscagem.

+

Altera o tempo total de cada ciclo de piscagem (tempo de texto sendo renderizado + tempo sem renderização).

+
@@ -440,6 +487,44 @@

Métodos

Altera o texto.

Altera a posição do texto. Para essa modificação fazer efeito a textura precisa ser refeita.

+ + + +
+
+ + + + + + + + +
void Text::SetTimeShown (float newTime)
+
+ +

Altera tempo mostrado enquanto pisca.

+

Altera o tempo em que o texto vai ser renderizado a cada ciclo de piscagem.

+ +
+
+ +
+
+ + + + + + + + +
void Text::Update (float dt)
+
+ +

Update.

+

Atualiza o textTime.

+

Atributos

@@ -546,6 +631,48 @@

Atributos

Tamanho da fonte do texto.

+
+ + +
+
+ + + + + +
+ + + + +
bool Text::isStrobe
+
+private
+
+

Flag que determina se o texto deve piscar

+ +
+
+ +
+
+ + + + + +
+ + + + +
float Text::strobeFrequency
+
+private
+
+

Tempo de um ciclo da piscagem. Seu valor é TEXT_FREQUENCY por padrão.

+
@@ -588,6 +715,27 @@

Atributos

String com o texto do Text.

+
+ + +
+
+ + + + + +
+ + + + +
Timer Text::textTime
+
+private
+
+

Tempo para piscagem do texto

+
@@ -609,6 +757,27 @@

Atributos

O texto para exibir na tela precisa ser texturizado. Essa variável contém a textura do texto.

+
+ + +
+
+ + + + + +
+ + + + +
float Text::timeShown
+
+private
+
+

Tempo em que o texto é mostrado na piscagem. Seu valor é MIN_TIME_SHOWN por padrão.

+

A documentação para esta classe foi gerada a partir dos seguintes arquivos:
    @@ -618,7 +787,7 @@

    Atributos

    diff --git a/docs/classText__coll__graph.map b/docs/classText__coll__graph.map index 590c5b05..b2dbdf68 100644 --- a/docs/classText__coll__graph.map +++ b/docs/classText__coll__graph.map @@ -1,3 +1,4 @@ - + + diff --git a/docs/classText__coll__graph.md5 b/docs/classText__coll__graph.md5 index af30ff89..f866a6ee 100644 --- a/docs/classText__coll__graph.md5 +++ b/docs/classText__coll__graph.md5 @@ -1 +1 @@ -8051fdabb6f3388a9a9a7253fc736b8f \ No newline at end of file +942e010fc3f378109ea1dc41b378d390 \ No newline at end of file diff --git a/docs/classText__coll__graph.svg b/docs/classText__coll__graph.svg index 9a720be9..824f706e 100644 --- a/docs/classText__coll__graph.svg +++ b/docs/classText__coll__graph.svg @@ -4,110 +4,148 @@ - - + + Text - + Node1 - -Text + +Text Node2 - -shared_ptr< TTF_Font > + +shared_ptr< TTF_Font > Node2->Node1 - - - font + + + font Node3 - -SDL_Color + +SDL_Color Node3->Node1 - - - color + + + color Node4 - -Rect + +Rect Node4->Node1 - - - box + + + box Node5 - -float + +float + + +Node5->Node1 + + + timeShown +strobeFrequency Node5->Node4 - - - w -x -h -y + + + w +x +h +y + + +Node10 + + +Timer + + + + +Node5->Node10 + + + time Node6 - -SDL_Texture * + +SDL_Texture * Node6->Node1 - - - texture + + + texture Node7 - -int + +int -Node7->Node1 - - - fontSize +Node7->Node1 + + + fontSize Node8 - -string + +bool -Node8->Node1 - - - fontFile -text +Node8->Node1 + + + isStrobe Node9 - -TextStyle + +string -Node9->Node1 - - - style +Node9->Node1 + + + fontFile +text + + +Node10->Node1 + + + textTime + + +Node11 + +TextStyle + + +Node11->Node1 + + + style diff --git a/docs/classTileMap-members.html b/docs/classTileMap-members.html index dfab123e..642abc26 100644 --- a/docs/classTileMap-members.html +++ b/docs/classTileMap-members.html @@ -117,7 +117,7 @@ diff --git a/docs/classTileMap.html b/docs/classTileMap.html index b4180a82..da8b8f9e 100644 --- a/docs/classTileMap.html +++ b/docs/classTileMap.html @@ -880,7 +880,7 @@

    Atributos

    diff --git a/docs/classTileSet-members.html b/docs/classTileSet-members.html index c9071ea7..0ae658e3 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 9fd9fb32..dd0c2546 100644 --- a/docs/classTileSet.html +++ b/docs/classTileSet.html @@ -382,7 +382,7 @@

    Atributos

    diff --git a/docs/classTimer-members.html b/docs/classTimer-members.html index 7b431915..7dee05c5 100644 --- a/docs/classTimer-members.html +++ b/docs/classTimer-members.html @@ -90,7 +90,7 @@

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

    - + @@ -98,7 +98,7 @@
    Get(void)Timer
    Get(void) const Timer
    Restart(void)Timer
    timeTimerprivate
    Timer(void)Timer
    diff --git a/docs/classTimer.html b/docs/classTimer.html index 4a7ba039..8edb5cb6 100644 --- a/docs/classTimer.html +++ b/docs/classTimer.html @@ -114,9 +114,9 @@ void Restart (void)  Reinicia o contador. Mais...
      -float Get (void) - Informa termpo cronometrado. Mais...
    -  +float Get (void) const + Informa termpo cronometrado. Mais...
    +  @@ -147,7 +147,7 @@

    Métodos

    - +

    Atributos Privados

    @@ -156,7 +156,7 @@

    Métodos

    - +
    ( void  ) const
    @@ -239,7 +239,7 @@

    Atributos

    diff --git a/docs/classTitleState-members.html b/docs/classTitleState-members.html index aa4d6b22..0f20b824 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 9d0e17a4..68d239be 100644 --- a/docs/classTitleState.html +++ b/docs/classTitleState.html @@ -330,7 +330,7 @@

    Atributos

    diff --git a/docs/classVec2-members.html b/docs/classVec2-members.html index de9e9647..7c5ea49c 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 4ddac880..cef72a4f 100644 --- a/docs/classVec2.html +++ b/docs/classVec2.html @@ -648,7 +648,7 @@

    Atributos

    diff --git a/docs/classWave-members.html b/docs/classWave-members.html index 60cac0d4..8ffeb804 100644 --- a/docs/classWave-members.html +++ b/docs/classWave-members.html @@ -110,7 +110,7 @@ diff --git a/docs/classWave.html b/docs/classWave.html index 3a068185..b2036698 100644 --- a/docs/classWave.html +++ b/docs/classWave.html @@ -403,7 +403,7 @@

    Atributos

    diff --git a/docs/classes.html b/docs/classes.html index fc4d0735..f4eca330 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -122,7 +122,7 @@ diff --git a/docs/dir_000002_000001.html b/docs/dir_000002_000001.html index 9bbe380b..badfc942 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
    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.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.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
    Wave.cppWave.h
    diff --git a/docs/dir_000004_000000.html b/docs/dir_000004_000000.html index e0b9f04a..b311941f 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 / GameObject.h
    Enemy.hinclude / Rect.h
    Enemy.hinclude / Sprite.h
    Enemy.hinclude / TileMap.h
    Enemy.hinclude / Timer.h
    Enemy.hinclude / Wave.h
    Face.hinclude / GameObject.h
    Face.hinclude / Rect.h
    Face.hinclude / Sprite.h
    Face.hinclude / TileMap.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 / Sprite.h
    TitleState.hinclude / State.h
    diff --git a/docs/dir_000005_000000.html b/docs/dir_000005_000000.html index 297287cb..ca978c9a 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
    EndStateData.cppinclude / StateData.h
    Enemy.cppinclude / AIGoDown.h
    Enemy.cppinclude / Camera.h
    Enemy.cppinclude / Error.h
    Face.cppinclude / Camera.h
    Face.cppinclude / DragAndDrop.h
    Face.cppinclude / Error.h
    main.cppinclude / Game.h
    StageState.cppinclude / Camera.h
    StageState.cppinclude / Collision.h
    StageState.cppinclude / Error.h
    StageState.cppinclude / Game.h
    TitleState.cppinclude / Game.h
    TitleState.cppinclude / InputManager.h
    diff --git a/docs/dir_000005_000004.html b/docs/dir_000005_000004.html index 0d936ccf..5ace1983 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
    Face.cppFace.h
    main.cppTitleState.h
    StageState.cppEndStateData.h
    StageState.cppEnemy.h
    StageState.cppFace.h
    StageState.cppStageState.h
    TitleState.cppStageState.h
    TitleState.cppTitleState.h
    diff --git a/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html b/docs/dir_0b6ee6e7e9547e675db4add2e5de97da.html index 2015d6a0..466dfb8c 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 c4704912..131d18d8 100644 --- a/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html +++ b/docs/dir_1dfe4a86cee15d5d6902f8c724dcf913.html @@ -146,7 +146,7 @@ diff --git a/docs/dir_a56613a6b795b5624452287469afc550.html b/docs/dir_a56613a6b795b5624452287469afc550.html index d0cccb68..a510df0b 100644 --- a/docs/dir_a56613a6b795b5624452287469afc550.html +++ b/docs/dir_a56613a6b795b5624452287469afc550.html @@ -110,7 +110,7 @@ diff --git a/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html b/docs/dir_b6dc9fbf5fd229481ae647194eb362ed.html index ad457255..ed8cf22e 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 279438d8..07afb921 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 4b169638..f2c339e7 100644 --- a/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html +++ b/docs/dir_d858f423bf5825f9a3db826b6a54a3cc.html @@ -110,7 +110,7 @@ diff --git a/docs/files.html b/docs/files.html index a7e502cb..944901da 100644 --- a/docs/files.html +++ b/docs/files.html @@ -159,7 +159,7 @@ diff --git a/docs/functions.html b/docs/functions.html index 53cebc2c..12ca4872 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -153,7 +153,7 @@

    - a -

      diff --git a/docs/functions_b.html b/docs/functions_b.html index da52ba9e..df560301 100644 --- a/docs/functions_b.html +++ b/docs/functions_b.html @@ -144,7 +144,7 @@

      - b -

        diff --git a/docs/functions_c.html b/docs/functions_c.html index 15b39061..a7ecbab3 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -186,7 +186,7 @@

        - c -

          diff --git a/docs/functions_d.html b/docs/functions_d.html index 9e58fe1e..ab61b1db 100644 --- a/docs/functions_d.html +++ b/docs/functions_d.html @@ -153,7 +153,7 @@

          - d -

            diff --git a/docs/functions_e.html b/docs/functions_e.html index 26f3e767..3a42e34e 100644 --- a/docs/functions_e.html +++ b/docs/functions_e.html @@ -147,7 +147,7 @@

            - e -

              diff --git a/docs/functions_enum.html b/docs/functions_enum.html index 3c5deafa..69bbe372 100644 --- a/docs/functions_enum.html +++ b/docs/functions_enum.html @@ -100,7 +100,7 @@ diff --git a/docs/functions_eval.html b/docs/functions_eval.html index 399d4d9e..ce125490 100644 --- a/docs/functions_eval.html +++ b/docs/functions_eval.html @@ -115,7 +115,7 @@ diff --git a/docs/functions_f.html b/docs/functions_f.html index ea0970ab..1ae3db27 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -168,7 +168,7 @@

              - f -

                diff --git a/docs/functions_func.html b/docs/functions_func.html index 555be6b9..4f46329f 100644 --- a/docs/functions_func.html +++ b/docs/functions_func.html @@ -141,7 +141,7 @@

                - a -

                  diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html index 827873f5..89c367e3 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -156,7 +156,7 @@

                  - c -

                    diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index d4e8cbf7..e8d102d3 100644 --- a/docs/functions_func_d.html +++ b/docs/functions_func_d.html @@ -138,7 +138,7 @@

                    - d -

                      diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html index 560b1cd4..32720c9f 100644 --- a/docs/functions_func_e.html +++ b/docs/functions_func_e.html @@ -135,7 +135,7 @@

                      - e -

                        diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html index d15a6c50..4ed0ccde 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -138,7 +138,7 @@

                        - f -

                          diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index a66d3448..16db81a4 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -129,7 +129,7 @@

                          - g -

                            : GameObject
                          • Get() -: Timer +: Timer
                          • GetCurrentFramerate() : Game @@ -220,7 +220,7 @@

                            - g -

                              diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index 27846c63..b88e0076 100644 --- a/docs/functions_func_h.html +++ b/docs/functions_func_h.html @@ -129,7 +129,7 @@

                              - h -

                                diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html index e6acfd85..af88944a 100644 --- a/docs/functions_func_i.html +++ b/docs/functions_func_i.html @@ -181,7 +181,7 @@

                                - i -

                                  diff --git a/docs/functions_func_k.html b/docs/functions_func_k.html index 78bbe5c5..56823bc9 100644 --- a/docs/functions_func_k.html +++ b/docs/functions_func_k.html @@ -132,7 +132,7 @@

                                  - k -

                                    diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html index 65782e9f..8cabdbd1 100644 --- a/docs/functions_func_l.html +++ b/docs/functions_func_l.html @@ -132,7 +132,7 @@

                                    - l -

                                      diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html index 702c013f..740710c2 100644 --- a/docs/functions_func_m.html +++ b/docs/functions_func_m.html @@ -147,7 +147,7 @@

                                      - m -

                                        diff --git a/docs/functions_func_n.html b/docs/functions_func_n.html index 5d16f173..69930523 100644 --- a/docs/functions_func_n.html +++ b/docs/functions_func_n.html @@ -139,7 +139,7 @@

                                        - n -

                                          diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html index b5b61762..207bcc2b 100644 --- a/docs/functions_func_o.html +++ b/docs/functions_func_o.html @@ -165,7 +165,7 @@

                                          - o -

                                            diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html index b0c3a4c7..ff2851d4 100644 --- a/docs/functions_func_p.html +++ b/docs/functions_func_p.html @@ -142,7 +142,7 @@

                                            - p -

                                              diff --git a/docs/functions_func_q.html b/docs/functions_func_q.html index 60c106aa..8f2e2b87 100644 --- a/docs/functions_func_q.html +++ b/docs/functions_func_q.html @@ -130,7 +130,7 @@

                                              - q -

                                                diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html index 6fccd6e4..cec43d8b 100644 --- a/docs/functions_func_r.html +++ b/docs/functions_func_r.html @@ -179,7 +179,7 @@

                                                - r -

                                                  diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index d1c95808..437aa98b 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -164,6 +164,9 @@

                                                  - s -

                                                  • SetScaleY() : Sprite
                                                  • +
                                                  • SetStrobeFrequency() +: Text +
                                                  • SetStyle() : Text
                                                  • @@ -173,6 +176,9 @@

                                                    - s -

                                                    • SetTileSet() : TileMap
                                                    • +
                                                    • SetTimeShown() +: Text +
                                                    • SetWidthAndHeight() : Rect
                                                    • @@ -189,13 +195,13 @@

                                                      - s -

                                                        : TileMap
                                                      • Sound() -: Sound +: Sound
                                                      • SpawnEnemy() : StageState
                                                      • Sprite() -: Sprite +: Sprite
                                                      • StageState() : StageState @@ -211,7 +217,7 @@

                                                        - s -

                                                          diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index 10062818..833d1b99 100644 --- a/docs/functions_func_t.html +++ b/docs/functions_func_t.html @@ -123,7 +123,7 @@

                                                          - t -

                                                          • Text() -: Text +: Text
                                                          • TileMap() : TileMap @@ -141,7 +141,7 @@

                                                            - t -

                                                              diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html index 51a77a21..535dfd26 100644 --- a/docs/functions_func_u.html +++ b/docs/functions_func_u.html @@ -140,6 +140,7 @@

                                                              - u -

                                                                , Sprite , StageState , State +, Text , Timer , TitleState , Wave @@ -154,7 +155,7 @@

                                                                - u -

                                                                  diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html index f5ac28b7..410f1fa0 100644 --- a/docs/functions_func_v.html +++ b/docs/functions_func_v.html @@ -129,7 +129,7 @@

                                                                  - v -

                                                                    diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html index b05326c8..53c2fc08 100644 --- a/docs/functions_func_w.html +++ b/docs/functions_func_w.html @@ -129,7 +129,7 @@

                                                                    - w -

                                                                      diff --git a/docs/functions_func_z.html b/docs/functions_func_z.html index d9aca381..c886136a 100644 --- a/docs/functions_func_z.html +++ b/docs/functions_func_z.html @@ -129,7 +129,7 @@

                                                                      - z -

                                                                        diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html index 2665ae98..70767ae1 100644 --- a/docs/functions_func_~.html +++ b/docs/functions_func_~.html @@ -162,7 +162,7 @@

                                                                        - ~ -

                                                                          diff --git a/docs/functions_g.html b/docs/functions_g.html index 6a179883..9cc90fb4 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -138,7 +138,7 @@

                                                                          - g -

                                                                            : TileMap
                                                                          • Get() -: Timer +: Timer
                                                                          • GetCurrentFramerate() : Game @@ -229,7 +229,7 @@

                                                                            - g -

                                                                              diff --git a/docs/functions_h.html b/docs/functions_h.html index e7449d5f..53764fa1 100644 --- a/docs/functions_h.html +++ b/docs/functions_h.html @@ -153,7 +153,7 @@

                                                                              - h -

                                                                                diff --git a/docs/functions_i.html b/docs/functions_i.html index 592968a6..aaf69d64 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -201,11 +201,14 @@

                                                                                - i -

                                                                                • IsShowingCollisionInfo() : TileMap
                                                                                • +
                                                                                • isStrobe +: Text +
                                                                                diff --git a/docs/functions_k.html b/docs/functions_k.html index 738911c9..87684dc3 100644 --- a/docs/functions_k.html +++ b/docs/functions_k.html @@ -141,7 +141,7 @@

                                                                                - k -

                                                                                  diff --git a/docs/functions_l.html b/docs/functions_l.html index 2ba3d0b0..d7dd0470 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -138,7 +138,7 @@

                                                                                  - l -

                                                                                    diff --git a/docs/functions_m.html b/docs/functions_m.html index ae2a04fc..a924a60a 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -201,7 +201,7 @@

                                                                                    - m -

                                                                                      diff --git a/docs/functions_n.html b/docs/functions_n.html index 1c40ce4a..1a13a78c 100644 --- a/docs/functions_n.html +++ b/docs/functions_n.html @@ -145,7 +145,7 @@

                                                                                      - n -

                                                                                        diff --git a/docs/functions_o.html b/docs/functions_o.html index 9e82099a..410753c0 100644 --- a/docs/functions_o.html +++ b/docs/functions_o.html @@ -174,7 +174,7 @@

                                                                                        - o -

                                                                                          diff --git a/docs/functions_p.html b/docs/functions_p.html index 124879d6..7e169ecf 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -154,7 +154,7 @@

                                                                                          - p -

                                                                                            diff --git a/docs/functions_q.html b/docs/functions_q.html index 8a04936e..589809ca 100644 --- a/docs/functions_q.html +++ b/docs/functions_q.html @@ -128,23 +128,23 @@

                                                                                            - q -

                                                                                            diff --git a/docs/functions_r.html b/docs/functions_r.html index 46ec5623..7131fd6f 100644 --- a/docs/functions_r.html +++ b/docs/functions_r.html @@ -194,7 +194,7 @@

                                                                                            - r -

                                                                                              diff --git a/docs/functions_s.html b/docs/functions_s.html index 84a65606..84db336d 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -173,6 +173,9 @@

                                                                                              - s -

                                                                                              • SetScaleY() : Sprite
                                                                                              • +
                                                                                              • SetStrobeFrequency() +: Text +
                                                                                              • SetStyle() : Text
                                                                                              • @@ -182,6 +185,9 @@

                                                                                                - s -

                                                                                                • SetTileSet() : TileMap
                                                                                                • +
                                                                                                • SetTimeShown() +: Text +
                                                                                                • SetWidthAndHeight() : Rect
                                                                                                • @@ -198,14 +204,11 @@

                                                                                                  - s -

                                                                                                    : TileMap
                                                                                                  • Sound() -: Sound +: Sound
                                                                                                  • sound : Sound
                                                                                                  • -
                                                                                                  • Sound() -: Sound -
                                                                                                  • soundTable : Resources
                                                                                                  • @@ -228,7 +231,7 @@

                                                                                                    - s -

                                                                                                      , Camera
                                                                                                    • Sprite() -: Sprite +: Sprite
                                                                                                    • StageState() : StageState @@ -246,6 +249,9 @@

                                                                                                      - s -

                                                                                                      • storedState : Game
                                                                                                      • +
                                                                                                      • strobeFrequency +: Text +
                                                                                                      • style : Text
                                                                                                      • @@ -253,7 +259,7 @@

                                                                                                        - s -

                                                                                                          diff --git a/docs/functions_t.html b/docs/functions_t.html index 21d2e83e..97f9c00d 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -126,11 +126,14 @@

                                                                                                          - t -

                                                                                                          • Text() -: Text +: Text
                                                                                                          • text : Text
                                                                                                          • +
                                                                                                          • textTime +: Text +
                                                                                                          • texture : Sprite , Text @@ -151,11 +154,13 @@

                                                                                                            - t -

                                                                                                            • tileSet : StageState , TileMap -, TileSet
                                                                                                            • TileSet() : TileSet
                                                                                                            • +
                                                                                                            • tileSet +: TileSet +
                                                                                                            • tileWidth : TileSet
                                                                                                            • @@ -171,6 +176,9 @@

                                                                                                              - t -

                                                                                                              • Timer() : Timer
                                                                                                              • +
                                                                                                              • timeShown +: Text +
                                                                                                              • TitleState() : TitleState
                                                                                                              • @@ -181,7 +189,7 @@

                                                                                                                - t -

                                                                                                                  diff --git a/docs/functions_u.html b/docs/functions_u.html index 5bfff4ab..d5d39b85 100644 --- a/docs/functions_u.html +++ b/docs/functions_u.html @@ -143,6 +143,7 @@

                                                                                                                  - u -

                                                                                                                    , Sprite , StageState , State +, Text , Timer , TitleState , Wave @@ -160,7 +161,7 @@

                                                                                                                    - u -

                                                                                                                      diff --git a/docs/functions_v.html b/docs/functions_v.html index 392c0762..034207cc 100644 --- a/docs/functions_v.html +++ b/docs/functions_v.html @@ -132,7 +132,7 @@

                                                                                                                      - v -

                                                                                                                        diff --git a/docs/functions_vars.html b/docs/functions_vars.html index 01ccc6cc..e15f2acb 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -284,6 +284,9 @@

                                                                                                                        - i -

                                                                                                                        @@ -433,6 +436,9 @@

                                                                                                                        - s -

                                                                                                                        • storedState : Game
                                                                                                                        • +
                                                                                                                        • strobeFrequency +: Text +
                                                                                                                        • style : Text
                                                                                                                        • @@ -443,6 +449,9 @@

                                                                                                                          - t -

                                                                                                                          • text : Text
                                                                                                                          • +
                                                                                                                          • textTime +: Text +
                                                                                                                          • texture : Sprite , Text @@ -474,6 +483,9 @@

                                                                                                                            - t -

                                                                                                                            • timeLimit : Animation
                                                                                                                            • +
                                                                                                                            • timeShown +: Text +
                                                                                                                            • type : Enemy
                                                                                                                            • @@ -531,7 +543,7 @@

                                                                                                                              - z -

                                                                                                                                diff --git a/docs/functions_w.html b/docs/functions_w.html index eb370b05..8900747e 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -145,7 +145,7 @@

                                                                                                                                - w -

                                                                                                                                  diff --git a/docs/functions_x.html b/docs/functions_x.html index 09bbe1f9..092f9cc4 100644 --- a/docs/functions_x.html +++ b/docs/functions_x.html @@ -133,7 +133,7 @@

                                                                                                                                  - x -

                                                                                                                                    diff --git a/docs/functions_y.html b/docs/functions_y.html index 3924afaa..74bf93c4 100644 --- a/docs/functions_y.html +++ b/docs/functions_y.html @@ -133,7 +133,7 @@

                                                                                                                                    - y -

                                                                                                                                      diff --git a/docs/functions_z.html b/docs/functions_z.html index 7a14d34a..5942e2d3 100644 --- a/docs/functions_z.html +++ b/docs/functions_z.html @@ -138,7 +138,7 @@

                                                                                                                                      - z -

                                                                                                                                        diff --git a/docs/functions_~.html b/docs/functions_~.html index 02811ea9..214e6d56 100644 --- a/docs/functions_~.html +++ b/docs/functions_~.html @@ -165,7 +165,7 @@

                                                                                                                                        - ~ -

                                                                                                                                          diff --git a/docs/globals.html b/docs/globals.html index 0110c9b0..c722312d 100644 --- a/docs/globals.html +++ b/docs/globals.html @@ -287,6 +287,9 @@

                                                                                                                                          - m -

                                                                                                                                          • MIDDLE_MOUSE_BUTTON : InputManager.h
                                                                                                                                          • +
                                                                                                                                          • MIN_TIME_SHOWN +: Text.h +
                                                                                                                                          • MIXER_CHUCK_SIZE : Game.h
                                                                                                                                          • @@ -363,6 +366,9 @@

                                                                                                                                            - t -

                                                                                                                                            • TEMP_REPORT_I_WAS_HERE : Error.h
                                                                                                                                            • +
                                                                                                                                            • TEXT_FREQUENCY +: Text.h +
                                                                                                                                            • TextStyle : Text.h
                                                                                                                                            • @@ -394,7 +400,7 @@

                                                                                                                                              - w -

                                                                                                                                                diff --git a/docs/globals_defs.html b/docs/globals_defs.html index 5417b0ed..a7d28667 100644 --- a/docs/globals_defs.html +++ b/docs/globals_defs.html @@ -264,6 +264,9 @@

                                                                                                                                                - m -

                                                                                                                                                • MIDDLE_MOUSE_BUTTON : InputManager.h
                                                                                                                                                • +
                                                                                                                                                • MIN_TIME_SHOWN +: Text.h +
                                                                                                                                                • MIXER_CHUCK_SIZE : Game.h
                                                                                                                                                • @@ -328,6 +331,9 @@

                                                                                                                                                  - t -

                                                                                                                                                  • TEMP_REPORT_I_WAS_HERE : Error.h
                                                                                                                                                  • +
                                                                                                                                                  • TEXT_FREQUENCY +: Text.h +
                                                                                                                                                  • TILE_VAZIO : TileMap.h
                                                                                                                                                  • @@ -352,7 +358,7 @@

                                                                                                                                                    - w -

                                                                                                                                                      diff --git a/docs/globals_enum.html b/docs/globals_enum.html index 17ac6d45..112899fe 100644 --- a/docs/globals_enum.html +++ b/docs/globals_enum.html @@ -102,7 +102,7 @@ diff --git a/docs/globals_eval.html b/docs/globals_eval.html index 270ae1cf..9af5b54a 100644 --- a/docs/globals_eval.html +++ b/docs/globals_eval.html @@ -117,7 +117,7 @@ diff --git a/docs/globals_func.html b/docs/globals_func.html index 5eeaf05b..477d1988 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 769f618a..2ed90aa8 100644 --- a/docs/globals_type.html +++ b/docs/globals_type.html @@ -103,7 +103,7 @@ diff --git a/docs/graph_legend.html b/docs/graph_legend.html index 18ba7174..62d657c1 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 e08a0260..85872d8f 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -127,7 +127,7 @@ diff --git a/docs/index.html b/docs/index.html index 52b8bb04..bf50026c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,7 +82,7 @@ diff --git a/docs/inherits.html b/docs/inherits.html index 352946b5..dad49f7b 100644 --- a/docs/inherits.html +++ b/docs/inherits.html @@ -132,7 +132,7 @@ diff --git a/docs/main_8cpp.html b/docs/main_8cpp.html index e45cdcc8..b586ea14 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 a8b1d50b..11a4b8c6 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 8e70ce9e..501848f7 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -88,7 +88,7 @@ diff --git a/docs/search/all_10.js b/docs/search/all_10.js index 4d6139cd..b12d3c52 100644 --- a/docs/search/all_10.js +++ b/docs/search/all_10.js @@ -1,5 +1,5 @@ var searchData= [ ['quimic',['QUIMIC',['../classEnemy.html#a98c2ee2c2081001de17a4bc9fa8da94fad70f38cce07755ea6632750501ab085c',1,'Enemy']]], - ['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 ca22001a..13d218bb 100644 --- a/docs/search/all_12.js +++ b/docs/search/all_12.js @@ -15,9 +15,11 @@ var searchData= ['setscale',['SetScale',['../classSprite.html#a54d18a18383575b04f397f5bec3113d0',1,'Sprite']]], ['setscalex',['SetScaleX',['../classSprite.html#aad7bb29fc017ac2197dffec177c17e15',1,'Sprite']]], ['setscaley',['SetScaleY',['../classSprite.html#a2853ee7687dc906b9be791d197a1b1b6',1,'Sprite']]], + ['setstrobefrequency',['SetStrobeFrequency',['../classText.html#a8170b3d5b99bca8ef161794c226841f2',1,'Text']]], ['setstyle',['SetStyle',['../classText.html#acd7cd539df681365587e86144cc3c352',1,'Text']]], ['settext',['SetText',['../classText.html#abffaafcd871424690014ca0a74c45989',1,'Text']]], ['settileset',['SetTileSet',['../classTileMap.html#aeaeb5ed2cc7e621ab2fe9f5ee26b2b69',1,'TileMap']]], + ['settimeshown',['SetTimeShown',['../classText.html#ae96b3e5967b643436dcb98bc62c04ade',1,'Text']]], ['setwidthandheight',['SetWidthAndHeight',['../classRect.html#a5751026840c842f72e1f79cb82d9554c',1,'Rect']]], ['setzoomable',['SetZoomable',['../classCamera.html#a3912a07e55bb225146fdaedb333c4452',1,'Camera']]], ['setzoomlimits',['SetZoomLimits',['../classCamera.html#aa320e33bcbe395cdad9f63887ea15689',1,'Camera']]], @@ -26,7 +28,7 @@ var searchData= ['showcollisioninfo',['ShowCollisionInfo',['../classTileMap.html#a31b1607f50b08cf2c49c71a8478ec07d',1,'TileMap']]], ['size',['SIZE',['../Component_8h.html#a81f78fc173dedefe5a049c0aa3eed2c0a4aa71180778b711338785695df5d7c52',1,'Component.h']]], ['solid',['SOLID',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45a1b45f84e1f6603b52e5ef442836df9af',1,'Text.h']]], - ['sound',['Sound',['../classSound.html',1,'Sound'],['../classSound.html#a44bbda770ac76c7455b60d3d63b663a7',1,'Sound::sound()'],['../classSound.html#a539c205cdf06fe2c621fd77c37bcfac9',1,'Sound::Sound()'],['../classSound.html#af2c277cdc12b7df1de53e5b855e4f09c',1,'Sound::Sound(string file)']]], + ['sound',['Sound',['../classSound.html',1,'Sound'],['../classSound.html#a539c205cdf06fe2c621fd77c37bcfac9',1,'Sound::Sound()'],['../classSound.html#af2c277cdc12b7df1de53e5b855e4f09c',1,'Sound::Sound(string file)'],['../classSound.html#a44bbda770ac76c7455b60d3d63b663a7',1,'Sound::sound()']]], ['sound_2ecpp',['Sound.cpp',['../Sound_8cpp.html',1,'']]], ['sound_2eh',['Sound.h',['../Sound_8h.html',1,'']]], ['soundtable',['soundTable',['../classResources.html#abbd116a3bc870ba6578a89b4aa08908c',1,'Resources']]], @@ -56,5 +58,6 @@ var searchData= ['statestack',['stateStack',['../classGame.html#a2706caaad0c60784a6671efc9ee147f8',1,'Game']]], ['stop',['Stop',['../classMusic.html#a76ee0c7654f3048045e1f1b7fde334c3',1,'Music::Stop()'],['../classSound.html#ae391c15fe26a0091e601be32eef0bce5',1,'Sound::Stop()']]], ['storedstate',['storedState',['../classGame.html#a46a38cae75b6557890d7c47ad8350a1d',1,'Game']]], + ['strobefrequency',['strobeFrequency',['../classText.html#a38e924c6d2f551bae9ab4b73cab1360c',1,'Text']]], ['style',['style',['../classText.html#aaf6b429b30c8e7b380aa2433cf1296ea',1,'Text']]] ]; diff --git a/docs/search/all_13.js b/docs/search/all_13.js index bce3dcf4..102c27d6 100644 --- a/docs/search/all_13.js +++ b/docs/search/all_13.js @@ -1,18 +1,20 @@ var searchData= [ ['temp_5freport_5fi_5fwas_5fhere',['TEMP_REPORT_I_WAS_HERE',['../Error_8h.html#a460a42aaa4200700dfb4a73f852e93b8',1,'Error.h']]], - ['text',['Text',['../classText.html',1,'Text'],['../classText.html#ab9d958002beef60e08b0e932267401d0',1,'Text::Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, int x=0, int y=0)'],['../classText.html#a7da8331e2da684bb0485a3ee7893b415',1,'Text::text()']]], + ['text',['Text',['../classText.html',1,'Text'],['../classText.html#aa8407cc951fc6848de89878339e6623b',1,'Text::Text(string fontFile, int fontSize, TextStyle style, SDL_Color color, bool isStrobing=false, int x=0, int y=0)'],['../classText.html#a7da8331e2da684bb0485a3ee7893b415',1,'Text::text()']]], ['text_2ecpp',['Text.cpp',['../Text_8cpp.html',1,'']]], ['text_2eh',['Text.h',['../Text_8h.html',1,'']]], + ['text_5ffrequency',['TEXT_FREQUENCY',['../Text_8h.html#a51c895f669b6bbf3a538dd9b2f987549',1,'Text.h']]], ['textstyle',['TextStyle',['../Text_8h.html#ad5957a553b7d89d4921c39cc3ad6bc45',1,'Text.h']]], + ['texttime',['textTime',['../classText.html#a7b4801a20d93b67e9c05fbf763ba282f',1,'Text']]], ['texture',['texture',['../classSprite.html#a9f90b14f1a69209da8babfa6745dc1fe',1,'Sprite::texture()'],['../classText.html#aea2a82ef1d8b4d448b6b3e524bce2cc2',1,'Text::texture()']]], ['tile_5fvazio',['TILE_VAZIO',['../TileMap_8h.html#ac02aac1b0a1bc1430a2bf4a3cd4ab7bf',1,'TileMap.h']]], ['tileheight',['tileHeight',['../classTileSet.html#a9409211e1c5560f969b737714be977c0',1,'TileSet']]], - ['tilemap',['TileMap',['../classTileMap.html',1,'TileMap'],['../classTileMap.html#acf6fe3a182047153ec9c25fadc55056c',1,'TileMap::TileMap()'],['../classDragAndDrop.html#a2365d8aea9a5503a49973c0176e96d39',1,'DragAndDrop::tileMap()'],['../classStageState.html#a1c795e4b3e5c0522709a6060e52291e4',1,'StageState::tileMap()']]], + ['tilemap',['TileMap',['../classTileMap.html',1,'TileMap'],['../classDragAndDrop.html#a2365d8aea9a5503a49973c0176e96d39',1,'DragAndDrop::tileMap()'],['../classStageState.html#a1c795e4b3e5c0522709a6060e52291e4',1,'StageState::tileMap()'],['../classTileMap.html#acf6fe3a182047153ec9c25fadc55056c',1,'TileMap::TileMap()']]], ['tilemap_2ecpp',['TileMap.cpp',['../TileMap_8cpp.html',1,'']]], ['tilemap_2eh',['TileMap.h',['../TileMap_8h.html',1,'']]], ['tilematrix',['tileMatrix',['../classTileMap.html#ac1d3ce0587c4e615682b71fd96295e0e',1,'TileMap']]], - ['tileset',['TileSet',['../classTileSet.html',1,'TileSet'],['../classTileMap.html#a24b2ea7aecfd795f1e13dfa9b0b3cb76',1,'TileMap::tileSet()'],['../classTileSet.html#adbd7ac102ce306e4f367c32cfa576979',1,'TileSet::tileSet()'],['../classStageState.html#ac1ef17645d0585767eaf96693a88d9bb',1,'StageState::tileSet()'],['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet::TileSet()']]], + ['tileset',['TileSet',['../classTileSet.html',1,'TileSet'],['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet::TileSet()'],['../classTileMap.html#a24b2ea7aecfd795f1e13dfa9b0b3cb76',1,'TileMap::tileSet()'],['../classTileSet.html#adbd7ac102ce306e4f367c32cfa576979',1,'TileSet::tileSet()'],['../classStageState.html#ac1ef17645d0585767eaf96693a88d9bb',1,'StageState::tileSet()']]], ['tileset_2ecpp',['Tileset.cpp',['../Tileset_8cpp.html',1,'']]], ['tileset_2eh',['Tileset.h',['../Tileset_8h.html',1,'']]], ['tilewidth',['tileWidth',['../classTileSet.html#a9ba9087a6da877f78af6cdf9afb0af7c',1,'TileSet']]], @@ -23,6 +25,7 @@ var searchData= ['timer',['Timer',['../classTimer.html',1,'Timer'],['../classTimer.html#af866f8d58d5ed1da7a0c61df4975be3e',1,'Timer::Timer()']]], ['timer_2ecpp',['Timer.cpp',['../Timer_8cpp.html',1,'']]], ['timer_2eh',['Timer.h',['../Timer_8h.html',1,'']]], + ['timeshown',['timeShown',['../classText.html#acbd9eb9838ed8223ba17ab0495828812',1,'Text']]], ['titlestate',['TitleState',['../classTitleState.html',1,'TitleState'],['../classTitleState.html#a0694f4ac042f6baf1516c26e7385a570',1,'TitleState::TitleState()']]], ['titlestate_2ecpp',['TitleState.cpp',['../TitleState_8cpp.html',1,'']]], ['titlestate_2eh',['TitleState.h',['../TitleState_8h.html',1,'']]], diff --git a/docs/search/all_14.js b/docs/search/all_14.js index 768bfe38..f08465f4 100644 --- a/docs/search/all_14.js +++ b/docs/search/all_14.js @@ -3,7 +3,7 @@ var searchData= ['uint',['uint',['../Error_8h.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Error.h'],['../Face_8cpp.html#a91ad9478d81a7aaf2593e8d9c3d06a14',1,'uint(): Face.cpp']]], ['unfollow',['Unfollow',['../classCamera.html#aa9ca7decdebf7147c9d6dc747e7d59e9',1,'Camera']]], ['up_5farrow_5fkey',['UP_ARROW_KEY',['../InputManager_8h.html#ad411242de334297d01bdadac8f47e90b',1,'InputManager.h']]], - ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classWave.html#ae58656ceaba495efc644adc287afae1d',1,'Wave::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classFace.html#ac9d2c445a21685b42741794a65b77543',1,'Face::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()']]], + ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classWave.html#ae58656ceaba495efc644adc287afae1d',1,'Wave::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classFace.html#ac9d2c445a21685b42741794a65b77543',1,'Face::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()']]], ['updatearray',['UpdateArray',['../classState.html#abb605ec5fe585d227fbf267e0e6c80a9',1,'State']]], ['updatecounter',['updateCounter',['../classInputManager.html#a96541a9ebd43184f92449f9daf94724f',1,'InputManager']]], ['updatestack',['UpdateStack',['../classGame.html#ae67b3fda973e4b05513d02c968b0ac17',1,'Game']]] diff --git a/docs/search/all_2.js b/docs/search/all_2.js index 0500d56c..9fa2f4a8 100644 --- a/docs/search/all_2.js +++ b/docs/search/all_2.js @@ -23,7 +23,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'],['../structColor.html#a01fc8b90de599a12365e87b9a0719264',1,'Color::Color()'],['../classText.html#ab0f771bd18d8e968f7aaee4a4e26e385',1,'Text::color()']]], + ['color',['Color',['../structColor.html',1,'Color'],['../classText.html#ab0f771bd18d8e968f7aaee4a4e26e385',1,'Text::color()'],['../structColor.html#a01fc8b90de599a12365e87b9a0719264',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 709202c8..376d9483 100644 --- a/docs/search/all_6.js +++ b/docs/search/all_6.js @@ -9,7 +9,7 @@ var searchData= ['gameobject_2ecpp',['GameObject.cpp',['../GameObject_8cpp.html',1,'']]], ['gameobject_2eh',['GameObject.h',['../GameObject_8h.html',1,'']]], ['gameobjectmatrix',['gameObjectMatrix',['../classTileMap.html#a52b6a4fcc0c13eb4224850f592f10eba',1,'TileMap']]], - ['get',['Get',['../classTimer.html#a7d41db026caef9bb0a0a22ddec49dd4c',1,'Timer']]], + ['get',['Get',['../classTimer.html#af3962012b13e46abf3cf798f7aa3eec7',1,'Timer']]], ['getcurrentframerate',['GetCurrentFramerate',['../classGame.html#a3e0a5615b8ebcdea9c4cac436e35cdcd',1,'Game']]], ['getcurrentstate',['GetCurrentState',['../classGame.html#a1f9d6f97e969424844881dd7ad2e353e',1,'Game']]], ['getdeltatime',['GetDeltaTime',['../classGame.html#aa2feacb19b45ff0ec0935ea1a6f9c9ab',1,'Game']]], diff --git a/docs/search/all_8.js b/docs/search/all_8.js index f533a541..4ccc35cf 100644 --- a/docs/search/all_8.js +++ b/docs/search/all_8.js @@ -21,5 +21,6 @@ var searchData= ['ismousedown',['IsMouseDown',['../classInputManager.html#a410c6f6a0fa13dfd938d6d26a524fc19',1,'InputManager']]], ['ismousescrolling',['IsMouseScrolling',['../classInputManager.html#aeb81e9386db70d1cc204e45963ec9077',1,'InputManager']]], ['isopen',['IsOpen',['../classMusic.html#a7dd0d191e358d600f0ea8a1db75f833d',1,'Music::IsOpen()'],['../classSound.html#a9e67e48d34d9ca3d31f0da846ada923b',1,'Sound::IsOpen()'],['../classSprite.html#a9f1e62573dd91cb03dbad7aa54807b8c',1,'Sprite::IsOpen()']]], - ['isshowingcollisioninfo',['IsShowingCollisionInfo',['../classTileMap.html#a9cdb06bdaca86adf9fc179ed5cf7b148',1,'TileMap']]] + ['isshowingcollisioninfo',['IsShowingCollisionInfo',['../classTileMap.html#a9cdb06bdaca86adf9fc179ed5cf7b148',1,'TileMap']]], + ['isstrobe',['isStrobe',['../classText.html#a5ebb0b4767c8487d440d9c36ae0c93cd',1,'Text']]] ]; diff --git a/docs/search/all_c.js b/docs/search/all_c.js index f9f2add5..83e67ae3 100644 --- a/docs/search/all_c.js +++ b/docs/search/all_c.js @@ -12,6 +12,7 @@ var searchData= ['maxzoom',['maxZoom',['../classCamera.html#af418b7887d39c773d73cb179c497a8da',1,'Camera']]], ['membermult',['MemberMult',['../classVec2.html#a0af80a4efc933b61b2885a815a15a77f',1,'Vec2']]], ['middle_5fmouse_5fbutton',['MIDDLE_MOUSE_BUTTON',['../InputManager_8h.html#a0f26b1a0dee82337d947288c4ebcee16',1,'InputManager.h']]], + ['min_5ftime_5fshown',['MIN_TIME_SHOWN',['../Text_8h.html#ae0001748c8e43f9667011d62636fb7a0',1,'Text.h']]], ['minzoom',['minZoom',['../classCamera.html#a65d5a8e5533b568224d9fc488bfdcb28',1,'Camera']]], ['mixer_5fchuck_5fsize',['MIXER_CHUCK_SIZE',['../Game_8h.html#aa464e7a29fa5110de8238c0cfb4458a2',1,'Game.h']]], ['mousepress',['MousePress',['../classInputManager.html#ad07e913718fc94601dfccb5c3a6fb0ae',1,'InputManager']]], diff --git a/docs/search/defines_9.js b/docs/search/defines_9.js index f6b090af..96d1d5b7 100644 --- a/docs/search/defines_9.js +++ b/docs/search/defines_9.js @@ -2,6 +2,7 @@ var searchData= [ ['margem_5ferro_5fcomparacao',['MARGEM_ERRO_COMPARACAO',['../Vec2_8h.html#a1759b83db156ac7ed195b3e04757ee14',1,'Vec2.h']]], ['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']]], ['music_5ffade_5fout_5ftime_5fmsec',['MUSIC_FADE_OUT_TIME_MSEC',['../Music_8h.html#a56d75cf0fabf795cc2ec85cdfa487bf2',1,'Music.h']]] ]; diff --git a/docs/search/defines_d.js b/docs/search/defines_d.js index c49ae570..f2bb557f 100644 --- a/docs/search/defines_d.js +++ b/docs/search/defines_d.js @@ -1,6 +1,7 @@ var searchData= [ ['temp_5freport_5fi_5fwas_5fhere',['TEMP_REPORT_I_WAS_HERE',['../Error_8h.html#a460a42aaa4200700dfb4a73f852e93b8',1,'Error.h']]], + ['text_5ffrequency',['TEXT_FREQUENCY',['../Text_8h.html#a51c895f669b6bbf3a538dd9b2f987549',1,'Text.h']]], ['tile_5fvazio',['TILE_VAZIO',['../TileMap_8h.html#ac02aac1b0a1bc1430a2bf4a3cd4ab7bf',1,'TileMap.h']]], ['time_5fbetween_5fspawns',['TIME_BETWEEN_SPAWNS',['../StageState_8cpp.html#a0ef95dcc696568b2b2c856681079ba89',1,'StageState.cpp']]] ]; diff --git a/docs/search/functions_10.js b/docs/search/functions_10.js index e7946ab4..360dc970 100644 --- a/docs/search/functions_10.js +++ b/docs/search/functions_10.js @@ -14,9 +14,11 @@ var searchData= ['setscale',['SetScale',['../classSprite.html#a54d18a18383575b04f397f5bec3113d0',1,'Sprite']]], ['setscalex',['SetScaleX',['../classSprite.html#aad7bb29fc017ac2197dffec177c17e15',1,'Sprite']]], ['setscaley',['SetScaleY',['../classSprite.html#a2853ee7687dc906b9be791d197a1b1b6',1,'Sprite']]], + ['setstrobefrequency',['SetStrobeFrequency',['../classText.html#a8170b3d5b99bca8ef161794c226841f2',1,'Text']]], ['setstyle',['SetStyle',['../classText.html#acd7cd539df681365587e86144cc3c352',1,'Text']]], ['settext',['SetText',['../classText.html#abffaafcd871424690014ca0a74c45989',1,'Text']]], ['settileset',['SetTileSet',['../classTileMap.html#aeaeb5ed2cc7e621ab2fe9f5ee26b2b69',1,'TileMap']]], + ['settimeshown',['SetTimeShown',['../classText.html#ae96b3e5967b643436dcb98bc62c04ade',1,'Text']]], ['setwidthandheight',['SetWidthAndHeight',['../classRect.html#a5751026840c842f72e1f79cb82d9554c',1,'Rect']]], ['setzoomable',['SetZoomable',['../classCamera.html#a3912a07e55bb225146fdaedb333c4452',1,'Camera']]], ['setzoomlimits',['SetZoomLimits',['../classCamera.html#aa320e33bcbe395cdad9f63887ea15689',1,'Camera']]], diff --git a/docs/search/functions_11.js b/docs/search/functions_11.js index ac8bf02a..cc15e805 100644 --- a/docs/search/functions_11.js +++ b/docs/search/functions_11.js @@ -1,6 +1,6 @@ var searchData= [ - ['text',['Text',['../classText.html#ab9d958002beef60e08b0e932267401d0',1,'Text']]], + ['text',['Text',['../classText.html#aa8407cc951fc6848de89878339e6623b',1,'Text']]], ['tilemap',['TileMap',['../classTileMap.html#acf6fe3a182047153ec9c25fadc55056c',1,'TileMap']]], ['tileset',['TileSet',['../classTileSet.html#a671a1040ef1ba7600a6ea21faa950819',1,'TileSet']]], ['timer',['Timer',['../classTimer.html#af866f8d58d5ed1da7a0c61df4975be3e',1,'Timer']]], diff --git a/docs/search/functions_12.js b/docs/search/functions_12.js index cb64c748..8dcd3cb9 100644 --- a/docs/search/functions_12.js +++ b/docs/search/functions_12.js @@ -1,7 +1,7 @@ var searchData= [ ['unfollow',['Unfollow',['../classCamera.html#aa9ca7decdebf7147c9d6dc747e7d59e9',1,'Camera']]], - ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classWave.html#ae58656ceaba495efc644adc287afae1d',1,'Wave::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classFace.html#ac9d2c445a21685b42741794a65b77543',1,'Face::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()']]], + ['update',['Update',['../classAIGoDown.html#ae88285cea2d7672c14a3c8ab26207b96',1,'AIGoDown::Update()'],['../classAnimation.html#a1871db60d1fb351aeb77ada38dd4dd9c',1,'Animation::Update()'],['../classCamera.html#a3d528df411b986596b652b61120ff302',1,'Camera::Update()'],['../classComponent.html#a0e159ba9d0cdeb481f8cc87c8ad99660',1,'Component::Update()'],['../classDragAndDrop.html#a1ae8df8b7ff9ef703b57354c410b5ef3',1,'DragAndDrop::Update()'],['../classGameObject.html#a93ed63df640deb516a020530e7f8e045',1,'GameObject::Update()'],['../classHitPoints.html#a6ba0651108974380597c64c55959a538',1,'HitPoints::Update()'],['../classInputManager.html#afc344b3b2e204cfb39ee17b33bcc5eab',1,'InputManager::Update()'],['../classSprite.html#a1f5ac7fbd3e6efeca11cedb6b822df43',1,'Sprite::Update()'],['../classState.html#ad79561dfb4e1a6b722a3d9c84b06e91c',1,'State::Update()'],['../classText.html#a7e995169e7723f5185e7432175d3a194',1,'Text::Update()'],['../classTimer.html#aaf9c3b63c5934eb6338f846788262987',1,'Timer::Update()'],['../classWave.html#ae58656ceaba495efc644adc287afae1d',1,'Wave::Update()'],['../classEndState.html#a0fabb275706a8324521ed1e88efda11d',1,'EndState::Update()'],['../classEnemy.html#a9a1ef91d86d0a6994ee63b81f266fc22',1,'Enemy::Update()'],['../classFace.html#ac9d2c445a21685b42741794a65b77543',1,'Face::Update()'],['../classStageState.html#ae77d7d804ee36c434faf52ace163e85a',1,'StageState::Update()'],['../classTitleState.html#a11c14c15e072eff738fd48f3f0b7c1bf',1,'TitleState::Update()']]], ['updatearray',['UpdateArray',['../classState.html#abb605ec5fe585d227fbf267e0e6c80a9',1,'State']]], ['updatestack',['UpdateStack',['../classGame.html#ae67b3fda973e4b05513d02c968b0ac17',1,'Game']]] ]; diff --git a/docs/search/functions_5.js b/docs/search/functions_5.js index 35a24703..e91a4b7b 100644 --- a/docs/search/functions_5.js +++ b/docs/search/functions_5.js @@ -2,7 +2,7 @@ var searchData= [ ['game',['Game',['../classGame.html#acf1ee7a59d78a51832e8878cfca81c5a',1,'Game']]], ['gameobject',['GameObject',['../classGameObject.html#a78da814b13c8bf344ba0c5f72cb22af3',1,'GameObject']]], - ['get',['Get',['../classTimer.html#a7d41db026caef9bb0a0a22ddec49dd4c',1,'Timer']]], + ['get',['Get',['../classTimer.html#af3962012b13e46abf3cf798f7aa3eec7',1,'Timer']]], ['getcurrentframerate',['GetCurrentFramerate',['../classGame.html#a3e0a5615b8ebcdea9c4cac436e35cdcd',1,'Game']]], ['getcurrentstate',['GetCurrentState',['../classGame.html#a1f9d6f97e969424844881dd7ad2e353e',1,'Game']]], ['getdeltatime',['GetDeltaTime',['../classGame.html#aa2feacb19b45ff0ec0935ea1a6f9c9ab',1,'Game']]], diff --git a/docs/search/variables_10.js b/docs/search/variables_10.js index 19063af6..25831225 100644 --- a/docs/search/variables_10.js +++ b/docs/search/variables_10.js @@ -10,5 +10,6 @@ var searchData= ['speed',['speed',['../classAIGoDown.html#ac494b9b70caa1919b45937492946cfe2',1,'AIGoDown::speed()'],['../classCamera.html#a2960f533df18fe6d7d574c316c6d217a',1,'Camera::speed()']]], ['statestack',['stateStack',['../classGame.html#a2706caaad0c60784a6671efc9ee147f8',1,'Game']]], ['storedstate',['storedState',['../classGame.html#a46a38cae75b6557890d7c47ad8350a1d',1,'Game']]], + ['strobefrequency',['strobeFrequency',['../classText.html#a38e924c6d2f551bae9ab4b73cab1360c',1,'Text']]], ['style',['style',['../classText.html#aaf6b429b30c8e7b380aa2433cf1296ea',1,'Text']]] ]; diff --git a/docs/search/variables_11.js b/docs/search/variables_11.js index d06d6806..fc3661b7 100644 --- a/docs/search/variables_11.js +++ b/docs/search/variables_11.js @@ -1,6 +1,7 @@ var searchData= [ ['text',['text',['../classText.html#a7da8331e2da684bb0485a3ee7893b415',1,'Text']]], + ['texttime',['textTime',['../classText.html#a7b4801a20d93b67e9c05fbf763ba282f',1,'Text']]], ['texture',['texture',['../classSprite.html#a9f90b14f1a69209da8babfa6745dc1fe',1,'Sprite::texture()'],['../classText.html#aea2a82ef1d8b4d448b6b3e524bce2cc2',1,'Text::texture()']]], ['tileheight',['tileHeight',['../classTileSet.html#a9409211e1c5560f969b737714be977c0',1,'TileSet']]], ['tilemap',['tileMap',['../classDragAndDrop.html#a2365d8aea9a5503a49973c0176e96d39',1,'DragAndDrop::tileMap()'],['../classStageState.html#a1c795e4b3e5c0522709a6060e52291e4',1,'StageState::tileMap()']]], @@ -10,5 +11,6 @@ var searchData= ['time',['time',['../classTimer.html#a6c45df1d084a18e41e3a35f6a43df0be',1,'Timer']]], ['timeelapsed',['timeElapsed',['../classSprite.html#ab19d07e81660346ed85d92e518cd8399',1,'Sprite']]], ['timelimit',['timeLimit',['../classAnimation.html#ab8b4a075f8bf097b7af6e732949235c6',1,'Animation']]], + ['timeshown',['timeShown',['../classText.html#acbd9eb9838ed8223ba17ab0495828812',1,'Text']]], ['type',['type',['../classEnemy.html#a810c9c09be3480cdd23cd4caf345f24f',1,'Enemy']]] ]; diff --git a/docs/search/variables_8.js b/docs/search/variables_8.js index 592f3fdb..d2ef4ab6 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']]], ['isdragging',['isDragging',['../classDragAndDrop.html#ae70478ad1144137afdf8fefe453379c8',1,'DragAndDrop']]], - ['isdraging',['isDraging',['../classFace.html#a617f599a3f170e5692495ba63a9fa5a7',1,'Face']]] + ['isdraging',['isDraging',['../classFace.html#a617f599a3f170e5692495ba63a9fa5a7',1,'Face']]], + ['isstrobe',['isStrobe',['../classText.html#a5ebb0b4767c8487d440d9c36ae0c93cd',1,'Text']]] ]; diff --git a/docs/structColor-members.html b/docs/structColor-members.html index 4e35ae6e..de72cc45 100644 --- a/docs/structColor-members.html +++ b/docs/structColor-members.html @@ -97,7 +97,7 @@ diff --git a/docs/structColor.html b/docs/structColor.html index 07787f78..57968cf7 100644 --- a/docs/structColor.html +++ b/docs/structColor.html @@ -212,7 +212,7 @@

                                                                                                                                                      Atributos

                                                                                                                                                      diff --git a/docs/todo.html b/docs/todo.html index 975761e1..0bfd1dda 100644 --- a/docs/todo.html +++ b/docs/todo.html @@ -130,7 +130,7 @@ diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db index e3088747d8b191e4a913729c68e772a09a8a3a77..2f25b926b25bd8a558ff6fa3bff4db2915ed26cb 100644 GIT binary patch delta 9088 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 OY5vI>44peLM*TOrcXBQO delta 7060 zcmai(d0f@UwZMPp4DkD1xu~p{oy#Vh$OT+LM8vCzpe!ydqQV6(n`{CqxZ!Wei>=i} za}y^nF||#zyqczlB)3_sX_A-5#Mr*PHd~vtpS;G#G)eoiHt!SP`OWzHN&hN;%>CXo zXU;5l&Y3yGfeZEn_uG#q!Sm;x*BCrEZ4dYp3wfHOrfGiDMdf4D*Y(2;*7yzwC&4-2 zx!{cGvB)5niv!+)cJD~1x2tv7GvXN-g}mu&!Oj49V%k3Yb*4XThEVGt`mTjL;i+kR z#1V{}j%0bT$}`~28y)G$tMGJq=XDGZw~^Xi(~m?o0z7+u_$KCa8J*F`){-=5J{8$9 z)>s(hRB9Ke?eP-~#PrQcV>q)jI8)bv{%rXL?&4`9g(17Z{yrV*`U_*4_Vej)GC~Y? zH~U&j0;v6&>Fb4dd*EUAHT!%zH0{sK_mw*g{(aiM;-OAwdvRy+f+Clzpxx{3TIlk+ zirQV?;=+Q0g^T99@;hDAZ{7c%10AW;7caaF5IKFzv(t!k=Zd~CJmGu$`JI@ZZE>OR z;0u>9JyRUE;kk!j3^Ks$)34Mm-lKV~DctyrsI_TYc$}uq(s~ESI%rWwJk73%nr}

                                                                                                                                                      >*g*+9^Kq2si=Ya*rBjZH^&sU>gK4VMeB8Q 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