From 0191ea26f64ad14c6c6165929fef92914502bd50 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Mon, 8 Nov 2021 17:41:57 +0300 Subject: [PATCH] Scripts version 2044-2 --- data_from_portwine/changelog | 5 ++--- data_from_portwine/scripts/functions_helper | 8 ++++++-- data_from_portwine/scripts/lang | 6 ++++++ data_from_portwine/scripts/runlib | 2 +- data_from_portwine/vkBasalt.conf | 13 ++----------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 75a92fa5..33b0fe53 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -1,9 +1,8 @@ История изменений и дальнейшие планы: ----------------------------------------- В планах: +* добавить содерживое user.conf в лог * добавить inxi в runtime и его вывод с аргументом -G в log -* добавить 32-битный mangohud_dlsym в runtime -* добавить cs_block при запуске порта * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- @@ -14,7 +13,7 @@ * улучшена работа функции использования гибридной графики intel + nvidia ###Scripts version 2042### -* из за проблемы на стороне githab перезалиты libs_v17.2 +* из-за проблемы на стороне githab перезалиты libs_v17.2 * добавлена возможность удаления wine из графического интерфейса - Cпасибо Aldiserg (Dmitry) ###Scripts version 2041### diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 85c2da55..702778b3 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -700,7 +700,11 @@ pw_gui_for_edit_db () { --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0 YAD_STATUS="$?" - if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 + if [[ "$YAD_STATUS" == "1" ]] ; then + /bin/bash -c ${pw_full_command_line[*]} & + exit 0 + elif [[ "$YAD_STATUS" == "252" ]] ; then + exit 0 elif [ "$YAD_STATUS" == "150" ] ; then xdg-open "${PORTWINE_DB_FILE}" & exit 0 @@ -905,7 +909,7 @@ gui_vkBasalt () { "${pw_yad_new}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" --center --borders=10 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ - --button="CANCEL":1 --button="DISABLED VKBASALT":180 --button="ENABLED VKBASALT":182 + --button="CANCEL":1 --button="DISABLE VKBASALT":180 --button="ENABLE VKBASALT":182 YAD_VKBASALT_STATUS="$?" case "${YAD_VKBASALT_STATUS}" in 1|252) diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 359c99dc..00bdbad1 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -90,6 +90,12 @@ then export PW_FilmGrain2_INFO='Добавление эффекта зерна кинопленки' export PW_Curves_INFO='Увеличение контраста изображения' export PW_Denoise_INFO='Уменьшение шумов за счет смазывания изображения' + export PW_Emphasize_INFO='Уменьшение рязрядности цветопередачи' + export PW_FakeMotionBlur_INFO='Сильное размытие объектов в движении' + export PW_FilmicAnamorphSharpen_INFO='Увеличение резкости (рекомендую для мультяшных игр)' + export PW_FilmicPass_INFO='Добавление холодных цветов' + export PW_SMAA_INFO='Альтернативный вариант сглаживания (меньший эффект, но с меньшим потреблением ресурсов GPU, относительно стандартного SMAA)' + export PW_GaussianBlur_INFO='Небольшой эффект размытия ярких обьектов (например пламя)' elif [ "${update_loc}" = "ENG" ] then diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 05e5b3b6..9dcc51e2 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -308,7 +308,7 @@ start_portwine () { if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ] then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents" fi - var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,GameOverlayRenderer,GameOverlayRenderer64,winemenubuilder.exe=" + var_winedlloverride_update "beclient,beclient_x64=b,n;steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,GameOverlayRenderer,GameOverlayRenderer64,winemenubuilder.exe=" # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` # echo "TOTAL_VRAM=${TOTAL_VRAM}" diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf index 4f091c21..c3a905cc 100755 --- a/data_from_portwine/vkBasalt.conf +++ b/data_from_portwine/vkBasalt.conf @@ -1,26 +1,18 @@ reshadeTexturePath = /usr/local/share/reshade/textures reshadeIncludePath = /usr/local/share/reshade/ FilmGrain2 = /usr/local/share/reshade/shaders/FilmGrain2.fx +Curves = /usr/local/share/reshade/shaders/Curves.fx FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx Colourfulness = /usr/local/share/reshade/shaders/Colourfulness.fx Bloom = /usr/local/share/reshade/shaders/Bloom.fx +SMAA = /usr/local/share/reshade/shaders/SMAA.fx ChromaticAberration = /usr/local/share/reshade/shaders/ChromaticAberration.fx Denoise = /usr/local/share/reshade/shaders/Denoise.fx Clarity = /usr/local/share/reshade/shaders/Clarity.fx -Curves = /usr/local/share/reshade/shaders/Curves.fx -Depth3D = /usr/local/share/reshade/shaders/Depth3D.fx -Dephhaze = /usr/local/share/reshade/shaders/Dephhaze.fx -DisplayDepth = /usr/local/share/reshade/shaders/DisplayDepth.fx -DOF = /usr/local/share/reshade/shaders/DOF.fx -DPX = /usr/local/share/reshade/shaders/DPX.fx Emphasize = /usr/local/share/reshade/shaders/Emphasize.fx -EyeAdaption = /usr/local/share/reshade/shaders/EyeAdaption.fx FakeMotionBlur = /usr/local/share/reshade/shaders/FakeMotionBlur.fx -FilmGrain = /usr/local/share/reshade/shaders/FilmGrain.fx FilmicAnamorphSharpen = /usr/local/share/reshade/shaders/FilmicAnamorphSharpen.fx FilmicPass = /usr/local/share/reshade/shaders/FilmicPass.fx -FineSharp = /usr/local/share/reshade/shaders/FineSharp.fx -FXAA = /usr/local/share/reshade/shaders/FXAA.fx GaussianBlur = /usr/local/share/reshade/shaders/GaussianBlur.fx Glitch = /usr/local/share/reshade/shaders/Glitch.fx HighPassSharpen = /usr/local/share/reshade/shaders/HighPassSharpen.fx @@ -45,7 +37,6 @@ PPFX_Godrays = /usr/local/share/reshade/shaders/PPFX_Godrays.fx Prism = /usr/local/share/reshade/shaders/Prism.fx ReflectiveBumpMapping = /usr/local/share/reshade/shaders/ReflectiveBumpMapping.fx Sepia = /usr/local/share/reshade/shaders/Sepia.fx -SMAA = /usr/local/share/reshade/shaders/SMAA.fx Splitscreen = /usr/local/share/reshade/shaders/Splitscreen.fx StageDepth = /usr/local/share/reshade/shaders/StageDepth.fx SurfaceBlur = /usr/local/share/reshade/shaders/SurfaceBlur.fx