From 0669d917679b4ab55f4de8ef65774cfbe14d65c8 Mon Sep 17 00:00:00 2001
From: William Moberg <william.moberg@live.se>
Date: Mon, 18 Jan 2016 13:29:10 +0100
Subject: [PATCH] CollisionSystem loops over Collidable components.

---
 include/Engine/Collision/CollisionSystem.h | 2 +-
 src/Engine/Collision/CollisionSystem.cpp   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/Engine/Collision/CollisionSystem.h b/include/Engine/Collision/CollisionSystem.h
index ea6004d9..561c5158 100644
--- a/include/Engine/Collision/CollisionSystem.h
+++ b/include/Engine/Collision/CollisionSystem.h
@@ -15,7 +15,7 @@ class CollisionSystem : public PureSystem
 public:
     CollisionSystem(EventBroker* eventBroker, Octree* octree)
         : System(eventBroker)
-        , PureSystem("AABB")
+        , PureSystem("Collidable")
         , m_Octree(octree)
         , zPress(false)
     {
diff --git a/src/Engine/Collision/CollisionSystem.cpp b/src/Engine/Collision/CollisionSystem.cpp
index 96e49153..d841c75e 100644
--- a/src/Engine/Collision/CollisionSystem.cpp
+++ b/src/Engine/Collision/CollisionSystem.cpp
@@ -30,10 +30,8 @@ void CollisionSystem::UpdateComponent(World* world, EntityWrapper& entity, Compo
             continue;
         }
         if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
-            if (entity.HasComponent("Physics")) {
-                (glm::vec3&)cTransform["Position"] += resolutionVector;
-                cPhysics["Velocity"] = glm::vec3(0, 0, 0);
-            }
+            (glm::vec3&)cTransform["Position"] += resolutionVector;
+            cPhysics["Velocity"] = glm::vec3(0, 0, 0);
         }
     }