diff --git a/RecastDemo/Include/InputGeom.h b/RecastDemo/Include/InputGeom.h index 4f64e609..7a9f1aff 100644 --- a/RecastDemo/Include/InputGeom.h +++ b/RecastDemo/Include/InputGeom.h @@ -84,8 +84,8 @@ public: [[nodiscard]] int getVertCount() const { return static_cast(verts.size()) / 3; } [[nodiscard]] int getTriCount() const { return static_cast(tris.size()) / 3; } -private: ChunkyTriMesh* chunkyMesh = nullptr; +private: float meshBMin[3] = {}; float meshBMax[3] = {}; BuildSettings buildSettings; @@ -132,7 +132,6 @@ public: [[nodiscard]] const float* getMeshBoundsMax() const { return meshBMax; } [[nodiscard]] const float* getNavMeshBoundsMin() const { return hasBuildSettings ? buildSettings.navMeshBMin : meshBMin; } [[nodiscard]] const float* getNavMeshBoundsMax() const { return hasBuildSettings ? buildSettings.navMeshBMax : meshBMax; } - [[nodiscard]] const ChunkyTriMesh* getChunkyMesh() const { return chunkyMesh; } [[nodiscard]] const BuildSettings* getBuildSettings() const { return hasBuildSettings ? &buildSettings : nullptr; } bool raycastMesh(float* src, float* dst, float& tmin); diff --git a/RecastDemo/Source/Sample_TempObstacles.cpp b/RecastDemo/Source/Sample_TempObstacles.cpp index d604fcf9..0cf5e6a9 100644 --- a/RecastDemo/Source/Sample_TempObstacles.cpp +++ b/RecastDemo/Source/Sample_TempObstacles.cpp @@ -533,7 +533,7 @@ int Sample_TempObstacles::rasterizeTileLayers( TileCacheData* tiles, const int maxTiles) const { - if (!inputGeometry || inputGeometry->getVertCount() == 0 || !inputGeometry->getChunkyMesh()) + if (!inputGeometry || inputGeometry->getVertCount() == 0 || !inputGeometry->chunkyMesh) { buildContext->log(RC_LOG_ERROR, "buildTile: Input mesh is not specified."); return 0; @@ -544,7 +544,7 @@ int Sample_TempObstacles::rasterizeTileLayers( const float* verts = inputGeometry->verts.data(); const int nverts = inputGeometry->getVertCount(); - const ChunkyTriMesh* chunkyMesh = inputGeometry->getChunkyMesh(); + const ChunkyTriMesh* chunkyMesh = inputGeometry->chunkyMesh; // Tile bounds. const float tcs = cfg.tileSize * cfg.cs; diff --git a/RecastDemo/Source/Sample_TileMesh.cpp b/RecastDemo/Source/Sample_TileMesh.cpp index b30b9ffb..5d9983f9 100644 --- a/RecastDemo/Source/Sample_TileMesh.cpp +++ b/RecastDemo/Source/Sample_TileMesh.cpp @@ -834,7 +834,7 @@ unsigned char* Sample_TileMesh::buildTileMesh( const float* boundsMax, int& outDataSize) { - if (!inputGeometry || inputGeometry->getVertCount() == 0 || !inputGeometry->getChunkyMesh()) + if (!inputGeometry || inputGeometry->getVertCount() == 0 || !inputGeometry->chunkyMesh) { buildContext->log(RC_LOG_ERROR, "buildNavigation: Input mesh is not specified."); return 0; @@ -848,7 +848,7 @@ unsigned char* Sample_TileMesh::buildTileMesh( const float* verts = inputGeometry->verts.data(); const int numVerts = inputGeometry->getVertCount(); const int numTris = inputGeometry->getTriCount(); - const ChunkyTriMesh* chunkyMesh = inputGeometry->getChunkyMesh(); + const ChunkyTriMesh* chunkyMesh = inputGeometry->chunkyMesh; // Init build configuration from GUI memset(&config, 0, sizeof(config));