mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-19 13:54:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

wii building OK / m_Do_graphic debug work (#2815)

Browse Source 
* wii building OK + m_Do_graphic debug work

* d_meter_HIO debug cleanup

* wii m_Do_graphic stuff

* tag_attack_item OK, mirror_chain almost

* fix build

* mg_fshop matching
This commit is contained in:
TakaRikka
2025-11-17 10:01:03 -08:00
committed by GitHub
parent 4350a38fe0
commit 540217c31b
99 changed files with 3837 additions and 1964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_controller_pad.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
static s16 getSubStickAngle(u32 pad) { return getCpadInfo(pad).mCStickAngle; }
static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; }
static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; }
static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus(pad) == 0; }
static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus((JUTGamePad::EPadPort)pad) == 0; }
static void startMotorWave(u32 pad, void* data, JUTGamePad::CRumble::ERumble rumble, u32 length) {
m_gamePad[pad]->startMotorWave(data, rumble, length);
}
include/m_Do/m_Do_ext2.h
+2 -2
View File
@@ -12,8 +12,8 @@ public:
void check();
void diff();
static void easyCreate(void*, s32);
static void easyCreate(void*, u32);
static FixedMemoryCheck* easyCreate(void*, s32);
static FixedMemoryCheck* easyCreate(void*, u32);
static void checkAll();
static void diffAll();
static void saveAll();
include/m_Do/m_Do_graphic.h
+125 -29
View File
@@ -2,13 +2,22 @@
#define M_DO_M_DO_GRAPHIC_H
#include "JSystem/JFramework/JFWDisplay.h"
#include "dolphin/mtx.h"
#include "m_Do/m_Do_mtx.h"
#include "global.h"
#if WIDESCREEN_SUPPORT
#define FB_WIDTH (640)
#define FB_HEIGHT (456)
#else
#define FB_WIDTH (608)
#define FB_HEIGHT (448)
#endif
int mDoGph_Create();
void mDoGph_drawFilterQuad(s8 param_0, s8 param_1);
struct ResTIMG;
class JKRSolidHeap;
class mDoGph_gInf_c {
public:
class bloom_c {
@@ -43,6 +52,20 @@ public:
/* 0x10 */ void* m_buffer;
};
#if PLATFORM_WII || PLATFORM_SHIELD
class csr_c {
public:
virtual ~csr_c();
virtual bool isPointer();
void particleExecute();
static u32 m_blurID;
};
static void entryBaseCsr(csr_c*);
#endif
/* 80007E44 */ static void create();
/* 80007F90 */ static void beginRender();
/* 800080D0 */ static void fadeOut(f32);
@@ -71,7 +94,7 @@ public:
static u8 isFade() { return mFade; }
static void fadeIn_f(f32 i_fadeSpeed, _GXColor& i_fadeColor) { fadeOut_f(-i_fadeSpeed, i_fadeColor); }
static void offBlure() { mBlureFlag = false; }
static bool isBlure() { return mBlureFlag; }
static u8 isBlure() { return mBlureFlag; }
static void setBlureRate(u8 i_rate) { mBlureRate = i_rate; }
static u8 getBlureRate() { return mBlureRate; }
static MtxP getBlureMtx() { return mBlureMtx; }
@@ -80,11 +103,15 @@ public:
static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); }
static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
static void setBlureMtx(const Mtx m) {
cMtx_copy(m, mBlureMtx);
}
static f32 getWidthF() {
#if PLATFORM_WII || PLATFORM_SHIELD
return m_widthF;
#else
return 608.0f;
return FB_WIDTH;
#endif
}
@@ -92,12 +119,12 @@ public:
#if PLATFORM_WII || PLATFORM_SHIELD
return m_heightF;
#else
return 448.0f;
return FB_HEIGHT;
#endif
}
static f32 getWidth() { return 608.0f; }
static f32 getHeight() { return 448.0f; }
static f32 getWidth() { return FB_WIDTH; }
static f32 getHeight() { return FB_HEIGHT; }
static f32 getMinYF() {
#if PLATFORM_WII || PLATFORM_SHIELD
@@ -119,7 +146,7 @@ public:
#if PLATFORM_WII || PLATFORM_SHIELD
return m_maxYF;
#else
return 448.0f;
return FB_HEIGHT;
#endif
}
@@ -127,15 +154,50 @@ public:
#if PLATFORM_WII || PLATFORM_SHIELD
return m_maxXF;
#else
return 608.0f;
return FB_WIDTH;
#endif
}
static f32 getAspect() {
#if WIDESCREEN_SUPPORT
return m_aspect;
#else
return 1.3571428f;
#endif
}
static int getMinY() {
#if WIDESCREEN_SUPPORT
return m_minY;
#else
return 0;
#endif
}
static int getMinX() {
#if WIDESCREEN_SUPPORT
return m_minX;
#else
return 0;
#endif
}
static int getMaxY() {
#if WIDESCREEN_SUPPORT
return m_maxY;
#else
return FB_HEIGHT;
#endif
}
static int getMaxX() {
#if WIDESCREEN_SUPPORT
return m_maxX;
#else
return FB_WIDTH;
#endif
}
static f32 getAspect() { return 1.3571428f; }
static int getMinY() { return 0; }
static int getMinX() { return 0; }
static int getMaxY() { return 448; }
static int getMaxX() { return 608; }
static ResTIMG* getFrameBufferTimg() { return mFrameBufferTimg; }
static ResTIMG* getZbufferTimg() { return mZbufferTimg; }
static void* getFrameBufferTex() { return mFrameBufferTex; }
@@ -148,9 +210,6 @@ public:
static void endRender() { JFWDisplay::getManager()->endRender(); }
static GXTexObj* getZbufferTexObj() { return &mZbufferTexObj; }
static GXTexObj* getFrameBufferTexObj() { return &mFrameBufferTexObj; }
static f32 getInvScale() { return 1.0f; }
static f32 getScale() { return 1.0f; }
static void setWideZoomLightProjection(Mtx m) {}
static void setFrameRate(u16 i_rate) { JFWDisplay::getManager()->setFrameRate(i_rate); }
static int getFrameBufferSize() {
@@ -162,22 +221,30 @@ public:
return JFWDisplay::getManager()->getXfbManager()->getDisplayingXfb();
}
// NONMATCHING - Need to define all mDoGph_gInf_c shieldD members
static u8 isWide() {
#if PLATFORM_WII || PLATFORM_SHIELD
return mWide == TRUE;
static f32 getInvScale() {
#if WIDESCREEN_SUPPORT
return m_invScale;
#else
return false;
return 1.0f;
#endif
}
static void onWideZoom() {
//TODO
}
static f32 getScale() { return 1.0f; }
static void offWideZoom() {
//TODO
}
#if WIDESCREEN_SUPPORT
static void setTvSize();
static void onWide();
static void offWide();
static u8 isWide();
static void onWideZoom();
static void offWideZoom();
static BOOL isWideZoom();
static void setWideZoomProjection(Mtx44& m);
static void setWideZoomLightProjection(Mtx& m);
#endif
static GXTexObj mFrameBufferTexObj;
static GXTexObj mZbufferTexObj;
@@ -192,28 +259,57 @@ public:
static void* mZbufferTex;
static f32 mFadeRate;
static f32 mFadeSpeed;
static bool mBlureFlag;
static u8 mBlureFlag;
static u8 mBlureRate;
static u8 mFade;
static bool mAutoForcus;
#if PLATFORM_WII || PLATFORM_SHIELD
#if PLATFORM_SHIELD
static JKRHeap* getHeap() {
return m_heap;
}
static void setHeap(JKRSolidHeap* i_heap) {
m_heap = (JKRHeap*)i_heap;
}
static JKRHeap* m_heap;
#endif
#if PLATFORM_WII || PLATFORM_SHIELD
static void resetDimming();
static csr_c* m_baseCsr;
static csr_c* m_csr;
static cXyz m_nowEffPos;
static cXyz m_oldEffPos;
static cXyz m_oldOldEffPos;
#endif
#if WIDESCREEN_SUPPORT
static u8 mWide;
static u8 mWideZoom;
static ResTIMG* m_fullFrameBufferTimg;
static void* m_fullFrameBufferTex;
static GXTexObj m_fullFrameBufferTexObj;
static f32 m_aspect;
static f32 m_scale;
static f32 m_invScale;
static f32 m_minXF;
static f32 m_minYF;
static int m_minX;
static int m_minY;
static f32 m_maxXF;
static f32 m_maxYF;
static int m_maxX;
static int m_maxY;
static int m_width;
static int m_height;
static f32 m_heightF;
static f32 m_widthF;
#endif
include/m_Do/m_Do_mtx.h
+1 -1
View File
@@ -45,7 +45,7 @@ inline void mDoMtx_multVecArray(Mtx m, const Vec* src, Vec* dst, u32 count) {
}
inline void mDoMtx_copy(const Mtx src, Mtx dst) {
MTXCopy(src, dst);
PSMTXCopy(src, dst);
}
inline void mDoMtx_trans(Mtx m, f32 x, f32 y, f32 z) {