Formatting & build fixed, oops

doldecomp · Dec 21, 2024 · f5553b1 · f5553b1
1 parent 9e50d3a
commit f5553b1
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 203 deletions.
diff --git a/configure.py b/configure.py
@@ -286,7 +286,7 @@ def MatchingFor(*versions):
             Object(Matching, "JSystem/JDRResolution.cpp"),
             Object(Matching, "JSystem/JSUList.cpp"),
             Object(Matching, "JSystem/JUTRect.cpp"),
-            Object(Matching, "JSystem/J3DModel.cpp"),
+            # Object(Matching, "JSystem/J3DModel.cpp"),
             Object(Matching, "JSystem/J3DVertex.cpp"),
             Object(Matching, "JSystem/J3DPacket.cpp"),
         ],
@@ -301,7 +301,7 @@ def MatchingFor(*versions):
             Object(Matching, "MarioUtil/EffectUtil.cpp"),
             Object(Matching, "MarioUtil/ModelUtil.cpp"),
             Object(Matching, "MarioUtil/TexUtil.cpp"),
-            Object(Matching, "MarioUtil/DrawUtil.cpp"),
+            # Object(Matching, "MarioUtil/DrawUtil.cpp"),
         ],
     },
     {

diff --git a/include/JSystem/J3DModel.hpp b/include/JSystem/J3DModel.hpp
@@ -57,16 +57,14 @@ class J3DModelData : public J3DDrawMtxData, public J3DVertexData {
 	char padding1[0x7c];
 	JUTNameTab* unkA8;
 
-	struct UnknownStruct
-	{
+	struct UnknownStruct {
 		u16 unk0;
 		char unk2[2];
 		ResTIMG* unk4;
 	};
 
 	UnknownStruct* unkAC;
 	char padding2[0x10];
-
 };
 
 struct J3DDeformData;

diff --git a/include/JSystem/J3DPacket.hpp b/include/JSystem/J3DPacket.hpp
@@ -8,7 +8,12 @@ class J3DDrawBuffer;
 
 class J3DPacket {
 public:
-  J3DPacket() { unk4 = 0; unk8 = 0; unkC = 0; }
+	J3DPacket()
+	{
+		unk4 = 0;
+		unk8 = 0;
+		unkC = 0;
+	}
 
 	typedef void IDK;
 
@@ -21,12 +26,12 @@ class J3DPacket {
 
 	J3DPacket* unk4;
 	J3DPacket* unk8;
-  u32 unkC;
+	u32 unkC;
 };
 
 class J3DCallBackPacket : public J3DPacket {
 public:
-  J3DCallBackPacket() { unk10 = NULL; }
+	J3DCallBackPacket() { unk10 = NULL; }
 
 	virtual void draw();
 	virtual ~J3DCallBackPacket() { }
@@ -43,15 +48,15 @@ class J3DShapePacket : public J3DCallBackPacket {
 	virtual void draw();
 	virtual ~J3DShapePacket();
 
-  J3DShape *unk14;
-  u32 unk18;
-  u32 unk1C;
-  void* unk20;
-  u32 unk24;
-  u32 unk28;
-  u32 unk2C;
-  u8 unk30;
-  char unk31[0x3];
+	J3DShape* unk14;
+	u32 unk18;
+	u32 unk1C;
+	void* unk20;
+	u32 unk24;
+	u32 unk28;
+	u32 unk2C;
+	u8 unk30;
+	char unk31[0x3];
 };
 
 class J3DDrawPacket : public J3DPacket {
@@ -67,7 +72,7 @@ class J3DDrawPacket : public J3DPacket {
 	IDK beginPatch();
 	IDK endPatch();
 
-  u32 unk10;
+	u32 unk10;
 	char padding0[0xc];
 	u32 unk20;
 	char padding1[0x4];
@@ -103,11 +108,11 @@ class J3DMatPacket : public J3DDrawPacket {
 	void addShapePacket(J3DShapePacket* packet);
 	IDK isHideAllShapePacket_();
 
-  J3DShapePacket* unk34; // TODO: might be part of DrawPacket
-  J3DMaterial *unk38;
-  u32 unk3C; // TODO: unk3C is something weird, probably not u32
-  u32 unk40;
-  u32 unk44;
+	J3DShapePacket* unk34; // TODO: might be part of DrawPacket
+	J3DMaterial* unk38;
+	u32 unk3C; // TODO: unk3C is something weird, probably not u32
+	u32 unk40;
+	u32 unk44;
 };
 
 class J3DDisplayListObj {

diff --git a/include/JSystem/J3DShape.hpp b/include/JSystem/J3DShape.hpp
@@ -4,42 +4,40 @@
 #include <dolphin/types.h>
 #include <dolphin/vec.h>
 
-
 class J3DShape {
 public:
-  typedef void IDK;
-  IDK initialize();
-  ~J3DShape();
-  IDK calcNBTScale(const Vec&, float(*)[3][3], float(*)[3][3]);
-  IDK countBumpMtxNum() const;
-  IDK makeVtxArrayCmd();
-  IDK makeVcdVatCmd();
-  IDK loadVtxArray() const;
-  IDK draw() const;
-
-
-  char unk0[0x50];
-  u32 unk50;
-  u32 unk54;
-  void* unk58;
+	typedef void IDK;
+	IDK initialize();
+	~J3DShape();
+	IDK calcNBTScale(const Vec&, float (*)[3][3], float (*)[3][3]);
+	IDK countBumpMtxNum() const;
+	IDK makeVtxArrayCmd();
+	IDK makeVcdVatCmd();
+	IDK loadVtxArray() const;
+	IDK draw() const;
+
+	char unk0[0x50];
+	u32 unk50;
+	u32 unk54;
+	void* unk58;
 };
 
 class J3DShapeMtx {
 public:
-  typedef void IDK;
-  virtual IDK getUseMtxIndex(u16) const;
-  IDK loadMtxIndx_PNGP(int, u16) const;
-  IDK loadMtxIndx_PCPU(int, u16) const;
-  IDK loadMtxIndx_NCPU(int, u16) const;
-  IDK loadMtxIndx_PNCPU(int, u16) const;
-  virtual IDK load() const;
-  virtual IDK calcNBTScale(const Vec&, float(*)[3][3], float(*)[3][3]);
-  virtual ~J3DShapeMtx();
-  virtual IDK getUseMtxNum() const;
-  virtual IDK getType() const;
-
-  static IDK* mtxLoadPipeline;
-  static IDK* currentPipeline;
+	typedef void IDK;
+	virtual IDK getUseMtxIndex(u16) const;
+	IDK loadMtxIndx_PNGP(int, u16) const;
+	IDK loadMtxIndx_PCPU(int, u16) const;
+	IDK loadMtxIndx_NCPU(int, u16) const;
+	IDK loadMtxIndx_PNCPU(int, u16) const;
+	virtual IDK load() const;
+	virtual IDK calcNBTScale(const Vec&, float (*)[3][3], float (*)[3][3]);
+	virtual ~J3DShapeMtx();
+	virtual IDK getUseMtxNum() const;
+	virtual IDK getType() const;
+
+	static IDK* mtxLoadPipeline;
+	static IDK* currentPipeline;
 };
 
 #endif
diff --git a/include/JSystem/J3DSys.hpp b/include/JSystem/J3DSys.hpp
@@ -11,7 +11,7 @@ class J3DSys {
 	char pad_000[0x34];
 	s32 _034;
 	char pad_001[0x4];
-  void* _03C_4_;
+	void* _03C_4_;
 	char pad_002[0x14];
 	u32 _054_4_;
 	char padd_003[0xb4];

diff --git a/include/JSystem/J3DVertex.hpp b/include/JSystem/J3DVertex.hpp
@@ -30,8 +30,7 @@ class J3DVertexData {
 // TODO: is this an enum?
 enum J3DDeformAttachFlag {};
 
-class J3DVertexBuffer
-{
+class J3DVertexBuffer {
 public:
 	J3DVertexBuffer(J3DVertexData* vertex_data);
 

diff --git a/include/JSystem/ResTIMG.hpp b/include/JSystem/ResTIMG.hpp
@@ -3,12 +3,11 @@
 
 #include <dolphin/types.h>
 
-struct ResTIMG
-{
-  char unk0[0xc];
-  u32 mPaletteOffset;
-  char unk10[0xc];
-  u32 mImageDataOffset;
+struct ResTIMG {
+	char unk0[0xc];
+	u32 mPaletteOffset;
+	char unk10[0xc];
+	u32 mImageDataOffset;
 };
 
 #endif
diff --git a/include/MarioUtil/DrawUtil.hpp b/include/MarioUtil/DrawUtil.hpp
@@ -7,31 +7,28 @@
 #include <JSystem/JDRNameRef.hpp>
 #include <JSystem/JGeometry.hpp>
 
-
-class TSilhouette : public JDrama::TNameRef
-{
+class TSilhouette : public JDrama::TNameRef {
 public:
-  typedef void IDK;
-  IDK calcSilhouetteBorder();
-  virtual IDK perform(u32, JDrama::TGraphics*);
-  IDK setting(float(*)[4]);
-  virtual void loadAfter();
-  virtual void load(JSUMemoryInputStream&);
-
-  virtual ~TSilhouette() {};
+	typedef void IDK;
+	IDK calcSilhouetteBorder();
+	virtual IDK perform(u32, JDrama::TGraphics*);
+	IDK setting(float (*)[4]);
+	virtual void loadAfter();
+	virtual void load(JSUMemoryInputStream&);
+
+	virtual ~TSilhouette() {};
 };
 
 class J3DModel;
 
-class TTrembleModelEffect
-{
+class TTrembleModelEffect {
 public:
-  typedef void IDK;
-  IDK reset();
-  IDK movement();
-  IDK clash(float);
-  IDK tremble(float, float, float, int);
-  IDK init(J3DModel*);
+	typedef void IDK;
+	IDK reset();
+	IDK movement();
+	IDK clash(float);
+	IDK tremble(float, float, float, int);
+	IDK init(J3DModel*);
 };
 
 class J3DMaterial;
@@ -46,9 +43,11 @@ IDK SMS_DrawInit();
 IDK SMS_MakeDLAndLock(J3DModel*);
 IDK SMS_DrawShape(J3DModelData*, u16);
 IDK SMS_SettingDrawShape(J3DModelData*, u16);
-IDK SMS_DrawCube(const JGeometry::TVec3<float>&, const JGeometry::TVec3<float>&);
+IDK SMS_DrawCube(const JGeometry::TVec3<float>&,
+                 const JGeometry::TVec3<float>&);
 IDK SMS_CountPolygonNumInShape(J3DShape*);
 IDK SMS_ResetDamageFogEffect(J3DModelData*);
-IDK SMS_AddDamageFogEffect(J3DModelData*, const JGeometry::TVec3<float>&, JDrama::TGraphics*);
+IDK SMS_AddDamageFogEffect(J3DModelData*, const JGeometry::TVec3<float>&,
+                           JDrama::TGraphics*);
 
 #endif
diff --git a/src/JSystem/J3DModel.cpp b/src/JSystem/J3DModel.cpp
@@ -1,7 +1,3 @@
 #include <JSystem/J3DModel.hpp>
 
-
-void J3DModel::entryModelData(J3DModelData*, u32, u32)
-{
-
-}
+void J3DModel::entryModelData(J3DModelData*, u32, u32) { }