diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-07-10 02:22:51 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-07-10 02:22:51 +0400 |
| commit | 852b84745c60c6b82ededbe00c4906ca8d2f5944 (patch) | |
| tree | 61d89922a1ac79e366b8c7d9662388e0156ec096 /source/gameengine/Ketsji/KX_GameObject.h | |
| parent | 36e27b07658440117f7bb3dbfee3d5812b6e0e83 (diff) | |
Work on conversion of the navigation mesh: we build navmesh directly from blender mesh using custom face data, when no custom data provided we use RAS_MeshObject interface
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 116230adc48..c0683ae0b4e 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -59,7 +59,7 @@ class KX_IPhysicsController; class PHY_IGraphicController; class PHY_IPhysicsEnvironment; struct Object; -struct KX_Obstacle; +class KX_ObstacleSimulation; #ifndef DISABLE_PYTHON /* utility conversion function */ @@ -109,7 +109,7 @@ protected: MT_CmMatrix4x4 m_OpenGL_4x4Matrix; - KX_Obstacle* m_pObstacle; + KX_ObstacleSimulation* m_pObstacleSimulation; public: bool m_isDeformable; @@ -794,14 +794,14 @@ public: m_bSuspendDynamics = false; } - void RegisterObstacle(KX_Obstacle* obstacle) + void RegisterObstacle(KX_ObstacleSimulation* obstacleSimulation) { - m_pObstacle = obstacle; + m_pObstacleSimulation = obstacleSimulation; } void UnregisterObstacle() { - m_pObstacle = NULL; + m_pObstacleSimulation = NULL; } |