Switched default include path from JOLT_PHYSICS_ROOT to PHYSICS_REPO_ROOT. (#106)

This means that all includes now need to be of the form #include <Jolt/...> which prevents a collision if a project also has for example a Math/Float4.h

Build/CMakeLists.txt

@@ -175,7 +175,7 @@ if (TARGET_UNIT_TESTS)
     # Create UnitTests executable
     include(${PHYSICS_REPO_ROOT}/UnitTests/UnitTests.cmake)
     add_executable(UnitTests ${UNIT_TESTS_SRC_FILES})
-    target_include_directories(UnitTests PUBLIC ${JOLT_PHYSICS_ROOT} ${UNIT_TESTS_ROOT})
+    target_include_directories(UnitTests PUBLIC ${UNIT_TESTS_ROOT})
     target_link_libraries (UnitTests LINK_PUBLIC Jolt)
     if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
         target_link_options(UnitTests PUBLIC "/SUBSYSTEM:CONSOLE")
@@ -199,7 +199,7 @@ if (TARGET_HELLO_WORLD)
 	# Example 'Hello World' application
 	include(${PHYSICS_REPO_ROOT}/HelloWorld/HelloWorld.cmake)
 	add_executable(HelloWorld ${HELLO_WORLD_SRC_FILES})
-	target_include_directories(HelloWorld PUBLIC ${JOLT_PHYSICS_ROOT} ${HELLO_WORLD_ROOT})
+	target_include_directories(HelloWorld PUBLIC ${HELLO_WORLD_ROOT})
 	target_link_libraries (HelloWorld LINK_PUBLIC Jolt)
 	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
 		target_link_options(HelloWorld PUBLIC "/SUBSYSTEM:CONSOLE")
@@ -210,7 +210,7 @@ if (TARGET_PERFORMANCE_TEST)
 	# Performance Test application
 	include(${PHYSICS_REPO_ROOT}/PerformanceTest/PerformanceTest.cmake)
 	add_executable(PerformanceTest ${PERFORMANCE_TEST_SRC_FILES})
-	target_include_directories(PerformanceTest PUBLIC ${JOLT_PHYSICS_ROOT} ${PERFORMANCE_TEST_ROOT})
+	target_include_directories(PerformanceTest PUBLIC ${PERFORMANCE_TEST_ROOT})
 	target_link_libraries (PerformanceTest LINK_PUBLIC Jolt)
 	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
 		target_link_options(PerformanceTest PUBLIC "/SUBSYSTEM:CONSOLE")

Build/README.md

@@ -13,8 +13,8 @@ Each platform supports multiple build targets
 
 ## Includes
 
-The Jolt headers don't include Jolt.h. Always include Jolt.h before including any other Jolt header.
-You can use Jolt.h in your precompiled header to speed up compilation.
+The Jolt headers don't include Jolt/Jolt.h. Always include Jolt/Jolt.h before including any other Jolt header.
+You can use Jolt/Jolt.h in your precompiled header to speed up compilation.
 
 ## Defines
 

HelloWorld/HelloWorld.cpp

@@ -3,18 +3,18 @@
 
 // The Jolt headers don't include Jolt.h. Always include Jolt.h before including any other Jolt header.
 // You can use Jolt.h in your precompiled header to speed up compilation.
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
 // Jolt includes
-#include <RegisterTypes.h>
-#include <Core/TempAllocator.h>
-#include <Core/JobSystemThreadPool.h>
-#include <Physics/PhysicsSettings.h>
-#include <Physics/PhysicsSystem.h>
-#include <Physics/Collision/Shape/BoxShape.h>
-#include <Physics/Collision/Shape/SphereShape.h>
-#include <Physics/Body/BodyCreationSettings.h>
-#include <Physics/Body/BodyActivationListener.h>
+#include <Jolt/RegisterTypes.h>
+#include <Jolt/Core/TempAllocator.h>
+#include <Jolt/Core/JobSystemThreadPool.h>
+#include <Jolt/Physics/PhysicsSettings.h>
+#include <Jolt/Physics/PhysicsSystem.h>
+#include <Jolt/Physics/Collision/Shape/BoxShape.h>
+#include <Jolt/Physics/Collision/Shape/SphereShape.h>
+#include <Jolt/Physics/Body/BodyCreationSettings.h>
+#include <Jolt/Physics/Body/BodyActivationListener.h>
 
 // STL includes
 #include <iostream>

Jolt/AABBTree/AABBTreeBuilder.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <AABBTree/AABBTreeBuilder.h>
+#include <Jolt/AABBTree/AABBTreeBuilder.h>
 
 namespace JPH {
 

Jolt/AABBTree/AABBTreeBuilder.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <TriangleSplitter/TriangleSplitter.h>
-#include <Geometry/AABox.h>
-#include <Core/NonCopyable.h>
+#include <Jolt/TriangleSplitter/TriangleSplitter.h>
+#include <Jolt/Geometry/AABox.h>
+#include <Jolt/Core/NonCopyable.h>
 
 namespace JPH {
 

Jolt/AABBTree/AABBTreeToBuffer.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <AABBTree/AABBTreeBuilder.h>
-#include <Core/ByteBuffer.h>
-#include <Geometry/IndexedTriangle.h>
+#include <Jolt/AABBTree/AABBTreeBuilder.h>
+#include <Jolt/Core/ByteBuffer.h>
+#include <Jolt/Geometry/IndexedTriangle.h>
 #include <deque>
 
 namespace JPH {

Jolt/AABBTree/NodeCodec/NodeCodecQuadTreeHalfFloat.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <Core/ByteBuffer.h>
-#include <Math/HalfFloat.h>
-#include <AABBTree/AABBTreeBuilder.h>
+#include <Jolt/Core/ByteBuffer.h>
+#include <Jolt/Math/HalfFloat.h>
+#include <Jolt/AABBTree/AABBTreeBuilder.h>
 
 namespace JPH {
 

Jolt/AABBTree/TriangleCodec/TriangleCodecIndexed8BitPackSOA4Flags.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Geometry/RayTriangle.h>
+#include <Jolt/Geometry/RayTriangle.h>
 #include <unordered_map>
 
 namespace JPH {

Jolt/Core/AlignedAllocator.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/Memory.h>
+#include <Jolt/Core/Memory.h>
 
 namespace JPH {
 

Jolt/Core/ByteBuffer.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/AlignedAllocator.h>
+#include <Jolt/Core/AlignedAllocator.h>
 
 namespace JPH {
 

Jolt/Core/Color.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/Color.h>
+#include <Jolt/Core/Color.h>
 
 namespace JPH {
 

Jolt/Core/Core.h

@@ -132,7 +132,7 @@
 	// This file is not distributed because it would violate an NDA. 
 	// Creating one should only be a couple of minutes of work if you have the documentation for the platform 
 	// (you only need to define JPH_BREAKPOINT, JPH_PLATFORM_BLUE_GET_TICKS and JPH_PLATFORM_BLUE_GET_TICK_FREQUENCY and include the right header).
-	#include <Core/PlatformBlue.h> 
+	#include <Jolt/Core/PlatformBlue.h> 
 #elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS)
 	#include <float.h>
 	#include <limits.h>

Jolt/Core/FPControlWord.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/NonCopyable.h>
 
 namespace JPH {
 

Jolt/Core/FPException.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/FPControlWord.h>
+#include <Jolt/Core/FPControlWord.h>
 
 namespace JPH {
 

Jolt/Core/FPFlushDenormals.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/FPControlWord.h>
+#include <Jolt/Core/FPControlWord.h>
 
 namespace JPH {
 

Jolt/Core/Factory.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/Factory.h>
+#include <Jolt/Core/Factory.h>
 
 namespace JPH {
 

Jolt/Core/Factory.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/RTTI.h>
+#include <Jolt/Core/RTTI.h>
 #include <unordered_map>
 
 namespace JPH {

Jolt/Core/FixedSizeFreeList.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
-#include <Core/Mutex.h>
-#include <Core/Memory.h>
+#include <Jolt/Core/NonCopyable.h>
+#include <Jolt/Core/Mutex.h>
+#include <Jolt/Core/Memory.h>
 #include <atomic>
 
 namespace JPH {
@@ -121,4 +121,4 @@ public:
 
 } // JPH
 
-#include <Core/FixedSizeFreeList.inl>
+#include "FixedSizeFreeList.inl"

Jolt/Core/IssueReporting.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 #include <fstream>
 
 namespace JPH {

Jolt/Core/JobSystem.h

@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include <Core/Reference.h>
-#include <Core/Color.h>
-#include <Core/Profiler.h>
-#include <Core/NonCopyable.h>
-#include <Core/StaticArray.h>
+#include <Jolt/Core/Reference.h>
+#include <Jolt/Core/Color.h>
+#include <Jolt/Core/Profiler.h>
+#include <Jolt/Core/NonCopyable.h>
+#include <Jolt/Core/StaticArray.h>
 #include <atomic>
 
 namespace JPH {
@@ -252,4 +252,4 @@ using JobHandle = JobSystem::JobHandle;
 
 } // JPH
 
-#include <Core/JobSystem.inl>
+#include "JobSystem.inl"

Jolt/Core/JobSystemThreadPool.cpp

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/JobSystemThreadPool.h>
-#include <Core/Profiler.h>
-#include <Core/FPException.h>
+#include <Jolt/Core/JobSystemThreadPool.h>
+#include <Jolt/Core/Profiler.h>
+#include <Jolt/Core/FPException.h>
 #include <algorithm>
 
 #ifdef JPH_PLATFORM_WINDOWS

Jolt/Core/JobSystemThreadPool.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Core/JobSystem.h>
-#include <Core/FixedSizeFreeList.h>
+#include <Jolt/Core/JobSystem.h>
+#include <Jolt/Core/FixedSizeFreeList.h>
 #include <thread>
 #include <mutex>
 #include <condition_variable>

Jolt/Core/LinearCurve.cpp

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/LinearCurve.h>
-#include <Core/StreamIn.h>
-#include <Core/StreamOut.h>
-#include <ObjectStream/TypeDeclarations.h>
+#include <Jolt/Core/LinearCurve.h>
+#include <Jolt/Core/StreamIn.h>
+#include <Jolt/Core/StreamOut.h>
+#include <Jolt/ObjectStream/TypeDeclarations.h>
 
 namespace JPH {
 

Jolt/Core/LinearCurve.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/SerializableObject.h>
+#include <Jolt/ObjectStream/SerializableObject.h>
 
 namespace JPH {
 

Jolt/Core/LockFreeHashMap.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/NonCopyable.h>
 #include <atomic>
 
 namespace JPH {
@@ -177,4 +177,4 @@ private:
 
 } // JPH
 
-#include <Core/LockFreeHashMap.inl>
+#include "LockFreeHashMap.inl"

Jolt/Core/Memory.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/Memory.h>
+#include <Jolt/Core/Memory.h>
 #include <cstdlib>
 #include <stdlib.h>
 

Jolt/Core/Mutex.h

@@ -6,8 +6,8 @@
 #include <mutex>
 #include <shared_mutex>
 #include <thread>
-#include <Core/Profiler.h>
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/Profiler.h>
+#include <Jolt/Core/NonCopyable.h>
 
 namespace JPH {
 

Jolt/Core/MutexArray.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/NonCopyable.h>
 
 namespace JPH {
 

Jolt/Core/Profiler.cpp

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/Profiler.h>
-#include <Core/Color.h>
-#include <Core/StringTools.h>
+#include <Jolt/Core/Profiler.h>
+#include <Jolt/Core/Color.h>
+#include <Jolt/Core/StringTools.h>
 #include <fstream>
 
 #ifdef JPH_PROFILE_ENABLED

Jolt/Core/Profiler.h

@@ -6,8 +6,8 @@
 #include <mutex>
 #include <unordered_map>
 
-#include <Core/NonCopyable.h>
-#include <Core/TickCounter.h>
+#include <Jolt/Core/NonCopyable.h>
+#include <Jolt/Core/TickCounter.h>
 
 #if defined(JPH_EXTERNAL_PROFILE)
 

Jolt/Core/RTTI.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/RTTI.h>
-#include <Core/StringTools.h>
+#include <Jolt/Core/RTTI.h>
+#include <Jolt/Core/StringTools.h>
 
 namespace JPH {
 

Jolt/Core/RTTI.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Core/Reference.h>
-#include <Core/StaticArray.h>
+#include <Jolt/Core/Reference.h>
+#include <Jolt/Core/StaticArray.h>
 
 namespace JPH {
 

Jolt/Core/StreamWrapper.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Core/StreamIn.h>
-#include <Core/StreamOut.h>
+#include <Jolt/Core/StreamIn.h>
+#include <Jolt/Core/StreamOut.h>
 #include <ostream>
 
 namespace JPH {

Jolt/Core/StringTools.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/StringTools.h>
+#include <Jolt/Core/StringTools.h>
 #include <cstdarg>
 
 namespace JPH {

Jolt/Core/TickCounter.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Core/TickCounter.h>
+#include <Jolt/Core/TickCounter.h>
 
 #if defined(JPH_PLATFORM_WINDOWS)
 	#pragma warning (push, 0)

Jolt/Geometry/AABox.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <Geometry/Triangle.h>
-#include <Geometry/IndexedTriangle.h>
-#include <Geometry/Plane.h>
-#include <Math/Mat44.h>
+#include <Jolt/Geometry/Triangle.h>
+#include <Jolt/Geometry/IndexedTriangle.h>
+#include <Jolt/Geometry/Plane.h>
+#include <Jolt/Math/Mat44.h>
 
 namespace JPH {
 

Jolt/Geometry/AABox4.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Geometry/OrientedBox.h>
+#include <Jolt/Geometry/OrientedBox.h>
 
 namespace JPH {
 

Jolt/Geometry/ClipPoly.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Geometry/AABox.h>
+#include <Jolt/Geometry/AABox.h>
 
 namespace JPH {
 

Jolt/Geometry/ConvexHullBuilder.cpp

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Geometry/ConvexHullBuilder.h>
-#include <Geometry/ConvexHullBuilder2D.h>
-#include <Geometry/ClosestPoint.h>
-#include <Core/StringTools.h>
+#include <Jolt/Geometry/ConvexHullBuilder.h>
+#include <Jolt/Geometry/ConvexHullBuilder2D.h>
+#include <Jolt/Geometry/ClosestPoint.h>
+#include <Jolt/Core/StringTools.h>
 #include <unordered_set>
 #include <fstream>
 
 #ifdef JPH_CONVEX_BUILDER_DEBUG
-	#include <Renderer/DebugRenderer.h>
+	#include <Jolt/Renderer/DebugRenderer.h>
 #endif
 
 namespace JPH {

Jolt/Geometry/ConvexHullBuilder.h

@@ -7,11 +7,11 @@
 //#define JPH_CONVEX_BUILDER_DUMP_SHAPE
 
 #ifdef JPH_CONVEX_BUILDER_DEBUG
-	#include <Core/Color.h>
+	#include <Jolt/Core/Color.h>
 #endif
 
-#include <Core/StaticArray.h>
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/StaticArray.h>
+#include <Jolt/Core/NonCopyable.h>
 
 namespace JPH {
 

Jolt/Geometry/ConvexHullBuilder2D.cpp

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Geometry/ConvexHullBuilder2D.h>
+#include <Jolt/Geometry/ConvexHullBuilder2D.h>
 
 #ifdef JPH_CONVEX_BUILDER_2D_DEBUG
-	#include <Renderer/DebugRenderer.h>
+	#include <Jolt/Renderer/DebugRenderer.h>
 #endif
 
 namespace JPH {

Jolt/Geometry/ConvexHullBuilder2D.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/NonCopyable.h>
 
 //#define JPH_CONVEX_BUILDER_2D_DEBUG
 

Jolt/Geometry/ConvexSupport.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Mat44.h>
+#include <Jolt/Math/Mat44.h>
 
 namespace JPH {
 

Jolt/Geometry/EPAConvexHullBuilder.h

@@ -9,11 +9,11 @@
 // Define to draw the building of the hull for debugging purposes
 //#define JPH_EPA_CONVEX_BUILDER_DRAW
 
-#include <Core/NonCopyable.h>
+#include <Jolt/Core/NonCopyable.h>
 
 #ifdef JPH_EPA_CONVEX_BUILDER_DRAW
-	#include <Renderer/DebugRenderer.h>
-	#include <Core/StringTools.h>
+	#include <Jolt/Renderer/DebugRenderer.h>
+	#include <Jolt/Core/StringTools.h>
 #endif
 
 namespace JPH {

Jolt/Geometry/EPAPenetrationDepth.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <Core/StaticArray.h>
-#include <Core/Profiler.h>
-#include <Geometry/GJKClosestPoint.h>
-#include <Geometry/EPAConvexHullBuilder.h>
+#include <Jolt/Core/StaticArray.h>
+#include <Jolt/Core/Profiler.h>
+#include <Jolt/Geometry/GJKClosestPoint.h>
+#include <Jolt/Geometry/EPAConvexHullBuilder.h>
 
 namespace JPH {
 

Jolt/Geometry/Ellipse.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Float2.h>
+#include <Jolt/Math/Float2.h>
 
 namespace JPH {
 

Jolt/Geometry/GJKClosestPoint.h

@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <Core/NonCopyable.h>
-#include <Core/FPException.h>
-#include <Geometry/ClosestPoint.h>
-#include <Geometry/ConvexSupport.h>
+#include <Jolt/Core/NonCopyable.h>
+#include <Jolt/Core/FPException.h>
+#include <Jolt/Geometry/ClosestPoint.h>
+#include <Jolt/Geometry/ConvexSupport.h>
 
 //#define JPH_GJK_DEBUG
 #ifdef JPH_GJK_DEBUG
-	#include <Core/StringTools.h>
-	#include <Renderer/DebugRenderer.h>
+	#include <Jolt/Core/StringTools.h>
+	#include <Jolt/Renderer/DebugRenderer.h>
 #endif
 
 namespace JPH {

Jolt/Geometry/IndexedTriangle.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/HashCombine.h>
+#include <Jolt/Core/HashCombine.h>
 
 namespace JPH {
 

Jolt/Geometry/Indexify.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Geometry/Indexify.h>
+#include <Jolt/Geometry/Indexify.h>
 #include <unordered_map>
 
 namespace JPH {

Jolt/Geometry/Indexify.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Geometry/Triangle.h>
-#include <Geometry/IndexedTriangle.h>
+#include <Jolt/Geometry/Triangle.h>
+#include <Jolt/Geometry/IndexedTriangle.h>
 
 namespace JPH {
 

Jolt/Geometry/MortonCode.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Geometry/AABox.h>
+#include <Jolt/Geometry/AABox.h>
 
 namespace JPH {
 

Jolt/Geometry/OrientedBox.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Geometry/AABox.h>
-#include <Geometry/OrientedBox.h>
+#include <Jolt/Geometry/AABox.h>
+#include <Jolt/Geometry/OrientedBox.h>
 
 namespace JPH {
 

Jolt/Geometry/OrientedBox.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <Geometry/Triangle.h>
-#include <Geometry/IndexedTriangle.h>
-#include <Geometry/AABox.h>
-#include <Math/Mat44.h>
+#include <Jolt/Geometry/Triangle.h>
+#include <Jolt/Geometry/IndexedTriangle.h>
+#include <Jolt/Geometry/AABox.h>
+#include <Jolt/Math/Mat44.h>
 
 namespace JPH {
 

Jolt/Geometry/RayAABox8.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Math/Vec8.h>
-#include <Geometry/RayAABox.h>
+#include <Jolt/Math/Vec8.h>
+#include <Jolt/Geometry/RayAABox.h>
 
 namespace JPH {
 

Jolt/Geometry/RayCapsule.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Geometry/RayCylinder.h>
-#include <Geometry/RaySphere.h>
+#include <Jolt/Geometry/RayCylinder.h>
+#include <Jolt/Geometry/RaySphere.h>
 
 namespace JPH {
 

Jolt/Geometry/RayCylinder.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/FindRoot.h>
+#include <Jolt/Math/FindRoot.h>
 
 namespace JPH {
 

Jolt/Geometry/RaySphere.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/FindRoot.h>
+#include <Jolt/Math/FindRoot.h>
 
 namespace JPH {
 

Jolt/Geometry/RayTriangle8.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Vec8.h>
+#include <Jolt/Math/Vec8.h>
 
 namespace JPH {
 

Jolt/Geometry/Sphere.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Geometry/AABox.h>
+#include <Jolt/Geometry/AABox.h>
 
 namespace JPH {
 

Jolt/Jolt.cmake

@@ -382,9 +382,9 @@ endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	# Enable Precompiled Headers for Jolt
-	set_source_files_properties(${JOLT_PHYSICS_SRC_FILES} PROPERTIES COMPILE_FLAGS "/YuJolt.h")
+	set_source_files_properties(${JOLT_PHYSICS_SRC_FILES} PROPERTIES COMPILE_FLAGS "/YuJolt/Jolt.h")
 	set(JOLT_PHYSICS_SRC_FILES ${JOLT_PHYSICS_SRC_FILES} ${JOLT_PHYSICS_ROOT}/pch.cpp)	
-	set_source_files_properties(${JOLT_PHYSICS_ROOT}/pch.cpp PROPERTIES COMPILE_FLAGS "/YcJolt.h")
+	set_source_files_properties(${JOLT_PHYSICS_ROOT}/pch.cpp PROPERTIES COMPILE_FLAGS "/YcJolt/Jolt.h")
 endif()
 
 # Group source files
@@ -392,7 +392,7 @@ source_group(TREE ${JOLT_PHYSICS_ROOT} FILES ${JOLT_PHYSICS_SRC_FILES})
 
 # Create Jolt lib
 add_library(Jolt STATIC ${JOLT_PHYSICS_SRC_FILES})
-target_include_directories(Jolt PUBLIC ${JOLT_PHYSICS_ROOT})
+target_include_directories(Jolt PUBLIC ${PHYSICS_REPO_ROOT})
 target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Debug>:_DEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>")
 target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Release>:NDEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>")
 target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Distribution>:NDEBUG>")

Jolt/Jolt.h

@@ -4,8 +4,8 @@
 #pragma once
 
 // Project includes
-#include <Core/Core.h>
-#include <Core/IssueReporting.h>
-#include <Math/Math.h>
-#include <Math/Vec4.h>
-#include <Math/Mat44.h>
+#include <Jolt/Core/Core.h>
+#include <Jolt/Core/IssueReporting.h>
+#include <Jolt/Math/Math.h>
+#include <Jolt/Math/Vec4.h>
+#include <Jolt/Math/Mat44.h>

Jolt/Math/DVec3.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Swizzle.h>
+#include <Jolt/Math/Swizzle.h>
 
 #ifdef JPH_USE_AVX2 // DVec3 currently uses AVX2 intrinsics but the class is currently unused so we can leave it out (it will be used in the future to support objects at a large distance from the origin)
 

Jolt/Math/DVec3.inl

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/HashCombine.h>
+#include <Jolt/Core/HashCombine.h>
 
 // Create a std::hash for DVec3
 JPH_MAKE_HASHABLE(JPH::DVec3, t.GetX(), t.GetY(), t.GetZ())

Jolt/Math/EigenValueSymmetric.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/FPFlushDenormals.h>
+#include <Jolt/Core/FPFlushDenormals.h>
 
 namespace JPH {
 

Jolt/Math/Float3.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/HashCombine.h>
+#include <Jolt/Core/HashCombine.h>
 
 namespace JPH {
 

Jolt/Math/HalfFloat.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Vec4.h>
+#include <Jolt/Math/Vec4.h>
 
 namespace JPH {
 

Jolt/Math/Mat44.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/MathTypes.h>
+#include <Jolt/Math/MathTypes.h>
 
 namespace JPH {
 

Jolt/Math/Mat44.inl

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <Math/Vec3.h>
-#include <Math/Vec4.h>
-#include <Math/Quat.h>
+#include <Jolt/Math/Vec3.h>
+#include <Jolt/Math/Vec4.h>
+#include <Jolt/Math/Quat.h>
 
 namespace JPH {
 

Jolt/Math/Matrix.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Math/Vector.h>
-#include <Math/GaussianElimination.h>
+#include <Jolt/Math/Vector.h>
+#include <Jolt/Math/GaussianElimination.h>
 
 namespace JPH {
 

Jolt/Math/Quat.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Math/Vec3.h>
-#include <Math/Vec4.h>
+#include <Jolt/Math/Vec3.h>
+#include <Jolt/Math/Vec4.h>
 
 namespace JPH {
 

Jolt/Math/UVec4.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
 namespace JPH {
 

Jolt/Math/UVec4.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Vec4.h>
+#include <Jolt/Math/Vec4.h>
 
 namespace JPH {
 

Jolt/Math/UVec8.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/Vec8.h>
+#include <Jolt/Math/Vec8.h>
 
 namespace JPH {
 

Jolt/Math/Vec3.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <Math/Vec3.h>
+#include <Jolt/Math/Vec3.h>
 #include <unordered_set>
 
 namespace JPH {

Jolt/Math/Vec3.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <Math/Float3.h>
-#include <Math/Swizzle.h>
-#include <Math/MathTypes.h>
+#include <Jolt/Math/Float3.h>
+#include <Jolt/Math/Swizzle.h>
+#include <Jolt/Math/MathTypes.h>
 
 namespace JPH {
 

Jolt/Math/Vec3.inl

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Math/Vec4.h>
-#include <Math/UVec4.h>
-#include <Core/HashCombine.h>
+#include <Jolt/Math/Vec4.h>
+#include <Jolt/Math/UVec4.h>
+#include <Jolt/Core/HashCombine.h>
 #include <random>
 
 // Create a std::hash for Vec3

Jolt/Math/Vec4.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <Math/Float4.h>
-#include <Math/Swizzle.h>
-#include <Math/MathTypes.h>
+#include <Jolt/Math/Float4.h>
+#include <Jolt/Math/Swizzle.h>
+#include <Jolt/Math/MathTypes.h>
 
 namespace JPH {
 

Jolt/Math/Vec4.inl

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Math/Vec3.h>
-#include <Math/UVec4.h>
+#include <Jolt/Math/Vec3.h>
+#include <Jolt/Math/UVec4.h>
 
 namespace JPH {
 

Jolt/Math/Vec8.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Math/MathTypes.h>
+#include <Jolt/Math/MathTypes.h>
 
 namespace JPH {
 

Jolt/Math/Vec8.inl

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Math/UVec8.h>
+#include <Jolt/Math/UVec8.h>
 
 namespace JPH {
 

Jolt/ObjectStream/GetPrimitiveTypeOfType.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <Core/RTTI.h>
+#include <Jolt/Core/RTTI.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStream.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStream.h>
+#include <Jolt/ObjectStream/ObjectStream.h>
 
 namespace JPH {
 
@@ -15,6 +15,6 @@ namespace JPH {
 	}
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 } // JPH

Jolt/ObjectStream/ObjectStream.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <Core/StaticArray.h>
-#include <Core/Reference.h>
+#include <Jolt/Core/StaticArray.h>
+#include <Jolt/Core/Reference.h>
 
 namespace JPH {
 
@@ -33,7 +33,7 @@ public:
 		#define JPH_DECLARE_PRIMITIVE(name)	T_##name,
 
 		// This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-		#include <ObjectStream/ObjectStreamTypes.h>
+		#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 		// Error values for read functions
 		Invalid,																		///< Next token on the stream was not a valid data type
@@ -56,7 +56,7 @@ protected:
 	bool						OSIsType(name *inNull, int inArrayDepth, ObjectStream::EDataType inDataType, const char *inClassName);
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 // Define serialization templates
 template <class T>

Jolt/ObjectStream/ObjectStreamBinaryIn.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStreamBinaryIn.h>
+#include <Jolt/ObjectStream/ObjectStreamBinaryIn.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamBinaryIn.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStreamIn.h>
+#include <Jolt/ObjectStream/ObjectStreamIn.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamBinaryOut.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStreamBinaryOut.h>
-#include <Core/StringTools.h>
+#include <Jolt/ObjectStream/ObjectStreamBinaryOut.h>
+#include <Jolt/Core/StringTools.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamBinaryOut.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStreamOut.h>
+#include <Jolt/ObjectStream/ObjectStreamOut.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamIn.cpp

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
-
-#include <Core/Factory.h>
-#include <ObjectStream/SerializableAttribute.h>
-#include <ObjectStream/ObjectStreamIn.h>
-#include <ObjectStream/ObjectStreamTextIn.h>
-#include <ObjectStream/ObjectStreamBinaryIn.h>
-#include <ObjectStream/SerializableObject.h>
+#include <Jolt/Jolt.h>
+
+#include <Jolt/Core/Factory.h>
+#include <Jolt/ObjectStream/SerializableAttribute.h>
+#include <Jolt/ObjectStream/ObjectStreamIn.h>
+#include <Jolt/ObjectStream/ObjectStreamTextIn.h>
+#include <Jolt/ObjectStream/ObjectStreamBinaryIn.h>
+#include <Jolt/ObjectStream/SerializableObject.h>
 #include <unordered_set>
 
 namespace JPH {
@@ -562,6 +562,6 @@ bool ObjectStreamIn::SkipAttributeData(int inArrayDepth, EDataType inDataType, c
 	}
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 } // JPH

Jolt/ObjectStream/ObjectStreamIn.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStream.h>
-#include <Core/Reference.h>
-#include <Core/RTTI.h>
+#include <Jolt/ObjectStream/ObjectStream.h>
+#include <Jolt/Core/Reference.h>
+#include <Jolt/Core/RTTI.h>
 #include <fstream>
 #include <unordered_map>
 
@@ -163,7 +163,7 @@ private:
 	bool	OSReadData(ObjectStreamIn &ioStream, name &outPrimitive);
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 /// Define serialization templates for dynamic arrays
 template <class T>

Jolt/ObjectStream/ObjectStreamOut.cpp

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStreamOut.h>
-#include <ObjectStream/ObjectStreamTextOut.h>
-#include <ObjectStream/ObjectStreamBinaryOut.h>
-#include <ObjectStream/SerializableAttribute.h>
-#include <ObjectStream/TypeDeclarations.h>
+#include <Jolt/ObjectStream/ObjectStreamOut.h>
+#include <Jolt/ObjectStream/ObjectStreamTextOut.h>
+#include <Jolt/ObjectStream/ObjectStreamBinaryOut.h>
+#include <Jolt/ObjectStream/SerializableAttribute.h>
+#include <Jolt/ObjectStream/TypeDeclarations.h>
 
 namespace JPH {
 
@@ -17,7 +17,7 @@ ObjectStreamOut::ObjectStreamOut(ostream &inStream) :
 {
 // Add all primitives to the class set
 #define JPH_DECLARE_PRIMITIVE(name)	mClassSet.insert(JPH_RTTI(name));
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 }
 
 ObjectStreamOut *ObjectStreamOut::Open(EStreamType inType, ostream &inStream)
@@ -179,6 +179,6 @@ void ObjectStreamOut::WritePointerData(const RTTI *inRTTI, const void *inPointer
 	}
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 } // JPH

Jolt/ObjectStream/ObjectStreamOut.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStream.h>
-#include <Core/RTTI.h>
+#include <Jolt/ObjectStream/ObjectStream.h>
+#include <Jolt/Core/RTTI.h>
 #include <queue>
 #include <fstream>
 #include <unordered_set>
@@ -122,7 +122,7 @@ private:
 	void	OSWriteData(ObjectStreamOut &ioStream, const name &inPrimitive);
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 // Define serialization templates for dynamic arrays
 template <class T>

Jolt/ObjectStream/ObjectStreamTextIn.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStreamTextIn.h>
+#include <Jolt/ObjectStream/ObjectStreamTextIn.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamTextIn.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStreamIn.h>
+#include <Jolt/ObjectStream/ObjectStreamIn.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamTextOut.cpp

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/ObjectStreamTextOut.h>
-#include <Core/StringTools.h>
+#include <Jolt/ObjectStream/ObjectStreamTextOut.h>
+#include <Jolt/Core/StringTools.h>
 
 namespace JPH {
 

Jolt/ObjectStream/ObjectStreamTextOut.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStreamOut.h>
+#include <Jolt/ObjectStream/ObjectStreamOut.h>
 
 namespace JPH {
 

Jolt/ObjectStream/SerializableAttribute.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <ObjectStream/ObjectStreamIn.h>
-#include <ObjectStream/ObjectStreamOut.h>
+#include <Jolt/ObjectStream/ObjectStreamIn.h>
+#include <Jolt/ObjectStream/ObjectStreamOut.h>
 
 namespace JPH {
 

Jolt/ObjectStream/SerializableAttributeEnum.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/SerializableAttribute.h>
+#include <Jolt/ObjectStream/SerializableAttribute.h>
 
 namespace JPH {
 

Jolt/ObjectStream/SerializableAttributeTyped.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <ObjectStream/SerializableAttribute.h>
-#include <ObjectStream/GetPrimitiveTypeOfType.h>
+#include <Jolt/ObjectStream/SerializableAttribute.h>
+#include <Jolt/ObjectStream/GetPrimitiveTypeOfType.h>
 
 namespace JPH {
 

Jolt/ObjectStream/SerializableObject.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Jorrit Rouwe
 // SPDX-License-Identifier: MIT
 
-#include <Jolt.h>
+#include <Jolt/Jolt.h>
 
-#include <ObjectStream/SerializableObject.h>
+#include <Jolt/ObjectStream/SerializableObject.h>
 
 namespace JPH {
 

Jolt/ObjectStream/SerializableObject.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <ObjectStream/SerializableAttribute.h>
+#include <Jolt/ObjectStream/SerializableAttribute.h>
 
 namespace JPH {
 
@@ -164,7 +164,7 @@ void OSVisitCompounds(const void *inObject, const RTTI *inRTTI, const CompoundVi
 	inline void OSVisitCompounds(const name &inObject, const CompoundVisitor &inVisitor) { }
 
 // This file uses the JPH_DECLARE_PRIMITIVE macro to define all types
-#include <ObjectStream/ObjectStreamTypes.h>
+#include <Jolt/ObjectStream/ObjectStreamTypes.h>
 
 /// Define visitor templates
 template <class T>