diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
| commit | 00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch) | |
| tree | 952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/gameengine/Ketsji/KX_RadarSensor.cpp | |
| parent | 5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff) | |
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them
That was about it.
There are a few things that needs double checking:
* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/gameengine/Ketsji/KX_RadarSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index 19e26b6f484..923a38cb7cc 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -39,11 +39,8 @@ /** * RadarSensor constructor. Creates a near-sensor derived class, with a cone collision shape. */ - -#ifdef PHYSICS_NOT_YET - -KX_RadarSensor::KX_RadarSensor(class SCA_EventManager* eventmgr, - class KX_GameObject* gameobj, +KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, + KX_GameObject* gameobj, double coneradius, double coneheight, int axis, @@ -57,20 +54,21 @@ KX_RadarSensor::KX_RadarSensor(class SCA_EventManager* eventmgr, : KX_NearSensor( eventmgr, gameobj, + DT_NewCone(coneradius,coneheight), margin, resetmargin, bFindMaterial, touchedpropname, kxscene, T), - m_coneheight(coneheight), m_coneradius(coneradius), + m_coneheight(coneheight), m_axis(axis) { - m_client_info.m_type = 3; - m_client_info.m_clientobject = gameobj; - m_client_info.m_auxilary_info = NULL; - sumoObj->setClientObject(&m_client_info); + m_client_info->m_type = KX_ClientObjectInfo::RADAR; + //m_client_info->m_clientobject = gameobj; + //m_client_info->m_auxilary_info = NULL; + //sumoObj->setClientObject(&m_client_info); } @@ -221,4 +219,3 @@ PyObject* KX_RadarSensor::PyGetConeHeight(PyObject* self, } -#endif //PHYSICS_NOT_YET |