partialy revert the scheduling changes and fix non xr crash

Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2024-07-12 08:20:50 +02:00
parent 3d773f86ba
commit 1eed718860
8 changed files with 111 additions and 100 deletions

View File

@@ -13,7 +13,7 @@ use bevy::{
use bevy_mod_xr::{
camera::{XrCamera, XrCameraBundle, XrProjection},
session::{
XrDestroySession, XrFirst, XrHandleEvents, XrRenderSet, XrRootTransform, XrTrackingRoot,
XrFirst, XrHandleEvents, XrPreDestroySession, XrRenderSet, XrRootTransform, XrTrackingRoot,
},
spaces::XrPrimaryReferenceSpace,
};
@@ -46,7 +46,7 @@ impl Plugin for OxrRenderPlugin {
ExtractResourcePlugin::<OxrSwapchainImages>::default(),
ExtractResourcePlugin::<OxrViews>::default(),
))
.add_systems(XrDestroySession, clean_views)
.add_systems(XrPreDestroySession, clean_views)
.add_systems(
XrFirst,
(
@@ -55,7 +55,7 @@ impl Plugin for OxrRenderPlugin {
init_views.run_if(resource_added::<OxrSession>),
)
.chain()
.after(XrHandleEvents),
.in_set(XrHandleEvents::FrameLoop),
)
.add_systems(
PostUpdate,
@@ -70,7 +70,7 @@ impl Plugin for OxrRenderPlugin {
let render_app = app.sub_app_mut(RenderApp);
render_app
.add_systems(XrDestroySession, clean_views)
.add_systems(XrPreDestroySession, clean_views)
.add_systems(
Render,
(