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_RadarSensor.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_RadarSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index 1ad37504224..ea656877e92 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -31,6 +31,7 @@ #include "KX_RadarSensor.h" #include "KX_GameObject.h" +#include "PHY_IPhysicsController.h" #ifdef HAVE_CONFIG_H #include <config.h> @@ -41,6 +42,7 @@ */ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, KX_GameObject* gameobj, + PHY_IPhysicsController* physCtrl, double coneradius, double coneheight, int axis, @@ -54,12 +56,13 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, : KX_NearSensor( eventmgr, gameobj, - DT_NewCone(coneradius,coneheight), + //DT_NewCone(coneradius,coneheight), margin, resetmargin, bFindMaterial, touchedpropname, kxscene, + physCtrl, T), m_coneradius(coneradius), m_coneheight(coneheight), @@ -90,9 +93,11 @@ CValue* KX_RadarSensor::GetReplica() replica->m_client_info = new KX_ClientObjectInfo(m_client_info->m_gameobject, KX_ClientObjectInfo::RADAR); - replica->m_sumoObj = new SM_Object(DT_NewCone(m_coneradius, m_coneheight),NULL,NULL,NULL); - replica->m_sumoObj->setMargin(m_Margin); - replica->m_sumoObj->setClientObject(replica->m_client_info); + replica->m_physCtrl = replica->m_physCtrl->GetReplica(); + //todo: make sure replication works fine! + //>m_sumoObj = new SM_Object(DT_NewCone(m_coneradius, m_coneheight),NULL,NULL,NULL); + //replica->m_sumoObj->setMargin(m_Margin); + //replica->m_sumoObj->setClientObject(replica->m_client_info); replica->SynchronizeTransform(); @@ -145,9 +150,11 @@ void KX_RadarSensor::SynchronizeTransform() m_cone_origin = trans.getOrigin(); m_cone_target = trans(MT_Point3(0, -m_coneheight/2.0 ,0)); - m_sumoObj->setPosition(trans.getOrigin()); - m_sumoObj->setOrientation(trans.getRotation()); - m_sumoObj->calcXform(); + + m_physCtrl->setPosition(trans.getOrigin().x(),trans.getOrigin().y(),trans.getOrigin().z()); + m_physCtrl->setOrientation(trans.getRotation().x(),trans.getRotation().y(),trans.getRotation().z(),trans.getRotation().w()); + m_physCtrl->calcXform(); + } /* ------------------------------------------------------------------------- */ |