Lifebuoy working

2015-10-08 17:22:19 +02:00
parent f147778d4d
commit b93013fcd8
14 changed files with 2589 additions and 31 deletions
@@ -9,13 +9,14 @@ namespace CollisionLayer
 {
 enum Type
 {
-    Pad = 1 << 0,
-    Ball = 1 << 1,
-    Brick = 1 << 2,
-    Water = 1 << 3,
-    PowerUp = 1 << 4,
-    Other = 1 << 5,
-    Wall = 1 << 6
+	Pad = 1 << 0,
+	Ball = 1 << 1,
+	Brick = 1 << 2,
+	Water = 1 << 3,
+	PowerUp = 1 << 4,
+	Other = 1 << 5,
+	Wall = 1 << 6,
+	LifeBuoy = 1 << 7
 };
 }

@@ -39,7 +40,7 @@ enum Type

            bool Calculate = false;
            float GravityScale = 0.f;
-			float Density = 10.f;
+			float Density = 20.f;


            CollisionLayer::Type Category = CollisionLayer::Type::Other;
@@ -50,6 +51,7 @@ enum Type
 				| CollisionLayer::Water
 				| CollisionLayer::PowerUp
 				| CollisionLayer::Wall
+				| CollisionLayer::LifeBuoy
 				| CollisionLayer::Other
 		);
   };