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

include/Game/EKrakenAttack.h

@@ -0,0 +1,27 @@
+//
+// Created by Adniklastrator on 2015-10-08.
+//
+
+#ifndef DAYDREAM_EKRAKENATTACK_H
+#define DAYDREAM_EKRAKENATTACK_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct KrakenAttack : Event
+{
+	double KrakenStrength;
+	double PlayerStrength;
+	double ChargeUpdate;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_EKRAKENATTACK_H

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;
+	}
 };
 
 }

include/Game/LevelSystem.h

@@ -26,6 +26,7 @@
 #include "Game/ELifebuoy.h"
 #include "Game/EStickyPad.h"
 #include "Game/EInkBlaster.h"
+#include "Game/EKrakenAttack.h"
 #include "Game/EMultiBall.h"
 #include "Game/EMultiBallLost.h"
 #include "Game/EPause.h"
@@ -133,6 +134,7 @@ private:
 	const int LifebuoyBrick = 3;
 	const int StickyBrick = 4;
 	const int InkBlasterBrick = 5;
+	const int KrakenAttackBrick = 6;
 
     EntityID m_BrickTemplate;
 

include/Game/PadSystem.h

@@ -26,6 +26,7 @@
 #include "Game/CPowerUp.h"
 #include "Game/EResetBall.h"
 #include "Game/EMultiBall.h"
+#include "Game/EKrakenAttack.h"
 #include "Game/EPowerUpTaken.h"
 #include "Game/EStageCleared.h"
 #include "Game/EPause.h"
@@ -76,6 +77,10 @@ private:
     bool m_Right = false;
     bool m_ReplaceBall = false;
     bool m_MultiBall = false;
+	bool m_KrakenAttack = false;
+	double m_KrakenCharge = 0;
+	double m_KrakenStrength = 0;
+	double m_PlayerStrength = 0;
     float m_Edge = 2.8f;
     Components::Transform* m_Transform = nullptr;
     Components::Pad* m_Pad = nullptr;
@@ -88,6 +93,8 @@ private:
     dd::EventRelay<PadSystem, dd::Events::Contact> m_EContactPowerUp;
     dd::EventRelay<PadSystem, dd::Events::StageCleared> m_EStageCleared;
     dd::EventRelay<PadSystem, dd::Events::Pause> m_EPause;
+	dd::EventRelay<PadSystem, dd::Events::KrakenAttack> m_EKrakenAttack;
+	dd::EventRelay<PadSystem, dd::Events::ActionButton> m_EActionButton;
 
     bool OnKeyDown(const dd::Events::KeyDown &event);
     bool OnKeyUp(const dd::Events::KeyUp &event);
@@ -95,6 +102,8 @@ private:
     bool OnContactPowerUp(const dd::Events::Contact &event);
     bool OnStageCleared(const dd::Events::StageCleared &event);
     bool OnPause(const dd::Events::Pause &event);
+	bool OnKrakenAttack(const dd::Events::KrakenAttack &event);
+	bool OnActionButton(const dd::Events::ActionButton &event);
 
     class PadSteeringInputController;
     std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;