diff options
author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-03-25 13:33:39 +0300 |
---|---|---|
committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-03-25 13:33:39 +0300 |
commit | c844aa265ad4eb50ad0e18661470fa6092052728 (patch) | |
tree | c4a778ab1227e4266022fd076e8a0cb709badd13 /source/gameengine/Ketsji/KX_TouchEventManager.h | |
parent | 3dd17cec3bcaa3885e14630e6a71a8486e9b2697 (diff) |
Big patches:
Erwin Coumans: Abstract the physics engine
Charlie C: Joystick fixes
Me: Moved the ray cast (shadows, mouse sensor & ray sensor)
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchEventManager.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchEventManager.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h index 128758f0be6..21faceef799 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.h +++ b/source/gameengine/Ketsji/KX_TouchEventManager.h @@ -32,6 +32,7 @@ #ifndef __KX_TOUCHEVENTMANAGER #define __KX_TOUCHEVENTMANAGER + #include "SCA_EventManager.h" #include "KX_TouchSensor.h" #include "KX_GameObject.h" @@ -40,35 +41,39 @@ #include <set> class SCA_ISensor; -class SM_Object; +class PHY_IPhysicsEnvironment; class KX_TouchEventManager : public SCA_EventManager { - typedef std::pair<SM_Object*, SM_Object*> Collision; + typedef std::pair<PHY_IPhysicsController*, PHY_IPhysicsController*> NewCollision; class SCA_LogicManager* m_logicmgr; - SM_Scene *m_scene; + PHY_IPhysicsEnvironment* m_physEnv; - std::set<Collision> m_collisions; + std::set<NewCollision> m_newCollisions; - - static DT_Bool collisionResponse(void *client_data, - void *object1, - void *object2, - const DT_CollData *coll_data); - virtual DT_Bool HandleCollision(void* obj1,void* obj2, - const DT_CollData * coll_data); + static bool newCollisionResponse(void *client_data, + void *object1, + void *object2, + const PHY_CollData *coll_data); + virtual bool NewHandleCollision(void* obj1,void* obj2, + const PHY_CollData * coll_data); + + + + public: KX_TouchEventManager(class SCA_LogicManager* logicmgr, - SM_Scene *scene); + PHY_IPhysicsEnvironment* physEnv); virtual void NextFrame(); virtual void EndFrame(); virtual void RemoveSensor(class SCA_ISensor* sensor); virtual void RegisterSensor(SCA_ISensor* sensor); SCA_LogicManager* GetLogicManager() { return m_logicmgr;} - SM_Scene *GetSumoScene() { return m_scene; } + PHY_IPhysicsEnvironment *GetPhysicsEnvironment() { return m_physEnv; } + }; #endif //__KX_TOUCHEVENTMANAGER |