diff --git a/.gitmodules b/.gitmodules index ea0719d..93dccdf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,8 @@ [submodule "vulkan/modules/sombrero"] path = vulkan/modules/sombrero url = git@github.com:wheaney/sombrero.git + branch = plugins [submodule "modules/xrealAirLinuxDriver"] path = modules/xrealAirLinuxDriver url = git@github.com:wheaney/xrealAirLinuxDriver.git + branch = plugins \ No newline at end of file diff --git a/bin/package_vulkan b/bin/package_vulkan index 5a9d17a..e978d84 100755 --- a/bin/package_vulkan +++ b/bin/package_vulkan @@ -42,6 +42,7 @@ cp $VKBASALT_BUILD_DIR/builddir.32/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.32/ # copy Sombrero FX, get ReShade headers cp $VULKAN_MODULES/sombrero/IMUAdjust.fx $PACKAGE_DIR +cp $VULKAN_MODULES/sombrero/Sideview.fx $PACKAGE_DIR cp $VULKAN_MODULES/sombrero/calibrating.png $PACKAGE_DIR wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShade.fxh wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShadeUI.fxh diff --git a/modules/xrealAirLinuxDriver b/modules/xrealAirLinuxDriver index 3371ce4..e3b49be 160000 --- a/modules/xrealAirLinuxDriver +++ b/modules/xrealAirLinuxDriver @@ -1 +1 @@ -Subproject commit 3371ce49ae0cd766eb978ab29b658e1f5e8aa68e +Subproject commit e3b49beeade9ea80bf6eed9658658984d5cab2cf diff --git a/vulkan/bin/setup b/vulkan/bin/setup index e3e9860..0f1ae19 100755 --- a/vulkan/bin/setup +++ b/vulkan/bin/setup @@ -48,10 +48,13 @@ fi chown $USER:$USER $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.* # copy the vkBasalt.conf file and make replacements -sed -e "s|/path/to/reshade-shaders|${USER_HOME}/.config/reshade|" -e "s|/path/to/sombrero|${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx|" config/vkBasalt.conf > $USER_HOME/.config/vkBasalt/vkBasalt.conf +sed -e "s|/path/to/reshade-shaders|${USER_HOME}/.config/reshade|" \ + -e "s|/path/to/virtual_display|${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx|" \ + -e "s|/path/to/sideview|${USER_HOME}/.config/reshade/Shaders/Sideview.fx|" \ + config/vkBasalt.conf > $USER_HOME/.config/vkBasalt/vkBasalt.conf chown -R $USER:$USER $USER_HOME/.config/vkBasalt -echo "Installing the Sombrero shader and texture files to ${USER_HOME}/.config/reshade/{Shaders,Textures}" +echo "Installing the Sombrero shaders and texture files to ${USER_HOME}/.config/reshade/{Shaders,Textures}" cp *.fx* $USER_HOME/.config/reshade/Shaders cp calibrating.png $USER_HOME/.config/reshade/Textures chown -R $USER:$USER $USER_HOME/.config/reshade diff --git a/vulkan/config/vkBasalt.conf b/vulkan/config/vkBasalt.conf index 1402899..947d061 100644 --- a/vulkan/config/vkBasalt.conf +++ b/vulkan/config/vkBasalt.conf @@ -1,6 +1,7 @@ -effects = sombrero +effects = virtual_display:sideview -sombrero = /path/to/sombrero +virtual_display = /path/to/virtual_display +sideview = /path/to/sideview reshadeTexturePath = "/path/to/reshade-shaders/Textures" reshadeIncludePath = "/path/to/reshade-shaders/Shaders" depthCapture = off diff --git a/vulkan/modules/sombrero b/vulkan/modules/sombrero index 5e26880..c429d56 160000 --- a/vulkan/modules/sombrero +++ b/vulkan/modules/sombrero @@ -1 +1 @@ -Subproject commit 5e26880d3221dd8a30aae4ef6b34f52a157e2adf +Subproject commit c429d5614e71238d6377b4929208fbebc35b0f52