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_IPO_SGController.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_IPO_SGController.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_IPO_SGController.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index 2152fa35cd1..e54fb11dc14 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -57,7 +57,6 @@ KX_IpoSGController::KX_IpoSGController() m_modified(true), m_ipotime(1.0) { - m_sumo_object = NULL; m_game_object = NULL; } @@ -86,7 +85,7 @@ KX_IpoSGController::UpdateSumoReference( ) { if (m_game_object) { - m_sumo_object = 0;//m_game_object->GetSumoObject(); + } } @@ -113,15 +112,7 @@ bool KX_IpoSGController::Update(double currentTime) if (m_modify_position) { if (m_ipo_as_force) { - /* - UpdateSumoReference(); - if (m_sumo_object && ob) { - m_sumo_object->applyCenterForce(m_force_ipo_acts_local ? - ob->GetWorldOrientation() * m_ipo_xform.GetPosition() : - m_ipo_xform.GetPosition()); - m_sumo_object->calcXform(); - } - */ + if (m_game_object && ob) { m_game_object->GetPhysicsController()->ApplyForce(m_force_ipo_acts_local ? ob->GetWorldOrientation() * m_ipo_xform.GetPosition() : @@ -134,15 +125,7 @@ bool KX_IpoSGController::Update(double currentTime) } if (m_modify_orientation) { if (m_ipo_as_force) { - /* - UpdateSumoReference(); - if (m_sumo_object && ob) { - m_sumo_object->applyTorque(m_force_ipo_acts_local ? - ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() : - m_ipo_xform.GetEulerAngles()); - m_sumo_object->calcXform(); - } - */ + if (m_game_object && ob) { m_game_object->ApplyTorque(m_force_ipo_acts_local ? ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() : |