diff options
| author | Julgodis <> | 2021-04-08 21:05:48 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-08 21:05:48 +0200 |
| commit | 2661db6aaa98a5bbd17691cb438ef64752dbcdf4 (patch) | |
| tree | 4e6d8499431192316bc2bae0cec8e6f92636b4b4 /libs/JSystem/J3DGraphLoader | |
| parent | a23a10639979ee10cbea5ffdadadc490d9e60227 (diff) | |
auto decompile more functions
Diffstat (limited to 'libs/JSystem/J3DGraphLoader')
5 files changed, 25 insertions, 25 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index 49fdf5df8c..c707f266d6 100644 --- a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -79,15 +79,15 @@ struct J3DAnmLoader { /* 80339800 */ ~J3DAnmLoader(); }; -struct J3DAnmClusterKey {}; - struct J3DAnmColorKeyData {}; +struct J3DAnmClusterKeyData {}; + struct J3DAnmColorKey { /* 8032AB00 */ J3DAnmColorKey(); }; -struct J3DAnmClusterKeyData {}; +struct J3DAnmClusterKey {}; struct J3DAnmKeyLoader_v15 { /* 803384E0 */ J3DAnmKeyLoader_v15(); @@ -108,14 +108,14 @@ struct J3DAnmKeyLoader_v15 { /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*); }; +struct J3DAnmColorFullData {}; + struct J3DAnmColorFull { /* 8032A93C */ J3DAnmColorFull(); }; struct J3DAnmClusterFullData {}; -struct J3DAnmColorFullData {}; - struct J3DAnmClusterFull {}; struct J3DAnmFullLoader_v15 { diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index 03d69fd9d1..5459112a69 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -79,10 +79,6 @@ struct J3DTevBlockPatched { /* 803176E0 */ void initialize(); }; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; @@ -91,6 +87,10 @@ struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DTevBlock { /* 8000DBC8 */ void patchTexNoAndTexCoordScale(); /* 8000DBD4 */ void patch(); @@ -164,10 +164,10 @@ struct J3DPEBlockNull { struct J3DBlend {}; -struct J3DAlphaComp {}; - struct J3DFog {}; +struct J3DAlphaComp {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; @@ -197,10 +197,6 @@ struct J3DPEBlock { /* 80317394 */ void setFogOffset(u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DMaterialBlock {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -216,6 +212,10 @@ struct J3DMaterial { /* 80332B94 */ ~J3DMaterial(); }; +struct J3DMaterialBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DMaterialFactory { struct MaterialType {}; diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index 8eea17083a..d4769de6ef 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -22,8 +22,6 @@ struct J3DTevStage { /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); }; -struct J3DMaterialBlock_v21 {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -33,6 +31,8 @@ struct J3DMaterial { /* 80316240 */ void initialize(); }; +struct J3DMaterialBlock_v21 {}; + struct J3DMaterialFactory_v21 { /* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&); /* 80332F84 */ void countUniqueMaterials(); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index a225195168..0b050dd574 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -126,16 +126,16 @@ struct J3DModelLoaderDataBase { /* 803346BC */ void load(void const*, u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DEnvelopeBlock {}; - struct J3DModelInfoBlock {}; struct J3DJointBlock {}; struct J3DDrawBlock {}; +struct J3DEnvelopeBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DModelLoader { /* 8033468C */ J3DModelLoader(); /* 803347E0 */ void load(void const*, u32); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index b835dfcc02..6d82ff98b9 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -28,16 +28,16 @@ struct J3DModelLoader_v26 { /* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DEnvelopeBlock {}; - struct J3DModelInfoBlock {}; struct J3DJointBlock {}; struct J3DDrawBlock {}; +struct J3DEnvelopeBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DModelLoader { /* 80336794 */ void countMaterialNum(void const*); /* 803367D4 */ void calcLoadSize(void const*, u32); |
