mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-03 01:54:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

most of d_kankyo done (#61)

Browse Source 
* most of d_kankyo done

* some kankyo fixes
This commit is contained in:
TakaRikka
2023-09-19 16:46:06 -07:00
committed by GitHub
parent 0a9745477f
commit 853e5c7fba
19 changed files with 2952 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DMatBlock.h
+8 -15
View File
@@ -162,7 +162,7 @@ public:
virtual _GXColor* getTevKColor(u32);
virtual void setTevKColorSel(u32, u8 const*);
virtual void setTevKColorSel(u32, u8);
virtual bool getTevKColorSel(u32);
virtual u8 getTevKColorSel(u32);
virtual void setTevKAlphaSel(u32, u8 const*);
virtual void setTevKAlphaSel(u32, u8);
virtual bool getTevKAlphaSel(u32);
@@ -228,7 +228,7 @@ public:
virtual GXColor* getTevKColor(u32);
virtual void setTevKColorSel(u32, u8 const*);
virtual void setTevKColorSel(u32, u8);
virtual bool getTevKColorSel(u32);
virtual u8 getTevKColorSel(u32);
virtual void setTevStageNum(u8 const*);
virtual void setTevStageNum(u8);
virtual u8 getTevStageNum() const;
@@ -295,7 +295,7 @@ public:
virtual GXColor* getTevKColor(u32);
virtual void setTevKColorSel(u32, u8 const*);
virtual void setTevKColorSel(u32, u8);
virtual bool getTevKColorSel(u32);
virtual u8 getTevKColorSel(u32);
virtual void setTevKAlphaSel(u32, u8 const*);
virtual void setTevKAlphaSel(u32, u8);
virtual bool getTevKAlphaSel(u32);
@@ -368,7 +368,7 @@ public:
virtual GXColor* getTevKColor(u32);
virtual void setTevKColorSel(u32, u8 const*);
virtual void setTevKColorSel(u32, u8);
virtual bool getTevKColorSel(u32);
virtual u8 getTevKColorSel(u32);
virtual void setTevKAlphaSel(u32, u8 const*);
virtual void setTevKAlphaSel(u32, u8);
virtual bool getTevKAlphaSel(u32);
@@ -441,7 +441,7 @@ public:
virtual GXColor* getTevKColor(u32);
virtual void setTevKColorSel(u32, u8 const*);
virtual void setTevKColorSel(u32, u8);
virtual bool getTevKColorSel(u32);
virtual u8 getTevKColorSel(u32);
virtual void setTevKAlphaSel(u32, u8 const*);
virtual void setTevKAlphaSel(u32, u8);
virtual bool getTevKAlphaSel(u32);
@@ -626,7 +626,6 @@ public:
virtual void diffBlend();
virtual s32 countDLSize();
virtual u32 getType() = 0;
virtual void setFog(J3DFog);
virtual void setFog(J3DFog*);
virtual J3DFog* getFog();
virtual void setAlphaComp(J3DAlphaComp const*);
@@ -688,7 +687,6 @@ public:
virtual void diffBlend();
virtual s32 countDLSize();
virtual u32 getType();
virtual void setFog(J3DFog);
virtual void setFog(J3DFog*);
virtual J3DFog* getFog();
virtual void setAlphaComp(J3DAlphaComp const*);
@@ -875,15 +873,13 @@ public:
virtual void patchMatColor();
virtual void patchLight();
virtual void diff(u32);
virtual void diffAmbColor();
virtual void diffMatColor();
virtual void diffColorChan();
virtual void diffLightObj(u32);
virtual void diffLight();
virtual s32 countDLSize();
virtual u32 getType() = 0;
virtual void setMatColor(u32, J3DGXColor const*);
virtual void setMatColor(u32, J3DGXColor);
virtual _GXColor* getMatColor(u32);
virtual GXColor* getMatColor(u32);
virtual void setAmbColor(u32, J3DGXColor const*);
virtual void setAmbColor(u32, J3DGXColor);
virtual bool getAmbColor(u32);
@@ -918,10 +914,8 @@ public:
virtual void patchMatColor();
virtual void patchLight();
virtual void diff(u32);
virtual void diffAmbColor();
virtual void diffMatColor();
virtual void diffColorChan();
virtual void diffLightObj(u32);
virtual void diffLight();
virtual s32 countDLSize();
virtual u32 getType();
virtual void setMatColor(u32, J3DGXColor const*);
@@ -972,7 +966,6 @@ public:
virtual void patchLight();
virtual void diff(u32);
virtual void diffMatColor();
virtual void diffColorChan();
virtual s32 countDLSize();
virtual u32 getType();
virtual void setMatColor(u32, J3DGXColor const*);
include/JSystem/J3DGraphBase/J3DStruct.h
+9 -12
View File
@@ -63,18 +63,15 @@ struct J3DIndTexMtxInfo {
struct J3DFogInfo {
/* 80325800 */ void operator=(J3DFogInfo const&);
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u16 field_0x2;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u16 field_0x18[10];
/* 0x00 */ u8 mType;
/* 0x01 */ u8 mAdjEnable;
/* 0x02 */ u16 mCenter;
/* 0x04 */ f32 mStartZ;
/* 0x08 */ f32 mEndZ;
/* 0x0C */ f32 mNearZ;
/* 0x10 */ f32 mFarZ;
/* 0x14 */ GXColor mColor;
/* 0x18 */ u16 mFogAdjTable[10];
}; // Size: 0x2C
struct J3DNBTScaleInfo {