Sort J3D into folders (based on Wind Waker)

doldecomp · Dec 27, 2024 · 225ae21 · 225ae21
1 parent a885c7a
commit 225ae21
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 20 deletions.
diff --git a/config/GMSJ01/splits.txt b/config/GMSJ01/splits.txt
@@ -234,78 +234,78 @@ JSystem/J2D/J2DWindow.cpp:
 	.data       start:0x803A8D78 end:0x803A8DB0
 	.sdata2     start:0x8040B5F0 end:0x8040B608
 
-JSystem/J3D/J3DTransform.cpp:
+JSystem/J3D/J3DGraphBase/J3DTransform.cpp:
 	.text       start:0x8001BAB0 end:0x8001C59C
 	.data       start:0x803A8DB0 end:0x803A8E08
 	.sdata      start:0x80408AD8 end:0x80408AE0
 	.sdata2     start:0x8040B608 end:0x8040B618
 
-JSystem/J3D/J3DCluster.cpp:
+JSystem/J3D/J3DGraphAnimator/J3DCluster.cpp:
 	.text       start:0x8001C59C end:0x8001DABC
 	.rodata     start:0x80370BE8 end:0x80370BF8
 	.data       start:0x803A8E08 end:0x803A8E18
 	.sdata2     start:0x8040B618 end:0x8040B650
 
-JSystem/J3D/J3DJoint.cpp:
+JSystem/J3D/J3DGraphAnimator/J3DJoint.cpp:
 	.text       start:0x8001DABC end:0x8001FD18
 	.rodata     start:0x80370BF8 end:0x80370C28
 	.data       start:0x803A8E18 end:0x803A9058
 	.sdata2     start:0x8040B650 end:0x8040B658
 
-JSystem/J3D/J3DMaterial.cpp:
+JSystem/J3D/J3DGraphBase/J3DMaterial.cpp:
 	.text       start:0x8001FD18 end:0x80026A94
 	.rodata     start:0x80370C28 end:0x80370C38
 	.data       start:0x803A9058 end:0x803A9800
 	.sdata2     start:0x8040B658 end:0x8040B690
 
-JSystem/J3D/J3DModel.cpp:
+JSystem/J3D/J3DGraphAnimator/J3DModel.cpp:
 	.text       start:0x80026A94 end:0x80029534
 	.data       start:0x803A9800 end:0x803A9878
 	.sdata      start:0x80408AE0 end:0x80408AE8
 	.sdata2     start:0x8040B690 end:0x8040B6A8
 
-JSystem/J3D/J3DNode.cpp:
+JSystem/J3D/J3DGraphAnimator/J3DNode.cpp:
 	.text       start:0x80029534 end:0x800295D8
 	.data       start:0x803A9878 end:0x803A98A0
 
-JSystem/J3D/J3DShape.cpp:
+JSystem/J3D/J3DGraphBase/J3DShape.cpp:
 	.text       start:0x800295D8 end:0x8002A1D0
 	.ctors      start:0x8036FBC4 end:0x8036FBC8
 	.data       start:0x803A98A0 end:0x803A9980
 	.sbss       start:0x804098C8 end:0x804098D0
 	.sdata2     start:0x8040B6A8 end:0x8040B6B0
 
-JSystem/J3D/J3DSys.cpp:
+JSystem/J3D/J3DGraphBase/J3DSys.cpp:
 	.text       start:0x8002A1D0 end:0x8002AC94
 	.ctors      start:0x8036FBC8 end:0x8036FBCC
 	.rodata     start:0x80370C38 end:0x80370C80
 	.data       start:0x803A9980 end:0x803A9990
 	.bss        start:0x80400ED8 end:0x8040110C align:4 common
 	.sbss       start:0x804098D0 end:0x804098D8
 
-JSystem/J3D/J3DAnimation.cpp:
+JSystem/J3D/J3DGraphAnimator/J3DAnimation.cpp:
 	.text       start:0x8002AC94 end:0x8002EB3C
 	.data       start:0x803A9990 end:0x803A9A60
 	.sdata2     start:0x8040B6B0 end:0x8040B6E0
 
-JSystem/J3D/J3DClusterLoader.cpp:
+JSystem/J3D/J3DGraphLoader/J3DClusterLoader.cpp:
 	.text       start:0x8002EB3C end:0x8002EB84
 
-JSystem/J3D/J3DJointFactory.cpp:
+JSystem/J3D/J3DGraphLoader/J3DJointFactory.cpp:
 	.text       start:0x8002EB84 end:0x8002EDB0
 
-JSystem/J3D/J3DMaterialFactory.cpp:
+JSystem/J3D/J3DGraphLoader/J3DMaterialFactory.cpp:
 	.text       start:0x8002EDB0 end:0x80030A64
 	.sdata2     start:0x8040B6E0 end:0x8040B6F8
 
-JSystem/J3D/J3DModelLoader.cpp:
+JSystem/J3D/J3DGraphLoader/J3DModelLoader.cpp:
 	.text       start:0x80030A64 end:0x80032380
 	.data       start:0x803A9A60 end:0x803A9AE8
 
-JSystem/J3D/J3DShapeFactory.cpp:
+JSystem/J3D/J3DGraphLoader/J3DShapeFactory.cpp:
 	.text       start:0x80032380 end:0x80032808
 
-JSystem/J3D/J3DAnmLoader.cpp:
+JSystem/J3D/J3DGraphLoader/J3DAnmLoader.cpp:
 	.text       start:0x80032808 end:0x800341FC
 	.data       start:0x803A9AE8 end:0x803A9B48
 	.sdata2     start:0x8040B6F8 end:0x8040B700

diff --git a/configure.py b/configure.py
@@ -305,11 +305,11 @@ def MatchingFor(*versions):
             Object(Matching, "JSystem/JUtility/JUTRect.cpp"),
 
             # J3D
-            Object(Matching, "JSystem/J3D/J3DClusterLoader.cpp"),
-            # Object(Matching, "JSystem/J3D/J3DModel.cpp"),
-            Object(Matching, "JSystem/J3D/J3DVertex.cpp"),
-            Object(Matching, "JSystem/J3D/J3DPacket.cpp"),
-            # Object(Matching, "JSystem/J3D/J3DShape.cpp"),
+            Object(Matching, "JSystem/J3D/J3DGraphLoader/J3DClusterLoader.cpp"),
+            # Object(Matching, "JSystem/J3D/J3DGraphAnimator/J3DModel.cpp"),
+            Object(Matching, "JSystem/J3D/J3DGraphBase/J3DVertex.cpp"),
+            Object(Matching, "JSystem/J3D/J3DGraphBase/J3DPacket.cpp"),
+            # Object(Matching, "JSystem/J3D/J3DGraphBase/J3DShape.cpp"),
 
             # JKernel
             Object(Matching, "JSystem/JKernel/JKRAramHeap.cpp"),

diff --git a/include/JSystem/J3D/J3DAnimation.hpp → ...tem/J3D/J3DGraphAnimator/J3DAnimation.hpp b/include/JSystem/J3D/J3DAnimation.hpp → ...tem/J3D/J3DGraphAnimator/J3DAnimation.hpp
diff --git a/include/JSystem/J3D/J3DMaterialAnm.hpp → ...m/J3D/J3DGraphAnimator/J3DMaterialAnm.hpp b/include/JSystem/J3D/J3DMaterialAnm.hpp → ...m/J3D/J3DGraphAnimator/J3DMaterialAnm.hpp
diff --git a/include/JSystem/J3D/J3DMaterialAttach.hpp → ...3D/J3DGraphAnimator/J3DMaterialAttach.hpp b/include/JSystem/J3D/J3DMaterialAttach.hpp → ...3D/J3DGraphAnimator/J3DMaterialAttach.hpp
diff --git a/include/JSystem/J3D/J3DModel.hpp → ...JSystem/J3D/J3DGraphAnimator/J3DModel.hpp b/include/JSystem/J3D/J3DModel.hpp → ...JSystem/J3D/J3DGraphAnimator/J3DModel.hpp
diff --git a/include/JSystem/J3D/J3DMaterial.hpp → .../JSystem/J3D/J3DGraphBase/J3DMaterial.hpp b/include/JSystem/J3D/J3DMaterial.hpp → .../JSystem/J3D/J3DGraphBase/J3DMaterial.hpp
diff --git a/include/JSystem/J3D/J3DPacket.hpp → ...de/JSystem/J3D/J3DGraphBase/J3DPacket.hpp b/include/JSystem/J3D/J3DPacket.hpp → ...de/JSystem/J3D/J3DGraphBase/J3DPacket.hpp
diff --git a/include/JSystem/J3D/J3DShape.hpp → ...ude/JSystem/J3D/J3DGraphBase/J3DShape.hpp b/include/JSystem/J3D/J3DShape.hpp → ...ude/JSystem/J3D/J3DGraphBase/J3DShape.hpp
diff --git a/include/JSystem/J3D/J3DSys.hpp → include/JSystem/J3D/J3DGraphBase/J3DSys.hpp b/include/JSystem/J3D/J3DSys.hpp → include/JSystem/J3D/J3DGraphBase/J3DSys.hpp
diff --git a/include/JSystem/J3D/J3DTevs.hpp → include/JSystem/J3D/J3DGraphBase/J3DTevs.hpp b/include/JSystem/J3D/J3DTevs.hpp → include/JSystem/J3D/J3DGraphBase/J3DTevs.hpp
diff --git a/include/JSystem/J3D/J3DVertex.hpp → ...de/JSystem/J3D/J3DGraphBase/J3DVertex.hpp b/include/JSystem/J3D/J3DVertex.hpp → ...de/JSystem/J3D/J3DGraphBase/J3DVertex.hpp
diff --git a/include/JSystem/J3D/J3DAnmLoader.hpp → ...ystem/J3D/J3DGraphLoader/J3DAnmLoader.hpp b/include/JSystem/J3D/J3DAnmLoader.hpp → ...ystem/J3D/J3DGraphLoader/J3DAnmLoader.hpp
diff --git a/include/JSystem/J3D/J3DModelLoader.hpp → ...tem/J3D/J3DGraphLoader/J3DModelLoader.hpp b/include/JSystem/J3D/J3DModelLoader.hpp → ...tem/J3D/J3DGraphLoader/J3DModelLoader.hpp
diff --git a/src/JSystem/J3D/J3DAnimation.cpp → ...tem/J3D/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3D/J3DAnimation.cpp → ...tem/J3D/J3DGraphAnimator/J3DAnimation.cpp
diff --git a/src/JSystem/J3D/J3DMaterialAnm.cpp → ...m/J3D/J3DGraphAnimator/J3DMaterialAnm.cpp b/src/JSystem/J3D/J3DMaterialAnm.cpp → ...m/J3D/J3DGraphAnimator/J3DMaterialAnm.cpp
diff --git a/src/JSystem/J3D/J3DMaterialAttach.cpp → ...3D/J3DGraphAnimator/J3DMaterialAttach.cpp b/src/JSystem/J3D/J3DMaterialAttach.cpp → ...3D/J3DGraphAnimator/J3DMaterialAttach.cpp
diff --git a/src/JSystem/J3D/J3DModel.cpp → ...JSystem/J3D/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3D/J3DModel.cpp → ...JSystem/J3D/J3DGraphAnimator/J3DModel.cpp
diff --git a/src/JSystem/J3D/J3DMaterial.cpp → src/JSystem/J3D/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3D/J3DMaterial.cpp → src/JSystem/J3D/J3DGraphBase/J3DMaterial.cpp
diff --git a/src/JSystem/J3D/J3DPacket.cpp → src/JSystem/J3D/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3D/J3DPacket.cpp → src/JSystem/J3D/J3DGraphBase/J3DPacket.cpp
diff --git a/src/JSystem/J3D/J3DShape.cpp → src/JSystem/J3D/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3D/J3DShape.cpp → src/JSystem/J3D/J3DGraphBase/J3DShape.cpp
diff --git a/src/JSystem/J3D/J3DTevs.cpp → src/JSystem/J3D/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3D/J3DTevs.cpp → src/JSystem/J3D/J3DGraphBase/J3DTevs.cpp
diff --git a/src/JSystem/J3D/J3DVertex.cpp → src/JSystem/J3D/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3D/J3DVertex.cpp → src/JSystem/J3D/J3DGraphBase/J3DVertex.cpp
diff --git a/src/JSystem/J3D/J3DAnmLoader.cpp → ...ystem/J3D/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3D/J3DAnmLoader.cpp → ...ystem/J3D/J3DGraphLoader/J3DAnmLoader.cpp
diff --git a/src/JSystem/J3D/J3DClusterLoader.cpp → ...m/J3D/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3D/J3DClusterLoader.cpp → ...m/J3D/J3DGraphLoader/J3DClusterLoader.cpp
diff --git a/src/JSystem/J3D/J3DModelLoader.cpp → ...tem/J3D/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3D/J3DModelLoader.cpp → ...tem/J3D/J3DGraphLoader/J3DModelLoader.cpp