diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 64a63a298c..dac5e58ebb 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -11,6 +11,10 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" +#if TARGET_PC +#include "m_Do/m_Do_lib.h" +#endif + void dOvlpFd2_dlst_c::draw() { GXSetViewport(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f); GXSetScissor(0, 0, FB_WIDTH, FB_HEIGHT); @@ -55,14 +59,16 @@ void dOvlpFd2_dlst_c::draw() { #endif GXSetProjection(m, GX_PERSPECTIVE); -#ifdef TARGET_PC - mDoGph_gInf_c::getFrameBufferTexObj()->reset(); -#endif +#if TARGET_PC + mDoLib_setResTimgObj(mDoGph_gInf_c::m_fullFrameBufferTimg, &mDoGph_gInf_c::m_fullFrameBufferTexObj, 0, NULL); +#else GXInitTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), mDoGph_gInf_c::getFrameBufferTex(), FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); GXInitTexObjLOD(mDoGph_gInf_c::getFrameBufferTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); - GXLoadTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), GX_TEXMAP0); +#endif + GXLoadTexObj(DUSK_IF_ELSE(&mDoGph_gInf_c::m_fullFrameBufferTexObj, mDoGph_gInf_c::getFrameBufferTexObj()), + GX_TEXMAP0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0, 0, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 3dc931ca74..6f0fe5413f 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -12,14 +12,16 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" +#if TARGET_PC +#include "m_Do/m_Do_lib.h" +#endif + void dDlst_snapShot_c::draw() { GXSetTexCopySrc(0, 0, FB_WIDTH, FB_HEIGHT); -#if TARGET_PC - GXSetTexCopyDst(FB_WIDTH, FB_HEIGHT, GX_TF_RGBA8, GX_FALSE); -#else - GXSetTexCopyDst(FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGBA8, GX_TRUE); -#endif - GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE); + GXSetTexCopyDst(FB_WIDTH IF_NOT_DUSK(/ 2), FB_HEIGHT IF_NOT_DUSK(/ 2), + GX_TF_RGBA8, DUSK_IF_ELSE(GX_FALSE, GX_TRUE)); + GXCopyTex(DUSK_IF_ELSE(mDoGph_gInf_c::m_fullFrameBufferTex, mDoGph_gInf_c::getFrameBufferTex()), + GX_FALSE); GXPixModeSync(); } @@ -67,14 +69,16 @@ void dOvlpFd3_dlst_c::draw() { #endif GXSetProjection(m, GX_PERSPECTIVE); -#ifdef TARGET_PC - mDoGph_gInf_c::getFrameBufferTexObj()->reset(); -#endif +#if TARGET_PC + mDoLib_setResTimgObj(mDoGph_gInf_c::m_fullFrameBufferTimg, &mDoGph_gInf_c::m_fullFrameBufferTexObj, 0, NULL); +#else GXInitTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), mDoGph_gInf_c::getFrameBufferTex(), FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); GXInitTexObjLOD(mDoGph_gInf_c::getFrameBufferTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); - GXLoadTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), GX_TEXMAP0); +#endif + GXLoadTexObj(DUSK_IF_ELSE(&mDoGph_gInf_c::m_fullFrameBufferTexObj, mDoGph_gInf_c::getFrameBufferTexObj()), + GX_TEXMAP0); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0, 0, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 18ed4fe39d..6bc98b28a7 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -2694,7 +2694,7 @@ int mDoGph_Painter() { #endif #if TARGET_PC - if (dusk::getSettings().game.enableMirrorMode) + if (dusk::getSettings().game.enableMirrorMode && dComIfGp_getWindowNum() != 0) #elif PLATFORM_WII if (data_8053a730) #endif