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

2015-10-08 20:08:10 +02:00
parent 5c2844c137 87fd73f249
commit 3793515968
13 changed files with 2581 additions and 27 deletions
@@ -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);
 		}