use XrSessionCreated schedule to init the Views

Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-02-05 19:00:00 +01:00
parent dcdf362efa
commit 8a3719a019
2 changed files with 18 additions and 9 deletions

View File

@@ -10,8 +10,11 @@ use bevy::{
transform::TransformSystem, transform::TransformSystem,
}; };
use bevy_mod_xr::{ use bevy_mod_xr::{
camera::{XrCamera, XrProjection}, camera::{XrCamera, XrProjection, XrViewInit},
session::{XrFirst, XrHandleEvents, XrPreDestroySession, XrRenderSet, XrRootTransform}, session::{
XrFirst, XrHandleEvents, XrPreDestroySession, XrRenderSet, XrRootTransform,
XrSessionCreated,
},
spaces::XrPrimaryReferenceSpace, spaces::XrPrimaryReferenceSpace,
}; };
use openxr::ViewStateFlags; use openxr::ViewStateFlags;
@@ -55,16 +58,19 @@ impl Plugin for OxrRenderPlugin {
( (
wait_frame.run_if(should_run_frame_loop), wait_frame.run_if(should_run_frame_loop),
update_cameras.run_if(should_run_frame_loop), update_cameras.run_if(should_run_frame_loop),
if self.spawn_cameras {
init_views::<true>
} else {
init_views::<false>
}
.run_if(resource_added::<OxrSession>),
) )
.chain() .chain()
.in_set(XrHandleEvents::FrameLoop), .in_set(XrHandleEvents::FrameLoop),
) )
.add_systems(
XrSessionCreated,
if self.spawn_cameras {
init_views::<true>
} else {
init_views::<false>
}
.in_set(XrViewInit),
)
.add_systems( .add_systems(
PostUpdate, PostUpdate,
(locate_views, update_views) (locate_views, update_views)

View File

@@ -7,7 +7,7 @@ use bevy::ecs::reflect::ReflectComponent;
use bevy::ecs::schedule::IntoSystemConfigs; use bevy::ecs::schedule::IntoSystemConfigs;
use bevy::math::{Mat4, Vec3A}; use bevy::math::{Mat4, Vec3A};
use bevy::pbr::{PbrPlugin, PbrProjectionPlugin}; use bevy::pbr::{PbrPlugin, PbrProjectionPlugin};
use bevy::prelude::Projection; use bevy::prelude::{Projection, SystemSet};
use bevy::reflect::std_traits::ReflectDefault; use bevy::reflect::std_traits::ReflectDefault;
use bevy::reflect::Reflect; use bevy::reflect::Reflect;
use bevy::render::camera::{CameraProjection, CameraProjectionPlugin}; use bevy::render::camera::{CameraProjection, CameraProjectionPlugin};
@@ -38,6 +38,9 @@ impl Plugin for XrCameraPlugin {
} }
} }
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, SystemSet)]
pub struct XrViewInit;
#[derive(Debug, Clone, Reflect, ExtractComponent)] #[derive(Debug, Clone, Reflect, ExtractComponent)]
#[reflect(Component, Default)] #[reflect(Component, Default)]
pub struct XrProjection { pub struct XrProjection {