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

finish renaming and move HandBoneEntities to bevy_mod_xr

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-07-04 20:22:45 +02:00
parent e65573124b
commit b6f69eecd9
29 changed files with 91 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_openxr/src/openxr/action_binding.rs
View File

@@ -5,7 +5,7 @@ use bevy::ecs::schedule::ScheduleLabel;
use bevy::ecs::system::RunSystemOnce;
use bevy::prelude::*;
use bevy::utils::HashMap;
use bevy_xr::session::XrSessionCreatedEvent;
use bevy_mod_xr::session::XrSessionCreatedEvent;
use openxr::sys::ActionSuggestedBinding;
use crate::resources::OxrInstance;

2
crates/bevy_openxr/src/openxr/action_set_attaching.rs
View File

@@ -1,6 +1,6 @@
use crate::{action_binding::run_action_binding_sugestion, session::OxrSession};
use bevy::prelude::*;
use bevy_xr::session::XrSessionCreatedEvent;
use bevy_mod_xr::session::XrSessionCreatedEvent;
impl Plugin for OxrActionAttachingPlugin {
fn build(&self, app: &mut App) {

2
crates/bevy_openxr/src/openxr/action_set_syncing.rs
View File

@@ -1,6 +1,6 @@
use crate::session::OxrSession;
use bevy::prelude::*;
use bevy_xr::session::session_running;
use bevy_mod_xr::session::session_running;
#[derive(SystemSet, Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub struct OxrActionSetSyncSet;

67
crates/bevy_openxr/src/openxr/features/handtracking.rs
View File

@@ -1,8 +1,8 @@
use bevy::prelude::*;
use bevy_xr::hands::{LeftHand, RightHand};
use bevy_xr::session::{XrCreateSession, XrDestroySession, XrTrackingRoot};
use bevy_xr::spaces::{XrPrimaryReferenceSpace, XrReferenceSpace};
use bevy_xr::{
use bevy_mod_xr::hands::{LeftHand, RightHand, XrHandBoneEntities, HAND_JOINT_COUNT};
use bevy_mod_xr::session::{XrCreateSession, XrDestroySession, XrTrackingRoot};
use bevy_mod_xr::spaces::{XrPrimaryReferenceSpace, XrReferenceSpace};
use bevy_mod_xr::{
hands::{HandBone, HandBoneRadius},
session::session_running,
};
@@ -39,6 +39,22 @@ impl Plugin for HandTrackingPlugin {
}
}
pub fn spawn_hand_bones<T: Bundle + Clone>(
cmds: &mut Commands,
bundle: T,
) -> [Entity; HAND_JOINT_COUNT] {
let mut bones: [Entity; HAND_JOINT_COUNT] = [Entity::PLACEHOLDER; HAND_JOINT_COUNT];
// screw you clippy, i don't see a better way to init this array
#[allow(clippy::needless_range_loop)]
for bone in HandBone::get_all_bones().into_iter() {
bones[bone as usize] = cmds
.spawn((SpatialBundle::default(), bone, HandBoneRadius(0.0)))
.insert(bundle.clone())
.id();
}
bones
}
fn spawn_default_hands(
mut cmds: Commands,
session: Res<OxrSession>,
@@ -71,49 +87,27 @@ fn spawn_default_hands(
return;
}
};
let mut left_bones = [Entity::PLACEHOLDER; 26];
let mut right_bones = [Entity::PLACEHOLDER; 26];
for bone in HandBone::get_all_bones() {
let bone_left = cmds
.spawn((
DefaultHandBone,
SpatialBundle::default(),
bone,
HandBoneRadius(0.0),
LeftHand,
))
.id();
let bone_right = cmds
.spawn((
DefaultHandBone,
SpatialBundle::default(),
bone,
HandBoneRadius(0.0),
RightHand,
))
.id();
cmds.entity(root).push_children(&[bone_left]);
cmds.entity(root).push_children(&[bone_right]);
left_bones[bone as usize] = bone_left;
right_bones[bone as usize] = bone_right;
}
let left_bones = spawn_hand_bones(&mut cmds, (DefaultHandBone, LeftHand));
let right_bones = spawn_hand_bones(&mut cmds, (DefaultHandBone, RightHand));
cmds.entity(root).push_children(&left_bones);
cmds.entity(root).push_children(&right_bones);
cmds.spawn((
DefaultHandTracker,
OxrHandTracker(tracker_left),
OxrHandBoneEntities(left_bones),
XrHandBoneEntities(left_bones),
LeftHand,
));
cmds.spawn((
DefaultHandTracker,
OxrHandTracker(tracker_right),
OxrHandBoneEntities(right_bones),
XrHandBoneEntities(right_bones),
RightHand,
));
}
#[derive(Component)]
#[derive(Component, Clone, Copy)]
struct DefaultHandTracker;
#[derive(Component)]
#[derive(Component, Clone, Copy)]
struct DefaultHandBone;
#[allow(clippy::type_complexity)]
@@ -127,9 +121,6 @@ fn clean_up_default_hands(
}
}
#[derive(Deref, DerefMut, Component, Clone, Copy)]
pub struct OxrHandBoneEntities(pub [Entity; 26]);
#[derive(Deref, DerefMut, Component)]
pub struct OxrHandTracker(pub openxr::HandTracker);
@@ -139,7 +130,7 @@ fn locate_hands(
tracker_query: Query<(
&OxrHandTracker,
Option<&XrReferenceSpace>,
&OxrHandBoneEntities,
&XrHandBoneEntities,
)>,
session: Res<OxrSession>,
mut bone_query: Query<(&HandBone, &mut HandBoneRadius, &mut Transform)>,

2
crates/bevy_openxr/src/openxr/features/overlay.rs
View File

@@ -1,7 +1,7 @@
use std::{mem, ptr};
use bevy::prelude::*;
use bevy_xr::session::session_available;
use bevy_mod_xr::session::session_available;
use openxr::sys;
use crate::{

2
crates/bevy_openxr/src/openxr/helper_traits.rs
View File

@@ -1,5 +1,5 @@
use bevy::prelude::*;
use bevy_xr::types::XrPose;
use bevy_mod_xr::types::XrPose;
pub trait ToPosef {
fn to_posef(&self) -> openxr::Posef;

2
crates/bevy_openxr/src/openxr/init.rs
View File

@@ -11,7 +11,7 @@ use bevy::render::RenderApp;
use bevy::render::RenderPlugin;
use bevy::winit::UpdateMode;
use bevy::winit::WinitSettings;
use bevy_xr::session::*;
use bevy_mod_xr::session::*;
use crate::error::OxrError;
use crate::features::overlay::OxrOverlaySessionEvent;

2
crates/bevy_openxr/src/openxr/layer_builder.rs
View File

@@ -1,7 +1,7 @@
use std::mem;
use bevy::ecs::world::World;
use bevy_xr::spaces::{XrPrimaryReferenceSpace, XrSpace};
use bevy_mod_xr::spaces::{XrPrimaryReferenceSpace, XrSpace};
use openxr::{sys, CompositionLayerFlags, Fovf, Posef, Rect2Di};
use crate::graphics::graphics_match;

4
crates/bevy_openxr/src/openxr/mod.rs
View File

@@ -5,8 +5,8 @@ use bevy::{
utils::default,
window::{PresentMode, Window, WindowPlugin},
};
use bevy_xr::camera::XrCameraPlugin;
use bevy_xr::session::XrSessionPlugin;
use bevy_mod_xr::camera::XrCameraPlugin;
use bevy_mod_xr::session::XrSessionPlugin;
use init::OxrInitPlugin;
use render::OxrRenderPlugin;

2
crates/bevy_openxr/src/openxr/reference_space.rs
View File

@@ -2,7 +2,7 @@ use bevy::{
prelude::*,
render::{extract_resource::ExtractResourcePlugin, RenderApp},
};
use bevy_xr::{
use bevy_mod_xr::{
session::{XrCreateSession, XrDestroySession},
spaces::{XrPrimaryReferenceSpace, XrReferenceSpace},
};

2
crates/bevy_openxr/src/openxr/render.rs
View File

@@ -10,7 +10,7 @@ use bevy::{
},
transform::TransformSystem,
};
use bevy_xr::{
use bevy_mod_xr::{
camera::{XrCamera, XrCameraBundle, XrProjection},
session::{
XrDestroySession, XrFirst, XrHandleEvents, XrRenderSet, XrRootTransform, XrTrackingRoot,

2
crates/bevy_openxr/src/openxr/spaces.rs
View File

@@ -1,7 +1,7 @@
use std::{mem::MaybeUninit, ptr, sync::Mutex};
use bevy::{prelude::*, utils::hashbrown::HashSet};
use bevy_xr::{
use bevy_mod_xr::{
session::{session_available, session_running, XrFirst, XrHandleEvents},
spaces::{XrDestroySpace, XrPrimaryReferenceSpace, XrReferenceSpace, XrSpace, XrSpatialOffset},
types::XrPose,