wiiu: fix mblur and default to off

This commit is contained in:
GaryOderNichts 2021-01-31 23:22:57 +01:00
parent 27674eb532
commit fd8ed81888
3 changed files with 21 additions and 1 deletions

View File

@ -3674,7 +3674,9 @@ CMenuManager::LoadSettings()
int fileHandle = CFileMgr::OpenFile("gta3.set", "r"); int fileHandle = CFileMgr::OpenFile("gta3.set", "r");
int32 prevLang = m_PrefsLanguage; 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); CMBlur::BlurOn = (_dwOperatingSystemVersion != OS_WIN98);
#else #else
CMBlur::BlurOn = true; CMBlur::BlurOn = true;
@ -5038,6 +5040,7 @@ CMenuManager::ProcessButtonPresses(void)
#endif #endif
m_PrefsShowSubtitles = true; m_PrefsShowSubtitles = true;
m_nDisplayVideoMode = m_nPrefsVideoMode; m_nDisplayVideoMode = m_nPrefsVideoMode;
#ifndef __WIIU__
#if GTA_VERSION >= GTA3_PC_11 #if GTA_VERSION >= GTA3_PC_11
if (_dwOperatingSystemVersion == OS_WIN98) { if (_dwOperatingSystemVersion == OS_WIN98) {
CMBlur::BlurOn = false; CMBlur::BlurOn = false;
@ -5049,6 +5052,10 @@ CMenuManager::ProcessButtonPresses(void)
#else #else
CMBlur::BlurOn = true; CMBlur::BlurOn = true;
#endif #endif
#else
CMBlur::BlurOn = false;
CMBlur::MotionBlurClose();
#endif
#ifdef CUSTOM_FRONTEND_OPTIONS #ifdef CUSTOM_FRONTEND_OPTIONS
extern void RestoreDefGraphics(int8); extern void RestoreDefGraphics(int8);
extern void RestoreDefDisplay(int8); extern void RestoreDefDisplay(int8);

View File

@ -105,6 +105,7 @@ void RestoreDefGraphics(int8 action) {
CMenuManager::m_PrefsVsync = true; CMenuManager::m_PrefsVsync = true;
CMenuManager::m_PrefsUseWideScreen = false; CMenuManager::m_PrefsUseWideScreen = false;
FrontEndMenuManager.m_nDisplayVideoMode = FrontEndMenuManager.m_nPrefsVideoMode; FrontEndMenuManager.m_nDisplayVideoMode = FrontEndMenuManager.m_nPrefsVideoMode;
#ifndef __WIIU__
#if GTA_VERSION >= GTA3_PC_11 #if GTA_VERSION >= GTA3_PC_11
if (_dwOperatingSystemVersion == OS_WIN98) { if (_dwOperatingSystemVersion == OS_WIN98) {
CMBlur::BlurOn = false; CMBlur::BlurOn = false;
@ -116,6 +117,10 @@ void RestoreDefGraphics(int8 action) {
#else #else
CMBlur::BlurOn = true; CMBlur::BlurOn = true;
#endif #endif
#else
CMBlur::BlurOn = false;
CMBlur::MotionBlurClose();
#endif
FrontEndMenuManager.SaveSettings(); FrontEndMenuManager.SaveSettings();
#endif #endif
} }

View File

@ -200,6 +200,14 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
RwIm2DVertexSetU(&Vertex[3], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam)); RwIm2DVertexSetU(&Vertex[3], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam));
RwIm2DVertexSetV(&Vertex[3], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam)); RwIm2DVertexSetV(&Vertex[3], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
RwIm2DVertexSetIntRGBA(&Vertex[3], 255, 255, 255, 255); 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 void