mirror of
https://github.com/zeldaret/tp
synced 2026-05-23 06:54:28 -04:00
Various JSystem work (#2383)
* JKernel and JStudio cleanup * JMessage cleanup * JAudio cleanup * JASBNKParser work * functionvalue work * fvb work * J2D and J3D cleanup * steal from tww * J2DPictureEx mostly done * fix build
This commit is contained in:
@@ -31,7 +31,8 @@ struct J3DGXColor : public GXColor {
|
||||
/* 8000E538 */ J3DGXColor() {}
|
||||
J3DGXColor(J3DGXColor const& other) { __memcpy(this, &other, sizeof(J3DGXColor)); }
|
||||
J3DGXColor(GXColor const& color) : GXColor(color) {}
|
||||
J3DGXColor& operator=(const GXColor& color) {
|
||||
// making color a reference breaks J3DColorBlockLightOff::initialize et al
|
||||
J3DGXColor& operator=(GXColor color) {
|
||||
*(GXColor*)this = color;
|
||||
return *this;
|
||||
}
|
||||
@@ -1054,8 +1055,8 @@ public:
|
||||
/* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {}
|
||||
/* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
|
||||
/* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
|
||||
/* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
|
||||
/* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
|
||||
/* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
|
||||
/* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
|
||||
/* 8031726C */ virtual ~J3DIndBlock() {}
|
||||
};
|
||||
@@ -1066,9 +1067,9 @@ public:
|
||||
*/
|
||||
class J3DIndBlockNull : public J3DIndBlock {
|
||||
public:
|
||||
/* 803173A0 */ virtual void reset(J3DIndBlock*) {}
|
||||
/* 80317398 */ virtual void diff(u32) {}
|
||||
/* 8031739C */ virtual void load() {}
|
||||
/* 803173A0 */ virtual void reset(J3DIndBlock*) {}
|
||||
/* 803173A4 */ virtual u32 getType() { return 'IBLN'; }
|
||||
/* 803173B0 */ virtual ~J3DIndBlockNull() {}
|
||||
};
|
||||
|
||||
@@ -94,7 +94,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
|
||||
u8 getTexGenType() const { return mTexGenType; }
|
||||
u8 getTexGenSrc() const { return mTexGenSrc; }
|
||||
u8 getTexGenMtx() const { return mTexGenMtx; }
|
||||
u16 getTexMtxReg() const { return mTexMtxReg & 0xff; }
|
||||
u32 getTexMtxReg() const { return mTexMtxReg & 0xff; }
|
||||
void setTexGenMtx(u8 param_1) { mTexGenMtx = param_1; }
|
||||
void setTexMtxReg(u16 reg) { mTexMtxReg = reg; }
|
||||
J3DTexCoord& operator=(const J3DTexCoord& other) {
|
||||
|
||||
Reference in New Issue
Block a user