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/Ketsji/KX_TouchEventManager.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/Ketsji/KX_TouchEventManager.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchEventManager.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h index eb2c26a64f3..128758f0be6 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.h +++ b/source/gameengine/Ketsji/KX_TouchEventManager.h @@ -44,20 +44,7 @@ class SM_Object; class KX_TouchEventManager : public SCA_EventManager { - struct Collision - { - static int next_id; - int m_id; - SCA_ISensor *m_sensor; - SM_Object *m_object1; - SM_Object *m_object2; - - Collision(SCA_ISensor *sensor, SM_Object *obj1, SM_Object *obj2); - - bool operator<(const Collision &other) const; - bool operator==(const Collision &other) const; - }; - + typedef std::pair<SM_Object*, SM_Object*> Collision; class SCA_LogicManager* m_logicmgr; SM_Scene *m_scene; |