summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-01-07 03:29:50 -0500
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-01-07 03:29:50 -0500
commitf683c2bfc49dfd06a035fbc5d20f7ef1334bcb5e (patch)
tree73152ad87af9eb8665a78f5edaa0b22648327660 /include
parent6ec8c7029532695c192233473b8e26ca58c1537e (diff)
mDoGph_Painter fixed
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/J3DGraphBase/J3DDrawBuffer.h12
-rw-r--r--include/m_Do/m_Do_graphic.h17
2 files changed, 22 insertions, 7 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index 47752c82..e7b16d68 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -46,15 +46,19 @@ public:
void draw() const;
void drawHead() const;
void drawTail() const;
+ void setCallBackPacket(J3DCallBackPacket* pPacket);
- u32 getEntryTableSize() { return mBufSize; }
-
- inline void calcZRatio();
+ J3DPacket* getEntryPacket(u16 i) { return mpBuf[i]; }
+ u32 getEntryTableSize() { return mBufSize; } // Unused in TWW, but exists in TP
void setNonSort() { mSortType = (u32)SORT_NON; }
void setZSort() { mSortType = (u32)SORT_Z; }
void setInvalidSort() { mSortType = (u32)SORT_INVALID; }
void setZMtx(MtxP mtx) { mpZMtx = mtx; }
- void setCallBackPacket(J3DCallBackPacket* pPacket);
+ void calcZRatio() {
+ mZRatio = (mZFar - mZNear) / (f32)mBufSize;
+ }
+
+ void getSortMode() {}
public:
/* 0x00 */ J3DPacket** mpBuf;
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index c7883de3..994decf2 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -14,14 +14,13 @@ public:
static void* alloc(u32, int);
static void free();
static void fadeOut(f32, GXColor&);
- static void onBlure();
- static void onBlure(const Mtx);
+ static void onBlure(); // weak?
+ static void onBlure(const Mtx); // weak?
static void fadeOut(f32);
static void calcFade();
static void onMonotone();
static void offMonotone();
static void calcMonotone();
- static void setFrameRate(u16);
static void getFrameRate();
static void setFader(JUTFader* fader) {
@@ -54,10 +53,22 @@ public:
static f32 getFadeRate() { return mFadeRate; }
static GXColor& getFadeColor() { return mFadeColor; }
static GXColor& getBackColor() { return mBackColor; }
+ static void beginRender() { JFWDisplay::getManager()->beginRender(); }
static void endRender() { JFWDisplay::getManager()->endRender(); }
static GXTexObj* getZbufferTexObj() { return &mZbufferTexObj; }
static GXTexObj* getFrameBufferTexObj() { return &mFrameBufferTexObj; }
+ static void alloc32(u32) {}
+ static void fadeIn(f32, _GXColor&) {}
+ static void getFrameBufferMemory() {}
+ static void getFrameBufferSize() {}
+ static void getMonotoneRate() {}
+ static void setBlureMtx(const Mtx) {}
+ static void setBlureRate(u8) {}
+ static void setFrameRate(u16) {}
+ static void setMonotoneRate(s16) {}
+ static void setMonotoneRateSpeed(s16) {}
+
static GXTexObj mFrameBufferTexObj;
static GXTexObj mZbufferTexObj;
static Mtx mBlureMtx;