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_SumoPhysicsController.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_SumoPhysicsController.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_SumoPhysicsController.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.h b/source/gameengine/Ketsji/KX_SumoPhysicsController.h index b160315ce53..b4b0f8a4cd0 100644 --- a/source/gameengine/Ketsji/KX_SumoPhysicsController.h +++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.h @@ -33,7 +33,6 @@ #define __KX_SUMOPHYSICSCONTROLLER_H #include "PHY_IPhysicsController.h" -#include "SM_Object.h" // for SM_Callback /** Physics Controller, a special kind of Scene Graph Transformation Controller. @@ -54,7 +53,6 @@ class KX_SumoPhysicsController : public KX_IPhysicsController, public: KX_SumoPhysicsController( class SM_Scene* sumoScene, -/* DT_SceneHandle solidscene, */ class SM_Object* sumoObj, class PHY_IMotionState* motionstate ,bool dyna) @@ -76,7 +74,7 @@ public: MT_Vector3 GetVelocity(const MT_Point3& pos); void SetAngularVelocity(const MT_Vector3& ang_vel,bool local); void SetLinearVelocity(const MT_Vector3& lin_vel,bool local); - void resolveCombinedVelocities(const MT_Vector3 & lin_vel, const MT_Vector3 & ang_vel); + void resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ); void SuspendDynamics(); @@ -108,8 +106,6 @@ public: ){ // intentionally empty }; - - }; #endif //__KX_SUMOPHYSICSCONTROLLER_H |