mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

cleanup some unnecessary static members

Browse source
This commit is contained in:
NotAdam 2019-01-24 22:34:15 +11:00
parent dfdc249716
commit 1c45e69628
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/world/Navi/NaviProvider.h
View file

@ -12,8 +12,8 @@ namespace Sapphire::World::Navi
class NaviProvider class NaviProvider
{ {
static const int32_t NAVMESHSET_MAGIC = 'M' << 24 | 'S' << 16 | 'E' << 8 | 'T'; //'MSET' const int32_t NAVMESHSET_MAGIC = 'M' << 24 | 'S' << 16 | 'E' << 8 | 'T'; //'MSET'
static const int32_t NAVMESHSET_VERSION = 1; const int32_t NAVMESHSET_VERSION = 1;
struct NavMeshSetHeader struct NavMeshSetHeader
{ {
@ -29,11 +29,11 @@ namespace Sapphire::World::Navi
int32_t dataSize; int32_t dataSize;
}; };
static const int32_t MAX_POLYS = 256; const int32_t MAX_POLYS = 256;
static const int32_t MAX_SMOOTH = 2048; const int32_t MAX_SMOOTH = 2048;
public: public:
NaviProvider( const std::string& internalName ); explicit NaviProvider( const std::string& internalName );
bool init(); bool init();
void loadMesh( const std::string& path ); void loadMesh( const std::string& path );
@ -55,10 +55,10 @@ namespace Sapphire::World::Navi
float m_polyFindRange[ 3 ]; float m_polyFindRange[ 3 ];
private: private:
static int32_t fixupCorridor( dtPolyRef* path, int32_t npath, int32_t maxPath, const dtPolyRef* visited, int32_t nvisited ); int32_t fixupCorridor( dtPolyRef* path, int32_t npath, int32_t maxPath, const dtPolyRef* visited, int32_t nvisited );
static int32_t fixupShortcuts( dtPolyRef* path, int32_t npath, dtNavMeshQuery* navQuery ); int32_t fixupShortcuts( dtPolyRef* path, int32_t npath, dtNavMeshQuery* navQuery );
inline static bool inRange( const float* v1, const float* v2, const float r, const float h ); inline bool inRange( const float* v1, const float* v2, const float r, const float h );
static bool getSteerTarget( dtNavMeshQuery* navQuery, const float* startPos, const float* endPos, const float minTargetDist, bool getSteerTarget( dtNavMeshQuery* navQuery, const float* startPos, const float* endPos, const float minTargetDist,
const dtPolyRef* path, const int32_t pathSize, float* steerPos, uint8_t& steerPosFlag, const dtPolyRef* path, const int32_t pathSize, float* steerPos, uint8_t& steerPosFlag,
dtPolyRef& steerPosRef, float* outPoints = 0, int32_t* outPointCount = 0 ); dtPolyRef& steerPosRef, float* outPoints = 0, int32_t* outPointCount = 0 );