From 0106f731e2ea8696055a438ea7d8c0a6278e370d Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Wed, 15 Jul 2026 20:55:55 -0600 Subject: [PATCH] refactor(WWMath): Qualify implementation header includes --- Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp | 6 +++--- Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp | 2 +- Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/curve.cpp | 6 +++--- Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp | 8 ++++---- Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp | 6 +++--- Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/vp.cpp | 4 ++-- Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp | 6 +++--- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp index 079ac5aad87..37296f93892 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp @@ -36,8 +36,8 @@ #include "aabtreecull.h" -#include "chunkio.h" -#include "iostruct.h" +#include "WWLib/chunkio.h" +#include "WWLib/iostruct.h" #include "sphere.h" #include "colmath.h" #include "colmathinlines.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp index 69f9fc3b437..1717ff23a04 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp @@ -36,10 +36,10 @@ #include "cardinalspline.h" -#include "wwdebug.h" -#include "persistfactory.h" +#include "WWDebug/wwdebug.h" +#include "WWSaveLoad/persistfactory.h" #include "wwmathids.h" -#include "wwhack.h" +#include "WWDebug/wwhack.h" /* ** Force-Link this module because the linker can't detect that we actually need it... diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp index 2aa772205fd..9a593875d88 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp @@ -44,9 +44,9 @@ #include "catmullromspline.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" #include "wwmathids.h" -#include "wwhack.h" +#include "WWDebug/wwhack.h" /* ** Force-Link this module because the linker can't detect that we actually need it... diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp index decb97274f4..ba3927b829f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp @@ -51,7 +51,7 @@ #include "sphere.h" #include "aabox.h" #include "obbox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp index e64265243a7..da1cc6c3ee4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp @@ -50,7 +50,7 @@ #include "colmath.h" #include "aabox.h" #include "tri.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp index 261abc558ab..24e80c36367 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp @@ -45,7 +45,7 @@ #include "aabox.h" #include "obbox.h" #include "frustum.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" // TODO: Most of these overlap functions actually do not catch all cases of when diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp index c55036b636d..726adee7e86 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp @@ -43,7 +43,7 @@ #include "sphere.h" #include "aabox.h" #include "obbox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp index 9af3fd1e007..d1e01f2522e 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp @@ -56,7 +56,7 @@ #include "colmath.h" #include "obbox.h" #include "aabox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp index 8dd15f3ad16..c7a71d2b87d 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp @@ -46,7 +46,7 @@ #include "sphere.h" #include "aabox.h" #include "obbox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp index 1b3418efb59..18ea575286c 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp @@ -54,7 +54,7 @@ #include "colmath.h" #include "obbox.h" #include "tri.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp index 616e7263e07..48e3db7e954 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp @@ -47,7 +47,7 @@ #include "sphere.h" #include "aabox.h" #include "obbox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp index 1485c2efc19..fb024348cea 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp @@ -51,7 +51,7 @@ #include "sphere.h" #include "aabox.h" #include "obbox.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" // Sphere Intersection functions. Does the sphere intersect the passed in object diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp b/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp index fb2ba1d5f6d..8872828d1a9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp @@ -35,8 +35,8 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "cullsys.h" -#include "wwdebug.h" -#include "wwprofile.h" +#include "WWDebug/wwdebug.h" +#include "WWDebug/wwprofile.h" /************************************************************************* diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.cpp b/Core/Libraries/Source/WWVegas/WWMath/curve.cpp index 11c186825b4..f230fb36cc2 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.cpp @@ -38,10 +38,10 @@ #include "curve.h" -#include "wwdebug.h" -#include "persistfactory.h" +#include "WWDebug/wwdebug.h" +#include "WWSaveLoad/persistfactory.h" #include "wwmathids.h" -#include "wwhack.h" +#include "WWDebug/wwhack.h" /* ** Force-Link this module because the linker can't detect that we actually need it... diff --git a/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp b/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp index 7774d58fa70..4bfdffac08d 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp @@ -55,8 +55,8 @@ #include "gridcull.h" -#include "chunkio.h" -#include "iostruct.h" +#include "WWLib/chunkio.h" +#include "WWLib/iostruct.h" #include "colmath.h" #include "colmathinlines.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp index 7d8ca055c91..8aecd6debab 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp @@ -37,8 +37,8 @@ #include "hermitespline.h" #include "wwmathids.h" -#include "persistfactory.h" -#include "wwhack.h" +#include "WWSaveLoad/persistfactory.h" +#include "WWDebug/wwhack.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp index 718b5ee3069..5afc5d39a4c 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp @@ -38,10 +38,10 @@ #include "lookuptable.h" #include "curve.h" -#include "WWFILE.h" -#include "ffactory.h" -#include "chunkio.h" -#include "persistfactory.h" +#include "WWLib/WWFILE.h" +#include "WWLib/ffactory.h" +#include "WWLib/chunkio.h" +#include "WWSaveLoad/persistfactory.h" #include "vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp index f0fad77ef5e..27014851868 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp @@ -36,10 +36,10 @@ #include "tcbspline.h" -#include "wwdebug.h" -#include "persistfactory.h" +#include "WWDebug/wwdebug.h" +#include "WWSaveLoad/persistfactory.h" #include "wwmathids.h" -#include "wwhack.h" +#include "WWDebug/wwhack.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp index a671ca700c5..ddacd48b50e 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp @@ -37,9 +37,9 @@ #include "vehiclecurve.h" #include "vector3.h" #include "matrix3d.h" -#include "persistfactory.h" +#include "WWSaveLoad/persistfactory.h" #include "wwmathids.h" -#include "wwmemlog.h" +#include "WWDebug/wwmemlog.h" ////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWMath/vp.cpp b/Core/Libraries/Source/WWVegas/WWMath/vp.cpp index 16346e380b7..65af31e8b4a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vp.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/vp.cpp @@ -41,8 +41,8 @@ #include "vector4.h" #include "matrix3d.h" #include "matrix4.h" -#include "wwdebug.h" -#include "cpudetect.h" +#include "WWDebug/wwdebug.h" +#include "WWLib/cpudetect.h" #include #define SHUFFLE(x, y, z, w) (((x)&3)<< 6|((y)&3)<<4|((z)&3)<< 2|((w)&3)) diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp b/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp index ab5c0f91276..526d1556650 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp @@ -36,11 +36,11 @@ #include "wwmath.h" -#include "wwhack.h" +#include "WWDebug/wwhack.h" #include "lookuptable.h" #include -#include "wwdebug.h" -#include "wwprofile.h" +#include "WWDebug/wwdebug.h" +#include "WWDebug/wwprofile.h" // TODO: convert to use loouptablemanager... float _FastAcosTable[ARC_TABLE_SIZE];