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

rename some schedules and fix comments

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-07-15 19:03:11 +02:00
parent 1eed718860
commit 45fc44db5c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,7 +511,7 @@ pub fn begin_xr_session(
.begin(openxr::ViewConfigurationType::PRIMARY_STEREO) .begin(openxr::ViewConfigurationType::PRIMARY_STEREO)
.expect("Failed to begin session"); .expect("Failed to begin session");
world.get_resource_mut::<OxrSessionStarted>().unwrap().0 = true; world.get_resource_mut::<OxrSessionStarted>().unwrap().0 = true;
world.run_schedule(XrBeginSession); world.run_schedule(XrPostSessionBegin);
} }
pub fn end_xr_session( pub fn end_xr_session(
@@ -519,7 +519,7 @@ pub fn end_xr_session(
// session: Res<OxrSession>, mut session_started: ResMut<OxrSessionStarted> // session: Res<OxrSession>, mut session_started: ResMut<OxrSessionStarted>
) { ) {
// Maybe this could be an event? // Maybe this could be an event?
world.run_schedule(XrEndSession); world.run_schedule(XrPreSessionEnd);
let _span = info_span!("xr_end_session"); let _span = info_span!("xr_end_session");
world world
.get_resource::<OxrSession>() .get_resource::<OxrSession>()

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

@@ -12,7 +12,7 @@ pub struct XrCreateSessionEvent;
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)] #[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)]
pub struct XrSessionCreated; pub struct XrSessionCreated;
/// Event sent when [`XrCreateSession`] is ran /// Event sent after the XrSession was created.
#[derive(Event, Clone, Copy, Default)] #[derive(Event, Clone, Copy, Default)]
pub struct XrSessionCreatedEvent; pub struct XrSessionCreatedEvent;
@@ -25,7 +25,7 @@ pub struct XrDestroySessionEvent;
#[derive(Resource, ExtractResource, Clone, Copy, Default)] #[derive(Resource, ExtractResource, Clone, Copy, Default)]
pub struct XrDestroySessionRender; pub struct XrDestroySessionRender;
/// Schedule thats ran whenever an [`XrDestroySessionEvent`] is recieved while the [`XrState`] is [`Exiting`](XrState::Exiting). /// Schedule thats ran whenever the XrSession is about to be destroyed
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)] #[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)]
pub struct XrPreDestroySession; pub struct XrPreDestroySession;
@@ -33,17 +33,17 @@ pub struct XrPreDestroySession;
#[derive(Event, Clone, Copy, Default)] #[derive(Event, Clone, Copy, Default)]
pub struct XrBeginSessionEvent; pub struct XrBeginSessionEvent;
/// Schedule thats ran whenever an [`XrBeginSessionEvent`] is recieved while the [`XrState`] is [`Ready`](XrState::Ready). /// Schedule thats ran when the XrSession has begun.
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)] #[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)]
pub struct XrBeginSession; pub struct XrPostSessionBegin;
/// Event sent to backends to end an XR session. Only works when the [`XrState`] is [`Stopping`](XrState::Stopping). /// Event sent to backends to end an XR session. Only works when the [`XrState`] is [`Stopping`](XrState::Stopping).
#[derive(Event, Clone, Copy, Default)] #[derive(Event, Clone, Copy, Default)]
pub struct XrEndSessionEvent; pub struct XrEndSessionEvent;
/// Schedule thats rna whenever an [`XrEndSessionEvent`] is recieved while the [`XrState`] is [`Stopping`](XrState::Stopping). /// Schedule thats rna whenever the XrSession is about to end
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)] #[derive(Clone, Copy, Default, PartialEq, Eq, Debug, Hash, ScheduleLabel)]
pub struct XrEndSession; pub struct XrPreSessionEnd;
/// Event sent to backends to request the [`XrState`] proceed to [`Exiting`](XrState::Exiting) and for the session to be exited. Can be called at any time a session exists. /// Event sent to backends to request the [`XrState`] proceed to [`Exiting`](XrState::Exiting) and for the session to be exited. Can be called at any time a session exists.
#[derive(Event, Clone, Copy, Default)] #[derive(Event, Clone, Copy, Default)]
@@ -100,8 +100,8 @@ impl Plugin for XrSessionPlugin {
.add_event::<XrSessionCreatedEvent>() .add_event::<XrSessionCreatedEvent>()
.init_schedule(XrSessionCreated) .init_schedule(XrSessionCreated)
.init_schedule(XrPreDestroySession) .init_schedule(XrPreDestroySession)
.init_schedule(XrBeginSession) .init_schedule(XrPostSessionBegin)
.init_schedule(XrEndSession) .init_schedule(XrPreSessionEnd)
.add_schedule(xr_first) .add_schedule(xr_first)
.configure_sets( .configure_sets(
XrFirst, XrFirst,