Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adaptive speed for grab & push/pull

Browse Source
This commit is contained in:
galister
2025-12-20 18:55:20 +09:00
parent 73e2f06b01
commit 796fdcbc01
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wlx-overlay-s/src/backend/input.rs
View File

@@ -679,10 +679,13 @@ where
if grab_anchor { if grab_anchor {
if pointer.now.click { if pointer.now.click {
pointer.interaction.mode = PointerMode::Special; pointer.interaction.mode = PointerMode::Special;
handle_scale(&mut app.anchor, pointer.now.scroll_y); let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0) * 0.2 + 0.4;
handle_scale(&mut app.anchor, pointer.now.scroll_y * grab_dist);
} else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() { } else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() {
// single grab push/pull // single grab push/pull
grab_data.offset.translation.z -= pointer.now.scroll_y * 0.05; let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0);
grab_data.offset.translation.z -= pointer.now.scroll_y * 0.02 * grab_dist;
grab_data.offset.translation.z = grab_data.offset.translation.z.min(-0.05);
} }
if pointer.now.click_modifier_right { if pointer.now.click_modifier_right {
app.anchor = pointer.pose * grab_data.offset; app.anchor = pointer.pose * grab_data.offset;
@@ -695,10 +698,16 @@ where
// single grab resize // single grab resize
if pointer.now.click { if pointer.now.click {
pointer.interaction.mode = PointerMode::Special; pointer.interaction.mode = PointerMode::Special;
handle_scale(&mut overlay_state.transform, pointer.now.scroll_y); let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0) * 0.2 + 0.4;
handle_scale(
&mut overlay_state.transform,
pointer.now.scroll_y * grab_dist,
);
} else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() { } else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() {
// single grab push/pull // single grab push/pull
grab_data.offset.translation.z -= pointer.now.scroll_y * 0.05; let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0);
grab_data.offset.translation.z -= pointer.now.scroll_y * 0.02 * grab_dist;
grab_data.offset.translation.z = grab_data.offset.translation.z.min(-0.05);
} }
if pointer.now.click_modifier_right { if pointer.now.click_modifier_right {
overlay_state.transform = pointer.pose * grab_data.offset; overlay_state.transform = pointer.pose * grab_data.offset;

2
wlx-overlay-s/src/backend/openxr/skybox.rs
View File

@@ -220,7 +220,7 @@ impl Skybox {
let sky = xr::CompositionLayerEquirect2KHR::new() let sky = xr::CompositionLayerEquirect2KHR::new()
.layer_flags(xr::CompositionLayerFlags::BLEND_TEXTURE_SOURCE_ALPHA) .layer_flags(xr::CompositionLayerFlags::BLEND_TEXTURE_SOURCE_ALPHA)
.pose(pose) .pose(pose)
.radius(10.0) .radius(100.0)
.sub_image(self.sky.as_ref().unwrap().get_subimage(0)) .sub_image(self.sky.as_ref().unwrap().get_subimage(0))
.eye_visibility(xr::EyeVisibility::BOTH) .eye_visibility(xr::EyeVisibility::BOTH)
.space(&xr.stage) .space(&xr.stage)