diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 023e6a7..af4bd0d 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -10,7 +10,7 @@ ----------------------------------------- ###Scripts version 1113### * начальная поддержка нативной версии nvapi при условии, что wine его поддерживает -* тест vkBasalt (переменныt добавлены в скрипт var) +* тест vkBasalt (в каталог data добавлен vkBasalt.conf и добавлены переменные в скрипт var) ###PortProton-90### 28.06.2021 * обновлен Proton 6.3-5 (RELEASE) diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 7ba138c..bd94493 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -131,6 +131,12 @@ pw_mangohud_check () { export DISABLE_MANGOHUD=1 fi } +pw_vkbasalt_check () { + export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" + if [ -d "/home/${USER}/.local/share/reshade/Shaders/" ] + then sed -i "s%/xuser/%/${USER}/%" "${VKBASALT_CONFIG_FILE}" + fi +} gui_question () { `zenity --question --title "${inst_set}." --text "$1" --no-wrap ` &> /dev/null [ $? -eq "0" ] && return 0 || return 1 @@ -277,7 +283,7 @@ PW_DOWNLOAD_GECKO () { PW_TRAY_ICON () { if [ -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then tray_icon_click() { - echo "" + echo "" } export -f tray_icon_click tray_icon_click_exit() { @@ -294,8 +300,8 @@ PW_TRAY_ICON () { --command="bash -c tray_icon_click" \ --tooltip="PortProton" \ --menu="| \ - <<< CHANGE LOG >>>!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"| \ - <<< FORCE EXIT >>>!bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"|" +<<< CHANGE LOG >>>!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"| \ +<<< FORCE EXIT >>>!bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"|" fi } START_PORTWINE () { @@ -324,17 +330,17 @@ START_PORTWINE () { export WINE="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine" export WINESERVER="${WINEDIR}/bin/wineserver" - export WINEDLLPATH="${WINEDIR}/lib/wine" - export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib" + export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" create_new_dir "${WINEDIR}/share/wine/" try_remove_dir "${WINEDIR}"/share/wine/gecko try_remove_dir "${WINEDIR}"/share/wine/mono try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/ try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/ - if [ -d "${PATH_TO_GAME}" ] - then export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}" - else export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" + + if [ ! -z "${LD_LIBRARY_PATH}" ] + then export LD_LIBRARY_PATH="${WINEDIR}/lib64/:${WINEDIR}/lib/:${LD_LIBRARY_PATH}" + else export LD_LIBRARY_PATH="${WINEDIR}/lib64/:${WINEDIR}/lib/" fi if [ ! -z "${PATH}" ] then export PATH="${WINEDIR}/bin:${PATH}" @@ -344,7 +350,7 @@ START_PORTWINE () { export PW_RUNTIME="" echo "RUNTIME is disabled" else - export PW_AND_RUNTIME_LIBRARY_PATH="/overrides/lib/x86_64-linux-gnu:/overrides/lib/x86_64-linux-gnu/aliases:/overrides/lib/i386-linux-gnu:/overrides/lib/i386-linux-gnu/aliases:" + export PW_AND_RUNTIME_LIBRARY_PATH="/overrides/lib/x86_64-linux-gnu/:/overrides/lib/x86_64-linux-gnu/aliases/:/overrides/lib/i386-linux-gnu/:/overrides/lib/i386-linux-gnu/aliases/:" export PW_RUNTIME="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ --share-home \ --runtime=${PW_WINELIB}/runtime \ @@ -850,6 +856,7 @@ PW_RUN () { cd "${WINEPREFIX}/drive_c" fi pw_mangohud_check + pw_vkbasalt_check print_var "WINEDIR" "WINEARCH" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_VULKAN_USE" "VKD3D_CONFIG" if [ "${PW_LOG}" == 1 ] ; then export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 283fd72..b0c790c 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -5,7 +5,6 @@ try_remove_file "${PORT_WINE_TMP_PATH}/update_notifier" try_remove_file "${PORT_WINE_TMP_PATH}/init_run_suc" -try_remove_file "${PORT_WINE_PATH}/data/port_on" try_remove_file "${PORT_WINE_PATH}/settings.desktop" try_remove_file "${PORT_WINE_PATH}/debug.desktop" try_remove_file "${PORT_WINE_PATH}/reset.desktop" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 24f7752..cfdefcc 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -5,7 +5,6 @@ export PW_MANGOHUD=1 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display #export DXVK_HUD=fps,devinfo #export ENABLE_VKBASALT=1 -#export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" #export PW_VIRTUAL_DESKTOP=1 export PW_USE_RUNTIME=1 # 0 - disabled; 1 - enabled diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf index 033255e..a44c365 100644 --- a/data_from_portwine/vkBasalt.conf +++ b/data_from_portwine/vkBasalt.conf @@ -1,80 +1,19 @@ -################### File Generated by GOverlay ################### reshadeTexturePath = /home/xuser/.local/share/reshade/Textures reshadeIncludePath = /home/xuser/.local/share/reshade -3DFX = /home/xuser/.local/share/reshade/Shaders/3DFX.fx -AdaptiveFog = /home/xuser/.local/share/reshade/Shaders/AdaptiveFog.fx -AdaptiveSharpen = /home/xuser/.local/share/reshade/Shaders/AdaptiveSharpen.fx -AmbientLight = /home/xuser/.local/share/reshade/Shaders/AmbientLight.fx -ASCII = /home/xuser/.local/share/reshade/Shaders/ASCII.fx -AspectRatio = /home/xuser/.local/share/reshade/Shaders/AspectRatio.fx -Bloom = /home/xuser/.local/share/reshade/Shaders/Bloom.fx -Border = /home/xuser/.local/share/reshade/Shaders/Border.fx -Cartoon = /home/xuser/.local/share/reshade/Shaders/Cartoon.fx -ChromaKey = /home/xuser/.local/share/reshade/Shaders/ChromaKey.fx -ChromaticAberration = /home/xuser/.local/share/reshade/Shaders/ChromaticAberration.fx -CinematicDOF = /home/xuser/.local/share/reshade/Shaders/CinematicDOF.fx -Clarity = /home/xuser/.local/share/reshade/Shaders/Clarity.fx -ColorMatrix = /home/xuser/.local/share/reshade/Shaders/ColorMatrix.fx -Colourfulness = /home/xuser/.local/share/reshade/Shaders/Colourfulness.fx -CRT = /home/xuser/.local/share/reshade/Shaders/CRT.fx -Curves = /home/xuser/.local/share/reshade/Shaders/Curves.fx -Daltonize = /home/xuser/.local/share/reshade/Shaders/Daltonize.fx -Deband = /home/xuser/.local/share/reshade/Shaders/Deband.fx -Denoise = /home/xuser/.local/share/reshade/Shaders/Denoise.fx -Depth3D = /home/xuser/.local/share/reshade/Shaders/Depth3D.fx -Dephhaze = /home/xuser/.local/share/reshade/Shaders/Dephhaze.fx -DisplayDepth = /home/xuser/.local/share/reshade/Shaders/DisplayDepth.fx -DOF = /home/xuser/.local/share/reshade/Shaders/DOF.fx -DPX = /home/xuser/.local/share/reshade/Shaders/DPX.fx -Emphasize = /home/xuser/.local/share/reshade/Shaders/Emphasize.fx -EyeAdaption = /home/xuser/.local/share/reshade/Shaders/EyeAdaption.fx -FakeHDR = /home/xuser/.local/share/reshade/Shaders/FakeHDR.fx FakeMotionBlur = /home/xuser/.local/share/reshade/Shaders/FakeMotionBlur.fx -FilmGrain = /home/xuser/.local/share/reshade/Shaders/FilmGrain.fx -FilmGrain2 = /home/xuser/.local/share/reshade/Shaders/FilmGrain2.fx -FilmicAnamorphSharpen = /home/xuser/.local/share/reshade/Shaders/FilmicAnamorphSharpen.fx -FilmicPass = /home/xuser/.local/share/reshade/Shaders/FilmicPass.fx -FineSharp = /home/xuser/.local/share/reshade/Shaders/FineSharp.fx FXAA = /home/xuser/.local/share/reshade/Shaders/FXAA.fx GaussianBlur = /home/xuser/.local/share/reshade/Shaders/GaussianBlur.fx -Glitch = /home/xuser/.local/share/reshade/Shaders/Glitch.fx -HighPassSharpen = /home/xuser/.local/share/reshade/Shaders/HighPassSharpen.fx HQ4X = /home/xuser/.local/share/reshade/Shaders/HQ4X.fx -HSLShift = /home/xuser/.local/share/reshade/Shaders/HSLShift.fx Layer = /home/xuser/.local/share/reshade/Shaders/Layer.fx -Levels = /home/xuser/.local/share/reshade/Shaders/Levels.fx LevelsPlus = /home/xuser/.local/share/reshade/Shaders/LevelsPlus.fx -LiftGammaGain = /home/xuser/.local/share/reshade/Shaders/LiftGammaGain.fx -LightDoF = /home/xuser/.local/share/reshade/Shaders/LightDoF.fx -LumaSharpen = /home/xuser/.local/share/reshade/Shaders/LumaSharpen.fx -LUT = /home/xuser/.local/share/reshade/Shaders/LUT.fx MagicBloom = /home/xuser/.local/share/reshade/Shaders/MagicBloom.fx -Monochrome = /home/xuser/.local/share/reshade/Shaders/Monochrome.fx -MultiLUT = /home/xuser/.local/share/reshade/Shaders/MultiLUT.fx -MXAO = /home/xuser/.local/share/reshade/Shaders/MXAO.fx -NightVision = /home/xuser/.local/share/reshade/Shaders/NightVision.fx -Nostalgia = /home/xuser/.local/share/reshade/Shaders/Nostalgia.fx -PerfectPerspective = /home/xuser/.local/share/reshade/Shaders/PerfectPerspective.fx -PPFX_Bloom = /home/xuser/.local/share/reshade/Shaders/PPFX_Bloom.fx -PPFX_Godrays = /home/xuser/.local/share/reshade/Shaders/PPFX_Godrays.fx -Prism = /home/xuser/.local/share/reshade/Shaders/Prism.fx ReflectiveBumpMapping = /home/xuser/.local/share/reshade/Shaders/ReflectiveBumpMapping.fx -Sepia = /home/xuser/.local/share/reshade/Shaders/Sepia.fx SMAA = /home/xuser/.local/share/reshade/Shaders/SMAA.fx -Splitscreen = /home/xuser/.local/share/reshade/Shaders/Splitscreen.fx -StageDepth = /home/xuser/.local/share/reshade/Shaders/StageDepth.fx -SurfaceBlur = /home/xuser/.local/share/reshade/Shaders/SurfaceBlur.fx -Technicolor = /home/xuser/.local/share/reshade/Shaders/Technicolor.fx -Technicolor2 = /home/xuser/.local/share/reshade/Shaders/Technicolor2.fx -TiltShift = /home/xuser/.local/share/reshade/Shaders/TiltShift.fx Tonemap = /home/xuser/.local/share/reshade/Shaders/Tonemap.fx -TriDither = /home/xuser/.local/share/reshade/Shaders/TriDither.fx -UIDetect = /home/xuser/.local/share/reshade/Shaders/UIDetect.fx -UIMask = /home/xuser/.local/share/reshade/Shaders/UIMask.fx -Vibrance = /home/xuser/.local/share/reshade/Shaders/Vibrance.fx Vignette = /home/xuser/.local/share/reshade/Shaders/Vignette.fx -Temporal_AA = /home/xuser/.local/share/reshade/Shaders/Temporal_AA.fx +Curves = /home/xuser/.local/share/reshade/Shaders/Curves.fx +FakeHDR = /home/xuser/.local/share/reshade/Shaders/FakeHDR.fx -casSharpness=1.0 +casSharpness=0.8 toggleKey = Home -effects = SMAA:FakeHDR:cas +effects = Curves:cas