stuffs so broke

crates/editor_ui/src/game_view.rs

@@ -1,5 +1,5 @@
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_egui::{egui::{self, RichText, Widget}, render_systems::ExtractedEguiSettings};
+use bevy_egui::{egui::{self, RichText, Widget}, render_systems::ExtractedEguiSettings, EguiContextSettings};
 use space_undo::UndoRedo;
 use transform_gizmo_egui::GizmoMode;
 
@@ -148,15 +148,20 @@ pub struct LastGameTabRect(Option<egui::Rect>);
 pub fn set_camera_viewport(
     mut local: Local<LastGameTabRect>,
     ui_state: Res<GameViewTab>,
-    primary_window: Query<&mut Window, With<PrimaryWindow>>,
-    egui_settings: Res<ExtractedEguiSettings>,
+    primary_window: Query<(Entity, &mut Window), With<PrimaryWindow>>,
+    mut egui_settings: Query<&mut EguiContextSettings>,
     mut cameras: Query<&mut Camera, With<EditorCameraMarker>>,
 ) {
     let Ok(mut cam) = cameras.get_single_mut() else {
         return;
     };
 
-    let Ok(window) = primary_window.get_single() else {
+    let Ok((entity,window)) = primary_window.get_single() else {
+        return;
+    };
+
+    let Ok(context_settings) = 
+    egui_settings.get_mut(entity) else {
         return;
     };
 
@@ -173,7 +178,7 @@ pub fn set_camera_viewport(
     let scale_factor = window.scale_factor();
     debug!(
         "Window scale factor: {} egui scale factor: {}",
-        scale_factor, egui_settings.scale_factor
+        scale_factor, context_settings.scale_factor
     );
 
     let mut viewport_pos = viewport_rect.left_top().to_vec2() * scale_factor;

crates/editor_ui/src/inspector/mod.rs

@@ -1,3 +1,4 @@
+
 pub mod components_order;
 pub mod events_dispatcher;
 pub mod refl_impl;
@@ -373,6 +374,7 @@ impl EditorTab for InspectorTab {
     }
 }
 
+
 impl InspectorTab {
     fn show_component(
         &mut self,
@@ -389,9 +391,10 @@ impl InspectorTab {
                 .default_open(*self.open_components.get(name).unwrap_or(&default))
                 .show(ui, |ui| {
                     ui.push_id(format!("content-{:?}-{}", &e.id(), &name), |ui| {
-                        if env.ui_for_reflect_with_options(value, ui, ui.id(), &()) {
-                            (set_changed)();
-                        }
+                        //if env.ui_for_reflect_with_options(value, ui, ui.id(), &()) {
+                        //    (set_changed)();
+                        //}
+                        ui.label("show component function error");
                     });
                 });
             if header.header_response.clicked() {

crates/editor_ui/src/inspector/refl_impl.rs

@@ -2,16 +2,18 @@ use std::any::{Any, TypeId};
 
 use bevy::{
     prelude::{AppTypeRegistry, ResMut},
-    reflect::Reflect,
+    reflect::{PartialReflect, Reflect},
 };
 use bevy_egui::egui;
+use bevy_inspector_egui::reflect_inspector::ProjectorReflect;
 use space_shared::ext::bevy_inspector_egui::{
     inspector_egui_impls::InspectorEguiImpl, reflect_inspector::InspectorUi,
 };
 
 use space_prefab::component::EntityLink;
 
 /// Method from `bevy_inspector_egui` to make dummy reflection ui
+/* 
 pub fn many_unimplemented<T: Any>(
     _ui: &mut egui::Ui,
     _options: &dyn Any,
@@ -22,6 +24,19 @@ pub fn many_unimplemented<T: Any>(
 ) -> bool {
     false
 }
+*/
+
+pub fn many_unimplemented<T: Any>(
+    ui: &mut egui::Ui,
+    _options: &dyn Any,
+    _id: egui::Id,
+    _env: InspectorUi<'_, '_>,
+    _values: &mut [&mut dyn PartialReflect],
+    _projector: &dyn ProjectorReflect,
+) -> bool {
+    //no_multiedit(ui, &pretty_type_name::<T>());
+    false
+}
 
 /// Custom UI for [`EntityLink`] struct
 pub fn setup_ref_registry(reg: ResMut<AppTypeRegistry>) {

crates/editor_ui/src/lib.rs

@@ -91,10 +91,19 @@ use bevy_egui::{egui, EguiContext};
 use space_editor_tabs::prelude::*;
 
 use game_view::{has_window_changed, GameViewPlugin};
+
+/* 
 use prelude::{
     clean_meshless, reset_camera_viewport, set_camera_viewport, GameModeSettings, GameViewTab,
     MeshlessVisualizerPlugin, SpaceHierarchyPlugin, SpaceInspectorPlugin,
 };
+*/
+
+use prelude::{
+    reset_camera_viewport, set_camera_viewport, GameModeSettings, GameViewTab,
+    SpaceHierarchyPlugin, SpaceInspectorPlugin,
+};
+
 use space_editor_core::toast::ToastUiPlugin;
 use space_prefab::prelude::*;
 use space_shared::{
@@ -187,11 +196,11 @@ impl PluginGroup for EditorPluginGroup {
             .add(EditorDefaultBundlesPlugin)
             .add(EditorDefaultCameraPlugin)
             .add(bevy_egui::EguiPlugin)
-            .add(EventListenerPlugin::<selection::SelectEvent>::default())
+            //.add(EventListenerPlugin::<selection::SelectEvent>::default())
             .add(DefaultInspectorConfigPlugin);
         res = EditorUiPlugin::default().add_plugins_to_group(res);
         res.add(PanOrbitCameraPlugin)
-            .add(selection::EditorPickingPlugin)
+            //.add(selection::EditorPickingPlugin)
             .add(bevy_debug_grid::DebugGridPlugin::without_floor_grid())
             .add(
                 WorldInspectorPlugin::default()
@@ -270,12 +279,14 @@ fn game_gizmos(mut gizmos_config: ResMut<GizmoConfigStore>) {
     gizmos_config.config_mut::<EditorGizmo>().0.render_layers = RenderLayers::layer(0)
 }
 
+/* 
 type AutoAddQueryFilter = (
     Without<PrefabMarker>,
     Without<Pickable>,
     With<Parent>,
     Changed<Handle<Mesh>>,
 );
+*/
 
 #[derive(Default, Reflect, GizmoConfigGroup)]
 pub struct EditorGizmo;
@@ -347,7 +358,7 @@ pub fn simple_editor_setup(mut commands: Commands) {
             ..default()
         },
         Transform::from_xyz(4.0, 8.0, 4.0).looking_at(Vec3::ZERO, Vec3::Y),
-        CascadeShadowConfigBuilder::default().into(),
+        CascadeShadowConfigBuilder::default().build(),
         Name::from("Editor Level Light"),
     ));
 
@@ -390,12 +401,13 @@ pub fn simple_editor_setup(mut commands: Commands) {
         bevy_panorbit_camera::PanOrbitCamera::default(),
         EditorCameraMarker,
         Name::from("Editor Camera"),
-        PickableBundle::default(),
+        //PickableBundle::default(),
         RayCastPickable,
         all_render_layers(),
     ));
 }
 
+
 pub fn game_mode_changed(
     mut commands: Commands,
     mode: Res<GameModeSettings>,
@@ -418,7 +430,7 @@ pub fn game_mode_changed(
                 bevy_panorbit_camera::PanOrbitCamera::default(),
                 EditorCameraMarker,
                 Name::from("Editor Camera"),
-                PickableBundle::default(),
+                //PickableBundle::default(),
                 RayCastPickable,
                 all_render_layers(),
             ));
@@ -431,7 +443,7 @@ pub fn game_mode_changed(
                 },
                 EditorCameraMarker,
                 Name::from("Editor 2D Camera"),
-                PickableBundle::default(),
+                //PickableBundle::default(),
                 RayCastPickable,
                 all_render_layers(),
             ));

crates/editor_ui/src/menu_toolbars.rs

@@ -140,6 +140,8 @@ fn in_game_menu(
         });
 }
 
+
+
 #[derive(Resource, Default)]
 pub struct MenuToolbarState {
     pub file_dialog: Option<egui_file::FileDialog>,

crates/editor_ui/src/meshless_visualizer.rs

@@ -17,6 +17,10 @@ use space_shared::*;
 use crate::{EditorGizmo, LAST_RENDER_LAYER};
 use space_editor_core::selected::Selected;
 
+
+
+
+/* 
 #[derive(Default)]
 pub struct MeshlessVisualizerPlugin;
 
@@ -540,3 +544,5 @@ mod tests {
         assert_eq!(query.iter(&app.world()).count(), 2);
     }
 }
+
+*/

crates/editor_ui/src/selection.rs

@@ -1,8 +1,8 @@
 use crate::*;
 use bevy::prelude::*;
 
-bevy::picking::backend::ray::r
 
+/* 
 pub struct EditorPickingPlugin;
 
 impl Plugin for EditorPickingPlugin {
@@ -99,22 +99,7 @@ pub fn select_listener(
     }
 }
 
-pub fn delete_selected(
-    mut commands: Commands,
-    query: Query<Entity, With<Selected>>,
-    keyboard: Res<ButtonInput<KeyCode>>,
-) {
-    let shift = keyboard.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
-    let ctrl = keyboard.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
-    let delete = keyboard.any_just_pressed([KeyCode::Backspace, KeyCode::Delete]);
 
-    if ctrl && shift && delete {
-        for entity in query.iter() {
-            info!("Delete Entity: {entity:?}");
-            commands.entity(entity).despawn_recursive();
-        }
-    }
-}
 
 impl From<ListenerInput<Pointer<Down>>> for SelectEvent {
     fn from(value: ListenerInput<Pointer<Down>>) -> Self {
@@ -125,10 +110,30 @@ impl From<ListenerInput<Pointer<Down>>> for SelectEvent {
     }
 }
 
+
+
 /// This event used for selecting entities
 #[derive(Event, Clone, EntityEvent)]
 pub struct SelectEvent {
     #[target]
     e: Entity,
     event: ListenerInput<Pointer<Down>>,
 }
+
+pub fn delete_selected(
+    mut commands: Commands,
+    query: Query<Entity, With<Selected>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
+) {
+    let shift = keyboard.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
+    let ctrl = keyboard.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
+    let delete = keyboard.any_just_pressed([KeyCode::Backspace, KeyCode::Delete]);
+
+    if ctrl && shift && delete {
+        for entity in query.iter() {
+            info!("Delete Entity: {entity:?}");
+            commands.entity(entity).despawn_recursive();
+        }
+    }
+}
+*/

crates/editor_ui/src/ui_plugin.rs

@@ -1,7 +1,7 @@
 use crate::tools::gizmo::*;
 use crate::*;
 use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
-use meshless_visualizer::draw_light_gizmo;
+//use meshless_visualizer::draw_light_gizmo;
 
 use self::{change_chain::ChangeChainViewPlugin, editor_tab_name::EditorTabName};
 
@@ -38,7 +38,7 @@ impl FlatPluginList for EditorUiPlugin {
     fn add_plugins_to_group(&self, group: PluginGroupBuilder) -> PluginGroupBuilder {
         let mut res = group
             .add(SelectedPlugin)
-            .add(MeshlessVisualizerPlugin)
+            //.add(MeshlessVisualizerPlugin)
             .add(EditorUiCore::default())
             .add(GameViewPlugin)
             .add(menu_toolbars::BottomMenuPlugin)
@@ -166,7 +166,7 @@ impl Plugin for EditorUiCore {
         //play systems
         app.add_systems(OnEnter(EditorState::GamePrepare), save_prefab_before_play);
         // clean up meshless children on entering the game state
-        app.add_systems(OnEnter(EditorState::GamePrepare), clean_meshless);
+        //app.add_systems(OnEnter(EditorState::GamePrepare), clean_meshless);
         app.add_systems(
             OnEnter(SaveState::Idle),
             to_game_after_save.run_if(in_state(EditorState::GamePrepare)),
@@ -183,8 +183,8 @@ impl Plugin for EditorUiCore {
             Update,
             (
                 draw_camera_gizmo,
-                draw_light_gizmo,
-                selection::delete_selected,
+                //draw_light_gizmo,
+                //selection::delete_selected,
             )
                 .run_if(in_state(EditorState::Editor).and_then(in_state(ShowEditorUi::Show))),
         );
@@ -198,7 +198,7 @@ impl Plugin for EditorUiCore {
             app.add_systems(OnEnter(EditorState::Editor), change_camera_in_editor);
         }
 
-        app.add_event::<selection::SelectEvent>();
+        //app.add_event::<selection::SelectEvent>();
 
         app.init_resource::<BundleReg>();
     }