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_OdePhysicsController.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_OdePhysicsController.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_OdePhysicsController.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.h b/source/gameengine/Ketsji/KX_OdePhysicsController.h index 69c06a2b620..f5bc7dee165 100644 --- a/source/gameengine/Ketsji/KX_OdePhysicsController.h +++ b/source/gameengine/Ketsji/KX_OdePhysicsController.h @@ -65,7 +65,7 @@ public: virtual MT_Vector3 GetVelocity(const MT_Point3& pos); virtual void SetAngularVelocity(const MT_Vector3& ang_vel,bool local); virtual void SetLinearVelocity(const MT_Vector3& lin_vel,bool local); - virtual void resolveCombinedVelocities(const MT_Vector3 & lin_vel, const MT_Vector3 & ang_vel ); + virtual void resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ); virtual void getOrientation(MT_Quaternion& orn); virtual void setOrientation(const MT_Quaternion& orn); virtual void setPosition(const MT_Point3& pos); @@ -95,7 +95,7 @@ public: ){ // intentionally empty }; - + }; #endif //__KX_ODEPHYSICSCONTROLLER_H |