openvr: fix scrolling

.github/workflows/scripts/appimage_prepare_env.sh

@@ -22,7 +22,7 @@ sudo apt-get update
 sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev \
   libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 \
   libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1t64 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev \
-  dav1d libdav1d-dev libvulkan-dev glslc vulkan-tools libudev-dev libudev1 libinput-dev libinput10 spirv-headers
+  dav1d libdav1d-dev libvulkan-dev glslc vulkan-tools libudev-dev libudev1 libinput-dev libinput10
 
 rustup update
 

Cargo.lock

@@ -6374,7 +6374,8 @@ dependencies = [
 [[package]]
 name = "whisper-rs"
 version = "0.16.0"
-source = "git+https://github.com/wayvr-org/whisper-rs.git?rev=2d908ec36cd41521a28f7f5fb5dc95499fd40051#2d908ec36cd41521a28f7f5fb5dc95499fd40051"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2088172d00f936c348d6a72f488dc2660ab3f507263a195df308a3c2383229f6"
 dependencies = [
  "libc",
  "whisper-rs-sys",
@@ -6383,7 +6384,8 @@ dependencies = [
 [[package]]
 name = "whisper-rs-sys"
 version = "0.15.0"
-source = "git+https://github.com/wayvr-org/whisper-rs.git?rev=2d908ec36cd41521a28f7f5fb5dc95499fd40051#2d908ec36cd41521a28f7f5fb5dc95499fd40051"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6986c0fe081241d391f09b9a071fbcbb59720c3563628c3c829057cf69f2a56f"
 dependencies = [
  "bindgen",
  "cfg-if",

wayvr/Cargo.toml

@@ -109,13 +109,7 @@ smithay-clipboard = "0.7.3"
 sysinfo = { version = "0.39.6" }
 thiserror = "2.0.18"
 tracing = "0.1.44"
-whisper-rs = {
-  # version = "0.16.0",
-  git = "https://github.com/wayvr-org/whisper-rs.git",
-  rev = "2d908ec36cd41521a28f7f5fb5dc95499fd40051",
-  features = ["vulkan"],
-  optional = true
-}
+whisper-rs = { version = "0.16.0", features = ["vulkan"], optional = true }
 xcb = {
   version = "1.7.0",
   features = [

wayvr/src/res/actions_binding_frame.json

@@ -223,26 +223,22 @@
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/left/input/thumbstick"
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/right/input/thumbstick"
             },
             {

wayvr/src/res/actions_binding_knuckles.json

@@ -141,26 +141,22 @@
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/left/input/thumbstick"
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/right/input/thumbstick"
             }
          ]

wayvr/src/res/actions_binding_oculus.json

@@ -107,26 +107,22 @@
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/left/input/joystick"
             },
             {
                "inputs" : {
-                  "scroll" : {
+                  "position" : {
                      "output" : "/actions/default/in/scroll"
                   }
                },
-               "mode" : "scroll",
-               "parameters" : {
-                  "scroll_mode" : "smooth"
-               },
+               "mode" : "joystick",
+               "parameters" : {},
                "path" : "/user/hand/right/input/joystick"
             }
          ]