From 71afc19427fc17872dd699e1de1120dcf4b6b065 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Sun, 14 Jun 2020 09:14:29 -0700 Subject: [PATCH] Separate "Dump" and "Reload" options Continuation of commit 7228d0d5db323e9540f7466e7b387b0f7cdc5968 --- src/GLideNUI-wtl/GLideNUI.rc | Bin 53324 -> 53792 bytes src/GLideNUI-wtl/Language.cpp | 8 +++++--- src/GLideNUI-wtl/Language.h | 8 +++++--- src/GLideNUI-wtl/Settings.cpp | 3 +++ src/GLideNUI-wtl/config-texture.cpp | 14 +++++++++++--- src/GLideNUI-wtl/resource.h | Bin 20272 -> 20364 bytes translations/wtl/gliden64_en.Lang | 8 +++++--- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc index 5b5176e47c600ac432e4dbf997925b18a9667365..1a536e76500169465b48b79c45fd194c7e0737b1 100644 GIT binary patch delta 802 zcmb7BUr1A76hF6Hv+2;SB{Y%kZtAp}wR^YSZDGi4`Vh6b=nn|RMouye-Mm6J88)bi zCH*-)6{V055_<@~qCXEsA<{$CL(jfOL6|+&gHY$*&2@W>%Xc~F_dDl1=lA{IFYpVC z{Ns1cybJ+cwTNt^d5Yux;73QT4cCfZT(g zmL^WZOv@*uM1wrwD-XkD>j+PGY`XfTuKbwf28j6MKpW=s`!HDy(bI+4y`q!Tg4Z*LR0jiiqi_(- z!&|X$w#3OeSLoI<`C5q&mf85f3bHx{sN)W`~^Lx?z)`0fw9Xboxz}($>U5;cEPF>l~r2ETTIGO#NKV{_t zEY8|EK1|9I%!iMj{Hn&W)4Oo}>F3RynVy;c7RH``+az%8#dtb~bpckj#~YWmxDw|m73O?nV2gZ>dTDl)K_9QtC$ZSA3! zq1C>ghocaJOH6)bVG;=Jj#0EFL3m0-CoDhuKJ{k_EVB9-0ln(!jp9(MKS1Z z3Wqcm%i(iAPPUYpWaGMd7;jFhxTs%KxU^-A5W?I*Hs6X}#`!w;#B(I@Yrw{tNIT=m zL_SMCDJR9HQ+G||x`w60#>cKp+hb&rEwnj5tL^-!)P|YvFDwP!;^Oh%Q|&UskAYD+ z=fvRZR&{Y|pEy1=7~0Bx7&gRu+6j6bXV}rNitNOCqY|Se9!;f0cDmxjX0gfFL!)$s z#%L0^CNww)n&3_c8i(jK9itIs^a#q)D9W=9czEYqi;OKJaCr`n-+g=FI8l7MYsnx< z(UR9$4fNbQQvE?34{`?)7;C`NjEnJc6@^@1tzNkA;%!F7%52(O@|oX*@(R@qo5hW7 z%oOiSXM;*Y9&K?kj_0e*xcuU~V#yCzYiH?i9h(@r(1x{_UQc{|)yh1fvHY`&#m?7} O|74{U5I0s9cK-wLy1Uf? diff --git a/src/GLideNUI-wtl/Language.cpp b/src/GLideNUI-wtl/Language.cpp index 7430726e..0e5a7070 100644 --- a/src/GLideNUI-wtl/Language.cpp +++ b/src/GLideNUI-wtl/Language.cpp @@ -183,9 +183,11 @@ void loadDefaultStrings(void) g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_USE_FULL_TRANSPARENCIES_TOOLTIP, "When this option is cleared, textures will be loaded as they are when using Rice Video: transparencies either on or off. When this option is selected, GlideN64 will check how the texture's alpha channel was designed and will select the most appropriate format. This gives texture pack designers freedom to use semi-transparent textures.\nClear this option for older or poorly designed texture packs.\n[Recommended: Texture pack dependent]")); 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[Recommended: Mostly unchecked, checked for old texture packs]")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_FILE_STORAGE, "Use file storage instead of memory cache")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_DUMP_EDIT, "Dump/edit textures")); - g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_DUMP_EDIT_TOOLTIP, "This option dumps textures on screen to a texture pack folder. You can also reload textures while the game is running to see how they look instantly—big time saver!\nHotkeys:\nUse R to reload textures from the texture pack\nUse D to toggle texture dumping on or off")); + 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[Recommended: PC and game dependent]")); g_defaultStrings.insert(LANG_STRINGS::value_type(TEXTURE_SAVE_ENHANCED, "Save enhanced texture cache to hard disk")); diff --git a/src/GLideNUI-wtl/Language.h b/src/GLideNUI-wtl/Language.h index 0db2d5b9..2eccde24 100644 --- a/src/GLideNUI-wtl/Language.h +++ b/src/GLideNUI-wtl/Language.h @@ -189,9 +189,9 @@ enum languageStringID TEXTURE_USE_FULL_TRANSPARENCIES_TOOLTIP = 5025, TEXTURE_ALTERNATIVE_CRC = 5026, TEXTURE_ALTERNATIVE_CRC_TOOLTIP = 5027, - TEXTURE_FILE_STORAGE = 5028, - TEXTURE_DUMP_EDIT = 5029, - TEXTURE_DUMP_EDIT_TOOLTIP = 5030, + 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, @@ -200,6 +200,8 @@ enum languageStringID TEXTURE_COMPRESS_CACHE_TOOLTIP = 5036, TEXTURE_CONVERT_16BPP = 5037, TEXTURE_CONVERT_16BPP_TOOLTIP = 5038, + TEXTURE_RELOAD = 5039, + TEXTURE_RELOAD_TOOLTIP = 5040, /********************************************************************************* * On-screen display * diff --git a/src/GLideNUI-wtl/Settings.cpp b/src/GLideNUI-wtl/Settings.cpp index e9d8fb77..af189c55 100644 --- a/src/GLideNUI-wtl/Settings.cpp +++ b/src/GLideNUI-wtl/Settings.cpp @@ -93,6 +93,7 @@ void _loadSettings(GlSettings & settings) 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(); @@ -274,6 +275,7 @@ void writeSettings(const char * _strIniFolder) 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); @@ -474,6 +476,7 @@ void saveCustomRomSettings(const char * _strIniFolder, const char * _strRomName) 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 a270b40e..27f9b77a 100644 --- a/src/GLideNUI-wtl/config-texture.cpp +++ b/src/GLideNUI-wtl/config-texture.cpp @@ -62,8 +62,9 @@ void CTextureEnhancementTab::ApplyLanguage(void) SetDlgItemTextW(IDC_TEX_DUMP_PATH_STATIC, wGS(TEXTURE_DUMP_PATH).c_str()); 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_FILE_STORAGE).c_str()); - SetDlgItemTextW(IDC_CHK_TEXTURE_DUMP, wGS(TEXTURE_DUMP_EDIT).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()); @@ -86,8 +87,12 @@ void CTextureEnhancementTab::ApplyLanguage(void) TTSetTxt(GetDlgItem(IDC_CHK_ALPHA_CHANNEL), tooltip.c_str()); tooltip = wGS(TEXTURE_ALTERNATIVE_CRC_TOOLTIP); TTSetTxt(GetDlgItem(IDC_CHK_ALTERNATIVE_CRC), tooltip.c_str()); - tooltip = wGS(TEXTURE_DUMP_EDIT_TOOLTIP); + 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()); @@ -161,6 +166,7 @@ void CTextureEnhancementTab::OnTexturePack(UINT /*Code*/, int /*id*/, HWND /*ctl 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*/) @@ -190,6 +196,7 @@ void CTextureEnhancementTab::LoadSettings(bool /*blockCustomSettings*/) 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); @@ -238,6 +245,7 @@ void CTextureEnhancementTab::SaveSettings() 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 c4af4f6c6738368e9631205ebb98e74b5e579e9c..0c9960e4c8f17271ac4c97591a49c07d918b582a 100644 GIT binary patch delta 936 zcmXBSPiP!v7{~EV4ePpH>e|LO=I}bibzF8Qo7vgfcmH(qCfRKEKQT!0P^1J2q9Ub2 zP9kL~MWo~q@`W6v#2iAAAZ1Y~9*P7J4Moa&ky1htDWyn|9)gGj@kw&}{GMTW--nrB zZ+&3-%Yoi@3hT89+pot@z7?7cbwY23rbAVJjlMEa;^XqGY^Mwt(+z6rA?~D=%nqCB z(_Bl~?4~uB9h;(~x#y^(lP-_O*l<$VV-9~iF4x4p=QHe%C3)sV=#6D4XFTGW6l>x~ z;^s-k##n@fOpG0w=f*uQzF>1}T+#pS!)wPO*?P{F`&R zpL2NIcS-pUi!aGLi6~cnk67NK?;AeME1bOHCz)^L1FmYDy}ah3*wC843W}TB&?+jX zbY!)lxh3(Yj_{7;6D38jV7MgSj>Z@+x_no%SSb(FEhZQ$Tl`oIxFTAmfNx$tympXo zsm%Sd;z7xfIy|@Cz`;bbw1#WK(Q(A2i9s3Fh8MLOvdRB4$%t_a(hCt zbtcYEkRfU;=FgnPnXq}!D6UKx`NN7|L^Y{M8p9{zb@8`Ji;Z((o*Ioeb)2h{KFg91 zyR;$sspR>o2nUj@(}&sc!yAgP#s8)ik!fjFMX@N}so3mHYbq_9L`51kbM(dNO1>w# z-;VOA;*qFYxHAD=aar6ISIS|29|^NR<58YfRI7%y*(6(4|7iaMndfRY3$vOn@va!I zOPgwjck4DwHJ`inBzz(94;oF}(ADs9fVp33E delta 936 zcmXw%O=w(I6vs&@!#Iv+xjH;)1Ivx;}rn8Ey&F^BHztkIuvy%qQ89_`P|b$HLpf ziG;&SbB0g2QTxpK=zLa|TB_&D9Bmp09Czi@vY; z()T%?&+xZza3QaGadK4iUS6@4Hy8v{WCDldyvH@+*}&sjkf9%#I18GI1%vCtPlX4< z-xo|)Rmh)H(uZoC9i@i4tm2!Cigjgien^A}8Yl!mG;(?@!8YzT$#pXCP}<(^Y+Tj=E)f6$^oB`x3bgrj*En5;(4OR`q; zxmcBX)-?OV=+0O@z^X-FNb+Ib=jX1)Z*|3!n$2`0pjaQ(8_3@EhQqD8#X#~$bsMJ{ z&}*1%G(&!DL~)$Mrc10To@=S$U!wPYEBbCzYP2-dE%94hbGapcYbzeKOk$l7w=I4X zUT@pn>jWIMP4SD=>?Ux!Hs#L$allr`;!#&|-0>;*GOrk8yO-u{H{iHukL7=vefN{` F{{XWNPz(S7 diff --git a/translations/wtl/gliden64_en.Lang b/translations/wtl/gliden64_en.Lang index 2c97443b..951b7afa 100644 --- a/translations/wtl/gliden64_en.Lang +++ b/translations/wtl/gliden64_en.Lang @@ -182,9 +182,9 @@ #5025# "When this option is cleared, textures will be loaded as they are when using Rice Video: transparencies either on or off. When this option is selected, GlideN64 will check how the texture's alpha channel was designed and will select the most appropriate format. This gives texture pack designers freedom to use semi-transparent textures.\nClear this option for older or poorly designed texture packs.\n[Recommended: Texture pack dependent]" #5026# "Alternative CRC calculation (for old Rice Video packs)" #5027# "This option emulates a palette CRC calculation bug in Rice Video. If you have problems loading textures, try checking or unchecking this option.\n[Recommended: Mostly unchecked, checked for old texture packs]" -#5028# "Use file storage instead of memory cache" -#5029# "Dump/edit textures" -#5030# "This option dumps textures on screen to a texture pack folder. You can also reload textures while the game is running to see how they look instantly—big time saver!\nHotkeys:\nUse R to reload textures from the texture pack\nUse D to toggle texture dumping on or off" +#5028# "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." +#5029# "Press 'd' to dump N64 textures (for texture artists)" +#5030# "This option dumps textures on screen to a texture pack folder.\nHotkey:\nUse D to toggle texture dumping on or off" #5031# "Size of memory cache for enhanced textures:" #5032# "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[Recommended: PC and game dependent]" #5033# "Save enhanced texture cache to hard disk" @@ -193,6 +193,8 @@ #5036# "Textures will be compressed so more textures can be held in the cache. The compression ratio varies per texture, but the compression is typically 1/5 of the original size.\n[Recommended: Checked]" #5037# "Convert textures to 16 bpp" #5038# "This option halves the space used by textures in the texture cache and video card memory to improve performance. When reducing the color, GLideN64 tries to perserve the original quality as much as possible. On most textures it's hardly noticeable, but some textures, like skies, can look noticeably worse.\n[Recommended: Unchecked]" +#5039# "Press 'r' to reload hi-res textures (for texture artists)" +#5040# "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" /********************************************************************************* * On-screen display *