Merge remote-tracking branch 'origin/master' into Physics

include/Game/EScreenShake.h

@@ -0,0 +1,26 @@
+//
+// Created by Administrator on 2015-10-13.
+//
+
+#ifndef DAYDREAM_ESCREENSHAKE_H
+#define DAYDREAM_ESCREENSHAKE_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct ScreenShake : Event
+{
+    float Time;
+	int Intensity;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_ESCREENSHAKE_H

include/Game/GUI/HUD.h

@@ -26,22 +26,9 @@ public:
 		Width = parent->Width;
 		Height = parent->Height;
 
-		//m_LevelIndicator = new GUI::TextureFrame(this, "HUDLevelIndicator");
-		//m_LevelIndicator->SetTexture("Textures/GUI/HUD/LevelIndicatorBG.png");
-
-		//m_AreaNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
-		//m_AreaNumberFrame->X = 132;
-		//m_AreaNumberFrame->Y = 19;
-		//m_AreaNumberFrame->SetNumber(6);
-		//m_StageNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
-		//m_StageNumberFrame->X = 165;
-		//m_StageNumberFrame->Y = 19;
-		//m_StageNumberFrame->SetNumber(5);
-
-		//m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
-		//m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
+		m_ScoreBackground = new GUI::TextureFrame(this, "HUDScoreBackgroundFrame");
+		m_ScoreBackground->SetTexture("Textures/GUI/Numbers/Background.png");
 		m_ScoreNumberFrame = new GUI::NumberFrame(this, "HUDScoreNumberFrame");
-		m_ScoreNumberFrame->SetTexture("Textures/GUI/Numbers/Background.png");
 		//m_ScoreNumberFrame->X = 15;
 		m_ScoreNumberFrame->Y = 18;
 
@@ -58,18 +45,14 @@ public:
 		EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &HUD::OnGameOver);
 		EVENT_SUBSCRIBE_MEMBER(m_ClusterClear, &HUD::OnClusterClear);
 		EVENT_SUBSCRIBE_MEMBER(m_KrakenAttack, &HUD::OnKrakenAttack);
+
+		updateScore();
 	}
 
-	void Update(double dt) override
-	{
-		m_ScoreNumberFrame->SetLeft(Width / 2.f - m_ScoreNumberFrame->Width / 2.f);
-	}
+
 
 private:
-	TextureFrame* m_LevelIndicator = nullptr;
-	TextureFrame* m_ScoreIndicator = nullptr;
-	NumberFrame* m_AreaNumberFrame = nullptr;
-	NumberFrame* m_StageNumberFrame = nullptr;
+	TextureFrame* m_ScoreBackground = nullptr;
 	NumberFrame* m_ScoreNumberFrame = nullptr;
 	FPSCounter* m_FPSCounter = nullptr;
 	TextureFrame* m_GameOverFrame = nullptr;
@@ -81,9 +64,18 @@ private:
 	EventRelay<Frame, Events::ClusterClear> m_ClusterClear;
 	EventRelay<Frame, Events::KrakenAttack> m_KrakenAttack;
 
+	void updateScore()
+	{
+		m_ScoreNumberFrame->SetLeft(Width / 2.f - m_ScoreNumberFrame->Width / 2.f);
+		m_ScoreBackground->SetLeft(m_ScoreNumberFrame->Left() - 20);
+		m_ScoreBackground->Width = m_ScoreNumberFrame->Width + 40;
+		m_ScoreBackground->Height = m_ScoreNumberFrame->Height + 30;
+	}
+
 	bool OnScore(const Events::ScoreEvent& event)
 	{
 		m_ScoreNumberFrame->SetNumber(m_ScoreNumberFrame->Number() + event.Score);
+		updateScore();
 		return true;
 	}
 

include/Game/PadSystem.h

@@ -35,6 +35,7 @@
 #include "Game/EStageCleared.h"
 #include "Game/EPause.h"
 #include "Game/EHitLag.h"
+#include "Game/EScreenShake.h"
 #include "Game/EActionButton.h"
 
 
@@ -92,6 +93,7 @@ private:
 	std::shared_ptr<Components::Transform> m_StickTransform;
 	std::shared_ptr<Components::StickyAim> m_StickyAim;
 
+	bool m_ResetBall = false;
     bool m_Pause = false;
 
     dd::EventRelay<PadSystem, dd::Events::KeyDown> m_EKeyDown;
@@ -99,6 +101,7 @@ private:
     dd::EventRelay<PadSystem, dd::Events::Contact> m_EContact;
     dd::EventRelay<PadSystem, dd::Events::Contact> m_EContactPowerUp;
     dd::EventRelay<PadSystem, dd::Events::StageCleared> m_EStageCleared;
+	dd::EventRelay<PadSystem, dd::Events::ResetBall> m_EResetBall;
     dd::EventRelay<PadSystem, dd::Events::Pause> m_EPause;
 	dd::EventRelay<PadSystem, dd::Events::KrakenAttack> m_EKrakenAttack;
 	dd::EventRelay<PadSystem, dd::Events::StickyPad> m_EStickyPad;
@@ -110,6 +113,7 @@ private:
     bool OnContact(const dd::Events::Contact &event);
     bool OnContactPowerUp(const dd::Events::Contact &event);
     bool OnStageCleared(const dd::Events::StageCleared &event);
+	bool OnResetBall(const dd::Events::ResetBall &event);
     bool OnPause(const dd::Events::Pause &event);
 	bool OnKrakenAttack(const dd::Events::KrakenAttack &event);
 	bool OnStickyPad(const dd::Events::StickyPad &event);

include/Game/TravellingSystem.h

@@ -0,0 +1,56 @@
+//
+// Created by Adniklastrator on 2015-10-13.
+//
+
+#ifndef DAYDREAM_TRAVELLINGSYSTEM_H
+#define DAYDREAM_TRAVELLINGSYSTEM_H
+
+
+#include "Core/System.h"
+#include "Core/CTransform.h"
+#include "Core/EventBroker.h"
+#include "Core/World.h"
+#include "Game/EPause.h"
+#include "Game/EArrivedAtNewStage.h"
+#include "Game/EStageCleared.h"
+
+
+namespace dd
+{
+
+namespace Systems
+{
+
+class TravellingSystem : public System
+{
+public:
+    TravellingSystem(World* world, std::shared_ptr<dd::EventBroker> eventBroker)
+    : System(world, eventBroker)
+    { }
+
+    
+	void Initialize() override;
+	void Update(double dt) override;
+	void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
+
+	bool IsPaused() const { return m_Pause; }
+	void SetPause(const bool& pause) { m_Pause = pause; }
+
+private:
+	bool m_Pause = false;
+
+	bool m_Travelling = false;
+	float m_DistanceTravelled = 0;
+
+    dd::EventRelay<TravellingSystem, dd::Events::Pause> m_EPause;
+	dd::EventRelay<TravellingSystem, dd::Events::StageCleared> m_EStageCleared;
+
+    bool OnPause(const dd::Events::Pause &event);
+	bool OnStageCleared(const dd::Events::StageCleared &event);
+};
+
+}
+
+}
+
+#endif //DAYDREAM_TRAVELLINGSYSTEM_H