From ec14bf82c91393dfc4b09c3539d9579e23a079b8 Mon Sep 17 00:00:00 2001 From: ForTehLose Date: Tue, 3 Sep 2024 20:16:50 -0400 Subject: [PATCH] used OxrSpaceSyncSet instead of system itself --- crates/bevy_openxr/src/openxr/spaces.rs | 2 +- crates/bevy_xr_utils/src/tracking_utils.rs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/bevy_openxr/src/openxr/spaces.rs b/crates/bevy_openxr/src/openxr/spaces.rs index 2e80425..028cc42 100644 --- a/crates/bevy_openxr/src/openxr/spaces.rs +++ b/crates/bevy_openxr/src/openxr/spaces.rs @@ -140,7 +140,7 @@ impl OxrSpaceVelocityFlags { } #[allow(clippy::type_complexity)] -pub fn update_space_transforms( +fn update_space_transforms( session: Res, default_ref_space: Res, pipelined: Option>, diff --git a/crates/bevy_xr_utils/src/tracking_utils.rs b/crates/bevy_xr_utils/src/tracking_utils.rs index c9db21c..fc7dbed 100644 --- a/crates/bevy_xr_utils/src/tracking_utils.rs +++ b/crates/bevy_xr_utils/src/tracking_utils.rs @@ -1,4 +1,3 @@ -use std::ops::Deref; use bevy::prelude::*; use bevy_mod_openxr::{ @@ -8,11 +7,11 @@ use bevy_mod_openxr::{ helper_traits::{ToQuat, ToVec3}, resources::{OxrFrameState, OxrInstance, Pipelined}, session::OxrSession, - spaces::{update_space_transforms, OxrSpaceExt, OxrSpaceLocationFlags, OxrSpaceSyncSet}, + spaces::{ OxrSpaceLocationFlags, OxrSpaceSyncSet}, }; use bevy_mod_xr::{ session::{session_available, session_running, XrSessionCreated, XrTrackingRoot}, - spaces::{XrPrimaryReferenceSpace, XrReferenceSpace, XrSpace}, + spaces::{XrPrimaryReferenceSpace, XrReferenceSpace}, types::XrPose, }; use openxr::Posef; @@ -86,8 +85,8 @@ impl Plugin for TrackingUtilitiesPlugin { // .in_set(OxrSpaceSyncSet) // .run_if(session_running), // ) - app.add_systems(PreUpdate, update_left_grip.after(update_space_transforms)); - app.add_systems(PreUpdate, update_right_grip.after(update_space_transforms)); + app.add_systems(PreUpdate, update_left_grip.after(OxrSpaceSyncSet)); + app.add_systems(PreUpdate, update_right_grip.after(OxrSpaceSyncSet)); } }