BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Working NumberFrame and score indicator

Browse Source
This commit is contained in:
sippeangelo
2015-09-25 05:30:31 +02:00
parent 2af9567722
commit 7b47385674
14 changed files with 131 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/HUD.h
+16
View File
@@ -3,6 +3,9 @@
#include "GUI/Frame.h"
#include "GUI/TextureFrame.h"
#include "GUI/NumberFrame.h"
#include "Core/EKeyUp.h"
#include "Game/EScoreEvent.h"
namespace dd
{
@@ -24,11 +27,24 @@ public:
m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
m_ScoreIndicator->SetRight(Right());
m_ScoreNumberFrame = new GUI::NumberFrame(m_ScoreIndicator, "HUDScoreNumberFrame");
m_ScoreNumberFrame->X = 15;
m_ScoreNumberFrame->Y = 21;
EVENT_SUBSCRIBE_MEMBER(m_EScore, &HUD::OnScore);
}
private:
TextureFrame* m_LevelIndicator = nullptr;
TextureFrame* m_ScoreIndicator = nullptr;
NumberFrame* m_ScoreNumberFrame = nullptr;
EventRelay<Frame, Events::ScoreEvent> m_EScore;
bool OnScore(const Events::ScoreEvent& event)
{
m_ScoreNumberFrame->SetNumber(event.Score);
}
};
}
include/Game/MainMenu.h
+2 -2
View File
@@ -34,7 +34,7 @@ public:
m_MainMenuOptions->SetLeft(m_LeftBanner->Right());
m_MainMenuOptions->SetTop(m_MainMenuMain->Bottom());
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &MainMenu::OnKeyUp);
//EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &MainMenu::OnKeyUp);
}
private:
@@ -42,7 +42,7 @@ private:
MainMenuMain* m_MainMenuMain;
MainMenuOptions* m_MainMenuOptions;
EventRelay<Frame, Events::KeyUp> m_EKeyUp;
//EventRelay<Frame, Events::KeyUp> m_EKeyUp;
bool OnKeyUp(const Events::KeyUp& event)
{
if (event.KeyCode == GLFW_KEY_ESCAPE) {