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:
authorNick Samarin <nicks1987@bigmir.net>2010-07-10 02:22:51 +0400
committerNick Samarin <nicks1987@bigmir.net>2010-07-10 02:22:51 +0400
commit852b84745c60c6b82ededbe00c4906ca8d2f5944 (patch)
tree61d89922a1ac79e366b8c7d9662388e0156ec096 /source/gameengine/Ketsji/KX_ObstacleSimulation.h
parent36e27b07658440117f7bb3dbfee3d5812b6e0e83 (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_ObstacleSimulation.h')
-rw-r--r--source/gameengine/Ketsji/KX_ObstacleSimulation.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.h b/source/gameengine/Ketsji/KX_ObstacleSimulation.h
index 4b323035823..c5b9a154c3b 100644
--- a/source/gameengine/Ketsji/KX_ObstacleSimulation.h
+++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.h
@@ -75,7 +75,7 @@ protected:
MT_Scalar m_levelHeight;
- virtual KX_Obstacle* CreateObstacle();
+ virtual KX_Obstacle* CreateObstacle(KX_GameObject* gameobj);
bool FilterObstacle(KX_Obstacle* activeObstacle, KX_NavMeshObject* activeNavMeshObj, KX_Obstacle* otherObstacle);
public:
KX_ObstacleSimulation(MT_Scalar levelHeight);
@@ -84,7 +84,7 @@ public:
void DrawObstacles();
void AddObstacleForObj(KX_GameObject* gameobj);
- void DestroyObstacle(KX_Obstacle* obstacle);
+ void DestroyObstacleForObj(KX_GameObject* gameobj);
void AddObstaclesForNavMesh(KX_NavMeshObject* navmesh);
KX_Obstacle* GetObstacle(KX_GameObject* gameobj);
void UpdateObstacles();
@@ -115,7 +115,7 @@ protected:
float m_collisionWeight; // Sample selection collision weight
std::vector<TOICircle*> m_toiCircles; // TOI circles (one per active agent)
- virtual KX_Obstacle* CreateObstacle();
+ virtual KX_Obstacle* CreateObstacle(KX_GameObject* gameobj);
public:
KX_ObstacleSimulationTOI(MT_Scalar levelHeight);
~KX_ObstacleSimulationTOI();