Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove transitive include for Detour, remove unused fields #1450

Merged
merged 1 commit into from
Feb 6, 2024
Merged

chore: Remove transitive include for Detour, remove unused fields #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions dNavigation/dNavMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "dZoneManager.h"
#include "DluAssert.h"
#include "DetourExtensions.h"

dNavMesh::dNavMesh(uint32_t zoneId) {
m_ZoneId = zoneId;
Expand All @@ -30,16 +31,8 @@ dNavMesh::dNavMesh(uint32_t zoneId) {
dNavMesh::~dNavMesh() {
// Clean up Recast information

if(m_Solid) rcFreeHeightField(m_Solid);
if (m_CHF) rcFreeCompactHeightfield(m_CHF);
if (m_CSet) rcFreeContourSet(m_CSet);
if (m_PMesh) rcFreePolyMesh(m_PMesh);
if (m_PMDMesh) rcFreePolyMeshDetail(m_PMDMesh);
if (m_NavMesh) dtFreeNavMesh(m_NavMesh);
if (m_NavQuery) dtFreeNavMeshQuery(m_NavQuery);

if (m_Ctx) delete m_Ctx;
if (m_Triareas) delete[] m_Triareas;
}


Expand Down
30 changes: 12 additions & 18 deletions dNavigation/dNavMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

#include <cstdint>
#include <vector>
#include <map>
#include <string>
#include <cstring>

#include "DetourExtensions.h"

class NiPoint3;
class rcHeightfield;
class rcCompactHeightfield;
class rcContourSet;
class rcPolyMesh;
class rcPolyMeshDetail;
class InputGeom;
class dtNavMesh;
class dtNavMeshQuery;
class rcContext;

class dNavMesh {
public:
Expand All @@ -26,24 +30,14 @@ class dNavMesh {
float GetHeightAtPoint(const NiPoint3& location, const float halfExtentsHeight = 32.0f) const;
std::vector<NiPoint3> GetPath(const NiPoint3& startPos, const NiPoint3& endPos, float speed = 10.0f);

class dtNavMesh* GetdtNavMesh() { return m_NavMesh; }
bool IsNavmeshLoaded() { return m_NavMesh != nullptr; }

private:
void LoadNavmesh();

uint32_t m_ZoneId;

uint8_t* m_Triareas = nullptr;
rcHeightfield* m_Solid = nullptr;
rcCompactHeightfield* m_CHF = nullptr;
rcContourSet* m_CSet = nullptr;
rcPolyMesh* m_PMesh = nullptr;
rcConfig m_Config;
rcPolyMeshDetail* m_PMDMesh = nullptr;

class InputGeom* m_Geometry = nullptr;
class dtNavMesh* m_NavMesh = nullptr;
class dtNavMeshQuery* m_NavQuery = nullptr;
dtNavMesh* m_NavMesh = nullptr;
dtNavMeshQuery* m_NavQuery = nullptr;
uint8_t m_NavMeshDrawFlags;
rcContext* m_Ctx = nullptr;
};
2 changes: 1 addition & 1 deletion dPhysics/dpWorld.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void dpWorld::Shutdown() {
}

bool dpWorld::IsLoaded() {
return m_NavMesh->GetdtNavMesh() != nullptr;
return m_NavMesh->IsNavmeshLoaded();
}

void dpWorld::StepWorld(float deltaTime) {
Expand Down
Loading