From 213d6529a929db38c40bb8d5d2be9d22ee891684 Mon Sep 17 00:00:00 2001 From: Graham Pentheny Date: Tue, 5 Aug 2025 21:47:44 -0400 Subject: [PATCH] Rename meshBMin and meshBMax to meshBoundsMin and meshBoundsMax --- RecastDemo/Include/InputGeom.h | 12 ++++++------ RecastDemo/Source/InputGeom.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RecastDemo/Include/InputGeom.h b/RecastDemo/Include/InputGeom.h index db5945e5..b135d54a 100644 --- a/RecastDemo/Include/InputGeom.h +++ b/RecastDemo/Include/InputGeom.h @@ -86,8 +86,8 @@ public: ChunkyTriMesh* chunkyMesh = nullptr; private: - float meshBMin[3] = {}; - float meshBMax[3] = {}; + float meshBoundsMin[3] = {}; + float meshBoundsMax[3] = {}; BuildSettings buildSettings; bool hasBuildSettings = false; @@ -122,10 +122,10 @@ public: bool saveGeomSet(const BuildSettings* settings); /// Method to return static mesh data. - [[nodiscard]] const float* getMeshBoundsMin() const { return meshBMin; } - [[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 float* getMeshBoundsMin() const { return meshBoundsMin; } + [[nodiscard]] const float* getMeshBoundsMax() const { return meshBoundsMax; } + [[nodiscard]] const float* getNavMeshBoundsMin() const { return hasBuildSettings ? buildSettings.navMeshBMin : meshBoundsMin; } + [[nodiscard]] const float* getNavMeshBoundsMax() const { return hasBuildSettings ? buildSettings.navMeshBMax : meshBoundsMax; } [[nodiscard]] const BuildSettings* getBuildSettings() const { return hasBuildSettings ? &buildSettings : nullptr; } bool raycastMesh(float* src, float* dst, float& tmin); diff --git a/RecastDemo/Source/InputGeom.cpp b/RecastDemo/Source/InputGeom.cpp index fa9e42fc..d99cd351 100644 --- a/RecastDemo/Source/InputGeom.cpp +++ b/RecastDemo/Source/InputGeom.cpp @@ -168,7 +168,7 @@ bool InputGeom::loadMesh(rcContext* ctx, const std::string& filepath) parseObjModel(buffer, bufferLen, verts, tris, normals); - rcCalcBounds(verts.data(), getVertCount(), meshBMin, meshBMax); + rcCalcBounds(verts.data(), getVertCount(), meshBoundsMin, meshBoundsMax); chunkyMesh = new ChunkyTriMesh; if (!chunkyMesh) @@ -493,7 +493,7 @@ bool InputGeom::raycastMesh(float* src, float* dst, float& tmin) // Prune hit ray. float btmin; float btmax; - if (!isectSegAABB(src, dst, meshBMin, meshBMax, btmin, btmax)) + if (!isectSegAABB(src, dst, meshBoundsMin, meshBoundsMax, btmin, btmax)) { return false; }