Increase compile performance even more for NavMesh Editor

Cleaned up redundant includes Reordered required ones
2025-02-09 19:15:03 +01:00 · 2022-03-13 03:00:07 +01:00 · 2022-03-13 03:00:07 +01:00 · 3cf36b5d61
commit 3cf36b5d61
parent b3f064d009
40 changed files with 146 additions and 136 deletions
--- a/r5dev/naveditor/ChunkyTriMesh.cpp
+++ b/r5dev/naveditor/ChunkyTriMesh.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/ChunkyTriMesh.h"

 struct BoundsItem
--- a/r5dev/naveditor/ConvexVolumeTool.cpp
+++ b/r5dev/naveditor/ConvexVolumeTool.cpp
@ -16,17 +16,13 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
+#include "Recast/Include/Recast.h"
+#include "DebugUtils/Include/DetourDebugDraw.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
 #include "NavEditor/Include/ConvexVolumeTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Sample.h"
-#include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
-#include "DebugUtils/Include/DetourDebugDraw.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif

 // Quick and dirty convex hull.

--- a/r5dev/naveditor/CrowdTool.cpp
+++ b/r5dev/naveditor/CrowdTool.cpp
@ -16,21 +16,17 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
+#include "Detour/Include/DetourCommon.h"
+#include "Detour/Include/DetourNode.h"
+#include "DetourCrowd/Include/DetourCrowd.h"
+#include "DetourCrowd/Include/DetourObstacleAvoidance.h"
+#include "DebugUtils/Include/DetourDebugDraw.h"
 #include "NavEditor/Include/CrowdTool.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/Sample.h"
-#include "DetourCrowd/Include/DetourCrowd.h"
-#include "DebugUtils/Include/DetourDebugDraw.h"
-#include "DetourCrowd/Include/DetourObstacleAvoidance.h"
-#include "Detour/Include/DetourCommon.h"
-#include "Detour/Include/DetourNode.h"
 #include "NavEditor/Include/SampleInterfaces.h"

-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
 static bool isectSegAABB(const float* sp, const float* sq,
 						 const float* amin, const float* amax,
 						 float& tmin, float& tmax)
--- a/r5dev/naveditor/Filelist.cpp
+++ b/r5dev/naveditor/Filelist.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/Filelist.h"

 using std::vector;
--- a/r5dev/naveditor/InputGeom.cpp
+++ b/r5dev/naveditor/InputGeom.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/pch.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
 #include "NavEditor/Include/InputGeom.h"
 #include "NavEditor/Include/ChunkyTriMesh.h"
--- a/r5dev/naveditor/MeshLoaderBsp.cpp
+++ b/r5dev/naveditor/MeshLoaderBsp.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/MeshLoaderBsp.h"

 bool rcMeshLoaderBsp::load(const std::string& filename)
--- a/r5dev/naveditor/MeshLoaderObj.cpp
+++ b/r5dev/naveditor/MeshLoaderObj.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/MeshLoaderObj.h"

 rcMeshLoaderObj::rcMeshLoaderObj() :
--- a/r5dev/naveditor/MeshLoaderPly.cpp
+++ b/r5dev/naveditor/MeshLoaderPly.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/MeshLoaderPly.h"

 bool rcMeshLoaderPly::load(const std::string& filename)
--- a/r5dev/naveditor/NavMeshPruneTool.cpp
+++ b/r5dev/naveditor/NavMeshPruneTool.cpp
@ -16,14 +16,14 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/NavMeshPruneTool.h"
-#include "NavEditor/Include/InputGeom.h"
-#include "NavEditor/Include/Sample.h"
+#include "Pch.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourCommon.h"
 #include "Detour/Include/DetourAssert.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
+#include "NavEditor/Include/NavMeshPruneTool.h"
+#include "NavEditor/Include/InputGeom.h"
+#include "NavEditor/Include/Sample.h"

 #ifdef WIN32
 #	define snprintf _snprintf
--- a/r5dev/naveditor/NavMeshTesterTool.cpp
+++ b/r5dev/naveditor/NavMeshTesterTool.cpp
@ -16,19 +16,15 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/NavMeshTesterTool.h"
-#include "NavEditor/Include/Sample.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshBuilder.h"
-#include "DebugUtils/Include/DetourDebugDraw.h"
 #include "Detour/Include/DetourCommon.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
+#include "DebugUtils/Include/DetourDebugDraw.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
+#include "NavEditor/Include/NavMeshTesterTool.h"
+#include "NavEditor/Include/Sample.h"

 // Uncomment this to dump all the requests in stdout.
 #define DUMP_REQS
--- a/r5dev/naveditor/OffMeshConnectionTool.cpp
+++ b/r5dev/naveditor/OffMeshConnectionTool.cpp
@ -16,13 +16,13 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/OffMeshConnectionTool.h"
-#include "NavEditor/Include/InputGeom.h"
-#include "NavEditor/Include/Sample.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
 #include "DebugUtils/Include/RecastDebugDraw.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
+#include "NavEditor/Include/OffMeshConnectionTool.h"
+#include "NavEditor/Include/InputGeom.h"
+#include "NavEditor/Include/Sample.h"

 #ifdef WIN32
 #	define snprintf _snprintf
--- a/r5dev/naveditor/Pch.cpp
+++ b/r5dev/naveditor/Pch.cpp
@ -1 +1,8 @@
-#include "NavEditor/Include/Pch.h"
+// Pch.cpp : source file that includes just the standard includes
+// *.pch will be the pre-compiled header
+// Pch.obj will contain the pre-compiled type information
+
+#include "Pch.h"
+
+// TODO: reference any additional headers you need in PCH.H
+// and not in this file
--- a/r5dev/naveditor/PerfTimer.cpp
+++ b/r5dev/naveditor/PerfTimer.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/PerfTimer.h"

 #if defined(WIN32)
--- a/r5dev/naveditor/Sample.cpp
+++ b/r5dev/naveditor/Sample.cpp
@ -16,15 +16,15 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/Sample.h"
-#include "NavEditor/Include/InputGeom.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
-#include "DebugUtils/Include/DetourDebugDraw.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshQuery.h"
 #include "DetourCrowd/Include/DetourCrowd.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
+#include "DebugUtils/Include/DetourDebugDraw.h"
+#include "NavEditor/Include/Sample.h"
+#include "NavEditor/Include/InputGeom.h"

 unsigned int SampleDebugDraw::areaToCol(unsigned int area)
 {
--- a/r5dev/naveditor/SampleInterfaces.cpp
+++ b/r5dev/naveditor/SampleInterfaces.cpp
@ -1,14 +1,10 @@
-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/SampleInterfaces.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
 #include "DebugUtils/Include/RecastDebugDraw.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
+#include "NavEditor/Include/SampleInterfaces.h"
 #include "NavEditor/Include/PerfTimer.h"

-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////

 BuildContext::BuildContext() :
--- a/r5dev/naveditor/Sample_Debug.cpp
+++ b/r5dev/naveditor/Sample_Debug.cpp
@ -16,18 +16,14 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/Sample_Debug.h"
-#include "NavEditor/Include/InputGeom.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "Detour/Include/DetourNavMesh.h"
 #include "DebugUtils/Include/RecastDebugDraw.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
 #include "DebugUtils/Include/RecastDump.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
+#include "Detour/Include/DetourNavMesh.h"
+#include "NavEditor/Include/Sample_Debug.h"
+#include "NavEditor/Include/InputGeom.h"

 /*
 static int loadBin(const char* path, unsigned char** data)
--- a/r5dev/naveditor/Sample_SoloMesh.cpp
+++ b/r5dev/naveditor/Sample_SoloMesh.cpp
@ -16,25 +16,21 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/InputGeom.h"
-#include "NavEditor/Include/Sample.h"
-#include "NavEditor/Include/Sample_SoloMesh.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
-#include "DebugUtils/Include/RecastDump.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshBuilder.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
+#include "DebugUtils/Include/RecastDump.h"
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/NavMeshPruneTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
 #include "NavEditor/Include/ConvexVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
+#include "NavEditor/Include/InputGeom.h"
+#include "NavEditor/Include/Sample.h"
+#include "NavEditor/Include/Sample_SoloMesh.h"


 Sample_SoloMesh::Sample_SoloMesh() :
--- a/r5dev/naveditor/Sample_TempObstacles.cpp
+++ b/r5dev/naveditor/Sample_TempObstacles.cpp
@ -16,31 +16,26 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/imgui.h"
-#include "NavEditor/Include/InputGeom.h"
-#include "NavEditor/Include/Sample.h"
-#include "NavEditor/Include/Sample_TempObstacles.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
+#include "Recast/Include/RecastAlloc.h"
+#include "Recast/Include/RecastAssert.h"
 #include "Detour/Include/DetourAssert.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshBuilder.h"
-#include "DebugUtils/Include/DetourDebugDraw.h"
 #include "Detour/Include/DetourCommon.h"
 #include "DetourTileCache/Include/DetourTileCache.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
+#include "DebugUtils/Include/DetourDebugDraw.h"
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
 #include "NavEditor/Include/ConvexVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
-#include "Recast/Include/RecastAlloc.h"
-#include "Recast/Include/RecastAssert.h"
+#include "NavEditor/Include/InputGeom.h"
+#include "NavEditor/Include/Sample.h"
+#include "NavEditor/Include/Sample_TempObstacles.h"
 #include "thirdparty/fastlz/fastlz.h"

-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
-

 // This value specifies how many layers (or "floors") each navmesh tile is expected to have.
 static const int EXPECTED_LAYERS_PER_TILE = 4;
--- a/r5dev/naveditor/Sample_TileMesh.cpp
+++ b/r5dev/naveditor/Sample_TileMesh.cpp
@ -16,25 +16,20 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/InputGeom.h"
-#include "NavEditor/Include/Sample.h"
-#include "NavEditor/Include/Sample_TileMesh.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
-#include "DebugUtils/Include/RecastDebugDraw.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshBuilder.h"
+#include "DebugUtils/Include/RecastDebugDraw.h"
 #include "DebugUtils/Include/DetourDebugDraw.h"
 #include "NavEditor/Include/NavMeshTesterTool.h"
 #include "NavEditor/Include/NavMeshPruneTool.h"
 #include "NavEditor/Include/OffMeshConnectionTool.h"
 #include "NavEditor/Include/ConvexVolumeTool.h"
 #include "NavEditor/Include/CrowdTool.h"
-
-
-#ifdef WIN32
-#	define snprintf _snprintf
-#endif
+#include "NavEditor/Include/InputGeom.h"
+#include "NavEditor/Include/Sample.h"
+#include "NavEditor/Include/Sample_TileMesh.h"


 inline unsigned int nextPow2(unsigned int v)
--- a/r5dev/naveditor/TestCase.cpp
+++ b/r5dev/naveditor/TestCase.cpp
@ -16,20 +16,11 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
-#include "NavEditor/Include/TestCase.h"
+#include "Pch.h"
+#include "Detour/Include/DetourCommon.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshQuery.h"
-#include "Detour/Include/DetourCommon.h"
-
-#include "thirdparty/sdl/include/SDL.h"
-#include "thirdparty/sdl/include/SDL_opengl.h"
-//#ifdef __APPLE__
-//#	include <OpenGL/glu.h>
-//#else
-//#	include <GL/glu.h>
-//#endif
-#include "NavEditor/Include/imgui.h"
+#include "NavEditor/Include/TestCase.h"
 #include "NavEditor/Include/PerfTimer.h"

 #ifdef WIN32
--- a/r5dev/naveditor/ValueHistory.cpp
+++ b/r5dev/naveditor/ValueHistory.cpp
@ -1,6 +1,5 @@
-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "NavEditor/Include/ValueHistory.h"
-#include "NavEditor/Include/imgui.h"

 #ifdef WIN32
 #	define snprintf _snprintf
--- a/r5dev/naveditor/imgui.cpp
+++ b/r5dev/naveditor/imgui.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"

 #ifdef WIN32
 #	define snprintf _snprintf
--- a/r5dev/naveditor/imguiRenderGL.cpp
+++ b/r5dev/naveditor/imguiRenderGL.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"

 // Some math headers don't have PI defined.
 static const float PI = 3.14159265f;
--- a/r5dev/naveditor/include/ConvexVolumeTool.h
+++ b/r5dev/naveditor/include/ConvexVolumeTool.h
@ -19,7 +19,7 @@
 #ifndef CONVEXVOLUMETOOL_H
 #define CONVEXVOLUMETOOL_H

-#include "Sample.h"
+#include "NavEditor/Include/Sample.h"

 // Tool to create convex volumess for InputGeom

--- a/r5dev/naveditor/include/CrowdTool.h
+++ b/r5dev/naveditor/include/CrowdTool.h
@ -19,11 +19,11 @@
 #ifndef CROWDTOOL_H
 #define CROWDTOOL_H

-#include "NavEditor/Include/Sample.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "DetourCrowd/Include/DetourObstacleAvoidance.h"
-#include "NavEditor/Include/ValueHistory.h"
 #include "DetourCrowd/Include/DetourCrowd.h"
+#include "NavEditor/Include/ValueHistory.h"
+#include "NavEditor/Include/Sample.h"

 // Tool to create crowds.

--- a/r5dev/naveditor/include/Filelist.h
+++ b/r5dev/naveditor/include/Filelist.h
@ -19,9 +19,6 @@
 #ifndef FILELIST_H
 #define FILELIST_H

-#include <vector>
-#include <string>
-
 void scanDirectoryAppend(const std::string& path, const std::string& ext, std::vector<std::string>& fileList);
 void scanDirectory(const std::string& path, const std::string& ext, std::vector<std::string>& fileList);

--- a/r5dev/naveditor/include/MeshLoaderBsp.h
+++ b/r5dev/naveditor/include/MeshLoaderBsp.h
@ -15,7 +15,8 @@
 //    misrepresented as being the original software.
 // 3. This notice may not be removed or altered from any source distribution.
 //
-#pragma once
+#ifndef MESHLOADER_BSP
+#define MESHLOADER_BSP

 #include <string>
 #include <vector>
@ -49,3 +50,5 @@ private:

 	
 };
+
+#endif // MESHLOADER_BSP
--- a/r5dev/naveditor/include/MeshLoaderPly.h
+++ b/r5dev/naveditor/include/MeshLoaderPly.h
@ -15,10 +15,9 @@
 //    misrepresented as being the original software.
 // 3. This notice may not be removed or altered from any source distribution.
 //
-#pragma once
+#ifndef MESHLOADER_PLY
+#define MESHLOADER_PLY

-#include <string>
-#include <vector>
 #include <NavEditor/Include/MeshLoaderObj.h>

 class rcMeshLoaderPly:public IMeshLoader
@ -48,3 +47,5 @@ private:
 	int m_vertCount = 0;
 	int m_triCount = 0;
 };
+
+#endif // MESHLOADER_PLY
--- a/r5dev/naveditor/include/NavMeshTesterTool.h
+++ b/r5dev/naveditor/include/NavMeshTesterTool.h
@ -19,9 +19,9 @@
 #ifndef NAVMESHTESTERTOOL_H
 #define NAVMESHTESTERTOOL_H

-#include "NavEditor/Include/Sample.h"
 #include "Detour/Include/DetourNavMesh.h"
 #include "Detour/Include/DetourNavMeshQuery.h"
+#include "NavEditor/Include/Sample.h"

 class NavMeshTesterTool : public SampleTool
 {
--- a/r5dev/naveditor/include/Pch.h
+++ b/r5dev/naveditor/include/Pch.h
@ -1,3 +1,5 @@
+#ifndef DTPCH_H
+#define DTPCH_H

 #define _USE_MATH_DEFINES
 #include <math.h>
@ -11,7 +13,7 @@

 #ifdef WIN32
 #	include <io.h>
-#else
+#else // Linux, BSD, OSX
 #	include <dirent.h>
 #	include <cstring>
 #endif
@ -40,4 +42,6 @@
 #endif

 #include "NavEditor/Include/imgui.h"
-#include "NavEditor/Include/imguiRenderGL.h"
+#include "NavEditor/Include/imguiRenderGL.h"
+
+#endif // DTPCH_H
--- a/r5dev/naveditor/include/Sample.h
+++ b/r5dev/naveditor/include/Sample.h
@ -21,7 +21,6 @@

 #include "Recast/Include/Recast.h"
 #include "NavEditor/Include/SampleInterfaces.h"
-#include <string>

 struct hulldef
 {
--- a/r5dev/naveditor/include/SampleInterfaces.h
+++ b/r5dev/naveditor/include/SampleInterfaces.h
@ -20,8 +20,8 @@
 #define SAMPLEINTERFACES_H

 #include "DebugUtils/Include/DebugDraw.h"
-#include "Recast/Include/Recast.h"
 #include "DebugUtils/Include/RecastDump.h"
+#include "Recast/Include/Recast.h"
 #include "NavEditor/Include/PerfTimer.h"

 // These are example implementations of various interfaces used in Recast and Detour.
--- a/r5dev/naveditor/include/Sample_SoloMesh.h
+++ b/r5dev/naveditor/include/Sample_SoloMesh.h
@ -19,9 +19,9 @@
 #ifndef RECASTSAMPLESOLOMESH_H
 #define RECASTSAMPLESOLOMESH_H

-#include "NavEditor/Include/Sample.h"
-#include "Detour/Include/DetourNavMesh.h"
 #include "Recast/Include/Recast.h"
+#include "Detour/Include/DetourNavMesh.h"
+#include "NavEditor/Include/Sample.h"

 class Sample_SoloMesh : public Sample
 {
--- a/r5dev/naveditor/include/Sample_TempObstacles.h
+++ b/r5dev/naveditor/include/Sample_TempObstacles.h
@ -19,10 +19,10 @@
 #ifndef RECASTSAMPLETEMPOBSTACLE_H
 #define RECASTSAMPLETEMPOBSTACLE_H

-#include "NavEditor/Include/Sample.h"
-#include "Detour/Include/DetourNavMesh.h"
 #include "Recast/Include/Recast.h"
+#include "Detour/Include/DetourNavMesh.h"
 #include "NavEditor/Include/ChunkyTriMesh.h"
+#include "NavEditor/Include/Sample.h"


 class Sample_TempObstacles : public Sample
--- a/r5dev/naveditor/include/Sample_TileMesh.h
+++ b/r5dev/naveditor/include/Sample_TileMesh.h
@ -19,10 +19,10 @@
 #ifndef RECASTSAMPLETILEMESH_H
 #define RECASTSAMPLETILEMESH_H

-#include "NavEditor/Include/Sample.h"
-#include "Detour/Include/DetourNavMesh.h"
 #include "Recast/Include/Recast.h"
+#include "Detour/Include/DetourNavMesh.h"
 #include "NavEditor/Include/ChunkyTriMesh.h"
+#include "NavEditor/Include/Sample.h"

 class Sample_TileMesh : public Sample
 {
--- a/r5dev/naveditor/include/TestCase.h
+++ b/r5dev/naveditor/include/TestCase.h
@ -19,7 +19,6 @@
 #ifndef TESTCASE_H
 #define TESTCASE_H

-#include <string>
 #include "Detour/Include/DetourNavMesh.h"

 class TestCase
--- a/r5dev/naveditor/main.cpp
+++ b/r5dev/naveditor/main.cpp
@ -16,7 +16,7 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //

-#include "NavEditor/Include/Pch.h"
+#include "Pch.h"
 #include "Recast/Include/Recast.h"
 #include "DebugUtils/Include/RecastDebugDraw.h"
 #include "NavEditor/Include/InputGeom.h"
--- a/r5dev/thirdparty/recast/Pch.cpp
+++ b/r5dev/thirdparty/recast/Pch.cpp
@ -0,0 +1 @@
+#include "NavEditor/Include/Pch.h"
--- a/r5dev/thirdparty/recast/Pch.h
+++ b/r5dev/thirdparty/recast/Pch.h
@ -0,0 +1,43 @@
+
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <cmath>
+#include <float.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+#ifdef WIN32
+#	include <io.h>
+#else
+#	include <dirent.h>
+#	include <cstring>
+#endif
+
+#include <stdio.h>
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+
+#include <set>
+#include <vector>
+#include <algorithm>
+
+#include "thirdparty/sdl/include/SDL.h"
+#include "thirdparty/sdl/include/SDL_syswm.h"
+#include "thirdparty/sdl/include/SDL_opengl.h"
+
+#ifdef __APPLE__
+#	include <OpenGL/glu.h>
+#else
+#	include <GL/glu.h>
+#endif
+
+#ifdef WIN32
+#	define snprintf _snprintf
+#endif
+
+#include "NavEditor/Include/imgui.h"
+#include "NavEditor/Include/imguiRenderGL.h"
--- a/r5dev/vproj/naveditor.vcxproj
+++ b/r5dev/vproj/naveditor.vcxproj
@ -127,7 +127,7 @@
      <AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D WIN32 %(AdditionalOptions)</AdditionalOptions>
      <LanguageStandard>stdcpp17</LanguageStandard>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>NavEditor/Include/Pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Pch.h</PrecompiledHeaderFile>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -150,7 +150,7 @@
      <AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D WIN32 %(AdditionalOptions)</AdditionalOptions>
      <LanguageStandard>stdcpp17</LanguageStandard>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>NavEditor/Include/Pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>Pch.h</PrecompiledHeaderFile>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>