mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 14:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix J3DDeformData being in the wrong header

Browse Source
This commit is contained in:
LagoLunatic
2025-06-18 20:57:19 -04:00
parent ede01ca07b
commit 98510714f1
2 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DCluster.h
+39
View File
@@ -1,11 +1,15 @@
#ifndef J3DCLUSTER_H
#define J3DCLUSTER_H
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
class J3DDeformer;
class J3DClusterKey;
class J3DClusterVertex;
class J3DModel;
class J3DVertexBuffer;
class JUTNameTab;
class J3DCluster {
public:
@@ -57,6 +61,41 @@ public:
/* 0x08 */ u16* mNrmFlag;
}; // Size: 0x0C
class J3DDeformData {
public:
J3DDeformData();
void clear();
void deform(J3DVertexBuffer*);
void deform(J3DModel*);
u16 getClusterNum() const { return mClusterNum; }
u16 getClusterKeyNum() const { return mClusterKeyNum; }
J3DCluster* getClusterPointer(u16 index) {
J3D_ASSERT(186, (index < mClusterNum),"Error : range over.");
return &mClusterPointer[index];
}
J3DClusterKey* getClusterKeyPointer(u16 i) { return &mClusterKeyPointer[i]; }
f32* getVtxPos() { return mVtxPos; }
f32* getVtxNrm() { return mVtxNrm; }
private:
friend class J3DClusterLoader;
friend class J3DClusterLoader_v15;
/* 0x00 */ u16 mClusterNum;
/* 0x02 */ u16 mClusterKeyNum;
/* 0x04 */ u16 mClusterVertexNum;
/* 0x08 */ J3DCluster* mClusterPointer;
/* 0x0C */ J3DClusterKey* mClusterKeyPointer;
/* 0x10 */ J3DClusterVertex* mClusterVertex;
/* 0x14 */ u16 mVtxPosNum;
/* 0x16 */ u16 mVtxNrmNum;
/* 0x18 */ f32* mVtxPos;
/* 0x1C */ f32* mVtxNrm;
/* 0x20 */ JUTNameTab* mClusterName;
/* 0x24 */ JUTNameTab* mClusterKeyName;
}; // Size: 0x28
class J3DClusterVertex {
public:
void operator=(const J3DClusterVertex& other) {
include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
-37
View File
@@ -3,7 +3,6 @@
#include "JSystem/J3DGraphAnimator/J3DCluster.h"
#include "JSystem/J3DGraphBase/J3DTransform.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
#include "global.h"
@@ -11,42 +10,6 @@ class J3DModelData;
class J3DModel;
class J3DVertexBuffer;
class J3DAnmCluster;
class JUTNameTab;
class J3DDeformData {
public:
J3DDeformData();
void clear();
void deform(J3DVertexBuffer*);
void deform(J3DModel*);
u16 getClusterNum() const { return mClusterNum; }
u16 getClusterKeyNum() const { return mClusterKeyNum; }
J3DCluster* getClusterPointer(u16 index) {
J3D_ASSERT(186, (index < mClusterNum),"Error : range over.");
return &mClusterPointer[index];
}
J3DClusterKey* getClusterKeyPointer(u16 i) { return &mClusterKeyPointer[i]; }
f32* getVtxPos() { return mVtxPos; }
f32* getVtxNrm() { return mVtxNrm; }
private:
friend class J3DClusterLoader;
friend class J3DClusterLoader_v15;
/* 0x00 */ u16 mClusterNum;
/* 0x02 */ u16 mClusterKeyNum;
/* 0x04 */ u16 mClusterVertexNum;
/* 0x08 */ J3DCluster* mClusterPointer;
/* 0x0C */ J3DClusterKey* mClusterKeyPointer;
/* 0x10 */ J3DClusterVertex* mClusterVertex;
/* 0x14 */ u16 mVtxPosNum;
/* 0x16 */ u16 mVtxNrmNum;
/* 0x18 */ f32* mVtxPos;
/* 0x1C */ f32* mVtxNrm;
/* 0x20 */ JUTNameTab* mClusterName;
/* 0x24 */ JUTNameTab* mClusterKeyName;
}; // Size: 0x28
class J3DSkinDeform {
public: