Merge branch 'master' of github.com:teamfisk/AgileBreakOut

include/Game/GUI/HUD.h

@@ -9,6 +9,8 @@
 #include "Game/GUI/FPSCounter.h"
 #include "Game/EGameOver.h"
 #include "Game/EClusterClear.h"
+#include "Game/EKrakenAttack.h"
+#include "GUI/Slider.h"
 
 namespace dd
 {
@@ -44,9 +46,17 @@ public:
 
 		m_FPSCounter = new GUI::FPSCounter(this, "FPSCounter");
 
+		m_KrakenAttackSlider = new Slider(this, "KrakenSlider");
+		m_KrakenAttackSlider->SetTexture("Textures/GUI/Menu/SliderBackground.png");
+		m_KrakenAttackSlider->SetTextureReleased("Textures/GUI/Menu/SliderHandle.png");
+		m_KrakenAttackSlider->SetLeft(Width / 2 - m_KrakenAttackSlider->Width / 2);
+		m_KrakenAttackSlider->Y = 800;
+		m_KrakenAttackSlider->Hide();
+
 		EVENT_SUBSCRIBE_MEMBER(m_EScore, &HUD::OnScore);
 		EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &HUD::OnGameOver);
 		EVENT_SUBSCRIBE_MEMBER(m_ClusterClear, &HUD::OnClusterClear);
+		EVENT_SUBSCRIBE_MEMBER(m_KrakenAttack, &HUD::OnKrakenAttack);
 	}
 
 	void Update(double dt) override
@@ -63,10 +73,12 @@ private:
 	FPSCounter* m_FPSCounter = nullptr;
 	TextureFrame* m_GameOverFrame = nullptr;
 	TextureFrame* m_ClusterClearFrame = nullptr;
+	Slider* m_KrakenAttackSlider = nullptr;
 
 	EventRelay<Frame, Events::ScoreEvent> m_EScore;
 	EventRelay<Frame, Events::GameOver> m_EGameOver;
 	EventRelay<Frame, Events::ClusterClear> m_ClusterClear;
+	EventRelay<Frame, Events::KrakenAttack> m_KrakenAttack;
 
 	bool OnScore(const Events::ScoreEvent& event)
 	{
@@ -87,6 +99,19 @@ private:
 		m_ClusterClearFrame->SetTexture("Textures/GUI/HUD/WinScreen.png");
 		return true;
 	}
+
+	bool OnKrakenAttack(const Events::KrakenAttack& event)
+	{
+		
+		if (event.ChargeUpdate >= 1.f) {
+			m_KrakenAttackSlider->Hide();
+		} else {
+			m_KrakenAttackSlider->Show();
+			m_KrakenAttackSlider->SetPercentage(event.ChargeUpdate);
+		}
+		
+		return true;
+	}
 };
 
 }