mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-07 13:23:27 -04:00
J3DMatBlock start
This commit is contained in:
Jasper St. Pierre
@@ -303,10 +303,10 @@ private:
|
||||
|
||||
class J3DAnmTransform : public J3DAnmBase {
|
||||
public:
|
||||
/* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
|
||||
J3DAnmTransform(s16, f32*, s16*, f32*);
|
||||
|
||||
/* 8003B93C */ virtual ~J3DAnmTransform();
|
||||
/* 8003C77C */ virtual s32 getKind() const;
|
||||
virtual ~J3DAnmTransform();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getTransform(u16, J3DTransformInfo*) const = 0;
|
||||
|
||||
private:
|
||||
@@ -326,11 +326,11 @@ public:
|
||||
field_0x24 = 0;
|
||||
}
|
||||
|
||||
/* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
|
||||
void calcTransform(f32, u16, J3DTransformInfo*) const;
|
||||
|
||||
/* 8003B8D0 */ virtual ~J3DAnmTransformKey();
|
||||
/* 8003C800 */ virtual s32 getKind() const;
|
||||
/* 8003C808 */ virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
virtual ~J3DAnmTransformKey();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
|
||||
private:
|
||||
/* 0x20 */ int field_0x20;
|
||||
@@ -339,9 +339,9 @@ private:
|
||||
|
||||
class J3DAnmTransformFull : public J3DAnmTransform {
|
||||
public:
|
||||
/* 8032C2AC */ virtual ~J3DAnmTransformFull();
|
||||
/* 8032C318 */ virtual s32 getKind() const;
|
||||
/* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
virtual ~J3DAnmTransformFull();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
|
||||
private:
|
||||
/* 0x20 */ int field_0x20;
|
||||
@@ -349,9 +349,9 @@ private:
|
||||
|
||||
class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
|
||||
public:
|
||||
/* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp();
|
||||
/* 8032C2A4 */ virtual s32 getKind() const;
|
||||
/* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
virtual ~J3DAnmTransformFullWithLerp();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
}; // Size: 0x24
|
||||
|
||||
struct J3DTextureSRTInfo;
|
||||
@@ -360,13 +360,13 @@ class J3DMaterialTable;
|
||||
|
||||
class J3DAnmTextureSRTKey : public J3DAnmBase {
|
||||
public:
|
||||
/* 80329E5C */ J3DAnmTextureSRTKey();
|
||||
/* 80329F14 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
|
||||
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
/* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*);
|
||||
J3DAnmTextureSRTKey();
|
||||
void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
|
||||
void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
void searchUpdateMaterialID(J3DModelData*);
|
||||
|
||||
/* 8032C198 */ virtual ~J3DAnmTextureSRTKey();
|
||||
/* 8032C220 */ virtual s32 getKind() const;
|
||||
virtual ~J3DAnmTextureSRTKey();
|
||||
virtual s32 getKind() const;
|
||||
|
||||
void getTransform(u16 param_0, J3DTextureSRTInfo* pSRTInfo) const {
|
||||
calcTransform(getFrame(), param_0, pSRTInfo);
|
||||
@@ -404,15 +404,32 @@ private:
|
||||
/* 0x78 */ u32 mTexMtxCalcType;
|
||||
}; // Size: 0x7C
|
||||
|
||||
class J3DAnmVisibilityFull : public J3DAnmBase {
|
||||
public:
|
||||
J3DAnmVisibilityFull();
|
||||
bool getVisibility(u16, u8*) const;
|
||||
|
||||
virtual ~J3DAnmVisibilityFull();
|
||||
virtual s32 getKind() const;
|
||||
|
||||
private:
|
||||
/* 0x0C */ void* field_0xc;
|
||||
/* 0x10 */ void* mAnmTable;
|
||||
/* 0x14 */ u16 field_0x14;
|
||||
/* 0x16 */ u16 mUpdateMaterialNum;
|
||||
/* 0x18 */ u16* field_0x18;
|
||||
/* 0x1C */ JUTNameTab field_0x1c;
|
||||
}; // Size: 0x2C
|
||||
|
||||
class J3DAnmTexPattern : public J3DAnmBase {
|
||||
public:
|
||||
/* 8032AED8 */ J3DAnmTexPattern();
|
||||
/* 8032AF50 */ void getTexNo(u16, u16*) const;
|
||||
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
|
||||
J3DAnmTexPattern();
|
||||
void getTexNo(u16, u16*) const;
|
||||
void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
void searchUpdateMaterialID(J3DModelData*);
|
||||
|
||||
/* 8032BD20 */ virtual ~J3DAnmTexPattern();
|
||||
/* 8032BD94 */ virtual s32 getKind() const;
|
||||
virtual ~J3DAnmTexPattern();
|
||||
virtual s32 getKind() const;
|
||||
|
||||
private:
|
||||
/* 0x0C */ void* field_0xc;
|
||||
@@ -425,14 +442,14 @@ private:
|
||||
|
||||
class J3DAnmTevRegKey : public J3DAnmBase {
|
||||
public:
|
||||
/* 8032AE18 */ J3DAnmTevRegKey();
|
||||
/* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const;
|
||||
/* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const;
|
||||
/* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
|
||||
J3DAnmTevRegKey();
|
||||
void getTevColorReg(u16, _GXColorS10*) const;
|
||||
void getTevKonstReg(u16, _GXColor*) const;
|
||||
void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
void searchUpdateMaterialID(J3DModelData*);
|
||||
|
||||
/* 8032BD9C */ virtual ~J3DAnmTevRegKey();
|
||||
/* 8032BE24 */ virtual s32 getKind() const;
|
||||
virtual ~J3DAnmTevRegKey();
|
||||
virtual s32 getKind() const;
|
||||
|
||||
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
|
||||
u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
|
||||
@@ -469,12 +486,13 @@ private:
|
||||
|
||||
class J3DAnmColor : public J3DAnmBase {
|
||||
public:
|
||||
/* 8032A828 */ J3DAnmColor();
|
||||
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
J3DAnmColor();
|
||||
void searchUpdateMaterialID(J3DMaterialTable*);
|
||||
void searchUpdateMaterialID(J3DModelData*);
|
||||
|
||||
/* 8032BCAC */ virtual ~J3DAnmColor();
|
||||
/* 8032BF44 */ virtual s32 getKind() const;
|
||||
/* 8032BF4C */ virtual void getColor(u16, _GXColor*) const;
|
||||
virtual ~J3DAnmColor();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getColor(u16, _GXColor*) const;
|
||||
|
||||
u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
|
||||
bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; }
|
||||
@@ -492,11 +510,11 @@ private:
|
||||
|
||||
class J3DAnmColorKey : public J3DAnmColor {
|
||||
public:
|
||||
/* 8032AB00 */ J3DAnmColorKey();
|
||||
J3DAnmColorKey();
|
||||
|
||||
/* 8032BE2C */ virtual ~J3DAnmColorKey();
|
||||
/* 8032BEB0 */ virtual s32 getKind() const;
|
||||
/* 8032AB54 */ virtual void getColor(u16, _GXColor*) const;
|
||||
virtual ~J3DAnmColorKey();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getColor(u16, _GXColor*) const;
|
||||
|
||||
private:
|
||||
/* 0x2C */ int field_0x2c;
|
||||
@@ -508,11 +526,11 @@ private:
|
||||
|
||||
class J3DAnmColorFull : public J3DAnmColor {
|
||||
public:
|
||||
/* 8032AB00 */ J3DAnmColorFull();
|
||||
J3DAnmColorFull();
|
||||
|
||||
/* 8032BE2C */ virtual ~J3DAnmColorFull();
|
||||
/* 8032BEB0 */ virtual s32 getKind() const;
|
||||
/* 8032AB54 */ virtual void getColor(u16, _GXColor*) const;
|
||||
virtual ~J3DAnmColorFull();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getColor(u16, _GXColor*) const;
|
||||
|
||||
private:
|
||||
/* 0x2C */ int field_0x2c;
|
||||
@@ -537,22 +555,22 @@ private:
|
||||
|
||||
class J3DAnmVtxColorKey : public J3DAnmVtxColor {
|
||||
public:
|
||||
/* 8032A4E0 */ J3DAnmVtxColorKey();
|
||||
J3DAnmVtxColorKey();
|
||||
|
||||
/* 8032BF50 */ virtual ~J3DAnmVtxColorKey();
|
||||
/* 8032BFBC */ virtual s32 getKind() const;
|
||||
/* 8032A53C */ virtual void getColor(u8, u16, _GXColor*) const;
|
||||
virtual ~J3DAnmVtxColorKey();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getColor(u8, u16, _GXColor*) const;
|
||||
|
||||
private:
|
||||
/* 0x18 */ int field_0x18[2];
|
||||
};
|
||||
|
||||
class J3DAnmVtxColorFull : public J3DAnmVtxColor {
|
||||
/* 8032A30C */ J3DAnmVtxColorFull();
|
||||
J3DAnmVtxColorFull();
|
||||
|
||||
/* 8032BFC4 */ virtual ~J3DAnmVtxColorFull();
|
||||
/* 8032C030 */ virtual s32 getKind() const;
|
||||
/* 8032A368 */ virtual void getColor(u8, u16, _GXColor*) const;
|
||||
virtual ~J3DAnmVtxColorFull();
|
||||
virtual s32 getKind() const;
|
||||
virtual void getColor(u8, u16, _GXColor*) const;
|
||||
|
||||
private:
|
||||
/* 0x18 */ int field_0x18[2];
|
||||
@@ -560,9 +578,9 @@ private:
|
||||
|
||||
class J3DAnmCluster : public J3DAnmBase {
|
||||
public:
|
||||
/* 8032BCAC */ virtual ~J3DAnmCluster();
|
||||
/* 8032BF44 */ virtual s32 getKind() const;
|
||||
/* 8032BF4C */ virtual f32 getWeight(u16) const;
|
||||
virtual ~J3DAnmCluster();
|
||||
virtual s32 getKind() const;
|
||||
virtual f32 getWeight(u16) const;
|
||||
|
||||
private:
|
||||
/* 0x0C */ f32* field_0xc;
|
||||
@@ -570,9 +588,9 @@ private:
|
||||
|
||||
class J3DAnmClusterFull : public J3DAnmCluster {
|
||||
public:
|
||||
/* 8032BCAC */ virtual ~J3DAnmClusterFull();
|
||||
/* 8032BF44 */ virtual s32 getKind() const;
|
||||
/* 8032BF4C */ virtual f32 getWeight(u16) const;
|
||||
virtual ~J3DAnmClusterFull();
|
||||
virtual s32 getKind() const;
|
||||
virtual f32 getWeight(u16) const;
|
||||
|
||||
private:
|
||||
/* 0x10 */ int field_0x10;
|
||||
@@ -580,9 +598,9 @@ private:
|
||||
|
||||
class J3DAnmClusterKey : public J3DAnmCluster {
|
||||
public:
|
||||
/* 8032C044 */ virtual ~J3DAnmClusterKey();
|
||||
/* 8032C0B0 */ virtual s32 getKind() const;
|
||||
/* 8032A218 */ virtual f32 getWeight(u16) const;
|
||||
virtual ~J3DAnmClusterKey();
|
||||
virtual s32 getKind() const;
|
||||
virtual f32 getWeight(u16) const;
|
||||
|
||||
private:
|
||||
/* 0x10 */ int field_0x10;
|
||||
|
||||
@@ -9,23 +9,32 @@ class J3DAnmColor;
|
||||
class J3DAnmTexPattern;
|
||||
class J3DAnmTextureSRTKey;
|
||||
class J3DAnmTevRegKey;
|
||||
class J3DMatColorAnm;
|
||||
class J3DTexNoAnm;
|
||||
class J3DTexMtxAnm;
|
||||
class J3DTevColorAnm;
|
||||
class J3DTevKColorAnm;
|
||||
class JUTNameTab;
|
||||
|
||||
class J3DMaterialTable {
|
||||
public:
|
||||
/* 8032F5A8 */ void clear();
|
||||
/* 8032F5D0 */ J3DMaterialTable();
|
||||
/* 8032F64C */ int removeMatColorAnimator(J3DAnmColor*);
|
||||
/* 8032F6F8 */ int removeTexNoAnimator(J3DAnmTexPattern*);
|
||||
/* 8032F7B4 */ int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
|
||||
/* 8032F880 */ int removeTevRegAnimator(J3DAnmTevRegKey*);
|
||||
/* 8032F9C0 */ void createTexMtxForAnimator(J3DAnmTextureSRTKey*);
|
||||
/* 8032FAF4 */ void entryMatColorAnimator(J3DAnmColor*);
|
||||
/* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*);
|
||||
/* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*);
|
||||
/* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*);
|
||||
void clear();
|
||||
J3DMaterialTable();
|
||||
int removeMatColorAnimator(J3DAnmColor*);
|
||||
int removeTexNoAnimator(J3DAnmTexPattern*);
|
||||
int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
|
||||
int removeTevRegAnimator(J3DAnmTevRegKey*);
|
||||
void createTexMtxForAnimator(J3DAnmTextureSRTKey*);
|
||||
void entryMatColorAnimator(J3DAnmColor*);
|
||||
void entryTexNoAnimator(J3DAnmTexPattern*);
|
||||
void entryTexMtxAnimator(J3DAnmTextureSRTKey*);
|
||||
void entryTevRegAnimator(J3DAnmTevRegKey*);
|
||||
void setMatColorAnimator(J3DAnmColor*, J3DMatColorAnm *);
|
||||
void setTexNoAnimator(J3DAnmTexPattern*, J3DTexNoAnm*);
|
||||
void setTexMtxAnimator(J3DAnmTextureSRTKey*, J3DTexMtxAnm*, J3DTexMtxAnm*);
|
||||
void setTevRegAnimator(J3DAnmTevRegKey*, J3DTevColorAnm*, J3DTevKColorAnm*);
|
||||
|
||||
/* 8032F604 */ virtual ~J3DMaterialTable();
|
||||
virtual ~J3DMaterialTable();
|
||||
|
||||
J3DMaterial* getMaterialNodePointer(u16 idx) const { return mMaterialNodePointer[idx]; }
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
virtual void setNBTScale(J3DNBTScale const*);
|
||||
virtual void setNBTScale(J3DNBTScale);
|
||||
virtual J3DNBTScale* getNBTScale();
|
||||
virtual bool getTexMtxOffset() const;
|
||||
virtual u32 getTexMtxOffset() const;
|
||||
virtual void setTexMtxOffset(u32);
|
||||
virtual ~J3DTexGenBlock();
|
||||
};
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
virtual J3DTexCoord* getTexCoord(u32);
|
||||
virtual void setTexMtx(u32, J3DTexMtx*);
|
||||
virtual J3DTexMtx* getTexMtx(u32);
|
||||
virtual bool getTexMtxOffset() const;
|
||||
virtual u32 getTexMtxOffset() const;
|
||||
virtual void setTexMtxOffset(u32);
|
||||
virtual ~J3DTexGenBlockPatched();
|
||||
|
||||
@@ -165,28 +165,28 @@ public:
|
||||
virtual u8 getTevKColorSel(u32);
|
||||
virtual void setTevKAlphaSel(u32, u8 const*);
|
||||
virtual void setTevKAlphaSel(u32, u8);
|
||||
virtual bool getTevKAlphaSel(u32);
|
||||
virtual u8 getTevKAlphaSel(u32);
|
||||
virtual void setTevStageNum(u8 const*);
|
||||
virtual void setTevStageNum(u8);
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
|
||||
virtual bool getTevSwapModeTable(u32);
|
||||
virtual J3DTevSwapModeTable * getTevSwapModeTable(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual bool getTevRegOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual u32 getTevRegOffset() const;
|
||||
virtual void setTexNoOffset(u32);
|
||||
virtual void setTevRegOffset(u32);
|
||||
virtual ~J3DTevBlock();
|
||||
|
||||
private:
|
||||
protected:
|
||||
void indexToPtr_private(u32);
|
||||
|
||||
/* 0x4 */ u32 mTexNoOffset;
|
||||
@@ -234,12 +234,12 @@ public:
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual bool getTevRegOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual u32 getTevRegOffset() const;
|
||||
virtual void setTevRegOffset(u32);
|
||||
virtual ~J3DTevBlockPatched();
|
||||
|
||||
@@ -298,23 +298,23 @@ public:
|
||||
virtual u8 getTevKColorSel(u32);
|
||||
virtual void setTevKAlphaSel(u32, u8 const*);
|
||||
virtual void setTevKAlphaSel(u32, u8);
|
||||
virtual bool getTevKAlphaSel(u32);
|
||||
virtual u8 getTevKAlphaSel(u32);
|
||||
virtual void setTevStageNum(u8 const*);
|
||||
virtual void setTevStageNum(u8);
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
|
||||
virtual bool getTevSwapModeTable(u32);
|
||||
virtual J3DTevSwapModeTable * getTevSwapModeTable(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual bool getTevRegOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual u32 getTevRegOffset() const;
|
||||
virtual void setTevRegOffset(u32);
|
||||
virtual ~J3DTevBlock4();
|
||||
|
||||
@@ -371,23 +371,23 @@ public:
|
||||
virtual u8 getTevKColorSel(u32);
|
||||
virtual void setTevKAlphaSel(u32, u8 const*);
|
||||
virtual void setTevKAlphaSel(u32, u8);
|
||||
virtual bool getTevKAlphaSel(u32);
|
||||
virtual u8 getTevKAlphaSel(u32);
|
||||
virtual void setTevStageNum(u8 const*);
|
||||
virtual void setTevStageNum(u8);
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
|
||||
virtual bool getTevSwapModeTable(u32);
|
||||
virtual J3DTevSwapModeTable * getTevSwapModeTable(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual bool getTevRegOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual u32 getTevRegOffset() const;
|
||||
virtual void setTevRegOffset(u32);
|
||||
virtual ~J3DTevBlock2();
|
||||
|
||||
@@ -444,23 +444,23 @@ public:
|
||||
virtual u8 getTevKColorSel(u32);
|
||||
virtual void setTevKAlphaSel(u32, u8 const*);
|
||||
virtual void setTevKAlphaSel(u32, u8);
|
||||
virtual bool getTevKAlphaSel(u32);
|
||||
virtual u8 getTevKAlphaSel(u32);
|
||||
virtual void setTevStageNum(u8);
|
||||
virtual void setTevStageNum(u8 const*);
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
|
||||
virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
|
||||
virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
|
||||
virtual bool getTevSwapModeTable(u32);
|
||||
virtual J3DTevSwapModeTable * getTevSwapModeTable(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual bool getTevRegOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual u32 getTevRegOffset() const;
|
||||
virtual void setTevRegOffset(u32);
|
||||
virtual ~J3DTevBlock16();
|
||||
|
||||
@@ -511,11 +511,11 @@ public:
|
||||
virtual u8 getTevStageNum() const;
|
||||
virtual void setTevStage(u32, J3DTevStage const*);
|
||||
virtual void setTevStage(u32, J3DTevStage);
|
||||
virtual bool getTevStage(u32);
|
||||
virtual J3DTevStage * getTevStage(u32);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage const*);
|
||||
virtual void setIndTevStage(u32, J3DIndTevStage);
|
||||
virtual bool getIndTevStage(u32);
|
||||
virtual bool getTexNoOffset() const;
|
||||
virtual J3DIndTevStage * getIndTevStage(u32);
|
||||
virtual u32 getTexNoOffset() const;
|
||||
virtual ~J3DTevBlock1();
|
||||
|
||||
private:
|
||||
@@ -629,21 +629,21 @@ public:
|
||||
virtual void setFog(J3DFog*);
|
||||
virtual J3DFog* getFog();
|
||||
virtual void setAlphaComp(J3DAlphaComp const*);
|
||||
virtual void setAlphaComp(J3DAlphaComp const&);
|
||||
virtual void setAlphaComp(J3DAlphaComp);
|
||||
virtual J3DAlphaComp* getAlphaComp();
|
||||
virtual void setBlend(J3DBlend const*);
|
||||
virtual void setBlend(J3DBlend const&);
|
||||
virtual bool getBlend();
|
||||
virtual void setBlend(J3DBlend);
|
||||
virtual J3DBlend* getBlend();
|
||||
virtual void setZMode(J3DZMode const*);
|
||||
virtual void setZMode(J3DZMode);
|
||||
virtual J3DZMode* getZMode();
|
||||
virtual void setZCompLoc(u8 const*);
|
||||
virtual void setZCompLoc(u8);
|
||||
virtual bool getZCompLoc() const;
|
||||
virtual u8 getZCompLoc() const;
|
||||
virtual void setDither(u8 const*);
|
||||
virtual void setDither(u8);
|
||||
virtual bool getDither() const;
|
||||
virtual bool getFogOffset() const;
|
||||
virtual u8 getDither() const;
|
||||
virtual u32 getFogOffset() const;
|
||||
virtual void setFogOffset(u32);
|
||||
virtual ~J3DPEBlock();
|
||||
};
|
||||
@@ -690,33 +690,33 @@ public:
|
||||
virtual void setFog(J3DFog*);
|
||||
virtual J3DFog* getFog();
|
||||
virtual void setAlphaComp(J3DAlphaComp const*);
|
||||
virtual void setAlphaComp(J3DAlphaComp const&);
|
||||
virtual void setAlphaComp(J3DAlphaComp);
|
||||
virtual J3DAlphaComp* getAlphaComp();
|
||||
virtual void setBlend(J3DBlend const*);
|
||||
virtual void setBlend(J3DBlend const&);
|
||||
virtual bool getBlend();
|
||||
virtual void setBlend(J3DBlend);
|
||||
virtual J3DBlend* getBlend();
|
||||
virtual void setZMode(J3DZMode const*);
|
||||
virtual void setZMode(J3DZMode);
|
||||
virtual J3DZMode* getZMode();
|
||||
virtual void setZCompLoc(u8 const*);
|
||||
virtual void setZCompLoc(u8);
|
||||
virtual bool getZCompLoc() const;
|
||||
virtual u8 getZCompLoc() const;
|
||||
virtual void setDither(u8 const*);
|
||||
virtual void setDither(u8);
|
||||
virtual bool getDither() const;
|
||||
virtual bool getFogOffset() const;
|
||||
virtual u8 getDither() const;
|
||||
virtual u32 getFogOffset() const;
|
||||
virtual void setFogOffset(u32);
|
||||
virtual ~J3DPEBlockFull();
|
||||
|
||||
private:
|
||||
/* 0x04 */ J3DFog mFog;
|
||||
/* 0x30 */ J3DAlphaComp mAlphaComp;
|
||||
/* 0x34 */ J3DBlend mBlend;
|
||||
/* 0x38 */ J3DZMode mZMode;
|
||||
/* 0x3A */ u8 mZCompLoc;
|
||||
/* 0x3B */ u8 mDither;
|
||||
/* 0x3C */ u32 mFogOffset;
|
||||
}; // Size: 0x40
|
||||
/* 0x04 */ J3DFog * mFog;
|
||||
/* 0x08 */ J3DAlphaComp mAlphaComp;
|
||||
/* 0x0C */ J3DBlend mBlend;
|
||||
/* 0x10 */ J3DZMode mZMode;
|
||||
/* 0x14 */ u8 mZCompLoc;
|
||||
/* 0x15 */ u8 mDither;
|
||||
/* 0x18 */ u32 mFogOffset;
|
||||
}; // Size: 0x1C
|
||||
|
||||
class J3DPEBlockFogOff : public J3DPEBlock {
|
||||
public:
|
||||
@@ -732,20 +732,20 @@ public:
|
||||
virtual s32 countDLSize();
|
||||
virtual u32 getType();
|
||||
virtual void setAlphaComp(J3DAlphaComp const*);
|
||||
virtual void setAlphaComp(J3DAlphaComp const&);
|
||||
virtual void setAlphaComp(J3DAlphaComp);
|
||||
virtual J3DAlphaComp* getAlphaComp();
|
||||
virtual void setBlend(J3DBlend const*);
|
||||
virtual void setBlend(J3DBlend const&);
|
||||
virtual bool getBlend();
|
||||
virtual void setBlend(J3DBlend);
|
||||
virtual J3DBlend* getBlend();
|
||||
virtual void setZMode(J3DZMode const*);
|
||||
virtual void setZMode(J3DZMode);
|
||||
virtual J3DZMode* getZMode();
|
||||
virtual void setZCompLoc(u8 const*);
|
||||
virtual void setZCompLoc(u8);
|
||||
virtual bool getZCompLoc() const;
|
||||
virtual u8 getZCompLoc() const;
|
||||
virtual void setDither(u8 const*);
|
||||
virtual void setDither(u8);
|
||||
virtual bool getDither() const;
|
||||
virtual u8 getDither() const;
|
||||
virtual ~J3DPEBlockFogOff();
|
||||
|
||||
private:
|
||||
@@ -762,8 +762,7 @@ struct J3DIndTexCoordScale {
|
||||
|
||||
/* 0x0 */ u8 mScaleS;
|
||||
/* 0x1 */ u8 mScaleT;
|
||||
/* 0x2 */ u8 field_0x2;
|
||||
/* 0x3 */ u8 field_0x3;
|
||||
u8 pad[2];
|
||||
};
|
||||
|
||||
struct J3DIndTexMtx {
|
||||
@@ -794,13 +793,13 @@ public:
|
||||
virtual u8 getIndTexStageNum() const;
|
||||
virtual void setIndTexOrder(u32, J3DIndTexOrder);
|
||||
virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
|
||||
virtual bool getIndTexOrder(u32);
|
||||
virtual J3DIndTexOrder * getIndTexOrder(u32);
|
||||
virtual void setIndTexMtx(u32, J3DIndTexMtx const*);
|
||||
virtual void setIndTexMtx(u32, J3DIndTexMtx);
|
||||
virtual bool getIndTexMtx(u32);
|
||||
virtual J3DIndTexMtx * getIndTexMtx(u32);
|
||||
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
|
||||
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
|
||||
virtual bool getIndTexCoordScale(u32);
|
||||
virtual J3DIndTexCoordScale * getIndTexCoordScale(u32);
|
||||
virtual ~J3DIndBlock();
|
||||
};
|
||||
|
||||
@@ -820,13 +819,13 @@ public:
|
||||
virtual u8 getIndTexStageNum() const;
|
||||
virtual void setIndTexOrder(u32, J3DIndTexOrder);
|
||||
virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
|
||||
virtual bool getIndTexOrder(u32);
|
||||
virtual J3DIndTexOrder * getIndTexOrder(u32);
|
||||
virtual void setIndTexMtx(u32, J3DIndTexMtx const*);
|
||||
virtual void setIndTexMtx(u32, J3DIndTexMtx);
|
||||
virtual bool getIndTexMtx(u32);
|
||||
virtual J3DIndTexMtx * getIndTexMtx(u32);
|
||||
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
|
||||
virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
|
||||
virtual bool getIndTexCoordScale(u32);
|
||||
virtual J3DIndTexCoordScale * getIndTexCoordScale(u32);
|
||||
virtual ~J3DIndBlockFull();
|
||||
|
||||
private:
|
||||
@@ -882,7 +881,7 @@ public:
|
||||
virtual GXColor* getMatColor(u32);
|
||||
virtual void setAmbColor(u32, J3DGXColor const*);
|
||||
virtual void setAmbColor(u32, J3DGXColor);
|
||||
virtual bool getAmbColor(u32);
|
||||
virtual GXColor* getAmbColor(u32);
|
||||
virtual void setColorChanNum(u8);
|
||||
virtual void setColorChanNum(u8 const*);
|
||||
virtual u8 getColorChanNum() const;
|
||||
@@ -890,12 +889,12 @@ public:
|
||||
virtual void setColorChan(u32, J3DColorChan const*);
|
||||
virtual J3DColorChan* getColorChan(u32);
|
||||
virtual void setLight(u32, J3DLightObj*);
|
||||
virtual bool getLight(u32);
|
||||
virtual J3DLightObj* getLight(u32);
|
||||
virtual void setCullMode(u8 const*);
|
||||
virtual void setCullMode(u8);
|
||||
virtual s32 getCullMode() const;
|
||||
virtual bool getMatColorOffset() const;
|
||||
virtual bool getColorChanOffset() const;
|
||||
virtual u8 getCullMode() const;
|
||||
virtual u32 getMatColorOffset() const;
|
||||
virtual u32 getColorChanOffset() const;
|
||||
virtual void setMatColorOffset(u32);
|
||||
virtual void setColorChanOffset(u32);
|
||||
virtual ~J3DColorBlock();
|
||||
@@ -923,7 +922,7 @@ public:
|
||||
virtual GXColor* getMatColor(u32);
|
||||
virtual void setAmbColor(u32, J3DGXColor const*);
|
||||
virtual void setAmbColor(u32, J3DGXColor);
|
||||
virtual bool getAmbColor(u32);
|
||||
virtual GXColor* getAmbColor(u32);
|
||||
virtual void setColorChanNum(u8);
|
||||
virtual void setColorChanNum(u8 const*);
|
||||
virtual u8 getColorChanNum() const;
|
||||
@@ -931,19 +930,19 @@ public:
|
||||
virtual void setColorChan(u32, J3DColorChan const*);
|
||||
virtual J3DColorChan* getColorChan(u32);
|
||||
virtual void setLight(u32, J3DLightObj*);
|
||||
virtual bool getLight(u32);
|
||||
virtual J3DLightObj* getLight(u32);
|
||||
virtual void setCullMode(u8 const*);
|
||||
virtual void setCullMode(u8);
|
||||
virtual s32 getCullMode() const;
|
||||
virtual bool getMatColorOffset() const;
|
||||
virtual bool getColorChanOffset() const;
|
||||
virtual u8 getCullMode() const;
|
||||
virtual u32 getMatColorOffset() const;
|
||||
virtual u32 getColorChanOffset() const;
|
||||
virtual void setMatColorOffset(u32);
|
||||
virtual void setColorChanOffset(u32);
|
||||
virtual ~J3DColorBlockLightOn();
|
||||
|
||||
private:
|
||||
/* 0x04 */ J3DGXColor mMatColor[2];
|
||||
/* 0x0C */ J3DGXColor mAmbColor[2];
|
||||
/* 0x04 */ GXColor mMatColor[2];
|
||||
/* 0x0C */ GXColor mAmbColor[2];
|
||||
/* 0x14 */ u8 mColorChanNum;
|
||||
/* 0x16 */ J3DColorChan mColorChan[4];
|
||||
/* 0x20 */ J3DLightObj* mLight[8];
|
||||
@@ -966,6 +965,7 @@ public:
|
||||
virtual void patchLight();
|
||||
virtual void diff(u32);
|
||||
virtual void diffMatColor();
|
||||
virtual void diffLight();
|
||||
virtual s32 countDLSize();
|
||||
virtual u32 getType();
|
||||
virtual void setMatColor(u32, J3DGXColor const*);
|
||||
@@ -979,15 +979,15 @@ public:
|
||||
virtual J3DColorChan* getColorChan(u32);
|
||||
virtual void setCullMode(u8 const*);
|
||||
virtual void setCullMode(u8);
|
||||
virtual s32 getCullMode() const;
|
||||
virtual bool getMatColorOffset() const;
|
||||
virtual bool getColorChanOffset() const;
|
||||
virtual u8 getCullMode() const;
|
||||
virtual u32 getMatColorOffset() const;
|
||||
virtual u32 getColorChanOffset() const;
|
||||
virtual void setMatColorOffset(u32);
|
||||
virtual void setColorChanOffset(u32);
|
||||
virtual ~J3DColorBlockLightOff();
|
||||
|
||||
private:
|
||||
/* 0x04 */ J3DGXColor mMatColor[2];
|
||||
protected:
|
||||
/* 0x04 */ GXColor mMatColor[2];
|
||||
/* 0x0C */ u8 mColorChanNum;
|
||||
/* 0x0E */ J3DColorChan mColorChan[4];
|
||||
/* 0x16 */ u8 mCullMode;
|
||||
@@ -1008,11 +1008,11 @@ public:
|
||||
virtual u32 getType();
|
||||
virtual void setAmbColor(u32, J3DGXColor const*);
|
||||
virtual void setAmbColor(u32, J3DGXColor);
|
||||
virtual bool getAmbColor(u32);
|
||||
virtual GXColor* getAmbColor(u32);
|
||||
virtual ~J3DColorBlockAmbientOn();
|
||||
|
||||
private:
|
||||
/* 0x20 */ J3DGXColor mAmbColor[2];
|
||||
protected:
|
||||
/* 0x20 */ GXColor mAmbColor[2];
|
||||
}; // Size: 0x28
|
||||
|
||||
#endif /* J3DMATBLOCK_H */
|
||||
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
s32 newSharedDisplayList(u32);
|
||||
s32 newSingleSharedDisplayList(u32);
|
||||
|
||||
virtual void calc(f32 const (*)[4]);
|
||||
virtual void calc(const Mtx);
|
||||
virtual void makeDisplayList();
|
||||
virtual void makeSharedDisplayList();
|
||||
virtual void load();
|
||||
@@ -97,29 +97,30 @@ public:
|
||||
|
||||
class J3DPatchedMaterial : public J3DMaterial {
|
||||
public:
|
||||
/* 80316FB8 */ void initialize();
|
||||
void initialize();
|
||||
|
||||
/* 80316FD8 */ virtual void makeDisplayList();
|
||||
/* 80316FDC */ virtual void makeSharedDisplayList();
|
||||
/* 80316FE0 */ virtual void load();
|
||||
/* 80316FFC */ virtual void loadSharedDL();
|
||||
/* 8031703C */ virtual void reset();
|
||||
/* 80317040 */ virtual void change();
|
||||
virtual void calc(const Mtx);
|
||||
virtual void makeDisplayList();
|
||||
virtual void makeSharedDisplayList();
|
||||
virtual void load();
|
||||
virtual void loadSharedDL();
|
||||
virtual void reset();
|
||||
virtual void change();
|
||||
};
|
||||
|
||||
class J3DLockedMaterial : public J3DMaterial {
|
||||
public:
|
||||
/* 80317044 */ void initialize();
|
||||
void initialize();
|
||||
|
||||
/* 803170D0 */ virtual void calc(f32 const (*)[4]);
|
||||
/* 80317064 */ virtual void makeDisplayList();
|
||||
/* 80317068 */ virtual void makeSharedDisplayList();
|
||||
/* 8031706C */ virtual void load();
|
||||
/* 80317088 */ virtual void loadSharedDL();
|
||||
/* 803170C8 */ virtual void patch();
|
||||
/* 803170CC */ virtual void diff(u32);
|
||||
/* 803170D4 */ virtual void reset();
|
||||
/* 803170D8 */ virtual void change();
|
||||
virtual void calc(const Mtx);
|
||||
virtual void makeDisplayList();
|
||||
virtual void makeSharedDisplayList();
|
||||
virtual void load();
|
||||
virtual void loadSharedDL();
|
||||
virtual void patch();
|
||||
virtual void diff(u32);
|
||||
virtual void reset();
|
||||
virtual void change();
|
||||
};
|
||||
|
||||
#endif /* J3DMATERIAL_H */
|
||||
|
||||
@@ -54,15 +54,11 @@ struct J3DTexMtxInfo {
|
||||
}; // Size: 0x64
|
||||
|
||||
struct J3DIndTexMtxInfo {
|
||||
/* 803257DC */ void operator=(J3DIndTexMtxInfo const&);
|
||||
|
||||
/* 0x00 */ Mtx23 field_0x0;
|
||||
/* 0x18 */ u8 field_0x18;
|
||||
}; // Size: 0x1C
|
||||
|
||||
struct J3DFogInfo {
|
||||
/* 80325800 */ void operator=(J3DFogInfo const&);
|
||||
|
||||
/* 0x00 */ u8 mType;
|
||||
/* 0x01 */ u8 mAdjEnable;
|
||||
/* 0x02 */ u16 mCenter;
|
||||
@@ -75,10 +71,10 @@ struct J3DFogInfo {
|
||||
}; // Size: 0x2C
|
||||
|
||||
struct J3DNBTScaleInfo {
|
||||
/* 8032587C */ void operator=(J3DNBTScaleInfo const&);
|
||||
|
||||
/* 0x0 */ u8 mbHasScale;
|
||||
/* 0x4 */ Vec mScale;
|
||||
|
||||
inline void operator=(const J3DNBTScaleInfo & other) { mbHasScale = other.mbHasScale; mScale = other.mScale; }
|
||||
}; // Size: 0x10
|
||||
|
||||
#endif /* J3DSTRUCT_H */
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "dolphin/types.h"
|
||||
|
||||
struct J3DTevStageInfo {
|
||||
/* 0x0 */ u8 field_0x0;
|
||||
/* 0x0 */ u8 mTevMode;
|
||||
/* 0x1 */ u8 mTevColorOp;
|
||||
/* 0x2 */ u8 mTevColorAB;
|
||||
/* 0x3 */ u8 mTevColorCD;
|
||||
@@ -15,9 +15,9 @@ struct J3DTevStageInfo {
|
||||
};
|
||||
|
||||
struct J3DTevStage : public J3DTevStageInfo {
|
||||
/* 8000E230 */ J3DTevStage();
|
||||
/* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
|
||||
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
|
||||
J3DTevStage();
|
||||
void setTevStageInfo(J3DTevStageInfo const&);
|
||||
J3DTevStage(J3DTevStageInfo const&);
|
||||
};
|
||||
|
||||
struct J3DIndTevStageInfo {
|
||||
@@ -33,24 +33,20 @@ struct J3DIndTevStageInfo {
|
||||
};
|
||||
|
||||
struct J3DIndTevStage {
|
||||
/* 8000E14C */ J3DIndTevStage();
|
||||
J3DIndTevStage();
|
||||
|
||||
/* 0x0 */ u32 mInfo;
|
||||
};
|
||||
|
||||
struct J3DTevOrderInfo {
|
||||
void operator=(const J3DTevOrderInfo& other) {
|
||||
*(u32*) this = *(u32*)&other;
|
||||
}
|
||||
|
||||
/* 0x0 */ u8 field_0x0;
|
||||
/* 0x0 */ u8 mTexCoord;
|
||||
/* 0x1 */ u8 mTexMap;
|
||||
/* 0x2 */ u8 field_0x2;
|
||||
/* 0x2 */ u8 mColorChan;
|
||||
/* 0x3 */ u8 field_0x3; // Maybe padding
|
||||
};
|
||||
|
||||
struct J3DTevOrder : public J3DTevOrderInfo {
|
||||
/* 8000E140 */ J3DTevOrder();
|
||||
J3DTevOrder();
|
||||
J3DTevOrder(const J3DTevOrderInfo& info) {
|
||||
*(J3DTevOrderInfo*)this = info;
|
||||
}
|
||||
@@ -59,12 +55,14 @@ struct J3DTevOrder : public J3DTevOrderInfo {
|
||||
};
|
||||
|
||||
struct J3DTevSwapModeTable {
|
||||
/* 8000E134 */ J3DTevSwapModeTable();
|
||||
J3DTevSwapModeTable();
|
||||
|
||||
/* 0x0 */ u8 field_0x0;
|
||||
}; // Size: 0x1
|
||||
|
||||
struct J3DTevSwapModeInfo {};
|
||||
struct J3DTevSwapModeInfo {
|
||||
/* 0x0 */ u8 field_0x0;
|
||||
};
|
||||
|
||||
struct J3DNBTScale;
|
||||
void loadNBTScale(J3DNBTScale& param_0);
|
||||
|
||||
@@ -12,10 +12,10 @@ private:
|
||||
/* 0x4 */ ResTIMG* mpRes;
|
||||
|
||||
public:
|
||||
/* 8031204C */ void loadGX(u16, _GXTexMapID) const;
|
||||
/* 803121A4 */ void entryNum(u16);
|
||||
/* 8031221C */ void addResTIMG(u16, ResTIMG const*);
|
||||
/* 803366A4 */ virtual ~J3DTexture();
|
||||
void loadGX(u16, _GXTexMapID) const;
|
||||
void entryNum(u16);
|
||||
void addResTIMG(u16, ResTIMG const*);
|
||||
virtual ~J3DTexture();
|
||||
|
||||
u16 getNum() const { return mNum; }
|
||||
ResTIMG* getResTIMG(u16 entry) const { return &mpRes[entry]; }
|
||||
@@ -31,12 +31,12 @@ public:
|
||||
J3DTexMtx(const J3DTexMtxInfo& info) {
|
||||
mTexMtxInfo = info;
|
||||
}
|
||||
/* 803238C4 */ void load(u32) const;
|
||||
/* 80323900 */ void calc(f32 const (*)[4]);
|
||||
/* 80323920 */ void calcTexMtx(f32 const (*)[4]);
|
||||
/* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]);
|
||||
/* 80324358 */ void loadTexMtx(u32) const;
|
||||
/* 803243BC */ void loadPostTexMtx(u32) const;
|
||||
void load(u32) const;
|
||||
void calc(f32 const (*)[4]);
|
||||
void calcTexMtx(f32 const (*)[4]);
|
||||
void calcPostTexMtx(f32 const (*)[4]);
|
||||
void loadTexMtx(u32) const;
|
||||
void loadPostTexMtx(u32) const;
|
||||
|
||||
J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
|
||||
Mtx& getMtx() { return mMtx; }
|
||||
@@ -51,13 +51,11 @@ struct J3DTexCoordInfo {
|
||||
/* 0x0 */ u8 mTexGenType;
|
||||
/* 0x1 */ u8 mTexGenSrc;
|
||||
/* 0x2 */ u8 mTexGenMtx;
|
||||
void operator=(J3DTexCoordInfo const& other) {
|
||||
*(u32*) this = *(u32*)&other;
|
||||
}
|
||||
};
|
||||
|
||||
struct J3DTexCoord : public J3DTexCoordInfo {
|
||||
/* 8000E464 */ J3DTexCoord();
|
||||
J3DTexCoord();
|
||||
|
||||
void setTexCoordInfo(J3DTexCoordInfo *param_1) {
|
||||
*(J3DTexCoordInfo*)this = *param_1;
|
||||
}
|
||||
@@ -69,7 +67,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
|
||||
mTexMtxReg = mTexGenMtx;
|
||||
}
|
||||
|
||||
/* 0x4 */ u16 mTexMtxReg;
|
||||
/* 0x4 */ u8 mTexMtxReg;
|
||||
}; // Size: 0x6
|
||||
|
||||
struct J3DDefaultTexCoordInfo {
|
||||
|
||||
@@ -12,7 +12,7 @@ void J3DFrameCtrl::init(short) {
|
||||
}
|
||||
|
||||
/* 802EF608-802EFBA8 .text checkPass__12J3DFrameCtrlFf */
|
||||
void J3DFrameCtrl::checkPass(float) {
|
||||
BOOL J3DFrameCtrl::checkPass(float) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -47,12 +47,12 @@ void J3DAnmTextureSRTKey::calcTransform(float, unsigned short, J3DTextureSRTInfo
|
||||
}
|
||||
|
||||
/* 802F10D4-802F1188 .text getWeight__17J3DAnmClusterFullCFUs */
|
||||
void J3DAnmClusterFull::getWeight(unsigned short) const {
|
||||
f32 J3DAnmClusterFull::getWeight(unsigned short) const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F1188-802F120C .text getWeight__16J3DAnmClusterKeyCFUs */
|
||||
void J3DAnmClusterKey::getWeight(unsigned short) const {
|
||||
f32 J3DAnmClusterKey::getWeight(unsigned short) const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ void J3DAnmTexPattern::getTexNo(unsigned short, unsigned short*) const {
|
||||
}
|
||||
|
||||
/* 802F200C-802F20EC .text getVisibility__20J3DAnmVisibilityFullCFUsPUc */
|
||||
void J3DAnmVisibilityFull::getVisibility(unsigned short, unsigned char*) const {
|
||||
bool J3DAnmVisibilityFull::getVisibility(u16, u8*) const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -136,16 +136,6 @@ void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F2A88-802F2DAC .text J3DGetKeyFrameInterpolation<s>__FfP18J3DAnmKeyTableBasePs */
|
||||
void J3DGetKeyFrameInterpolation<short>(float, J3DAnmKeyTableBase*, short*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F2DAC-802F2EF8 .text J3DGetKeyFrameInterpolation<f>__FfP18J3DAnmKeyTableBasePf */
|
||||
void J3DGetKeyFrameInterpolation<float>(float, J3DAnmKeyTableBase*, float*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F2EF8-802F2F7C .text __dt__14J3DAnmColorKeyFv */
|
||||
J3DAnmColorKey::~J3DAnmColorKey() {
|
||||
/* Nonmatching */
|
||||
@@ -197,7 +187,7 @@ J3DAnmCluster::~J3DAnmCluster() {
|
||||
}
|
||||
|
||||
/* 802F3278-802F3280 .text getWeight__13J3DAnmClusterCFUs */
|
||||
void J3DAnmCluster::getWeight(unsigned short) const {
|
||||
f32 J3DAnmCluster::getWeight(unsigned short) const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
|
||||
@@ -37,22 +37,22 @@ void J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey*) {
|
||||
}
|
||||
|
||||
/* 802F61E8-802F6260 .text removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor */
|
||||
void J3DMaterialTable::removeMatColorAnimator(J3DAnmColor*) {
|
||||
int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F6260-802F62F4 .text removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern */
|
||||
void J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern*) {
|
||||
int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F62F4-802F6398 .text removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
|
||||
void J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey*) {
|
||||
int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802F6398-802F64B8 .text removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey */
|
||||
void J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey*) {
|
||||
int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,52 +7,52 @@
|
||||
#include "dolphin/types.h"
|
||||
|
||||
/* 802DDBC4-802DDDC4 .text createColorBlock__11J3DMaterialFUl */
|
||||
void J3DMaterial::createColorBlock(unsigned long) {
|
||||
J3DColorBlock * J3DMaterial::createColorBlock(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DDDC4-802DDF28 .text createTexGenBlock__11J3DMaterialFUl */
|
||||
void J3DMaterial::createTexGenBlock(unsigned long) {
|
||||
J3DTexGenBlock * J3DMaterial::createTexGenBlock(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DDF28-802DE29C .text createTevBlock__11J3DMaterialFi */
|
||||
void J3DMaterial::createTevBlock(int) {
|
||||
J3DTevBlock * J3DMaterial::createTevBlock(int) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE29C-802DE384 .text createIndBlock__11J3DMaterialFi */
|
||||
void J3DMaterial::createIndBlock(int) {
|
||||
J3DIndBlock * J3DMaterial::createIndBlock(int) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE384-802DE548 .text createPEBlock__11J3DMaterialFUlUl */
|
||||
void J3DMaterial::createPEBlock(unsigned long, unsigned long) {
|
||||
J3DPEBlock * J3DMaterial::createPEBlock(u32, u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE548-802DE598 .text calcSizeColorBlock__11J3DMaterialFUl */
|
||||
void J3DMaterial::calcSizeColorBlock(unsigned long) {
|
||||
u32 J3DMaterial::calcSizeColorBlock(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE598-802DE5C4 .text calcSizeTexGenBlock__11J3DMaterialFUl */
|
||||
void J3DMaterial::calcSizeTexGenBlock(unsigned long) {
|
||||
u32 J3DMaterial::calcSizeTexGenBlock(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE5C4-802DE60C .text calcSizeTevBlock__11J3DMaterialFi */
|
||||
void J3DMaterial::calcSizeTevBlock(int) {
|
||||
u32 J3DMaterial::calcSizeTevBlock(int) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE60C-802DE620 .text calcSizeIndBlock__11J3DMaterialFi */
|
||||
void J3DMaterial::calcSizeIndBlock(int) {
|
||||
u32 J3DMaterial::calcSizeIndBlock(int) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DE620-802DE688 .text calcSizePEBlock__11J3DMaterialFUlUl */
|
||||
void J3DMaterial::calcSizePEBlock(unsigned long, unsigned long) {
|
||||
u32 J3DMaterial::calcSizePEBlock(u32, u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ void J3DMaterial::initialize() {
|
||||
}
|
||||
|
||||
/* 802DE6D8-802DE78C .text countDLSize__11J3DMaterialFv */
|
||||
void J3DMaterial::countDLSize() {
|
||||
u32 J3DMaterial::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ void J3DMaterial::patch() {
|
||||
}
|
||||
|
||||
/* 802DEC38-802DEE3C .text diff__11J3DMaterialFUl */
|
||||
void J3DMaterial::diff(unsigned long) {
|
||||
void J3DMaterial::diff(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -132,12 +132,12 @@ void J3DMaterial::change() {
|
||||
}
|
||||
|
||||
/* 802DF118-802DF1AC .text newSharedDisplayList__11J3DMaterialFUl */
|
||||
void J3DMaterial::newSharedDisplayList(unsigned long) {
|
||||
s32 J3DMaterial::newSharedDisplayList(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF1AC-802DF240 .text newSingleSharedDisplayList__11J3DMaterialFUl */
|
||||
void J3DMaterial::newSingleSharedDisplayList(unsigned long) {
|
||||
s32 J3DMaterial::newSingleSharedDisplayList(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ void J3DPatchedMaterial::loadSharedDL() {
|
||||
}
|
||||
|
||||
/* 802DF2EC-802DF338 .text calc__18J3DPatchedMaterialFPA4_Cf */
|
||||
void J3DPatchedMaterial::calc(const float(*)[4]) {
|
||||
void J3DPatchedMaterial::calc(const Mtx) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -212,7 +212,7 @@ void J3DLockedMaterial::patch() {
|
||||
}
|
||||
|
||||
/* 802DF3F0-802DF3F4 .text diff__17J3DLockedMaterialFUl */
|
||||
void J3DLockedMaterial::diff(unsigned long) {
|
||||
void J3DLockedMaterial::diff(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -267,27 +267,27 @@ J3DPEBlock::~J3DPEBlock() {
|
||||
}
|
||||
|
||||
/* 802DF620-802DF628 .text countDLSize__14J3DTexGenBlockFv */
|
||||
void J3DTexGenBlock::countDLSize() {
|
||||
s32 J3DTexGenBlock::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF628-802DF630 .text countDLSize__13J3DColorBlockFv */
|
||||
void J3DColorBlock::countDLSize() {
|
||||
s32 J3DColorBlock::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF630-802DF638 .text countDLSize__11J3DTevBlockFv */
|
||||
void J3DTevBlock::countDLSize() {
|
||||
s32 J3DTevBlock::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF638-802DF640 .text countDLSize__11J3DIndBlockFv */
|
||||
void J3DIndBlock::countDLSize() {
|
||||
s32 J3DIndBlock::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF640-802DF648 .text countDLSize__10J3DPEBlockFv */
|
||||
void J3DPEBlock::countDLSize() {
|
||||
s32 J3DPEBlock::countDLSize() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -297,7 +297,7 @@ void J3DColorBlock::load() {
|
||||
}
|
||||
|
||||
/* 802DF64C-802DF654 .text getCullMode__13J3DColorBlockCFv */
|
||||
void J3DColorBlock::getCullMode() const {
|
||||
u8 J3DColorBlock::getCullMode() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -307,7 +307,7 @@ void J3DTevBlock::load() {
|
||||
}
|
||||
|
||||
/* 802DF658-802DF660 .text getNBTScale__14J3DTexGenBlockFv */
|
||||
void J3DTexGenBlock::getNBTScale() {
|
||||
J3DNBTScale * J3DTexGenBlock::getNBTScale() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -317,12 +317,12 @@ void J3DColorBlock::patch() {
|
||||
}
|
||||
|
||||
/* 802DF664-802DF668 .text diff__13J3DColorBlockFUl */
|
||||
void J3DColorBlock::diff(unsigned long) {
|
||||
void J3DColorBlock::diff(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF668-802DF66C .text diff__10J3DPEBlockFUl */
|
||||
void J3DPEBlock::diff(unsigned long) {
|
||||
void J3DPEBlock::diff(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -382,37 +382,37 @@ void J3DPEBlock::setZMode(const J3DZMode*) {
|
||||
}
|
||||
|
||||
/* 802DF698-802DF69C .text setZCompLoc__10J3DPEBlockFPCUc */
|
||||
void J3DPEBlock::setZCompLoc(const unsigned char*) {
|
||||
void J3DPEBlock::setZCompLoc(const u8*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF69C-802DF6A0 .text setDither__10J3DPEBlockFUc */
|
||||
void J3DPEBlock::setDither(unsigned char) {
|
||||
void J3DPEBlock::setDither(u8) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF6A0-802DF6A4 .text setDither__10J3DPEBlockFPCUc */
|
||||
void J3DPEBlock::setDither(const unsigned char*) {
|
||||
void J3DPEBlock::setDither(const u8*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF6A4-802DF6AC .text getDither__10J3DPEBlockCFv */
|
||||
void J3DPEBlock::getDither() const {
|
||||
u8 J3DPEBlock::getDither() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF6AC-802DF6B4 .text getFogOffset__10J3DPEBlockCFv */
|
||||
void J3DPEBlock::getFogOffset() const {
|
||||
u32 J3DPEBlock::getFogOffset() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF6B4-802DF6B8 .text setFogOffset__10J3DPEBlockFUl */
|
||||
void J3DPEBlock::setFogOffset(unsigned long) {
|
||||
void J3DPEBlock::setFogOffset(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF6B8-802DF6BC .text diff__15J3DIndBlockNullFUl */
|
||||
void J3DIndBlockNull::diff(unsigned long) {
|
||||
void J3DIndBlockNull::diff(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -427,7 +427,7 @@ void J3DIndBlockNull::reset(J3DIndBlock*) {
|
||||
}
|
||||
|
||||
/* 802DF6C4-802DF6D0 .text getType__15J3DIndBlockNullFv */
|
||||
void J3DIndBlockNull::getType() {
|
||||
u32 J3DIndBlockNull::getType() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -437,27 +437,27 @@ J3DIndBlockNull::~J3DIndBlockNull() {
|
||||
}
|
||||
|
||||
/* 802DF72C-802DF730 .text setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder */
|
||||
void J3DIndBlock::setIndTexOrder(unsigned long, const J3DIndTexOrder*) {
|
||||
void J3DIndBlock::setIndTexOrder(u32, const J3DIndTexOrder*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF730-802DF734 .text setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder */
|
||||
void J3DIndBlock::setIndTexOrder(unsigned long, J3DIndTexOrder) {
|
||||
void J3DIndBlock::setIndTexOrder(u32, J3DIndTexOrder) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF734-802DF738 .text setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx */
|
||||
void J3DIndBlock::setIndTexMtx(unsigned long, const J3DIndTexMtx*) {
|
||||
void J3DIndBlock::setIndTexMtx(u32, const J3DIndTexMtx*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF738-802DF73C .text setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale */
|
||||
void J3DIndBlock::setIndTexCoordScale(unsigned long, const J3DIndTexCoordScale*) {
|
||||
void J3DIndBlock::setIndTexCoordScale(u32, const J3DIndTexCoordScale*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF73C-802DF740 .text setTexGenNum__14J3DTexGenBlockFPCUl */
|
||||
void J3DTexGenBlock::setTexGenNum(const unsigned long*) {
|
||||
void J3DTexGenBlock::setTexGenNum(const u32*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -472,12 +472,12 @@ void J3DTexGenBlock::setNBTScale(const J3DNBTScale*) {
|
||||
}
|
||||
|
||||
/* 802DF748-802DF750 .text getTexMtxOffset__14J3DTexGenBlockCFv */
|
||||
void J3DTexGenBlock::getTexMtxOffset() const {
|
||||
u32 J3DTexGenBlock::getTexMtxOffset() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF750-802DF754 .text setTexMtxOffset__14J3DTexGenBlockFUl */
|
||||
void J3DTexGenBlock::setTexMtxOffset(unsigned long) {
|
||||
void J3DTexGenBlock::setTexMtxOffset(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -497,51 +497,51 @@ void J3DColorBlock::diffLight() {
|
||||
}
|
||||
|
||||
/* 802DF760-802DF764 .text setMatColor__13J3DColorBlockFUlPC10J3DGXColor */
|
||||
void J3DColorBlock::setMatColor(unsigned long, const J3DGXColor*) {
|
||||
void J3DColorBlock::setMatColor(u32, const J3DGXColor*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF764-802DF768 .text setAmbColor__13J3DColorBlockFUlPC10J3DGXColor */
|
||||
void J3DColorBlock::setAmbColor(unsigned long, const J3DGXColor*) {
|
||||
void J3DColorBlock::setAmbColor(u32, const J3DGXColor*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF768-802DF76C .text setColorChanNum__13J3DColorBlockFPCUc */
|
||||
void J3DColorBlock::setColorChanNum(const unsigned char*) {
|
||||
void J3DColorBlock::setColorChanNum(const u8*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF76C-802DF770 .text setColorChan__13J3DColorBlockFUlPC12J3DColorChan */
|
||||
void J3DColorBlock::setColorChan(unsigned long, const J3DColorChan*) {
|
||||
void J3DColorBlock::setColorChan(u32, const J3DColorChan*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF770-802DF778 .text getLight__13J3DColorBlockFUl */
|
||||
void J3DColorBlock::getLight(unsigned long) {
|
||||
J3DLightObj * J3DColorBlock::getLight(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF778-802DF77C .text setCullMode__13J3DColorBlockFPCUc */
|
||||
void J3DColorBlock::setCullMode(const unsigned char*) {
|
||||
void J3DColorBlock::setCullMode(const u8*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF77C-802DF784 .text getMatColorOffset__13J3DColorBlockCFv */
|
||||
void J3DColorBlock::getMatColorOffset() const {
|
||||
u32 J3DColorBlock::getMatColorOffset() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF784-802DF78C .text getColorChanOffset__13J3DColorBlockCFv */
|
||||
void J3DColorBlock::getColorChanOffset() const {
|
||||
u32 J3DColorBlock::getColorChanOffset() const {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF78C-802DF790 .text setMatColorOffset__13J3DColorBlockFUl */
|
||||
void J3DColorBlock::setMatColorOffset(unsigned long) {
|
||||
void J3DColorBlock::setMatColorOffset(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802DF790-802DF794 .text setColorChanOffset__13J3DColorBlockFUl */
|
||||
void J3DColorBlock::setColorChanOffset(unsigned long) {
|
||||
void J3DColorBlock::setColorChanOffset(u32) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
@@ -351,19 +351,8 @@ void J3DShapePacket::draw() {
|
||||
if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
|
||||
prepareDraw();
|
||||
|
||||
#if 0
|
||||
if (mpTexMtxObj != NULL) {
|
||||
J3DMaterial* material = mpShape->getMaterial();
|
||||
J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock();
|
||||
J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
|
||||
} else {
|
||||
J3DDifferedTexMtx::sTexGenBlock = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (mpDisplayListObj != NULL) {
|
||||
if (mpDisplayListObj != NULL)
|
||||
mpDisplayListObj->callDL();
|
||||
}
|
||||
|
||||
mpShape->draw();
|
||||
}
|
||||
@@ -373,17 +362,6 @@ void J3DShapePacket::draw() {
|
||||
void J3DShapePacket::drawFast() {
|
||||
if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
|
||||
prepareDraw();
|
||||
|
||||
#if 0
|
||||
if (mpTexMtxObj != NULL) {
|
||||
J3DMaterial* material = mpShape->getMaterial();
|
||||
J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock();
|
||||
J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
|
||||
} else {
|
||||
J3DDifferedTexMtx::sTexGenBlock = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
mpShape->drawFast();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
#include "dolphin/types.h"
|
||||
|
||||
/* 802FB758-802FB8A4 .text load__22J3DModelLoaderDataBaseFPCvUl */
|
||||
void J3DModelLoaderDataBase::load(const void*, unsigned long) {
|
||||
J3DModelData * J3DModelLoaderDataBase::load(const void*, unsigned long) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802FB8A4-802FB94C .text loadMaterialTable__22J3DModelLoaderDataBaseFPCv */
|
||||
void J3DModelLoaderDataBase::loadMaterialTable(const void*) {
|
||||
J3DMaterialTable * J3DModelLoaderDataBase::loadMaterialTable(const void*) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 802FB94C-802FBA04 .text loadBinaryDisplayList__22J3DModelLoaderDataBaseFPCvUl */
|
||||
void J3DModelLoaderDataBase::loadBinaryDisplayList(const void*, unsigned long) {
|
||||
J3DModelData * J3DModelLoaderDataBase::loadBinaryDisplayList(const void*, unsigned long) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user