mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move J3DShapeMtx to correct header for assert

Browse Source
This commit is contained in:
LagoLunatic
2025-06-19 19:05:10 -04:00
parent efc33c5fc4
commit 705f55693c
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DShape.h
+35 -1
View File
@@ -2,10 +2,12 @@
#define J3DSHAPE_H
#include "JSystem/J3DGraphBase/J3DShapeDraw.h"
#include "JSystem/J3DGraphBase/J3DShapeMtx.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
class J3DShapeMtx;
class J3DCurrentMtxInfo {
public:
/* 0x00 */ u32 mMtxIdxRegA;
@@ -155,4 +157,36 @@ private:
/* 0x64 */ u32 mBumpMtxOffset;
};
class J3DShapeMtx {
public:
typedef void (J3DShapeMtx::*MtxLoadIndx)(int mtxNo, u16 index) const;
J3DShapeMtx(u16 useMtxIndex) : mUseMtxIndex(useMtxIndex) {}
void loadMtxIndx_PNGP(int, u16) const;
void loadMtxIndx_PCPU(int, u16) const;
void loadMtxIndx_NCPU(int, u16) const;
void loadMtxIndx_PNCPU(int, u16) const;
virtual ~J3DShapeMtx() {}
virtual u32 getType() const { return 'SMTX'; }
virtual u32 getUseMtxNum() const { return 1; }
virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
virtual void load() const;
virtual void calcNBTScale(Vec const&, Mtx33*, Mtx33*);
static MtxLoadIndx sMtxLoadPipeline[4];
static u32 sCurrentPipeline;
static u8* sCurrentScaleFlag;
static u8 sNBTFlag;
static void setCurrentPipeline(u32 pipeline) {
J3D_ASSERT(91, pipeline < 4, "Error : range over.");
sCurrentPipeline = pipeline;
}
protected:
/* 0x04 */ u16 mUseMtxIndex;
};
#endif /* J3DSHAPE_H */
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+1 -34
View File
@@ -1,42 +1,9 @@
#ifndef J3DSHAPEMTX_H
#define J3DSHAPEMTX_H
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/J3DGraphBase/J3DShape.h"
#include "dolphin/mtx/mtx.h"
class J3DShapeMtx {
public:
typedef void (J3DShapeMtx::*MtxLoadIndx)(int mtxNo, u16 index) const;
J3DShapeMtx(u16 useMtxIndex) : mUseMtxIndex(useMtxIndex) {}
void loadMtxIndx_PNGP(int, u16) const;
void loadMtxIndx_PCPU(int, u16) const;
void loadMtxIndx_NCPU(int, u16) const;
void loadMtxIndx_PNCPU(int, u16) const;
virtual ~J3DShapeMtx() {}
virtual u32 getType() const { return 'SMTX'; }
virtual u32 getUseMtxNum() const { return 1; }
virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
virtual void load() const;
virtual void calcNBTScale(Vec const&, Mtx33*, Mtx33*);
static MtxLoadIndx sMtxLoadPipeline[4];
static u32 sCurrentPipeline;
static u8* sCurrentScaleFlag;
static u8 sNBTFlag;
static void setCurrentPipeline(u32 pipeline) {
// TODO: needs to go in J3DShape.h for assert
J3D_ASSERT(91, pipeline < 4, "Error : range over.");
sCurrentPipeline = pipeline;
}
protected:
/* 0x04 */ u16 mUseMtxIndex;
};
class J3DShapeMtxImm : public J3DShapeMtx {
public:
typedef void (J3DShapeMtxImm::*MtxLoadImm)(int mtxNo, u16 index) const;