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

Merge branch 'webxr-refactor' into example_actions

Browse Source
This commit is contained in:
ForTehLose
2024-05-30 22:31:01 -04:00
committed by GitHub
parent f472b46a2c a9b062425b
commit f479ddb70f
15 changed files with 105 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_openxr/Cargo.toml
View File

@@ -12,6 +12,10 @@ passthrough = []
[dev-dependencies]
bevy_xr_utils.path = "../bevy_xr_utils"
[target.'cfg(target_os = "android")'.dependencies]
ndk-context = "0.1"
jni = "0.20"
# bevy can't be placed behind target or proc macros won't work properly
[dependencies]
bevy.workspace = true
@@ -28,6 +32,7 @@ ash = { version = "0.37.3", optional = true }
[target.'cfg(target_family = "unix")'.dependencies]
openxr = { version = "0.18.0", features = ["mint"] }
wgpu = { version = "0.19.3", features = ["vulkan-portability"] }
[target.'cfg(target_family = "windows")'.dependencies]
openxr = { version = "0.18.0", features = ["mint", "static"] }

3
crates/bevy_openxr/examples/3d_scene.rs
View File

@@ -39,7 +39,8 @@ fn setup(
},
transform: Transform::from_xyz(4.0, 8.0, 4.0),
..default()
}); commands.spawn(Camera3dBundle {
});
commands.spawn(Camera3dBundle {
transform: Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y),
..default()
});

14
crates/bevy_openxr/examples/android/src/lib.rs
View File

@@ -21,7 +21,12 @@ fn main() {
synchronous_pipeline_compilation: default(),
}))
.add_plugins(bevy_xr_utils::hand_gizmos::HandGizmosPlugin)
.insert_resource(Msaa::Off)
.add_systems(Startup, setup)
.insert_resource(AmbientLight {
color: Default::default(),
brightness: 500.0,
})
.insert_resource(ClearColor(Color::NONE))
.run();
}
@@ -46,13 +51,4 @@ fn setup(
transform: Transform::from_xyz(0.0, 0.5, 0.0),
..default()
});
// light
commands.spawn(PointLightBundle {
point_light: PointLight {
shadows_enabled: true,
..default()
},
transform: Transform::from_xyz(4.0, 8.0, 4.0),
..default()
});
}

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

@@ -14,10 +14,14 @@ impl Plugin for OxrActionAttachingPlugin {
fn attach_sets(session: Res<OxrSession>, mut events: EventReader<OxrAttachActionSet>) {
let sets = events.read().map(|v| &v.0).collect::<Vec<_>>();
if sets.is_empty() {return;}
if sets.is_empty() {
return;
}
info!("attaching {} sessions", sets.len());
match session.attach_action_sets(&sets) {
Ok(_) => {info!("attached sessions!")}
Ok(_) => {
info!("attached sessions!")
}
Err(openxr::sys::Result::ERROR_ACTIONSETS_ALREADY_ATTACHED) => {
error!("Action Sets Already attached!");
}

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

@@ -1,4 +1,5 @@
use bevy::prelude::*;
use bevy_xr::hands::{LeftHand, RightHand};
use bevy_xr::{
hands::{HandBone, HandBoneRadius},
session::{session_running, status_changed_to, XrStatus},
@@ -74,11 +75,22 @@ fn spawn_default_hands(
let mut right_bones = [Entity::PLACEHOLDER; 26];
for bone in HandBone::get_all_bones() {
let bone_left = cmds
.spawn((SpatialBundle::default(), bone, HandBoneRadius(0.0)))
.spawn((
SpatialBundle::default(),
bone,
HandBoneRadius(0.0),
LeftHand,
))
.id();
let bone_right = cmds
.spawn((SpatialBundle::default(), bone, HandBoneRadius(0.0)))
.spawn((
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;
@@ -87,11 +99,13 @@ fn spawn_default_hands(
DefaultHandTracker,
OxrHandTracker(tracker_left),
OxrHandBoneEntities(left_bones),
LeftHand,
));
cmds.spawn((
DefaultHandTracker,
OxrHandTracker(tracker_right),
OxrHandBoneEntities(right_bones),
RightHand,
));
}

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

@@ -1,3 +1,3 @@
pub mod handtracking;
#[cfg(feature = "passthrough")]
pub mod passthrough;
pub mod handtracking;

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

@@ -17,6 +17,7 @@ use self::{
pub mod action_binding;
pub mod action_set_attaching;
pub mod action_set_syncing;
pub mod error;
mod exts;
pub mod features;
@@ -28,7 +29,6 @@ pub mod reference_space;
pub mod render;
pub mod resources;
pub mod types;
pub mod action_set_syncing;
pub fn add_xr_plugins<G: PluginGroup>(plugins: G) -> PluginGroupBuilder {
plugins

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

@@ -10,14 +10,17 @@ use bevy::{
},
transform::TransformSystem,
};
use bevy_xr::{camera::{XrCamera, XrCameraBundle, XrProjection}, session::session_running};
use bevy_xr::{
camera::{XrCamera, XrCameraBundle, XrProjection},
session::session_running,
};
use openxr::ViewStateFlags;
use crate::{reference_space::OxrPrimaryReferenceSpace, resources::*};
use crate::{
init::{session_started, OxrPreUpdateSet, OxrTrackingRoot},
layer_builder::ProjectionLayer,
};
use crate::{reference_space::OxrPrimaryReferenceSpace, resources::*};
pub struct OxrRenderPlugin;
@@ -28,7 +31,6 @@ impl Plugin for OxrRenderPlugin {
PreUpdate,
(
init_views.run_if(resource_added::<OxrGraphicsInfo>),
wait_frame.run_if(session_started),
locate_views.run_if(session_running),
update_views.run_if(session_running),
)
@@ -41,7 +43,8 @@ impl Plugin for OxrRenderPlugin {
.chain()
.run_if(session_running)
.before(TransformSystem::TransformPropagate),
);
)
.add_systems(Last, wait_frame.run_if(session_started));
app.sub_app_mut(RenderApp)
.add_systems(
Render,
@@ -350,11 +353,23 @@ pub fn begin_frame(mut frame_stream: ResMut<OxrFrameStream>) {
pub fn release_image(mut swapchain: ResMut<OxrSwapchain>) {
let _span = info_span!("xr_release_image");
#[cfg(target_os = "android")]
{
let ctx = ndk_context::android_context();
let vm = unsafe { jni::JavaVM::from_raw(ctx.vm().cast()) }.unwrap();
let env = vm.attach_current_thread_as_daemon();
}
swapchain.release_image().unwrap();
}
pub fn end_frame(world: &mut World) {
let _span = info_span!("xr_end_frame");
#[cfg(target_os = "android")]
{
let ctx = ndk_context::android_context();
let vm = unsafe { jni::JavaVM::from_raw(ctx.vm().cast()) }.unwrap();
let env = vm.attach_current_thread_as_daemon();
}
world.resource_scope::<OxrFrameStream, ()>(|world, mut frame_stream| {
let mut layers = vec![];
for layer in world.resource::<OxrRenderLayers>().iter() {

1
crates/bevy_webxr/src/webxr/mod.rs
View File

@@ -0,0 +1 @@

43
crates/bevy_xr/macros/src/lib.rs
View File

@@ -1,11 +1,11 @@
use proc_macro::TokenStream;
use proc_macro2::Span;
use quote::quote;
use syn::parse::{Parse, ParseStream};
use syn::punctuated::Punctuated;
use syn::spanned::Spanned;
use syn::token::{Comma, Eq};
use syn::{parse_macro_input, parse_quote, AttrStyle, DeriveInput, Expr, Type};
use syn::parse::{Parse, ParseStream};
mod kw {
syn::custom_keyword!(action_type);
@@ -36,7 +36,6 @@ impl Parse for AttributeInput {
}
}
#[proc_macro_derive(Action, attributes(action))]
pub fn derive_action(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
@@ -44,9 +43,17 @@ pub fn derive_action(input: TokenStream) -> TokenStream {
let mut attributes = vec![];
for attribute in input.attrs {
if let AttrStyle::Inner(token) = attribute.style {
return TokenStream::from(syn::Error::new(token.span, "This derive macro does not accept inner attributes").to_compile_error());
return TokenStream::from(
syn::Error::new(
token.span,
"This derive macro does not accept inner attributes",
)
.to_compile_error(),
);
};
let parsed_attributes = match attribute.parse_args_with(Punctuated::<AttributeInput, Comma>::parse_terminated) {
let parsed_attributes = match attribute
.parse_args_with(Punctuated::<AttributeInput, Comma>::parse_terminated)
{
Ok(inner) => inner,
Err(e) => return TokenStream::from(e.to_compile_error()),
};
@@ -61,27 +68,39 @@ pub fn derive_action(input: TokenStream) -> TokenStream {
match attribute {
AttributeInput::Kind(ty, span) => {
if kind.is_some() {
return syn::Error::new(span, "attribute 'action_type' is defined more than once").to_compile_error().into();
return syn::Error::new(
span,
"attribute 'action_type' is defined more than once",
)
.to_compile_error()
.into();
}
kind = Some(ty);
},
}
AttributeInput::Name(expr, span) => {
if name.is_some() {
return syn::Error::new(span, "attribute 'name' is defined more than once").to_compile_error().into();
return syn::Error::new(span, "attribute 'name' is defined more than once")
.to_compile_error()
.into();
}
name = Some(expr);
},
}
AttributeInput::PrettyName(expr, span) => {
if pretty_name.is_some() {
return syn::Error::new(span, "attribute 'pretty_name' is defined more than once").to_compile_error().into();
return syn::Error::new(
span,
"attribute 'pretty_name' is defined more than once",
)
.to_compile_error()
.into();
}
pretty_name = Some(expr);
},
}
}
};
}
if kind.is_none() {
panic!("action_type isn't specified")
@@ -114,4 +133,4 @@ pub fn derive_action(input: TokenStream) -> TokenStream {
};
TokenStream::from(expanded)
}
}

14
crates/bevy_xr/src/hands.rs
View File

@@ -1,7 +1,17 @@
use bevy::{ecs::component::Component, math::bool, prelude::{Deref, DerefMut}};
use bevy::{
ecs::component::Component,
math::bool,
prelude::{Deref, DerefMut},
};
#[derive(Clone, Copy, Component, Debug)]
pub struct LeftHand;
#[derive(Clone, Copy, Component, Debug)]
pub struct RightHand;
#[repr(transparent)]
#[derive(Clone, Copy, Component, Debug,DerefMut,Deref)]
#[derive(Clone, Copy, Component, Debug, DerefMut, Deref)]
pub struct HandBoneRadius(pub f32);
#[repr(u8)]

2
crates/bevy_xr/src/lib.rs
View File

@@ -1,5 +1,5 @@
pub mod actions;
pub mod camera;
pub mod hands;
pub mod session;
pub mod types;
pub mod hands;

4
crates/bevy_xr/src/session.rs
View File

@@ -89,7 +89,9 @@ pub fn handle_session(
}
/// A [`Condition`](bevy::ecs::schedule::Condition) that allows the system to run when the xr status changed to a specific [`XrStatus`].
pub fn status_changed_to(status: XrStatus) -> impl FnMut(EventReader<XrStatusChanged>) -> bool + Clone {
pub fn status_changed_to(
status: XrStatus,
) -> impl FnMut(EventReader<XrStatusChanged>) -> bool + Clone {
move |mut reader: EventReader<XrStatusChanged>| {
reader.read().any(|new_status| new_status.0 == status)
}

4
crates/bevy_xr/src/types.rs
View File

@@ -2,5 +2,5 @@ use bevy::math::{Quat, Vec3};
pub struct Pose {
pub position: Vec3,
pub orientation: Quat
}
pub orientation: Quat,
}

46
examples/3d_scene.rs
View File

@@ -1,46 +0,0 @@
//! A simple 3D scene with light shining over a cube sitting on a plane.
use bevy::prelude::*;
fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_systems(Startup, setup)
.run();
}
/// set up a simple 3D scene
fn setup(
mut commands: Commands,
mut meshes: ResMut<Assets<Mesh>>,
mut materials: ResMut<Assets<StandardMaterial>>,
) {
// circular base
commands.spawn(PbrBundle {
mesh: meshes.add(Circle::new(4.0)),
material: materials.add(Color::WHITE),
transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
..default()
});
// cube
commands.spawn(PbrBundle {
mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
material: materials.add(Color::rgb_u8(124, 144, 255)),
transform: Transform::from_xyz(0.0, 0.5, 0.0),
..default()
});
// light
commands.spawn(PointLightBundle {
point_light: PointLight {
shadows_enabled: true,
..default()
},
transform: Transform::from_xyz(4.0, 8.0, 4.0),
..default()
});
// camera
commands.spawn(Camera3dBundle {
transform: Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y),
..default()
});
}