Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove transitive include for Detour (#1450)

Browse Source 
Moves it to the 1 cpp file that uses it and locks down its header.

Still compiles and links.
This commit is contained in:
David Markowitz 2024-02-06 06:53:51 -08:00 committed by GitHub
parent f0b6ad89d9
commit 395e5c1c66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dNavigation/dNavMesh.cpp
View File

@ -11,6 +11,7 @@
#include "dZoneManager.h" #include "dZoneManager.h"
#include "DluAssert.h" #include "DluAssert.h"
#include "DetourExtensions.h"
dNavMesh::dNavMesh(uint32_t zoneId) { dNavMesh::dNavMesh(uint32_t zoneId) {
m_ZoneId = zoneId; m_ZoneId = zoneId;
@ -30,16 +31,8 @@ dNavMesh::dNavMesh(uint32_t zoneId) {
dNavMesh::~dNavMesh() { dNavMesh::~dNavMesh() {
// Clean up Recast information // 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_NavMesh) dtFreeNavMesh(m_NavMesh);
if (m_NavQuery) dtFreeNavMeshQuery(m_NavQuery); if (m_NavQuery) dtFreeNavMeshQuery(m_NavQuery);
if (m_Ctx) delete m_Ctx;
if (m_Triareas) delete[] m_Triareas;
} }

30
dNavigation/dNavMesh.h
View File

@ -2,13 +2,17 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include <map>
#include <string>
#include <cstring>
#include "DetourExtensions.h"
class NiPoint3; class NiPoint3;
class rcHeightfield;
class rcCompactHeightfield;
class rcContourSet;
class rcPolyMesh;
class rcPolyMeshDetail;
class InputGeom;
class dtNavMesh;
class dtNavMeshQuery;
class rcContext;
class dNavMesh { class dNavMesh {
public: public:
@ -26,24 +30,14 @@ public:
float GetHeightAtPoint(const NiPoint3& location, const float halfExtentsHeight = 32.0f) const; 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); 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: private:
void LoadNavmesh(); void LoadNavmesh();
uint32_t m_ZoneId; uint32_t m_ZoneId;
uint8_t* m_Triareas = nullptr; dtNavMesh* m_NavMesh = nullptr;
rcHeightfield* m_Solid = nullptr; dtNavMeshQuery* m_NavQuery = 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;
uint8_t m_NavMeshDrawFlags; uint8_t m_NavMeshDrawFlags;
rcContext* m_Ctx = nullptr;
}; };

2
dPhysics/dpWorld.cpp
View File

@ -81,7 +81,7 @@ void dpWorld::Shutdown() {
} }
bool dpWorld::IsLoaded() { bool dpWorld::IsLoaded() {
return m_NavMesh->GetdtNavMesh() != nullptr; return m_NavMesh->IsNavmeshLoaded();
} }
void dpWorld::StepWorld(float deltaTime) { void dpWorld::StepWorld(float deltaTime) {