Run non-UI systems in FixedUpdate schedule

jameshiew · Jan 2, 2025 · df12c1b · df12c1b
1 parent 625db35
commit df12c1b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/crates/plugins/src/assets/mod.rs b/crates/plugins/src/assets/mod.rs
@@ -31,7 +31,7 @@ impl Plugin for AssetsPlugin {
         #[cfg(not(target_family = "wasm"))]
         app.add_systems(OnEnter(AppState::LoadingAssets), load_assets)
             .add_systems(
-                Update,
+                FixedUpdate,
                 (check_assets.run_if(in_state(AppState::LoadingAssets)),),
             );
 

diff --git a/crates/plugins/src/mesh/mod.rs b/crates/plugins/src/mesh/mod.rs
@@ -37,7 +37,7 @@ impl Plugin for MeshPlugin {
             .add_event::<MeshChunkRequest>()
             .add_event::<MeshChunkRerequest>()
             .add_systems(
-                Update,
+                FixedUpdate,
                 (
                     events::handle_mesh_chunk_requests.run_if(on_event::<MeshChunkRequest>),
                     events::handle_mesh_chunk_rerequests.run_if(on_event::<MeshChunkRerequest>),

diff --git a/crates/plugins/src/scene/mod.rs b/crates/plugins/src/scene/mod.rs
@@ -315,14 +315,8 @@ impl Plugin for ScenePlugin {
             .add_event::<UnloadChunkOpEvent>()
             .add_event::<UpdateSceneEvent>()
             .add_systems(
-                Update,
+                FixedUpdate,
                 ((
-                    (
-                        handle_update_scene_view.run_if(on_event::<UpdateSettingsEvent>),
-                        check_if_should_update_scene,
-                        update_scene.run_if(on_event::<UpdateSceneEvent>),
-                    )
-                        .chain(),
                     (
                         handle::process_load_requested,
                         handle::process_mesh_requested,
@@ -332,6 +326,16 @@ impl Plugin for ScenePlugin {
                     handle::process_unload_chunk_ops.run_if(on_event::<UnloadChunkOpEvent>),
                 )
                     .run_if(in_state(AppState::MainGame)),),
+            )
+            .add_systems(
+                Update,
+                ((
+                    handle_update_scene_view.run_if(on_event::<UpdateSettingsEvent>),
+                    check_if_should_update_scene,
+                    update_scene.run_if(on_event::<UpdateSceneEvent>),
+                )
+                    .chain())
+                .run_if(in_state(AppState::MainGame)),
             );
     }
 }
diff --git a/crates/plugins/src/world/mod.rs b/crates/plugins/src/world/mod.rs
@@ -64,7 +64,7 @@ impl Plugin for WorldPlugin {
             .add_event::<GenerateChunkRequest>()
             .add_systems(OnEnter(AppState::InitializingWorld), setup)
             .add_systems(
-                Update,
+                FixedUpdate,
                 (
                     events::handle_generate_chunk_request.run_if(on_event::<GenerateChunkRequest>),
                     events::handle_generate_chunk_task