From 7286390beae272d1f8201e45ecf725d75241a84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Fri, 16 Oct 2026 18:51:17 +0300
Subject: [PATCH] ksys/phys: rename physStaticCompoundUtil to physUtil

Most of these helpers have nothing to do with StaticCompound: they look
up material masks and collision filter info from shapes and collidables.
physUtil also fits the link order, between physUserTag and physWorld,
and it's what the function groups already call this block.

(AI assisted using Claude Opus 5.5)
---
 src/KingSystem/Physics/CMakeLists.txt                         | 4 ++--
 .../Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp      | 2 +-
 .../Physics/RigidBody/physRigidBodyFromResource.cpp           | 2 +-
 src/KingSystem/Physics/System/physRayCast.cpp                 | 2 +-
 src/KingSystem/Physics/System/physStaticCompoundUtil.cpp      | 1 -
 src/KingSystem/Physics/System/physUtil.cpp                    | 1 +
 .../Physics/System/{physStaticCompoundUtil.h => physUtil.h}   | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
 create mode 100644 src/KingSystem/Physics/System/physUtil.cpp
 rename src/KingSystem/Physics/System/{physStaticCompoundUtil.h => physUtil.h} (100%)

diff --git a/src/KingSystem/Physics/CMakeLists.txt b/src/KingSystem/Physics/CMakeLists.txt
index 9f9b7656..03102915 100644
--- a/src/KingSystem/Physics/CMakeLists.txt
+++ b/src/KingSystem/Physics/CMakeLists.txt
@@ -176,14 +176,14 @@ target_sources(uking PRIVATE
     System/physStaticCompoundMgr.h
     System/physStaticCompoundRigidBodyGroup.cpp
     System/physStaticCompoundRigidBodyGroup.h
-    System/physStaticCompoundUtil.cpp
-    System/physStaticCompoundUtil.h
     System/physSystem.cpp
     System/physSystem.h
     System/physSystemData.cpp
     System/physSystemData.h
     System/physUserTag.cpp
     System/physUserTag.h
+    System/physUtil.cpp
+    System/physUtil.h
 
     physConversions.h
     physDefines.cpp
diff --git a/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp b/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
index 9e55c51d..6e018cda 100644
--- a/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
+++ b/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
@@ -1,7 +1,7 @@
 #include "KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.h"
 #include <Havok/Physics2012/Dynamics/Entity/hkpRigidBody.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
+#include "KingSystem/Physics/System/physUtil.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
index 6e4384d1..fe64a482 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
@@ -5,7 +5,7 @@
 #include <Havok/Physics2012/Utilities/Dynamics/ScaleSystem/hkpSystemScalingUtility.h>
 #include <math/seadMathCalcCommon.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
+#include "KingSystem/Physics/System/physUtil.h"
 #include "KingSystem/Physics/physConversions.h"
 #include "KingSystem/Physics/physMaterialMask.h"
 
diff --git a/src/KingSystem/Physics/System/physRayCast.cpp b/src/KingSystem/Physics/System/physRayCast.cpp
index e7f8f9b9..e55c092e 100644
--- a/src/KingSystem/Physics/System/physRayCast.cpp
+++ b/src/KingSystem/Physics/System/physRayCast.cpp
@@ -17,8 +17,8 @@
 #include "KingSystem/Physics/System/physEntityContactListener.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
 #include "KingSystem/Physics/System/physPhantom.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
 #include "KingSystem/Physics/System/physSystem.h"
+#include "KingSystem/Physics/System/physUtil.h"
 #include "KingSystem/Physics/physConversions.h"
 #include "KingSystem/Physics/physLayerMaskBuilder.h"
 
diff --git a/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp b/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
deleted file mode 100644
index 3216d4bf..00000000
--- a/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
diff --git a/src/KingSystem/Physics/System/physUtil.cpp b/src/KingSystem/Physics/System/physUtil.cpp
new file mode 100644
index 00000000..95e685be
--- /dev/null
+++ b/src/KingSystem/Physics/System/physUtil.cpp
@@ -0,0 +1 @@
+#include "KingSystem/Physics/System/physUtil.h"
diff --git a/src/KingSystem/Physics/System/physStaticCompoundUtil.h b/src/KingSystem/Physics/System/physUtil.h
similarity index 100%
rename from src/KingSystem/Physics/System/physStaticCompoundUtil.h
rename to src/KingSystem/Physics/System/physUtil.h