svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / gameengine / Ketsji / KX_GameObject.h
index 6e79914172bd05b39647a9e64bdc5539aa60f89a..655bc9ff080991788fb0f72703e5bfb9f334b524 100644 (file)
@@ -65,6 +65,7 @@ class PHY_IGraphicController;
 class PHY_IPhysicsEnvironment;
 class BL_ActionManager;
 struct Object;
+class KX_ObstacleSimulation;
 struct bAction;
 
 #ifdef WITH_PYTHON
@@ -115,6 +116,9 @@ protected:
 
        MT_CmMatrix4x4                                          m_OpenGL_4x4Matrix;
 
+       KX_ObstacleSimulation*                          m_pObstacleSimulation;
+
+
        // The action manager is used to play/stop/update actions
        BL_ActionManager*                               m_actionManager;
 
@@ -864,6 +868,16 @@ public:
                }
                m_bSuspendDynamics = false;
        }
+
+       void RegisterObstacle(KX_ObstacleSimulation* obstacleSimulation)
+       {
+               m_pObstacleSimulation = obstacleSimulation;
+       }
+
+       void UnregisterObstacle()
+       {
+               m_pObstacleSimulation = NULL;
+       }
        
        KX_ClientObjectInfo* getClientInfo() { return m_pClient_info; }