diff --git a/Cargo.lock b/Cargo.lock index e38e99b..a47bb84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "bevy_mod_openxr" -version = "0.1.0-rc2" +version = "0.1.1" dependencies = [ "ash", "bevy", @@ -904,14 +904,14 @@ dependencies = [ [[package]] name = "bevy_mod_xr" -version = "0.1.0-rc2" +version = "0.1.1" dependencies = [ "bevy", ] [[package]] name = "bevy_openxr_android" -version = "0.1.0-rc2" +version = "0.1.1" dependencies = [ "bevy", "bevy_mod_openxr", @@ -1331,7 +1331,7 @@ dependencies = [ [[package]] name = "bevy_xr_utils" -version = "0.1.0-rc2" +version = "0.1.1" dependencies = [ "bevy", "bevy_mod_openxr", diff --git a/Cargo.toml b/Cargo.toml index 4c7e32c..616713a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.1.0-rc2" +version = "0.1.1" edition = "2021" description = "Community crate for XR in Bevy" repository = "https://github.com/awtterpip/bevy_oxr" diff --git a/crates/bevy_openxr/examples/tracking_utils.rs b/crates/bevy_openxr/examples/tracking_utils.rs index 41be029..f6d9756 100644 --- a/crates/bevy_openxr/examples/tracking_utils.rs +++ b/crates/bevy_openxr/examples/tracking_utils.rs @@ -4,8 +4,7 @@ use bevy::prelude::*; use bevy_mod_openxr::add_xr_plugins; use bevy_mod_xr::session::{XrSessionCreated, XrTracker}; use bevy_xr_utils::tracking_utils::{ - TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor, XrTrackedRightGrip, - XrTrackedStage, XrTrackedView, + suggest_action_bindings, TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor, XrTrackedRightGrip, XrTrackedStage, XrTrackedView }; fn main() { @@ -18,6 +17,8 @@ fn main() { //tracking utils plugin app.add_plugins(TrackingUtilitiesPlugin); + //default bindings only use for prototyping + app.add_systems(OxrSendActionBindings, suggest_action_bindings); app.run(); } diff --git a/crates/bevy_xr_utils/src/tracking_utils.rs b/crates/bevy_xr_utils/src/tracking_utils.rs index 3e8b1ce..fdc8dc4 100644 --- a/crates/bevy_xr_utils/src/tracking_utils.rs +++ b/crates/bevy_xr_utils/src/tracking_utils.rs @@ -60,7 +60,7 @@ impl Plugin for TrackingUtilitiesPlugin { ); //bindings - app.add_systems(OxrSendActionBindings, suggest_action_bindings); + // app.add_systems(OxrSendActionBindings, suggest_action_bindings); //sync actions app.add_systems( PreUpdate, @@ -190,10 +190,10 @@ fn update_right_grip( //tracking rig #[derive(Resource)] -struct ControllerActions { - set: openxr::ActionSet, - left: openxr::Action, - right: openxr::Action, +pub struct ControllerActions { + pub set: openxr::ActionSet, + pub left: openxr::Action, + pub right: openxr::Action, } fn spawn_tracking_rig( @@ -225,7 +225,7 @@ fn spawn_tracking_rig( //bindings //TODO figure out how to make these better, specifically not be controller specific -fn suggest_action_bindings( +pub fn suggest_action_bindings( actions: Res, mut bindings: EventWriter, ) {