diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-07-30 17:02:32 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-07-30 17:02:32 +0400 |
| commit | dbc8d4274fa47f429084f653008a14980432a65d (patch) | |
| tree | af21d01cfd28b58d5332f2c1d84c97b5bf75ba65 /source/gameengine/Ketsji/KX_NavMeshObject.cpp | |
| parent | 870e0e37e52ec644ad1e2e728b8b9b422b1a6dc4 (diff) | |
- moved navmesh conversion code to ED_Editors project (ED_navmesh_conversion.h and navmesh_conversion.cpp files)
- added new custom data layer CD_Recast
Diffstat (limited to 'source/gameengine/Ketsji/KX_NavMeshObject.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 8ba2f78958b..55b35a3a180 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -31,19 +31,22 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" + extern "C" { #include "BKE_scene.h" #include "BKE_customdata.h" #include "BKE_cdderivedmesh.h" #include "BKE_DerivedMesh.h" #include "BLI_math_vector.h" + +#include "ED_navmesh_conversion.h" } + #include "KX_PythonInit.h" #include "KX_PyMath.h" #include "Value.h" #include "Recast.h" #include "DetourStatNavMeshBuilder.h" -#include "NavMeshConversion.h" #include "KX_ObstacleSimulation.h" static const int MAX_PATH_LEN = 256; @@ -109,7 +112,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, { DerivedMesh* dm = mesh_create_derived_no_virtual(KX_GetActiveScene()->GetBlenderScene(), GetBlenderObject(), NULL, CD_MASK_MESH); - int* recastData = (int*) dm->getFaceDataArray(dm, CD_PROP_INT); + int* recastData = (int*) dm->getFaceDataArray(dm, CD_RECAST); if (recastData) { int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL; |