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.cpp | |
| 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.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_SumoPhysicsController.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp index 8f284809a17..609f0fc0e0b 100644 --- a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp +++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp @@ -10,6 +10,8 @@ #include "KX_MotionState.h" #include "KX_ClientObjectInfo.h" +#include "PHY_IPhysicsEnvironment.h" + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -64,12 +66,9 @@ MT_Vector3 KX_SumoPhysicsController::GetLinearVelocity() } -void KX_SumoPhysicsController::resolveCombinedVelocities( - const MT_Vector3 & lin_vel, - const MT_Vector3 & ang_vel - ) +void KX_SumoPhysicsController::resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ) { - SumoPhysicsController::resolveCombinedVelocities(lin_vel, ang_vel); + SumoPhysicsController::resolveCombinedVelocities(linvelX,linvelY,linvelZ,angVelX,angVelY,angVelZ); } void KX_SumoPhysicsController::ApplyTorque(const MT_Vector3& torque,bool local) @@ -215,3 +214,5 @@ KX_SumoPhysicsController::~KX_SumoPhysicsController() } + + |