From fd8ed8188864a0417721c01eae00fb1ae9f41caa Mon Sep 17 00:00:00 2001 From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com> Date: Sun, 31 Jan 2021 23:22:57 +0100 Subject: [PATCH] wiiu: fix mblur and default to off --- src/core/Frontend.cpp | 9 ++++++++- src/core/MenuScreensCustom.cpp | 5 +++++ src/render/MBlur.cpp | 8 ++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 0928b769..3d2a1c8e 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -3674,7 +3674,9 @@ CMenuManager::LoadSettings() int fileHandle = CFileMgr::OpenFile("gta3.set", "r"); int32 prevLang = m_PrefsLanguage; -#if GTA_VERSION >= GTA3_PC_11 +#ifdef __WIIU__ + CMBlur::BlurOn = false; +#elif GTA_VERSION >= GTA3_PC_11 CMBlur::BlurOn = (_dwOperatingSystemVersion != OS_WIN98); #else CMBlur::BlurOn = true; @@ -5038,6 +5040,7 @@ CMenuManager::ProcessButtonPresses(void) #endif m_PrefsShowSubtitles = true; m_nDisplayVideoMode = m_nPrefsVideoMode; +#ifndef __WIIU__ #if GTA_VERSION >= GTA3_PC_11 if (_dwOperatingSystemVersion == OS_WIN98) { CMBlur::BlurOn = false; @@ -5049,6 +5052,10 @@ CMenuManager::ProcessButtonPresses(void) #else CMBlur::BlurOn = true; #endif +#else + CMBlur::BlurOn = false; + CMBlur::MotionBlurClose(); +#endif #ifdef CUSTOM_FRONTEND_OPTIONS extern void RestoreDefGraphics(int8); extern void RestoreDefDisplay(int8); diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp index 3eee8dd2..d7502152 100644 --- a/src/core/MenuScreensCustom.cpp +++ b/src/core/MenuScreensCustom.cpp @@ -105,6 +105,7 @@ void RestoreDefGraphics(int8 action) { CMenuManager::m_PrefsVsync = true; CMenuManager::m_PrefsUseWideScreen = false; FrontEndMenuManager.m_nDisplayVideoMode = FrontEndMenuManager.m_nPrefsVideoMode; +#ifndef __WIIU__ #if GTA_VERSION >= GTA3_PC_11 if (_dwOperatingSystemVersion == OS_WIN98) { CMBlur::BlurOn = false; @@ -116,6 +117,10 @@ void RestoreDefGraphics(int8 action) { #else CMBlur::BlurOn = true; #endif +#else + CMBlur::BlurOn = false; + CMBlur::MotionBlurClose(); +#endif FrontEndMenuManager.SaveSettings(); #endif } diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp index a7d07ad9..e24a0811 100644 --- a/src/render/MBlur.cpp +++ b/src/render/MBlur.cpp @@ -200,6 +200,14 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect) RwIm2DVertexSetU(&Vertex[3], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam)); RwIm2DVertexSetV(&Vertex[3], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam)); RwIm2DVertexSetIntRGBA(&Vertex[3], 255, 255, 255, 255); + +#ifdef __WIIU__ + // The texture from the gx2 rasterRenderFast are currently mirrored so flip our Vs + RwIm2DVertexSetV(&Vertex[0], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam)); + RwIm2DVertexSetV(&Vertex[1], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam)); + RwIm2DVertexSetV(&Vertex[2], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam)); + RwIm2DVertexSetV(&Vertex[3], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam)); +#endif } void