Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchEventManager.h')
-rw-r--r--source/gameengine/Ketsji/KX_TouchEventManager.h15
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;