BGE bug fix (continuation of previous bug fix):
[blender-staging.git] / source / gameengine / Ketsji / KX_NearSensor.cpp
index 880d0d61c1660e54d462ecf6be1b08826ad562eb..bae87c281238b1a05437722f397d1812e820bd5d 100644 (file)
@@ -3,15 +3,12 @@
  *
  * $Id$
  *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,7 +26,7 @@
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 #include "KX_NearSensor.h"
 #include "KX_GameObject.h"
 #include "KX_TouchEventManager.h"
 #include "KX_Scene.h" // needed to create a replica
+#include "PHY_IPhysicsEnvironment.h"
+#include "PHY_IPhysicsController.h"
 
-#include "SM_Object.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
                                                         KX_GameObject* gameobj,
-                                                        void *vshape,
                                                         double margin,
                                                         double resetmargin,
                                                         bool bFindMaterial,
                                                         const STR_String& touchedpropname,
                                                         class KX_Scene* scene,
+                                                        PHY_IPhysicsController*        ctrl,
                                                         PyTypeObject* T)
                         :KX_TouchSensor(eventmgr,
                                                         gameobj,
@@ -62,65 +60,80 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
                         m_ResetMargin(resetmargin)
 
 {
+
+       gameobj->getClientInfo()->m_sensors.remove(this);
        m_client_info = new KX_ClientObjectInfo(gameobj, KX_ClientObjectInfo::NEAR);
+       m_client_info->m_sensors.push_back(this);
        
-       DT_ShapeHandle shape = (DT_ShapeHandle) vshape;
-       m_sumoObj = new SM_Object(shape,NULL,NULL,NULL);
-       m_sumoObj->setMargin(m_Margin);
-       m_sumoObj->setClientObject(m_client_info);
-       
+       //DT_ShapeHandle shape = (DT_ShapeHandle) vshape;
+       m_physCtrl = ctrl;
+       if (m_physCtrl)
+       {
+               m_physCtrl->SetMargin(m_Margin);
+               m_physCtrl->setNewClientInfo(m_client_info);
+       }
        SynchronizeTransform();
 }
 
-KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
-                                                        KX_GameObject* gameobj,
-                                                        double margin,
-                                                        double resetmargin,
-                                                        bool bFindMaterial,
-                                                        const STR_String& touchedpropname,
-                                                        class KX_Scene* scene,
-                                                        PyTypeObject* T)
-                        :KX_TouchSensor(eventmgr,
-                                                        gameobj,
-                                                        bFindMaterial,
-                                                        touchedpropname,
-                                                        /* scene, */
-                                                        T),
-                        m_Margin(margin),
-                        m_ResetMargin(resetmargin)
-
+void KX_NearSensor::SynchronizeTransform()
 {
-       m_client_info = new KX_ClientObjectInfo(gameobj, KX_ClientObjectInfo::NEAR);
-       
-       m_sumoObj = new SM_Object(DT_NewSphere(0.0),NULL,NULL,NULL);
-       m_sumoObj->setMargin(m_Margin);
-       m_sumoObj->setClientObject(m_client_info);
-       
-       SynchronizeTransform();
+       // The near and radar sensors are using a different physical object which is 
+       // not linked to the parent object, must synchronize it.
+       if (m_physCtrl)
+       {
+               KX_GameObject* parent = ((KX_GameObject*)GetParent());
+               MT_Vector3 pos = parent->NodeGetWorldPosition();
+               MT_Quaternion orn = parent->NodeGetWorldOrientation().getRotation();
+               m_physCtrl->setPosition(pos.x(),pos.y(),pos.z());
+               m_physCtrl->setOrientation(orn.x(),orn.y(),orn.z(),orn.w());
+               m_physCtrl->calcXform();
+       }
 }
 
 void KX_NearSensor::RegisterSumo(KX_TouchEventManager *touchman)
 {
-       touchman->GetSumoScene()->addSensor(*m_sumoObj);
+       if (m_physCtrl)
+       {
+               touchman->GetPhysicsEnvironment()->addSensor(m_physCtrl);
+       }
+}
+
+void KX_NearSensor::UnregisterSumo(KX_TouchEventManager* touchman)
+{
+       if (m_physCtrl)
+       {
+               touchman->GetPhysicsEnvironment()->removeSensor(m_physCtrl);
+       }
 }
 
 CValue* KX_NearSensor::GetReplica()
 {
        KX_NearSensor* replica = new KX_NearSensor(*this);
        replica->m_colliders = new CListValue();
-       replica->m_bCollision = false;
-       replica->m_bTriggered= false;
-       replica->m_hitObject = NULL;
-       replica->m_bLastTriggered = false;
+       replica->Init();
        // this will copy properties and so on...
        CValue::AddDataToReplica(replica);
        
-       replica->m_client_info = new KX_ClientObjectInfo(m_client_info->m_clientobject, KX_ClientObjectInfo::NEAR);
+       replica->m_client_info = new KX_ClientObjectInfo(m_client_info->m_gameobject, KX_ClientObjectInfo::NEAR);
        
-       replica->m_sumoObj = new SM_Object(DT_NewSphere(0.0),NULL,NULL,NULL);
-       replica->m_sumoObj->setMargin(m_Margin);
-       replica->m_sumoObj->setClientObject(replica->m_client_info);
+       if (replica->m_physCtrl)
+       {
+               replica->m_physCtrl = replica->m_physCtrl->GetReplica();
+               if (replica->m_physCtrl)
+               {
+                       //static_cast<KX_TouchEventManager*>(m_eventmgr)->GetPhysicsEnvironment()->addSensor(replica->m_physCtrl);
+                       replica->m_physCtrl->SetMargin(m_Margin);
+                       replica->m_physCtrl->setNewClientInfo(replica->m_client_info);
+               }
+               
+       }
+       //static_cast<KX_TouchEventManager*>(m_eventmgr)->RegisterSensor(this);
+       //todo: make sure replication works fine
+       //>m_sumoObj = new SM_Object(DT_NewSphere(0.0),NULL,NULL,NULL);
+       //replica->m_sumoObj->setMargin(m_Margin);
+       //replica->m_sumoObj->setClientObject(replica->m_client_info);
        
+       ((KX_GameObject*)replica->GetParent())->GetSGNode()->ComputeWorldTransforms(NULL);
        replica->SynchronizeTransform();
        
        return replica;
@@ -130,11 +143,20 @@ CValue* KX_NearSensor::GetReplica()
 
 void KX_NearSensor::ReParent(SCA_IObject* parent)
 {
-       SCA_ISensor::ReParent(parent);
+       m_client_info->m_gameobject = static_cast<KX_GameObject*>(parent); 
+       m_client_info->m_sensors.push_back(this);
        
-       m_client_info->m_clientobject = static_cast<KX_GameObject*>(parent); 
+
+/*     KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
+       client_info->m_gameobject = gameobj;
+       client_info->m_auxilary_info = NULL;
        
+       client_info->m_sensors.push_back(this);
+       SCA_ISensor::ReParent(parent);
+*/
+       ((KX_GameObject*)GetParent())->GetSGNode()->ComputeWorldTransforms(NULL);
        SynchronizeTransform();
+       SCA_ISensor::ReParent(parent);
 }
 
 
@@ -143,10 +165,13 @@ KX_NearSensor::~KX_NearSensor()
 {
        // for nearsensor, the sensor is the 'owner' of sumoobj
        // for touchsensor, it's the parent
-       static_cast<KX_TouchEventManager*>(m_eventmgr)->GetSumoScene()->remove(*m_sumoObj);
-
-       if (m_sumoObj)
-               delete m_sumoObj;
+       if (m_physCtrl)
+       {
+               //static_cast<KX_TouchEventManager*>(m_eventmgr)->GetPhysicsEnvironment()->removeSensor(m_physCtrl);
+               delete m_physCtrl;
+               m_physCtrl = NULL;
+       }
+       
                
        if (m_client_info)
                delete m_client_info;
@@ -156,22 +181,22 @@ KX_NearSensor::~KX_NearSensor()
 bool KX_NearSensor::Evaluate(CValue* event)
 {
        bool result = false;
-       KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent());
+//     KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent());
 
        if (m_bTriggered != m_bLastTriggered)
        {
                m_bLastTriggered = m_bTriggered;
                if (m_bTriggered)
                {
-                       if (m_sumoObj)
+                       if (m_physCtrl)
                        {
-                               m_sumoObj->setMargin(m_ResetMargin);
+                               m_physCtrl->SetRadius(m_ResetMargin);
                        }
                } else
                {
-                       if (m_sumoObj)
+                       if (m_physCtrl)
                        {
-                               m_sumoObj->setMargin(m_Margin);
+                               m_physCtrl->SetRadius(m_Margin);
                        }
 
                }
@@ -181,38 +206,71 @@ bool KX_NearSensor::Evaluate(CValue* event)
        return result;
 }
 
-
-
-DT_Bool KX_NearSensor::HandleCollision(void* obj1,void* obj2,const DT_CollData * coll_data)
+// this function is called at broad phase stage to check if the two controller
+// need to interact at all. It is used for Near/Radar sensor that don't need to
+// check collision with object not included in filter
+bool   KX_NearSensor::BroadPhaseFilterCollision(void*obj1,void*obj2)
 {
-       KX_TouchEventManager* toucheventmgr = static_cast<KX_TouchEventManager*>(m_eventmgr);
        KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent());
        
-       // need the mapping from SM_Objects to gameobjects now
-       
-       KX_ClientObjectInfo* client_info =static_cast<KX_ClientObjectInfo*> (obj1 == m_sumoObj? 
-                                       ((SM_Object*)obj2)->getClientObject() : 
-                                       ((SM_Object*)obj1)->getClientObject());
+       // need the mapping from PHY_IPhysicsController to gameobjects now
+       assert(obj1==m_physCtrl && obj2);
+       KX_ClientObjectInfo* client_info = static_cast<KX_ClientObjectInfo*>((static_cast<PHY_IPhysicsController*>(obj2))->getNewClientInfo());
 
        KX_GameObject* gameobj = ( client_info ? 
-                       static_cast<KX_GameObject*>(client_info->m_clientobject) : 
+                       client_info->m_gameobject :
                        NULL);
        
        if (gameobj && (gameobj != parent))
        {
-               if (!m_colliders->SearchValue(gameobj))
-                       m_colliders->Add(gameobj->AddRef());
                // only take valid colliders
                if (client_info->m_type == KX_ClientObjectInfo::ACTOR)
                {
                        if ((m_touchedpropname.Length() == 0) || 
                                (gameobj->GetProperty(m_touchedpropname)))
                        {
-                               m_bTriggered = true;
-                               m_hitObject = gameobj;
+                               return true;
                        }
                }
        }
+
+       return false;
+}
+
+bool   KX_NearSensor::NewHandleCollision(void* obj1,void* obj2,const PHY_CollData * coll_data)
+{
+//     KX_TouchEventManager* toucheventmgr = static_cast<KX_TouchEventManager*>(m_eventmgr);
+       KX_GameObject* parent = static_cast<KX_GameObject*>(GetParent());
+       
+       // need the mapping from PHY_IPhysicsController to gameobjects now
+       
+       KX_ClientObjectInfo* client_info =static_cast<KX_ClientObjectInfo*> (obj1 == m_physCtrl? 
+                                       ((PHY_IPhysicsController*)obj2)->getNewClientInfo() : 
+                                       ((PHY_IPhysicsController*)obj1)->getNewClientInfo());
+
+       KX_GameObject* gameobj = ( client_info ? 
+                       client_info->m_gameobject :
+                       NULL);
+       
+       // Add the same check as in SCA_ISensor::Activate(), 
+       // we don't want to record collision when the sensor is not active.
+       if (m_links && !m_suspended &&
+               gameobj /* done in BroadPhaseFilterCollision() && (gameobj != parent)*/)
+       {
+               if (!m_colliders->SearchValue(gameobj))
+                       m_colliders->Add(gameobj->AddRef());
+               // only take valid colliders
+               // These checks are done already in BroadPhaseFilterCollision()
+               //if (client_info->m_type == KX_ClientObjectInfo::ACTOR)
+               //{
+               //      if ((m_touchedpropname.Length() == 0) || 
+               //              (gameobj->GetProperty(m_touchedpropname)))
+               //      {
+                               m_bTriggered = true;
+                               m_hitObject = gameobj;
+               //      }
+               //}
+       }
        
        return DT_CONTINUE;
 }
@@ -253,20 +311,16 @@ PyParentObject KX_NearSensor::Parents[] = {
 
 
 PyMethodDef KX_NearSensor::Methods[] = {
-       {"setProperty", 
-        (PyCFunction) KX_NearSensor::sPySetProperty,      METH_VARARGS, SetProperty_doc},
-       {"getProperty", 
-        (PyCFunction) KX_NearSensor::sPyGetProperty,      METH_VARARGS, GetProperty_doc},
-       {"getHitObject", 
-        (PyCFunction) KX_NearSensor::sPyGetHitObject,     METH_VARARGS, GetHitObject_doc},
-       {"getHitObjectList", 
-        (PyCFunction) KX_NearSensor::sPyGetHitObjectList, METH_VARARGS, GetHitObjectList_doc},
+       {"setProperty", (PyCFunction) KX_NearSensor::sPySetProperty,      METH_VARARGS, (PY_METHODCHAR)SetProperty_doc},
+       {"getProperty", (PyCFunction) KX_NearSensor::sPyGetProperty,      METH_VARARGS, (PY_METHODCHAR)GetProperty_doc},
+       {"getHitObject",(PyCFunction) KX_NearSensor::sPyGetHitObject,     METH_VARARGS, (PY_METHODCHAR)GetHitObject_doc},
+       {"getHitObjectList", (PyCFunction) KX_NearSensor::sPyGetHitObjectList, METH_VARARGS, (PY_METHODCHAR)GetHitObjectList_doc},
        {NULL,NULL} //Sentinel
 };
 
 
 PyObject*
-KX_NearSensor::_getattr(char* attr)
+KX_NearSensor::_getattr(const STR_String& attr)
 {
   _getattr_up(KX_TouchSensor);
 }