From 93524b65f7ce68438f400abb6b4f0b5195984725 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Mon, 16 Nov 2020 12:26:34 +0700 Subject: [PATCH] Fix compilation of GLideNUI-WTL. Hotkeys are not supported in wtl ui yet. --- src/GLideNUI-wtl/GLideNUI.rc | Bin 53792 -> 53088 bytes src/GLideNUI-wtl/Language.cpp | 10 +++------- src/GLideNUI-wtl/Language.h | 2 -- src/GLideNUI-wtl/Settings.cpp | 6 ------ src/GLideNUI-wtl/config-texture.cpp | 16 ++-------------- src/GLideNUI-wtl/resource.h | Bin 20364 -> 20178 bytes 6 files changed, 5 insertions(+), 29 deletions(-) diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc index 1a536e76500169465b48b79c45fd194c7e0737b1..a221500fb3232db6e4860afbc81f483bc88ddd1d 100644 GIT binary patch delta 44 vcmZ3mg!#cd<_(WnCtnhhn*5K|1578em4WEZU)a*>Hg9O#!MgcOZ-@&3#L*Nz delta 326 zcmaDbk9olo<_(Wn85Jf!WK9N>vXc|oN+7JwAJ|grCO=SAN)BKsVn}5u20{e}b%qom zR$wS$$On=s45bXY3@EzU489BjlOLv5Pp)g?V76ee+-%u;nRRkbj8-nHLyC|b0&-vu(3(V` ulN1;-fQIVA9Z&+4qrgerK@6@8J`Da0jtnkPXR)ywF&HoyZT{Jn?g9Wj2v8XS diff --git a/src/GLideNUI-wtl/Language.cpp b/src/GLideNUI-wtl/Language.cpp index da3fc80a..45490838 100644 --- a/src/GLideNUI-wtl/Language.cpp +++ b/src/GLideNUI-wtl/Language.cpp @@ -23,7 +23,7 @@ void LoadDefaultStrings(void) g_defaultStrings.insert(LANG_STRINGS::value_type(CFG_SAVE_AND_CLOSE, "Save and Close")); g_defaultStrings.insert(LANG_STRINGS::value_type(CFG_SAVE, "Save")); g_defaultStrings.insert(LANG_STRINGS::value_type(CFG_CLOSE, "Close")); - + //Video Tab g_defaultStrings.insert(LANG_STRINGS::value_type(VIDEO_GROUP, "Video")); g_defaultStrings.insert(LANG_STRINGS::value_type(VIDEO_FULL_SCREEN_RES, "Full screen resolution:")); @@ -142,7 +142,7 @@ void LoadDefaultStrings(void) g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_N64_DEPTH_COMPARE_TOOLTIP, "The N64 uses a unique method of calculating depth to the camera. When enabled, GlideN64 uses shaders to try to emulate these calculations correctly. Not compatible with anti-aliasing. Experimental!\nFast mode requires OpenGL 4.2 and fragment shader interlock extensions.\nCompatible mode requires only core OpenGL 4.2 Can be slow!\n[Recommended: Sometimes checked, for several games]")); g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_N64_DEPTH_DISABLE, "Disable")); g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_N64_DEPTH_FAST, "Fast")); - g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_N64_DEPTH_COMPATIBLE, "Compatible")); + g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_N64_DEPTH_COMPATIBLE, "Compatible")); g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_FORCE_DEPTH_BUFFER_CLEAR, "Force depth buffer clear")); g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_FORCE_DEPTH_BUFFER_CLEAR_TOOLTIP, "Enable force depth buffer clear. A hack. Necessary for Eikou no Saint Andrews.\n\n[Recommended: off, except for Eikou no Saint Andrews]")); g_defaultStrings.insert(LANG_STRINGS::value_type(FRAMEBUFFER_RENDER_FRAMEBUFFER, "Render N64 frame buffer to output")); @@ -180,10 +180,6 @@ void LoadDefaultStrings(void) g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_ALTERNATIVE_CRC, "Alternative CRC calculation (for old Rice Video packs)")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_ALTERNATIVE_CRC_TOOLTIP, "This option emulates a palette CRC calculation bug in Rice Video. If you have problems loading textures, try checking or unchecking this option.\n\n[Recommended: Mostly unchecked, checked for old texture packs]")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_USE_FILE_STORAGE_TOOLTIP, "This option enables alternative storage for hi-res textures. Normally memory cache is used. It keeps all hi-res textures in RAM and thus limited by available RAM size. File storage keeps texture cache on HDD. It is slower than memory cache, but has virtually no limits on cache size. Disable \"Compress texture cache\" option for better performance.")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_DUMP, "Press 'd' to dump N64 textures (for texture artists)")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_DUMP_TOOLTIP, "This option dumps textures on screen to a texture pack folder.\nHotkey:\nUse D to toggle texture dumping on or off")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_RELOAD, "Press 'r' to reload hi-res textures (for texture artists)")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_RELOAD_TOOLTIP, "This option allows texture artists to reload hi-res textures while the game is running to instantly see how they look —big time saver\nHotkey:\nUse R to reload textures from the texture pack")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_SIZE_OF_MEMORY_CACHE, "Size of memory cache for enhanced textures:")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_SIZE_OF_MEMORY_CACHE_TOOLTIP, "Enhanced and filtered textures can be cached to improve performance. This option adjusts how much memory is dedicated to the texture cache. This can improve performance if there are many requests for the same texture, which is usually the case. Normally 128 MB should be more than enough, but the best option is different for each game. Super Mario 64 may not need more than 32 MB, but Conker's Bad Fur Day can take advantage of 256 MB+. Adjust accordingly if you are having performance problems. Setting this option to 0 disables the cache.\n\n[Recommended: PC and game dependent]")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_SAVE_ENHANCED, "Save enhanced texture cache to hard disk")); @@ -372,7 +368,7 @@ LanguageList GetLanguageList(const char * path) if (hFindFile != INVALID_HANDLE_VALUE) { do { std::string langFile = pluginFolder + FindData.cFileName; - LanguageFile file; + LanguageFile file; file.Filename = FindData.cFileName; file.LanguageName = GetLangString(langFile.c_str(), LANGUAGE_NAME); diff --git a/src/GLideNUI-wtl/Language.h b/src/GLideNUI-wtl/Language.h index 6d877815..210b0f1a 100644 --- a/src/GLideNUI-wtl/Language.h +++ b/src/GLideNUI-wtl/Language.h @@ -191,8 +191,6 @@ enum languageStringID TEXTURE_ALTERNATIVE_CRC = 5026, TEXTURE_ALTERNATIVE_CRC_TOOLTIP = 5027, TEXTURE_USE_FILE_STORAGE_TOOLTIP = 5028, - TEXTURE_DUMP = 5029, - TEXTURE_DUMP_TOOLTIP = 5030, TEXTURE_SIZE_OF_MEMORY_CACHE = 5031, TEXTURE_SIZE_OF_MEMORY_CACHE_TOOLTIP = 5032, TEXTURE_SAVE_ENHANCED = 5033, diff --git a/src/GLideNUI-wtl/Settings.cpp b/src/GLideNUI-wtl/Settings.cpp index 4bede554..0203118f 100644 --- a/src/GLideNUI-wtl/Settings.cpp +++ b/src/GLideNUI-wtl/Settings.cpp @@ -95,8 +95,6 @@ void _loadSettings(GlSettings & settings) config.textureFilter.txHiresEnable = settings.value("txHiresEnable", config.textureFilter.txHiresEnable).toInt(); config.textureFilter.txHiresFullAlphaChannel = settings.value("txHiresFullAlphaChannel", config.textureFilter.txHiresFullAlphaChannel).toInt(); config.textureFilter.txHresAltCRC = settings.value("txHresAltCRC", config.textureFilter.txHresAltCRC).toInt(); - config.textureFilter.txDump = settings.value("txDump", config.textureFilter.txDump).toInt(); - config.textureFilter.txReloadHiresTex = settings.value("txReloadHiresTex", config.textureFilter.txReloadHiresTex).toInt(); config.textureFilter.txForce16bpp = settings.value("txForce16bpp", config.textureFilter.txForce16bpp).toInt(); config.textureFilter.txCacheCompression = settings.value("txCacheCompression", config.textureFilter.txCacheCompression).toInt(); config.textureFilter.txSaveCache = settings.value("txSaveCache", config.textureFilter.txSaveCache).toInt(); @@ -279,8 +277,6 @@ void writeSettings(const char * _strIniFolder) settings.setValue("txHiresEnable", config.textureFilter.txHiresEnable); settings.setValue("txHiresFullAlphaChannel", config.textureFilter.txHiresFullAlphaChannel); settings.setValue("txHresAltCRC", config.textureFilter.txHresAltCRC); - settings.setValue("txDump", config.textureFilter.txDump); - settings.setValue("txReloadHiresTex", config.textureFilter.txReloadHiresTex); settings.setValue("txForce16bpp", config.textureFilter.txForce16bpp); settings.setValue("txCacheCompression", config.textureFilter.txCacheCompression); settings.setValue("txSaveCache", config.textureFilter.txSaveCache); @@ -480,8 +476,6 @@ void saveCustomRomSettings(const char * _strIniFolder, const char * _strRomName) WriteCustomSetting(textureFilter, txHiresEnable); WriteCustomSetting(textureFilter, txHiresFullAlphaChannel); WriteCustomSetting(textureFilter, txHresAltCRC); - WriteCustomSetting(textureFilter, txDump); - WriteCustomSetting(textureFilter, txReloadHiresTex); WriteCustomSetting(textureFilter, txForce16bpp); WriteCustomSetting(textureFilter, txCacheCompression); WriteCustomSetting(textureFilter, txSaveCache); diff --git a/src/GLideNUI-wtl/config-texture.cpp b/src/GLideNUI-wtl/config-texture.cpp index 6ee6a107..af7be3cf 100644 --- a/src/GLideNUI-wtl/config-texture.cpp +++ b/src/GLideNUI-wtl/config-texture.cpp @@ -63,8 +63,6 @@ void CTextureEnhancementTab::ApplyLanguage(void) SetDlgItemTextW(IDC_CHK_ALPHA_CHANNEL, wGS(TEXTURE_USE_FULL_TRANSPARENCIES).c_str()); SetDlgItemTextW(IDC_CHK_ALTERNATIVE_CRC, wGS(TEXTURE_ALTERNATIVE_CRC).c_str()); SetDlgItemTextW(IDC_CHK_HIRES_TEX_FILESTORAGE, wGS(TEXTURE_USE_FILE_STORAGE).c_str()); - SetDlgItemTextW(IDC_CHK_TEXTURE_DUMP, wGS(TEXTURE_DUMP).c_str()); - SetDlgItemTextW(IDC_CHK_TEXTURE_RELOAD, wGS(TEXTURE_RELOAD).c_str()); SetDlgItemTextW(IDC_TEXTURE_FILTER_CACHE_STATIC, wGS(TEXTURE_SIZE_OF_MEMORY_CACHE).c_str()); SetDlgItemTextW(IDC_CHK_SAVE_TEXTURE_CACHE, wGS(TEXTURE_SAVE_ENHANCED).c_str()); SetDlgItemTextW(IDC_CHK_COMPRESS_CACHE, wGS(TEXTURE_COMPRESS_CACHE).c_str()); @@ -89,10 +87,6 @@ void CTextureEnhancementTab::ApplyLanguage(void) TTSetTxt(GetDlgItem(IDC_CHK_ALTERNATIVE_CRC), tooltip.c_str()); tooltip = wGS(TEXTURE_USE_FILE_STORAGE_TOOLTIP); TTSetTxt(GetDlgItem(IDC_CHK_HIRES_TEX_FILESTORAGE), tooltip.c_str()); - tooltip = wGS(TEXTURE_DUMP_TOOLTIP); - TTSetTxt(GetDlgItem(IDC_CHK_TEXTURE_DUMP), tooltip.c_str()); - tooltip = wGS(TEXTURE_RELOAD_TOOLTIP); - TTSetTxt(GetDlgItem(IDC_CHK_TEXTURE_RELOAD), tooltip.c_str()); tooltip = wGS(TEXTURE_SIZE_OF_MEMORY_CACHE_TOOLTIP); TTSetTxt(GetDlgItem(IDC_TEXTURE_FILTER_CACHE_STATIC), tooltip.c_str()); TTSetTxt(GetDlgItem(IDC_TEXTURE_FILTER_CACHE_EDIT), tooltip.c_str()); @@ -165,8 +159,6 @@ void CTextureEnhancementTab::OnTexturePack(UINT /*Code*/, int /*id*/, HWND /*ctl CButton(GetDlgItem(IDC_CHK_ALPHA_CHANNEL)).EnableWindow(UseTextPack); CButton(GetDlgItem(IDC_CHK_ALTERNATIVE_CRC)).EnableWindow(UseTextPack); CButton(GetDlgItem(IDC_CHK_HIRES_TEX_FILESTORAGE)).EnableWindow(UseTextPack); - CButton(GetDlgItem(IDC_CHK_TEXTURE_DUMP)).EnableWindow(UseTextPack); - CButton(GetDlgItem(IDC_CHK_TEXTURE_RELOAD)).EnableWindow(UseTextPack); } LRESULT CTextureEnhancementTab::OnScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) @@ -187,7 +179,7 @@ void CTextureEnhancementTab::LoadSettings(bool /*blockCustomSettings*/) CButton(GetDlgItem(IDC_CHK_IGNORE_BACKGROUNDS)).SetCheck(config.textureFilter.txFilterIgnoreBG != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_ENHANCED_TEX_FILE_STORAGE)).SetCheck(config.textureFilter.txEnhancedTextureFileStorage != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_TEXTURE_PACK)).SetCheck(config.textureFilter.txHiresEnable != 0 ? BST_CHECKED : BST_UNCHECKED); - + GetDlgItem(IDC_TEX_PACK_PATH_EDIT).SetWindowText(config.textureFilter.txPath); GetDlgItem(IDC_TEX_CACHE_PATH_EDIT).SetWindowText(config.textureFilter.txCachePath); GetDlgItem(IDC_TEX_DUMP_PATH_EDIT).SetWindowText(config.textureFilter.txDumpPath); @@ -195,12 +187,10 @@ void CTextureEnhancementTab::LoadSettings(bool /*blockCustomSettings*/) CButton(GetDlgItem(IDC_CHK_ALPHA_CHANNEL)).SetCheck(config.textureFilter.txHiresFullAlphaChannel != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_ALTERNATIVE_CRC)).SetCheck(config.textureFilter.txHresAltCRC != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_HIRES_TEX_FILESTORAGE)).SetCheck(config.textureFilter.txHiresTextureFileStorage != 0 ? BST_CHECKED : BST_UNCHECKED); - CButton(GetDlgItem(IDC_CHK_TEXTURE_DUMP)).SetCheck(config.textureFilter.txDump != 0 ? BST_CHECKED : BST_UNCHECKED); - CButton(GetDlgItem(IDC_CHK_TEXTURE_RELOAD)).SetCheck(config.textureFilter.txReloadHiresTex != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_SAVE_TEXTURE_CACHE)).SetCheck(config.textureFilter.txSaveCache != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_COMPRESS_CACHE)).SetCheck(config.textureFilter.txCacheCompression != 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_CHK_FORCE_16BPP)).SetCheck(config.textureFilter.txForce16bpp != 0 ? BST_CHECKED : BST_UNCHECKED); - + m_TextureFilterCacheSpin.SetPos((config.textureFilter.txCacheSize / gc_uMegabyte) / 50); OnFileStorage(0, 0, NULL); @@ -244,8 +234,6 @@ void CTextureEnhancementTab::SaveSettings() config.textureFilter.txHiresFullAlphaChannel = CButton(GetDlgItem(IDC_CHK_ALPHA_CHANNEL)).GetCheck() == BST_CHECKED ? 1 : 0; config.textureFilter.txHresAltCRC = CButton(GetDlgItem(IDC_CHK_ALTERNATIVE_CRC)).GetCheck() == BST_CHECKED ? 1 : 0; config.textureFilter.txHiresTextureFileStorage = CButton(GetDlgItem(IDC_CHK_HIRES_TEX_FILESTORAGE)).GetCheck() == BST_CHECKED ? 1 : 0; - config.textureFilter.txDump = CButton(GetDlgItem(IDC_CHK_TEXTURE_DUMP)).GetCheck() == BST_CHECKED ? 1 : 0; - config.textureFilter.txReloadHiresTex = CButton(GetDlgItem(IDC_CHK_TEXTURE_RELOAD)).GetCheck() == BST_CHECKED ? 1 : 0; config.textureFilter.txCacheSize = m_TextureFilterCacheSpin.GetPos() * gc_uMegabyte * 50; config.textureFilter.txSaveCache = CButton(GetDlgItem(IDC_CHK_SAVE_TEXTURE_CACHE)).GetCheck() == BST_CHECKED ? 1 : 0; config.textureFilter.txCacheCompression = CButton(GetDlgItem(IDC_CHK_COMPRESS_CACHE)).GetCheck() == BST_CHECKED ? 1 : 0; diff --git a/src/GLideNUI-wtl/resource.h b/src/GLideNUI-wtl/resource.h index 0c9960e4c8f17271ac4c97591a49c07d918b582a..95489df11412f79da00ec0e65023be4152c83f0d 100644 GIT binary patch delta 27 jcmeB~&v8}lskyQmBEL>pTUvA cW%5NXNk+@bjhxb(6SOjv7!@`j_u*y&05S9w&j0`b