Merge pull request #295 from rewin123/issue-279-last-pr

Issue 279 last pr

crates/editor_core/src/load.rs

@@ -4,8 +4,12 @@ use space_shared::{toast::ToastMessage, *};
 use crate::EditorLoader;
 
 pub fn load_listener(world: &mut World) {
+    // AppTypeRegistry and are injected in Startup
     let app_registry = world.resource::<AppTypeRegistry>().clone();
-    let load_server = world.resource::<EditorLoader>().clone();
+    let Some(load_server) = world.get_resource::<EditorLoader>().cloned() else {
+        error!("Failed to get Editor Loader");
+        return;
+    };
     let mut prefab;
     {
         let assets = world.resource::<Assets<DynamicScene>>();

crates/editor_ui/src/camera_view.rs

@@ -75,7 +75,10 @@ fn create_camera_image(width: u32, height: u32) -> Image {
 impl EditorTab for CameraViewTab {
     fn ui(&mut self, ui: &mut bevy_egui::egui::Ui, commands: &mut Commands, world: &mut World) {
         if self.real_camera.is_none() {
-            if world.resource::<GameModeSettings>().is_3d() {
+            if world
+                .get_resource::<GameModeSettings>()
+                .map_or(false, |mode| mode.is_3d())
+            {
                 self.real_camera = Some(
                     commands
                         .spawn((
@@ -95,7 +98,10 @@ impl EditorTab for CameraViewTab {
                         ))
                         .id(),
                 );
-            } else if world.resource::<GameModeSettings>().is_2d() {
+            } else if world
+                .get_resource::<GameModeSettings>()
+                .map_or(false, |mode| mode.is_2d())
+            {
                 self.real_camera = Some(
                     commands
                         .spawn((
@@ -152,7 +158,10 @@ impl EditorTab for CameraViewTab {
             ui.spacing();
             ui.separator();
             ui.spacing();
-            if world.resource::<GameModeSettings>().is_3d() {
+            if world
+                .get_resource::<GameModeSettings>()
+                .map_or(false, |mode| mode.is_3d())
+            {
                 ui.spacing();
                 if ui.button("Add 3D Playmode Camera").clicked() {
                     commands.spawn((
@@ -212,7 +221,10 @@ impl EditorTab for CameraViewTab {
             );
             world.send_event(ToastMessage::new(&msg, toast::ToastKind::Success));
         } else if let Some(handle) = &self.target_image {
-            if let Some(image) = world.resource::<Assets<Image>>().get(handle) {
+            if let Some(image) = world
+                .get_resource::<Assets<Image>>()
+                .and_then(|asset| asset.get(handle))
+            {
                 if image.texture_descriptor.size.width != clipped.width() as u32
                     || image.texture_descriptor.size.height != clipped.height() as u32
                 {

crates/editor_ui/src/change_chain.rs

@@ -23,7 +23,10 @@ impl EditorTab for ChangeChainView {
         _commands: &mut bevy::prelude::Commands,
         world: &mut bevy::prelude::World,
     ) {
-        let change_chain = world.resource::<ChangeChain>();
+        let Some(change_chain) = world.get_resource::<ChangeChain>() else {
+            error!("Failed to get Change Chain");
+            return;
+        };
 
         for change in change_chain.changes.iter() {
             ui.label(change.debug_text());

crates/editor_ui/src/editor_style.rs

@@ -38,6 +38,6 @@ impl TabStyle for EditorStyle {
     }
 
     fn text_size(&self, world: &World) -> f32 {
-        world.resource::<Sizing>().text
+        world.get_resource::<Sizing>().map_or(12., |size| size.text)
     }
 }

crates/editor_ui/src/inspector/components_order.rs

@@ -23,9 +23,12 @@ impl ComponentsPriority for App {
         if !self.world.contains_resource::<ComponentsOrder>() {
             self.insert_resource(ComponentsOrder::default());
         }
-        let component_name = pretty_type_name::pretty_type_name::<T>();
-        let mut order = self.world.resource_mut::<ComponentsOrder>();
-        order.components.insert(component_name, priority);
+        if let Some(mut order) = self.world.get_resource_mut::<ComponentsOrder>() {
+            let component_name = pretty_type_name::pretty_type_name::<T>();
+            order.components.insert(component_name, priority);
+        } else {
+            error!("Failed to configure components order");
+        }
 
         self
     }

crates/editor_ui/src/inspector/events_dispatcher.rs

@@ -21,12 +21,18 @@ impl EditorTab for EventDispatcherTab {
 }
 
 pub fn inspect(ui: &mut egui::Ui, world: &mut World, open_events: &mut HashMap<String, bool>) {
-    let events = &mut world.resource::<EditorRegistry>().send_events.clone();
+    let Some(events) = &world.get_resource::<EditorRegistry>() else {
+        error!("Failed to get event registry");
+        return;
+    };
+    let mut events = events.send_events.clone();
+
     events.sort_by(|a, b| a.name().cmp(b.name()));
 
     if events.is_empty() {
         ui.label(egui::RichText::new("No events registered").color(ERROR_COLOR));
     } else {
+        // Safe as was injected by Bevy
         let type_registry = world.resource::<AppTypeRegistry>().clone();
         let type_registry = type_registry.read();
 

crates/editor_ui/src/inspector/mod.rs

@@ -71,7 +71,8 @@ pub struct InspectorTab {
 
 impl EditorTab for InspectorTab {
     fn ui(&mut self, ui: &mut egui::Ui, _: &mut Commands, world: &mut World) {
-        let sizing = world.resource::<Sizing>().clone();
+        // Defaults in case it is missing
+        let sizing = world.get_resource::<Sizing>().cloned().unwrap_or_default();
         let selected_entity = world
             .query_filtered::<Entity, With<Selected>>()
             .get_single(world);
@@ -88,8 +89,12 @@ impl EditorTab for InspectorTab {
         let app_registry = app_registry_handle.read();
         let mut disable_pan_orbit = false;
 
-        //Collet data about all components
-        let components_priority = world.resource::<ComponentsOrder>().clone().components;
+        //Collet data about all components | empty if missing
+        let components_priority = world
+            .get_resource::<ComponentsOrder>()
+            .cloned()
+            .unwrap_or_default()
+            .components;
         let mut components_id = Vec::new();
         if self.show_all_components {
             for reg in app_registry.iter() {
@@ -352,8 +357,13 @@ impl EditorTab for InspectorTab {
 
         state.commands = commands;
 
-        if disable_pan_orbit {
-            world.resource_mut::<crate::EditorCameraEnabled>().0 = false;
+        if let (Some(mut editor_camera_enabled), true) = (
+            world.get_resource_mut::<crate::EditorCameraEnabled>(),
+            disable_pan_orbit,
+        ) {
+            editor_camera_enabled.0 = false;
+        } else {
+            error!("Failed to get editor camera config");
         }
     }
 

crates/editor_ui/src/selection.rs

@@ -7,9 +7,12 @@ impl Plugin for EditorPickingPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(bevy_mod_picking::DefaultPickingPlugins);
 
-        app.world
-            .resource_mut::<bevy_mod_picking::backends::raycast::RaycastBackendSettings>()
-            .require_markers = true;
+        if let Some(mut raycast_backend) =
+            app.world
+                .get_resource_mut::<bevy_mod_picking::backends::raycast::RaycastBackendSettings>()
+        {
+            raycast_backend.require_markers = true;
+        }
 
         app.add_systems(
             PostUpdate,

crates/editor_ui/src/settings.rs

@@ -146,7 +146,10 @@ impl RegisterSettingsBlockExt for App {
 
 impl EditorTab for SettingsWindow {
     fn ui(&mut self, ui: &mut egui::Ui, commands: &mut Commands, world: &mut World) {
-        let game_mode_setting = &world.resource::<GameModeSettings>();
+        let Some(game_mode_setting) = &world.get_resource::<GameModeSettings>() else {
+            error!("Game Mode settings not available");
+            return;
+        };
         if let Some(new_game_mode) = game_mode_setting.ui(ui) {
             info!("Game Mode changed: {:?}", new_game_mode);
             *world.resource_mut::<GameModeSettings>() = new_game_mode;
@@ -162,8 +165,11 @@ impl EditorTab for SettingsWindow {
 
         ui.add_space(12.);
         ui.heading("New Tab Behaviour");
-        let new_window_settings = &mut world.resource_mut::<NewWindowSettings>();
-        new_window_settings.ui(ui);
+        if let Some(new_window_settings) = &mut world.get_resource_mut::<NewWindowSettings>() {
+            new_window_settings.ui(ui);
+        } else {
+            error!("New window settings not available");
+        }
 
         ui.add_space(12.);
         ui.heading("Default Sizing");

crates/editor_ui/src/tool.rs

@@ -38,9 +38,10 @@ impl ToolExt for App {
     where
         T: EditorTool + Send + Sync + 'static,
     {
-        self.world
-            .resource_mut::<GameViewTab>()
-            .tools
-            .push(Box::new(tool));
+        if let Some(mut game_view) = self.world.get_resource_mut::<GameViewTab>() {
+            game_view.tools.push(Box::new(tool));
+        } else {
+            error!("Game View tab not loaded");
+        }
     }
 }

crates/editor_ui/src/tools/gizmo.rs

@@ -18,7 +18,9 @@ impl Plugin for GizmoToolPlugin {
     fn build(&self, app: &mut App) {
         app.editor_tool(GizmoTool::default());
 
-        app.world.resource_mut::<GameViewTab>().active_tool = Some(0);
+        if let Some(mut game_view_tab) = app.world.get_resource_mut::<GameViewTab>() {
+            game_view_tab.active_tool = Some(0);
+        }
         app.init_resource::<MultipleCenter>();
 
         app.editor_hotkey(GizmoHotkey::Translate, vec![KeyCode::KeyG]);
@@ -95,6 +97,7 @@ impl EditorTool for GizmoTool {
         // If SHIFT+ALT pressed, then all selected entities will be cloned at interact
         // All hotkeys can be changes in editor ui
 
+        // Not much we can do
         let sizing = world.resource::<Sizing>();
 
         ui.spacing();
@@ -119,7 +122,10 @@ impl EditorTool for GizmoTool {
             }
         });
 
-        let input = world.resource::<ButtonInput<GizmoHotkey>>();
+        let Some(input) = world.get_resource::<ButtonInput<GizmoHotkey>>() else {
+            warn!("Failed to retrieve gizmos hotkey button input");
+            return;
+        };
 
         let mut del = false;
         let mut clone_pressed = false;

modules/bevy_xpbd_plugin/src/registry.rs

@@ -79,11 +79,12 @@ impl Plugin for BevyXpbdPlugin {
         if app.is_plugin_added::<space_editor_ui::ui_plugin::EditorUiCore>() {
             app.register_settings_block("Bevy XPBD 3D", |ui, _, world| {
                 ui.checkbox(
-                    &mut world
-                        .resource_mut::<GizmoConfigStore>()
-                        .config_mut::<PhysicsGizmos>()
-                        .1
-                        .hide_meshes,
+                    &mut world.get_resource_mut::<GizmoConfigStore>().map_or(
+                        false,
+                        |mut gizmos_config| {
+                            gizmos_config.config_mut::<PhysicsGizmos>().1.hide_meshes
+                        },
+                    ),
                     "Hide debug meshes",
                 );
             });