ksys/phys: Move common headers (Defines, MaterialMask) out of System/

src/KingSystem/Physics/CMakeLists.txt

@@ -107,16 +107,12 @@ target_sources(uking PRIVATE
   System/physContactListener.h
   System/physContactMgr.cpp
   System/physContactMgr.h
-  System/physDefines.cpp
-  System/physDefines.h
   System/physEntityGroupFilter.cpp
   System/physEntityGroupFilter.h
   System/physGroupFilter.cpp
   System/physGroupFilter.h
   System/physInstanceSet.cpp
   System/physInstanceSet.h
-  System/physMaterialMask.cpp
-  System/physMaterialMask.h
   System/physMaterialTable.cpp
   System/physMaterialTable.h
   System/physParamSet.cpp
@@ -134,6 +130,10 @@ target_sources(uking PRIVATE
   System/physUserTag.cpp
   System/physUserTag.h
 
+  physDefines.cpp
+  physDefines.h
   physConversions.h
   physHeapUtil.h
+  physMaterialMask.cpp
+  physMaterialMask.h
 )

src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.h

@@ -6,7 +6,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkTransformf;
 class hkpBoxShape;

src/KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h

@@ -4,7 +4,7 @@
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadAtomic.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpPlaneShape;
 

src/KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h

@@ -7,8 +7,8 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpShape;
 

src/KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h

@@ -6,7 +6,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkTransformf;
 class hkpCylinderShape;

src/KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h

@@ -5,7 +5,7 @@
 #include "KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBody.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/RigidBody/Shape/Polytope/physPolytopeShape.h

@@ -8,7 +8,7 @@
 #include <thread/seadCriticalSection.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpConvexTransformShape;
 class hkpConvexVerticesShape;

src/KingSystem/Physics/RigidBody/Shape/physShape.h

@@ -2,8 +2,8 @@
 
 #include <prim/seadRuntimeTypeInfo.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 class hkpShape;
 

src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h

@@ -4,7 +4,7 @@
 #include <agl/Utils/aglParameterObj.h>
 #include <container/seadBuffer.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/RigidBody/physRigidBody.h

@@ -10,7 +10,7 @@
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyAccessor.h"
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 enum hkpCollidableQualityType : int;

src/KingSystem/Physics/RigidBody/physRigidBodyAccessor.h

@@ -3,7 +3,7 @@
 #include <math/seadMatrix.h>
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 class hkpRigidBody;
 

src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp

@@ -5,8 +5,8 @@
 #include <Havok/Physics2012/Utilities/Dynamics/ScaleSystem/hkpSystemScalingUtility.h>
 #include <math/seadMathCalcCommon.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
 #include "KingSystem/Physics/physConversions.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp

@@ -20,9 +20,9 @@
 #include "KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.h"
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
 #include "KingSystem/Physics/physConversions.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/HeapUtil.h"
 
 namespace ksys::phys {

src/KingSystem/Physics/RigidBody/physRigidBodyParam.h

@@ -6,7 +6,7 @@
 #include <container/seadBuffer.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include "KingSystem/Physics/RigidBody/Shape/physShape.h"
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {

src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp

@@ -1,6 +1,6 @@
 #include "KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h"
 #include <prim/seadScopedLock.h>
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h

@@ -9,8 +9,8 @@
 #include <prim/seadDelegate.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physRigidContactPointsEx.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Container/LockFreeQueue.h"
 #include "KingSystem/Utils/Types.h"
 

src/KingSystem/Physics/RigidBody/physRigidBodySet.h

@@ -5,7 +5,7 @@
 #include <math/seadMatrix.h>
 #include <prim/seadNamable.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Havok/Common/Base/hkBase.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 class hkTypeInfo;
 

src/KingSystem/Physics/System/physContactListener.h

@@ -6,7 +6,7 @@
 #include <hostio/seadHostIONode.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/System/physContactMgr.h

@@ -12,8 +12,8 @@
 #include <prim/seadSafeString.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadMutex.h>
-#include "KingSystem/Physics/System/physDefines.h"
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physDefines.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace sead {

src/KingSystem/Physics/System/physEntityGroupFilter.h

@@ -3,8 +3,8 @@
 #include <container/seadSafeArray.h>
 #include <prim/seadBitUtil.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/System/physGroupFilter.h

@@ -6,7 +6,7 @@
 #include <container/seadSafeArray.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/System/physMaterialTable.h

@@ -6,7 +6,7 @@
 #include <agl/Utils/aglParameterObj.h>
 #include <agl/Utils/aglResParameter.h>
 #include <container/seadSafeArray.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {

src/KingSystem/Physics/System/physRigidContactPointsEx.h

@@ -4,8 +4,8 @@
 #include <math/seadVector.h>
 #include <prim/seadDelegate.h>
 #include <prim/seadTypedBitFlag.h>
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physRigidContactPoints.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {

src/KingSystem/Physics/System/physSensorGroupFilter.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "KingSystem/Physics/System/physDefines.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/System/physSystem.h

@@ -4,7 +4,7 @@
 #include <container/seadPtrArray.h>
 #include <heap/seadDisposer.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::phys {

src/KingSystem/Physics/System/physSystemData.h

@@ -7,7 +7,7 @@
 #include <agl/Utils/aglResParameter.h>
 #include <container/seadSafeArray.h>
 #include <prim/seadEnum.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::res {

src/KingSystem/Physics/physDefines.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 
 namespace ksys::phys {
 

src/KingSystem/Physics/physMaterialMask.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Physics/System/physMaterialMask.h"
+#include "KingSystem/Physics/physMaterialMask.h"
 #include "KingSystem/Physics/System/physMaterialTable.h"
 #include "KingSystem/Physics/System/physSystem.h"
 

src/KingSystem/Physics/physMaterialMask.h

@@ -3,7 +3,7 @@
 #include <basis/seadTypes.h>
 #include <prim/seadEnum.h>
 #include <prim/seadSafeString.h>
-#include "KingSystem/Physics/System/physDefines.h"
+#include "KingSystem/Physics/physDefines.h"
 #include "KingSystem/Utils/BitField.h"
 
 namespace ksys::phys {