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

include/Core/Engine.h

@@ -273,6 +273,8 @@ public:
 			rectangleShape->Dimensions = glm::vec2(20.f, 0.5f);
 			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(BottomWall);
 			physics->CollisionType = CollisionType::Type::Static;
+			physics->Category = CollisionLayer::Wall;
+			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::LifeBuoy);
 			transform->Sticky = true;
 			m_World->CommitEntity(BottomWall);
 		}

include/Game/BallSystem.h

@@ -28,6 +28,7 @@
 #include "Game/EHitPad.h"
 #include "Game/EHitLag.h"
 #include "Game/EActionButton.h"
+#include "Game/CLifebuoy.h"
 
 namespace dd
 {

include/Game/LifebuoySystem.h

@@ -52,6 +52,16 @@ private:
     bool OnContact(const dd::Events::Contact &event);
 	bool OnPause(const dd::Events::Pause &event);
 	bool OnLifebuoy(const dd::Events::Lifebuoy &event);
+
+	struct LifeBuoyInfo
+	{
+		EntityID Entity;
+		float TimeToLive = 15.f;
+	};
+
+	float m_LeftEdge = -3.8f;
+	float m_RightEdge = 3.8f;
+	std::list<LifeBuoyInfo> m_LifeBuoys;
 };
 
 }

include/Physics/CPhysics.h

@@ -16,7 +16,7 @@ enum Type
 	PowerUp = 1 << 4,
 	Other = 1 << 5,
 	Wall = 1 << 6,
-
+	LifeBuoy = 1 << 7,
 	Projectile = 1 << 8
 };
 }
@@ -41,7 +41,7 @@ enum Type
 
             bool Calculate = false;
             float GravityScale = 0.f;
-			float Density = 10.f;
+			float Density = 20.f;
 
 
             CollisionLayer::Type Category = CollisionLayer::Type::Other;
@@ -52,6 +52,7 @@ enum Type
 				| CollisionLayer::Water
 				| CollisionLayer::PowerUp
 				| CollisionLayer::Wall
+				| CollisionLayer::LifeBuoy
 				| CollisionLayer::Other
 		);
    };