Avii/bevy_oxr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull main branch

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-12-19 16:58:00 +01:00
parent 6fcd75c671 901b9bc446
commit f2706b1416
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@@ -876,7 +876,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_mod_openxr" name = "bevy_mod_openxr"
version = "0.1.0-rc2" version = "0.1.1"
dependencies = [ dependencies = [
"ash", "ash",
"bevy", "bevy",
@@ -904,14 +904,14 @@ dependencies = [
[[package]] [[package]]
name = "bevy_mod_xr" name = "bevy_mod_xr"
version = "0.1.0-rc2" version = "0.1.1"
dependencies = [ dependencies = [
"bevy", "bevy",
] ]
[[package]] [[package]]
name = "bevy_openxr_android" name = "bevy_openxr_android"
version = "0.1.0-rc2" version = "0.1.1"
dependencies = [ dependencies = [
"bevy", "bevy",
"bevy_mod_openxr", "bevy_mod_openxr",
@@ -1331,7 +1331,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_xr_utils" name = "bevy_xr_utils"
version = "0.1.0-rc2" version = "0.1.1"
dependencies = [ dependencies = [
"bevy", "bevy",
"bevy_mod_openxr", "bevy_mod_openxr",

2
Cargo.toml
View File

@@ -1,5 +1,5 @@
[workspace.package] [workspace.package]
version = "0.1.0-rc2" version = "0.1.1"
edition = "2021" edition = "2021"
description = "Community crate for XR in Bevy" description = "Community crate for XR in Bevy"
repository = "https://github.com/awtterpip/bevy_oxr" repository = "https://github.com/awtterpip/bevy_oxr"

5
crates/bevy_openxr/examples/tracking_utils.rs
View File

@@ -4,8 +4,7 @@ use bevy::prelude::*;
use bevy_mod_openxr::add_xr_plugins; use bevy_mod_openxr::add_xr_plugins;
use bevy_mod_xr::session::{XrSessionCreated, XrTracker}; use bevy_mod_xr::session::{XrSessionCreated, XrTracker};
use bevy_xr_utils::tracking_utils::{ use bevy_xr_utils::tracking_utils::{
TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor, XrTrackedRightGrip, suggest_action_bindings, TrackingUtilitiesPlugin, XrTrackedLeftGrip, XrTrackedLocalFloor, XrTrackedRightGrip, XrTrackedStage, XrTrackedView
XrTrackedStage, XrTrackedView,
}; };
fn main() { fn main() {
@@ -18,6 +17,8 @@ fn main() {
//tracking utils plugin //tracking utils plugin
app.add_plugins(TrackingUtilitiesPlugin); app.add_plugins(TrackingUtilitiesPlugin);
//default bindings only use for prototyping
app.add_systems(OxrSendActionBindings, suggest_action_bindings);
app.run(); app.run();
} }

12
crates/bevy_xr_utils/src/tracking_utils.rs
View File

@@ -60,7 +60,7 @@ impl Plugin for TrackingUtilitiesPlugin {
); );
//bindings //bindings
app.add_systems(OxrSendActionBindings, suggest_action_bindings); // app.add_systems(OxrSendActionBindings, suggest_action_bindings);
//sync actions //sync actions
app.add_systems( app.add_systems(
PreUpdate, PreUpdate,
@@ -190,10 +190,10 @@ fn update_right_grip(
//tracking rig //tracking rig
#[derive(Resource)] #[derive(Resource)]
struct ControllerActions { pub struct ControllerActions {
set: openxr::ActionSet, pub set: openxr::ActionSet,
left: openxr::Action<Posef>, pub left: openxr::Action<Posef>,
right: openxr::Action<Posef>, pub right: openxr::Action<Posef>,
} }
fn spawn_tracking_rig( fn spawn_tracking_rig(
@@ -225,7 +225,7 @@ fn spawn_tracking_rig(
//bindings //bindings
//TODO figure out how to make these better, specifically not be controller specific //TODO figure out how to make these better, specifically not be controller specific
fn suggest_action_bindings( pub fn suggest_action_bindings(
actions: Res<ControllerActions>, actions: Res<ControllerActions>,
mut bindings: EventWriter<OxrSuggestActionBinding>, mut bindings: EventWriter<OxrSuggestActionBinding>,
) { ) {