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

Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp

include/Game/BallSystem.h

@@ -49,6 +49,7 @@
 
 #include "Physics/ECreateParticleSequence.h"
 #include "Sound/CCollisionSound.h"
+#include "Sound/EPlaySound.h"
 #include "Rendering/EAnimationComplete.h"
 
 namespace dd

include/Game/CBall.h

@@ -25,6 +25,8 @@ struct Ball : Component
 	bool Loaded = false;
 	glm::vec3 StickyPlacement = glm::vec3(0, 0, 0);
     glm::vec3 SavedSpeed = glm::vec3(0, 1, 0);
+
+	int PosterBoy = 0;
 };
 
 }

include/Game/CBrick.h

@@ -20,6 +20,8 @@ struct Brick : Component
     int Type = 0;
     bool Removed = false;
 	int Number = 100; // For the Kraken to keep track of which bricks needs replacing.
+	bool BeingGenerated = false;
+	glm::vec3 GenerationGoal;
 
 	//What number of types each is.
 	const int EmptyBrickSpace = 0;

include/Game/CKraken.h

@@ -17,13 +17,14 @@ struct Kraken : Component {
 
     int MaxHealth = 30;
 	int Health = MaxHealth;
-	int CurrentAction = 1;
+	int CurrentAction = 3;
+	float RetreatSpeed = 0.2;
 	
 	const int Idle = 1;
 	const int Grabbing = 2;
-	const int Taunting = 3;
-	const int Moving = 4;
-	const int BrickGenerating = 5;
+	const int BrickGenerating = 3;
+	const int BrickGenerating2 = 4;
+	const int Waiting = 5;
 	// Idle. Generating bricks. Taunting. No idea.
 };
 

include/Game/CLife.h

@@ -13,10 +13,15 @@ namespace dd
 namespace Components
 {
 
-struct Life : Component {
-
+struct Life : Component 
+{
     int Number = 0;
-
+	float SinusAltitude = 0;
+	float Amplitude = 1;
+	float Frequency = 1;
+	float SinusSpeed = 1;
+	bool Left = false;
+	bool Dead = false;
 };
 
 }

include/Game/EBreakAllBricks.h

@@ -0,0 +1,25 @@
+//
+// Created by Adniklastrator on 2015-10-23.
+//
+
+#ifndef DAYDREAM_EBREAKALLBRICKS_H
+#define DAYDREAM_EBREAKALLBRICKS_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct BreakAllBricks : Event
+{
+	
+};
+
+}
+
+}
+
+#endif //DAYDREAM_EBREAKALLBRICKS_H

include/Game/EBrickGenerating.h

@@ -19,6 +19,7 @@ struct BrickGenerating : Event
 	glm::vec3 Origin2;
 	int TargetLine;
 	int Set;
+	int SetCluster;
 };
 
 }

include/Game/KrakenSystem.h

@@ -28,6 +28,7 @@
 #include "Game/EKrakenHit.h"
 #include "Game/EKrakenDefeated.h"
 #include "Game/EBrickGenerating.h"
+#include "Game/EArrivedAtNewStage.h"
 #include "Game/CTravels.h"
 #include "Game/CKraken.h"
 #include "Game/CBall.h"
@@ -64,12 +65,15 @@ private:
 
 	bool m_Pause = false;
 	bool m_KrakenBattle = false;
+	bool m_KrakenHasArrived = false;
 	bool m_ReturnToIdle = false;
 	EntityID m_KrakenTemplate;
 	std::string m_Action = "Idle";
 	int m_NumberOfActions;
 	float m_KrakenTimer = 0;
-	float m_KrakenSecondsToAction = 10;
+	float m_KrakenMaxSecondsToAction = 10;
+	float m_KrakenMinSecondsToAction = 10;
+	float m_KrakenCurrentSecondsToAction = 15;
 	const int Idle = 1;
 
 	std::array<int, 42> m_Bricks;
@@ -83,6 +87,7 @@ private:
 	dd::EventRelay<KrakenSystem, dd::Events::KrakenHit> m_EKrakenHit;
 	dd::EventRelay<KrakenSystem, dd::Events::KrakenDefeated> m_EKrakenDefeated;
 	dd::EventRelay<KrakenSystem, dd::Events::BrickGenerating> m_EBrickGenerating;
+	dd::EventRelay<KrakenSystem, dd::Events::ArrivedAtNewStage> m_EArrivedAtNewStage;
     bool OnPause(const dd::Events::Pause &event);
 	bool OnResume(const dd::Events::Resume &event);
 	bool OnContact(const dd::Events::Contact &event);
@@ -91,6 +96,7 @@ private:
 	bool OnKrakenHit(const dd::Events::KrakenHit &event);
 	bool OnKrakenDefeated(const dd::Events::KrakenDefeated &event);
 	bool OnBrickGenerating(const dd::Events::BrickGenerating &event);
+	bool OnArrivedAtNewStage(const dd::Events::ArrivedAtNewStage &event);
 	void GetBrickSet();
 };
 

include/Game/LevelSystem.h

@@ -19,6 +19,7 @@
 #include "Rendering/CSprite.h"
 #include "Rendering/CModel.h"
 #include "Rendering/CPointLight.h"
+#include "Rendering/CCamera.h"
 
 #include "Transform/EMove.h"
 
@@ -180,6 +181,8 @@ private:
 	bool m_BrickGenerating = false;
 	dd::Events::BrickGenerating m_BrickGeneratingEvent;
 
+	bool m_BreakAllBricks = false;
+
     dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
     dd::EventRelay<LevelSystem, dd::Events::ScoreEvent> m_EScoreEvent;
     dd::EventRelay<LevelSystem, dd::Events::MultiBall> m_EMultiBall;
@@ -207,7 +210,7 @@ private:
     bool OnHitPad(const dd::Events::HitPad &event);
 	bool OnBrickGenerating(const dd::Events::BrickGenerating &event);
 	bool BrickGenerating(const dd::Events::BrickGenerating &event);
-	void GetBrickSet(int Set);
+	void GetBrickSet(int Set, int SetCluster);
 	bool OnKrakenDefeated(const dd::Events::KrakenDefeated &event);
 
     void GetNextLevel();

include/Game/LifeSystem.h

@@ -24,6 +24,10 @@
 #include "Game/EGameOver.h"
 #include "Game/EKrakenAttackEnd.h"
 
+#include "Rendering/CAnimation.h"
+#include "Physics/CParticleEmitter.h"
+#include "Physics/ECreateParticleSequence.h"
+
 
 namespace dd
 {
@@ -54,6 +58,7 @@ private:
 	bool m_Pause = false;
 	int m_Lives = 3;
 	int m_PastLives = 3;
+	float m_LifeSpeed = 0.8;
 
 	bool m_GodMode = false;
 

include/Game/PadSystem.h

@@ -72,29 +72,12 @@ public:
     void Update(double dt) override;
     void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
 
-    EntityID& Entity() { return m_Entity; }
-    void SetEntity(const EntityID& ent) { m_Entity = ent; }
-    glm::vec3 Acceleration() const { return m_Acceleration; }
-    void SetAcceleration(const glm::vec3& acceleration) { m_Acceleration = acceleration; }
-
-    bool Left() const { return m_Left; }
-    void SetLeft(const bool& left) { m_Left = left; }
-    bool Right() const { return m_Right; }
-    void SetRight(const bool& right) { m_Right = right; }
-    float Edge() const { return m_Edge; }
-    void SetEdge(const float& edge) { m_Edge = edge; }
-
-    Components::Transform* Transform() const { return m_Transform; }
-    void SetTransform(Components::Transform* transform) { m_Transform = transform; }
-    Components::Pad* Pad() const { return m_Pad; }
-    void SetPad(Components::Pad* pad) { m_Pad = pad; }
-
     bool IsPaused() const { return m_Pause; }
     void SetPause(const bool& pause) { m_Pause = pause; }
 
 private:
-    EntityID m_Entity = 0;
-    glm::vec3 m_Acceleration = glm::vec3(0.f, 0.f, 0.f);
+    EntityID m_PadEntity = 0;
+    glm::vec3 m_PadAcceleration = glm::vec3(0.f, 0.f, 0.f);
     bool m_Left = false;
     bool m_Right = false;
     bool m_ReplaceBall = false;
@@ -107,11 +90,11 @@ private:
     float m_Edge = 2.8f;
 	float m_PadOriginalHeight = -4.8;
 	float m_PadHeight = m_PadOriginalHeight;
-	EntityID m_KrakenArm = NULL;
-	EntityID m_KrakenArmHitbox = NULL;
+	EntityID m_KrakenArm = 0;
+	EntityID m_KrakenArmHitbox = 0;
 	float m_PadRiseSpeed = 0.2;
-    Components::Transform* m_Transform = nullptr;
-    Components::Pad* m_Pad = nullptr;
+    Components::Transform* m_PadTransform = nullptr;
+    Components::Pad* m_PadComponent = nullptr;
 	std::shared_ptr<Components::Transform> m_StickTransform;
 	std::shared_ptr<Components::StickyAim> m_StickyAim;
 

include/Game/ProjectileSystem.h

@@ -5,6 +5,10 @@
 #ifndef DAYDREAM_PROJECTILESYSTEM_H
 #define DAYDREAM_PROJECTILESYSTEM_H
 
+
+#include <fstream>
+#include <iostream>
+
 #include "Core/System.h"
 #include "Core/CTransform.h"
 #include "Core/CTemplate.h"
@@ -26,8 +30,6 @@
 #include "Game/CProjectile.h"
 #include "Game/CBall.h"
 #include "Rendering/CSprite.h"
-#include <fstream>
-#include <iostream>
 #include "Rendering/CAnimation.h"
 
 namespace dd

include/Game/ScreenShakeSystem.h

@@ -12,6 +12,7 @@
 #include "Core/CTemplate.h"
 #include "Core/EventBroker.h"
 #include "Core/World.h"
+#include "Rendering/CCamera.h"
 #include "Game/EPause.h"
 #include "Game/EResume.h"
 #include "Game/EScreenShake.h"