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

2015-10-08 11:52:32 +02:00
parent b5ae490b23 33ecbaaab3
commit 1a49e9d1b0
8 changed files with 1867 additions and 33 deletions
@@ -39,20 +39,20 @@ enum Type

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


            CollisionLayer::Type Category = CollisionLayer::Type::Other;
-	CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
-		CollisionLayer::Pad
-		| CollisionLayer::Ball
-		| CollisionLayer::Brick
-		| CollisionLayer::Water
-		| CollisionLayer::PowerUp
-		| CollisionLayer::Wall
-		| CollisionLayer::Other
-	);
-        };
-
+			CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
+				CollisionLayer::Pad
+				| CollisionLayer::Ball
+				| CollisionLayer::Brick
+				| CollisionLayer::Water
+				| CollisionLayer::PowerUp
+				| CollisionLayer::Wall
+				| CollisionLayer::Other
+		);
+   };
 }
 }