diff options
author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-11-22 13:19:19 +0300 |
---|---|---|
committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-11-22 13:19:19 +0300 |
commit | 46fbe6b01e095ddb66f3bf6e0516569cfdca8f74 (patch) | |
tree | e7a7754188ef9b290eca479df6ac59b00ea7478b /source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h | |
parent | cf91617d7829647629c8ce04b9f047dfbdf3d910 (diff) |
Fix for bugs: 1788 (forces) and 1799 (python delattr on game objects)
Use Polytope collision for faster mesh intersection tests, so SOLID can actually use that qhull lib now.
Diffstat (limited to 'source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h')
-rw-r--r-- | source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h index 0b429a3c1a4..80e8c635cbb 100644 --- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h +++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h @@ -88,13 +88,7 @@ public: void add(SM_Object& object); void remove(SM_Object& object); - void addPair(SM_Object *obj1, SM_Object *obj2) { - m_pairList.insert(std::make_pair(obj1, obj2)); - } - - void clearPairs() { - m_pairList.clear(); - } + void notifyCollision(SM_Object *obj1, SM_Object *obj2); void setSecondaryRespTable(DT_RespTableHandle secondaryRespTable); DT_RespTableHandle getSecondaryRespTable() { return m_secondaryRespTable; } @@ -146,8 +140,6 @@ private: /** internal type */ typedef std::vector<SM_Object *> T_ObjectList; - /** internal type */ - typedef std::set<std::pair<SM_Object *, SM_Object *> > T_PairList; /** Handle to the scene in SOLID */ DT_SceneHandle m_scene; @@ -174,12 +166,6 @@ private: * The list of objects that receive motion updates and do * collision tests. */ T_ObjectList m_objectList; - - /** - * A list with pairs of objects that collided the previous - * timestep. The list is built during the proceed(). During that - * time, it is not valid. */ - T_PairList m_pairList; MT_Scalar m_lastTime; }; |