From ec1a4b2d9e79eafc8690843a54c4067fb3bf2826 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Sun, 3 Aug 2014 04:21:17 +0000 Subject: [PATCH] N64: Resolution setting is now applied in the jabo wrapper. --- .../mupen64plus-video-jabo/Config.h | 1 + .../mupen64plus-video-jabo/config.cpp | 6 ++++++ .../mupen64plus-video-jabo/main.cpp | 19 +++++++++++++++--- output/dll/mupen64plus-video-jabo.dll | Bin 27648 -> 27648 bytes 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/libmupen64plus/mupen64plus-video-jabo/Config.h b/libmupen64plus/mupen64plus-video-jabo/Config.h index b9f77cfe1b..cd4f988e32 100644 --- a/libmupen64plus/mupen64plus-video-jabo/Config.h +++ b/libmupen64plus/mupen64plus-video-jabo/Config.h @@ -5,6 +5,7 @@ BOOL Config_Open(); int Config_ReadInt(const char *itemname, const char *desc, int def_value, BOOL create=TRUE, BOOL isBoolean=TRUE); +void Config_ReadScreenResolution(int * width, int * height); #endif /* CONFIG_H */ \ No newline at end of file diff --git a/libmupen64plus/mupen64plus-video-jabo/config.cpp b/libmupen64plus/mupen64plus-video-jabo/config.cpp index 8c905a99d7..962b890f22 100644 --- a/libmupen64plus/mupen64plus-video-jabo/config.cpp +++ b/libmupen64plus/mupen64plus-video-jabo/config.cpp @@ -25,6 +25,12 @@ int Config_ReadScreenInt(const char *itemname) return ConfigGetParamInt(video_general_section, itemname); } +void Config_ReadScreenResolution(int * width, int * height) +{ + *width = ConfigGetParamInt(video_general_section, "ScreenWidth"); + *height = ConfigGetParamInt(video_general_section, "ScreenHeight"); +} + BOOL Config_ReadInt(const char *itemname, const char *desc, int def_value, int create, int isBoolean) { //VLOG("Getting value %s", itemname); diff --git a/libmupen64plus/mupen64plus-video-jabo/main.cpp b/libmupen64plus/mupen64plus-video-jabo/main.cpp index 62198f5c41..d20ee51fb6 100644 --- a/libmupen64plus/mupen64plus-video-jabo/main.cpp +++ b/libmupen64plus/mupen64plus-video-jabo/main.cpp @@ -403,8 +403,21 @@ EXPORT int CALL InitiateGFX(GFX_INFO Gfx_Info) case 4: new_options_val |= 0x00000100; break; } - // Force 800x600 for now - new_options_val |= 0x00000004; + int width, height; + Config_ReadScreenResolution(&width,&height); + if (width == 320 && height == 240) { new_options_val |= 0x00000000; } + else if (width == 400 && height == 300) { new_options_val |= 0x00000001; } + else if (width == 512 && height == 384) { new_options_val |= 0x00000002; } + else if (width == 640 && height == 480) { new_options_val |= 0x00000003; } + else if (width == 800 && height == 600) { new_options_val |= 0x00000004; } + else if (width == 1024 && height == 768) { new_options_val |= 0x00000005; } + else if (width == 1152 && height == 864) { new_options_val |= 0x00000006; } + else if (width == 1280 && height == 960) { new_options_val |= 0x00000007; } + else if (width == 1600 && height == 1200) { new_options_val |= 0x00000008; } + else if (width == 848 && height == 480) { new_options_val |= 0x00000009; } + else if (width == 1024 && height == 576) { new_options_val |= 0x0000000a; } + else if (width == 1380 && height == 768) { new_options_val |= 0x0000000b; } + else { /* will pick 320x240 */ } DWORD new_initflags_val = 0x00e00000; if (settings.direct3d_transformation_pipeline == TRUE) { new_initflags_val = 0x00a00000; } @@ -578,7 +591,7 @@ DWORD WINAPI ThreadProc( LPVOID lpParam ) char *pString = (char *)(lpParam); RegisterDLLWindowClass("InjectedDLLWindowClass"); hWnd_jabo = CreateWindowEx (0, "InjectedDLLWindowClass", pString, WS_OVERLAPPEDWINDOW, 300, 300, 400, 300, NULL, NULL,inj_hModule, NULL ); - ShowWindow (hWnd_jabo, SW_HIDE); + ShowWindow (hWnd_jabo, SW_NORMAL); while (GetMessage (&messages, NULL, 0, 0)) { TranslateMessage(&messages); diff --git a/output/dll/mupen64plus-video-jabo.dll b/output/dll/mupen64plus-video-jabo.dll index 48ec045e70b4108477f726b1515087ea700f2b7b..a6298ba99669f010e33f283776daf2fa1b33bdf8 100644 GIT binary patch delta 5106 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 J-r#K<_kZGGpLGBL delta 4747 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 Tpp&9dBKU<+WuRe{@o4`Wa*ah5