Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-04-10 19:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/dynamictextures-fix' into cooker

Browse source
This commit is contained in:
XargonWan 2025-02-10 14:18:45 +09:00
parent 0a23ecb371 8aede28eb8
commit 53a7bd5d38
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
functions/global.sh
View file

@ -107,6 +107,7 @@ dolphingcpadconf="/var/config/dolphin-emu/GCPadNew.ini"
dolphingfxconf="/var/config/dolphin-emu/GFX.ini" dolphingfxconf="/var/config/dolphin-emu/GFX.ini"
dolphinhkconf="/var/config/dolphin-emu/Hotkeys.ini" dolphinhkconf="/var/config/dolphin-emu/Hotkeys.ini"
dolphinqtconf="/var/config/dolphin-emu/Qt.ini" dolphinqtconf="/var/config/dolphin-emu/Qt.ini"
dolphinDynamicInputTexturesPath="/var/data/dolphin-emu/Load/DynamicInputTextures"
# PCSX2 config files # PCSX2 config files
@ -127,6 +128,7 @@ primehackgcpadconf="/var/config/primehack/GCPadNew.ini"
primehackgfxconf="/var/config/primehack/GFX.ini" primehackgfxconf="/var/config/primehack/GFX.ini"
primehackhkconf="/var/config/primehack/Hotkeys.ini" primehackhkconf="/var/config/primehack/Hotkeys.ini"
primehackqtconf="/var/config/primehack/Qt.ini" primehackqtconf="/var/config/primehack/Qt.ini"
primehackDynamicInputTexturesPath="/var/data/primehack/Load/DynamicInputTextures"
# RPCS3 config files # RPCS3 config files

18
tools/configurator.sh
View file

@ -274,7 +274,7 @@ configurator_global_presets_and_settings_dialog() {
} }
configurator_dolphin_input_textures_dialog() { configurator_dolphin_input_textures_dialog() {
if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then if [[ -d "$dolphinDynamicInputTexturesPath" ]]; then
rd_zenity --question \ rd_zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - Toggle Universal Dynamic Input for Dolphin" \ --title "RetroDECK Configurator - Toggle Universal Dynamic Input for Dolphin" \
@ -283,7 +283,7 @@ configurator_dolphin_input_textures_dialog() {
if [ $? == 0 ] if [ $? == 0 ]
then then
# set_setting_value $dolphingfxconf "HiresTextures" "False" dolphin # TODO: Break out a preset for texture packs so this can be enabled and disabled independently. # set_setting_value $dolphingfxconf "HiresTextures" "False" dolphin # TODO: Break out a preset for texture packs so this can be enabled and disabled independently.
rm -rf "/var/data/dolphin-emu/Load/DynamicInputTextures" rm -rf "$dolphinDynamicInputTexturesPath" && log d "Dolphin custom input textures folder deleted: $dolphinDynamicInputTexturesPath"
configurator_process_complete_dialog "disabling Dolphin custom input textures" configurator_process_complete_dialog "disabling Dolphin custom input textures"
else else
configurator_global_presets_and_settings_dialog configurator_global_presets_and_settings_dialog
@ -298,8 +298,8 @@ configurator_dolphin_input_textures_dialog() {
then then
set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin
( (
mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures" mkdir -p "$dolphinDynamicInputTexturesPath" && log d "Dolphin custom input textures folder created: $dolphinDynamicInputTexturesPath"
rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "$dolphinDynamicInputTexturesPath/" && log d "Dolphin custom input textures folder populated: $dolphinDynamicInputTexturesPath"
) | ) |
rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
@ -312,7 +312,7 @@ configurator_dolphin_input_textures_dialog() {
} }
configurator_primehack_input_textures_dialog() { configurator_primehack_input_textures_dialog() {
if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then if [[ -d "$primehackDynamicInputTexturesPath" ]]; then
rd_zenity --question \ rd_zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - Dolphin Custom Input Textures" \ --title "RetroDECK Configurator - Dolphin Custom Input Textures" \
@ -320,8 +320,9 @@ configurator_primehack_input_textures_dialog() {
if [ $? == 0 ] if [ $? == 0 ]
then then
# TODO: unify this in a single function
# set_setting_value $primehackgfxconf "HiresTextures" "False" primehack # TODO: Break out a preset for texture packs so this can be enabled and disabled independently. # set_setting_value $primehackgfxconf "HiresTextures" "False" primehack # TODO: Break out a preset for texture packs so this can be enabled and disabled independently.
rm -rf "/var/data/primehack/Load/DynamicInputTextures" rm -rf "$primehackDynamicInputTexturesPath" && log d "Primehack custom input textures folder deleted: $primehackDynamicInputTexturesPath"
configurator_process_complete_dialog "disabling Primehack custom input textures" configurator_process_complete_dialog "disabling Primehack custom input textures"
else else
configurator_global_presets_and_settings_dialog configurator_global_presets_and_settings_dialog
@ -336,8 +337,9 @@ configurator_primehack_input_textures_dialog() {
then then
set_setting_value $primehackgfxconf "HiresTextures" "True" primehack set_setting_value $primehackgfxconf "HiresTextures" "True" primehack
( (
mkdir "/var/data/primehack/Load/DynamicInputTextures" # TODO: unify this in a single function
rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" mkdir "$primehackDynamicInputTexturesPath" && log d "Primehack custom input textures folder created: $primehackDynamicInputTexturesPath"
rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "$primehackDynamicInputTexturesPath/" && log d "Primehack custom input textures folder populated: $primehackDynamicInputTexturesPath"
) | ) |
rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \