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_TouchSensor.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_TouchSensor.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 9dd17a5fe83..f1a2a26e822 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -38,8 +38,7 @@ #include "SCA_ISensor.h" #include "ListValue.h" -#include <SOLID/SOLID.h> -#include "SM_Scene.h" +struct PHY_CollData; #include "KX_ClientObjectInfo.h" @@ -57,10 +56,9 @@ protected: bool m_bFindMaterial; class SCA_EventManager* m_eventmgr; - class SM_Object* m_sumoObj; - DT_ObjectHandle m_solidHandle; - DT_RespTableHandle m_resptable; - + class PHY_IPhysicsController* m_physCtrl; + class PHY_ResponseTable* m_responstTable; + class PHY_PhysicsController* m_responsObject; bool m_bCollision; bool m_bTriggered; @@ -71,7 +69,6 @@ protected: public: KX_TouchSensor(class SCA_EventManager* eventmgr, class KX_GameObject* gameobj, - /*class SM_Object* sumoObj,*/ bool fFindMaterial, const STR_String& touchedpropname, PyTypeObject* T=&Type) ; @@ -84,12 +81,12 @@ public: virtual void RegisterSumo(KX_TouchEventManager* touchman); - virtual DT_Bool HandleCollision(void* obj1,void* obj2, - const DT_CollData * coll_data); - +// virtual DT_Bool HandleCollision(void* obj1,void* obj2, +// const DT_CollData * coll_data); - SM_Object* GetSumoObject() { return m_sumoObj; }; + virtual bool NewHandleCollision(void*obj1,void*obj2,const PHY_CollData* colldata); + PHY_PhysicsController* GetPhysicsController() { return m_responsObject;} virtual bool IsPositiveTrigger() { |