Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -15,16 +15,15 @@ class CollisionSystem : public PureSystem
 public:
    CollisionSystem(SystemParams params, Octree<EntityAABB>* octree)
        : System(params)
-        , PureSystem("Physics")
+        , PureSystem("Collidable")
        , m_Octree(octree)
    { }

-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;

 private:
    Octree<EntityAABB>* m_Octree;
    std::vector<EntityAABB> m_OctreeResult;
-    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };

 #endif