Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Ketsji/KX_RadarSensor.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_RadarSensor.cpp19
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