0.16 reflect functions

.gitignore

@@ -14,4 +14,5 @@ docs/.obsidian/*
 editor.ron
 .idea/*
 crates/prefab/test*.ron
-**/.DS_Store
+**/.DS_Store
+assets/models/TrackATest1_sp.glb

Cargo.toml

@@ -42,7 +42,18 @@ repository = "https://github.com/rewin123/space_editor"
 homepage = "https://github.com/rewin123/space_editor"
 
 [workspace.dependencies]
-bevy = { version = "0.16.0"}
+bevy = { version = "0.16.0", features = [
+    "bevy_gltf",
+    "bevy_log",
+    "bevy_window",
+    "bevy_state",
+    "bevy_sprite",
+    "reflect_documentation",
+    "reflect_functions",
+    "bevy_gizmos",
+    "bevy_picking",
+    "bevy_mesh_picking_backend",
+] }
 
 # Editor Crates
 space_prefab = { version = "0.8.0", path = "crates/prefab" }
@@ -83,13 +94,14 @@ bevy-inspector-egui = {version = "0.31.0", features = [
 bevy_mod_billboard = { branch = "dev-0.16", git = "https://github.com/MiniMinerX/bevy_mod_billboard.git"}
 bevy_asset_loader = "0.23.0-rc.3"
 bevy_panorbit_camera = "0.26"
-# bevy_panorbit_camera = { branch = "reflect_component", git = "https://github.com/MiniMinerX/bevy_panorbit_camera.git"}
+# bevy_panorbit_camera = { branch = "dev-0.16-reflect-cam-2", git = "https://github.com/MiniMinerX/bevy_panorbit_camera.git"}
+
 bevy_mod_outline = {git = "https://github.com/komadori/bevy_mod_outline.git", branch = "bevy-0.16"}
 
 # below has not been updated to bevy 0.16
 
-transform-gizmo-bevy = {git = "https://github.com/jakobhellermann/transform-gizmo.git", branch = "bevy-0.16", package = "transform-gizmo-bevy"}
-transform-gizmo-egui = {git = "https://github.com/jakobhellermann/transform-gizmo.git", branch = "bevy-0.16", package = "transform-gizmo-egui"}
+transform-gizmo-bevy = {git = "https://github.com/MiniMinerX/transform-gizmo", branch = "dev-0.16-3"}
+transform-gizmo-egui = {git = "https://github.com/MiniMinerX/transform-gizmo", branch = "dev-0.16-3"}
 
 
 #transform-gizmo-egui = {git = "https://github.com/MiniMinerX/transform-gizmo.git"}
@@ -106,6 +118,7 @@ bevy.workspace = true
 space_editor_ui.workspace = true
 space_prefab.workspace = true
 game_app.workspace = true
+transform-gizmo-bevy.workspace = true
 
 # Tabs
 space_editor_game_view.workspace = true

crates/editor_core/src/gltf_unpack.rs

@@ -11,10 +11,14 @@ use super::{BackgroundTask, BackgroundTaskStorage};
 /// Event to handle GLTF path
 pub struct EditorUnpackGltf {
     pub path: String,
+    pub parent: Option<Entity>,
 }
 
 #[derive(Event, Clone)]
-struct GltfLoaded(Handle<Gltf>);
+struct GltfLoaded {
+    handle: Handle<Gltf>,
+    parent: Option<Entity>,
+}
 
 pub struct UnpackGltfPlugin;
 
@@ -34,8 +38,8 @@ impl Plugin for UnpackGltfPlugin {
 #[reflect(Component)]
 struct GltfHolder(Handle<Gltf>);
 
-#[derive(Resource, Default)]
-struct GltfSceneQueue(Vec<Handle<Gltf>>);
+#[derive(Resource, Default)]  // Handle then parent
+struct GltfSceneQueue(Vec<(Handle<Gltf>, Option<Entity>)>);
 
 fn unpack_gltf_event(
     mut events: EventReader<EditorUnpackGltf>,
@@ -49,7 +53,7 @@ fn unpack_gltf_event(
             event.path.clone(),
             handle.clone().untyped(),
         ));
-        queue.0.push(handle);
+        queue.0.push((handle, event.parent));
     }
     events.clear();
 }
@@ -60,9 +64,11 @@ fn queue_push(
     mut events: EventWriter<GltfLoaded>,
     assets: Res<AssetServer>,
 ) {
-    if !queue.0.is_empty() && matches!(assets.get_load_state(&queue.0[0]), Some(LoadState::Loaded))
-    {
-        events.write(GltfLoaded(queue.0.remove(0)));
+    if let Some((handle, parent)) = queue.0.first().cloned() {
+        if matches!(assets.get_load_state(&handle), Some(LoadState::Loaded)) {
+            events.write(GltfLoaded { handle, parent });
+            queue.0.remove(0);
+        }
     }
 }
 
@@ -86,8 +92,8 @@ fn unpack_gltf(world: &mut World) {
     };
 
     let mut command_queue = CommandQueue::default();
-    for gltf in loaded_scenes.iter() {
-        let handle: Handle<Gltf> = gltf.0.clone();
+    for gltf_loaded in loaded_scenes.iter() {
+        let handle: Handle<Gltf> = gltf_loaded.handle.clone();
         let gltf_path = if let Some(path) = handle.path() {
             path.clone()
         } else {
@@ -97,7 +103,7 @@ fn unpack_gltf(world: &mut World) {
 
         let Some(gltf) = world
             .get_resource::<Assets<Gltf>>()
-            .and_then(|gltfs| gltfs.get(&gltf.0))
+            .and_then(|gltfs| gltfs.get(&gltf_loaded.handle))
         else {
             world.send_event(space_shared::toast::ToastMessage::new(
                 "Gltf asset not found or empty",
@@ -175,7 +181,11 @@ fn unpack_gltf(world: &mut World) {
             };
 
             for root in roots.iter() {
-                spawn_node(&mut commands, root, gltf, &ctx);
+                let entity = spawn_node(&mut commands, root, gltf, &ctx);
+
+                if let Some(parent) = gltf_loaded.parent {
+                    commands.entity(parent).add_child(entity);
+                }
             }
         }
 

crates/editor_core/src/lib.rs

@@ -51,8 +51,8 @@ impl Plugin for EditorCore {
         app.add_systems(Update, editor_event_listener);
 
         //app.auto_reflected_undo::<ChildOf>();
-        app.auto_reflected_undo::<Children>();
-        app.auto_undo::<PrefabMarker>();
+        //app.auto_reflected_undo::<Children>();
+        //app.auto_undo::<PrefabMarker>();
     }
 }
 
@@ -100,8 +100,11 @@ fn editor_event_listener(
             EditorEvent::StartGame => {
                 start_game_state.set(EditorState::GamePrepare);
             }
-            EditorEvent::LoadGltfAsPrefab(path) => {
-                gltf_events.write(gltf_unpack::EditorUnpackGltf { path: path.clone() });
+            EditorEvent::LoadGltfAsPrefab{path, parent} => {
+                gltf_events.write(gltf_unpack::EditorUnpackGltf { 
+                    path: path.clone(),
+                    parent: *parent,
+                });
             }
         }
     }

crates/editor_game_view/src/lib.rs

@@ -214,27 +214,39 @@ pub fn set_camera_viewport(
     local.0 = Some(viewport_rect);
 
     let scale_factor = window.scale_factor();
-    debug!(
-        "Window scale factor: {} egui scale factor: {}",
-        scale_factor, context_settings.scale_factor
-    );
 
     let mut viewport_pos = viewport_rect.left_top().to_vec2() * scale_factor;
     let mut viewport_size = viewport_rect.size() * scale_factor;
 
+    // Ensure position is non-negative
     viewport_pos.x = viewport_pos.x.max(0.0);
     viewport_pos.y = viewport_pos.y.max(0.0);
 
-    viewport_size.x = viewport_size
-        .x
-        .min(window.width().mul_add(scale_factor, -viewport_pos.x));
-    viewport_size.y = viewport_size
-        .y
-        .min(window.height().mul_add(scale_factor, -viewport_pos.y));
-
-    if (viewport_size.x <= 0.0) || (viewport_size.y <= 0.0) {
+    // Calculate maximum allowed size based on window dimensions and position
+    let window_width = window.width() * scale_factor;
+    let window_height = window.height() * scale_factor;
+
+    // IMPORTANT: Ensure viewport fits WITHIN the render target
+    // Subtract 1 pixel to ensure it's contained, not equal
+    let max_width = (window_width - viewport_pos.x - 1.0).max(0.0);
+    let max_height = (window_height - viewport_pos.y - 1.0).max(0.0);
+
+    viewport_size.x = viewport_size.x.min(max_width);
+    viewport_size.y = viewport_size.y.min(max_height);
+
+    // Ensure minimum size of 1x1
+    if viewport_size.x < 1.0 || viewport_size.y < 1.0 {
         return;
     }
+
+    // Additional safety check: ensure the viewport is fully contained
+    if viewport_pos.x + viewport_size.x >= window_width ||
+       viewport_pos.y + viewport_size.y >= window_height {
+        // Adjust size to fit
+        viewport_size.x = (window_width - viewport_pos.x - 1.0).max(1.0);
+        viewport_size.y = (window_height - viewport_pos.y - 1.0).max(1.0);
+    }
+
     cam.viewport = Some(bevy::render::camera::Viewport {
         physical_position: UVec2::new(viewport_pos.x as u32, viewport_pos.y as u32),
         physical_size: UVec2::new(viewport_size.x as u32, viewport_size.y as u32),
@@ -251,4 +263,4 @@ fn set_non_ui_areas(
     if let Some(viewport_rect) = game_view.viewport_rect {
         non_ui_areas.areas.push(viewport_rect);
     }
-}
+}

crates/editor_ui/src/camera_plugin.rs

@@ -81,18 +81,20 @@ pub fn update_pan_orbit(
     }
 }
 
-type PlayModeCameraFilter = (Without<EditorCameraMarker>, With<PlaymodeCamera>);
-type EditorModeCameraFilter = (With<EditorCameraMarker>, Without<PlaymodeCamera>);
+//type PlayModeCameraFilter = (Without<EditorCameraMarker>, With<PlaymodeCamera>);
+//type EditorModeCameraFilter = (With<EditorCameraMarker>, Without<PlaymodeCamera>);
 
 /// System to change camera from editor camera to game play camera (if exist)
 pub fn change_camera_in_play(
-    mut editor_cameras: Query<&mut Camera, EditorModeCameraFilter>,
-    mut play_cameras: Query<&mut Camera, PlayModeCameraFilter>,
+    //mut editor_cameras: Query<&mut Camera, EditorModeCameraFilter>,
+    //mut play_cameras: Query<&mut Camera, PlayModeCameraFilter>,
+    mut editor_only_cameras: Query<&mut Camera, (With<EditorCameraMarker>, Without<PlaymodeCamera>)>,
+    mut play_cameras: Query<&mut Camera, With<PlaymodeCamera>>,
     primary_window: Query<&mut Window, With<PrimaryWindow>>,
     mut toast: EventWriter<ToastMessage>,
 ) {
     if !play_cameras.is_empty() {
-        editor_cameras.iter_mut().for_each(|mut cam| {
+        editor_only_cameras.iter_mut().for_each(|mut cam| {
             cam.is_active = false;
         });
         play_cameras.iter_mut().for_each(|mut cam| {
@@ -131,14 +133,14 @@ pub fn change_camera_in_play(
 
 /// System to change camera from game camera to editor camera (if exist)
 pub fn change_camera_in_editor(
-    mut editor_cameras: Query<&mut Camera, EditorModeCameraFilter>,
-    mut play_cameras: Query<&mut Camera, PlayModeCameraFilter>,
+    mut editor_cameras: Query<&mut Camera, With<EditorCameraMarker>>,
+    mut play_only_cameras: Query<&mut Camera, (With<PlaymodeCamera>, Without<EditorCameraMarker>)>,
 ) {
     for mut ecam in editor_cameras.iter_mut() {
         ecam.is_active = true;
     }
 
-    for mut play_cam in play_cameras.iter_mut() {
+    for mut play_cam in play_only_cameras.iter_mut() {
         play_cam.is_active = false;
     }
 }
@@ -164,7 +166,7 @@ pub fn draw_camera_gizmo(
         (&GlobalTransform, &Projection),
         (
             With<Camera>,
-            Without<EditorCameraMarker>,
+            //Without<EditorCameraMarker>,
             Without<DisableCameraSkip>,
             Without<NotShowCamera>,
         ),
@@ -173,11 +175,14 @@ pub fn draw_camera_gizmo(
     for (transform, _projection) in cameras.iter() {
         let pink = Color::srgb(1.0, 0.41, 0.71);
 
+        let scale = 0.4;
+        let scale2 = 0.4 / 1.5;
+
         let transform = transform.compute_transform();
-        let cuboid_transform = transform.with_scale(Vec3::new(1.0, 1.0, 2.0));
+        let cuboid_transform = transform.with_scale(Vec3::new(1.0 * scale2, 1.0 * scale2, 2.0 * scale2));
         gizmos.cuboid(cuboid_transform, pink);
 
-        let scale = 1.5;
+
 
         gizmos.line(
             transform.translation,

crates/editor_ui/src/camera_view.rs

@@ -123,7 +123,7 @@ impl EditorTab for CameraViewTab {
         let mut camera_query = world.query_filtered::<Entity, (
             With<Camera>,
             With<PlaymodeCamera>,
-            Without<EditorCameraMarker>,
+            //Without<EditorCameraMarker>,
         )>();
 
         if camera_query.iter(world).count() == 1 {
@@ -267,7 +267,7 @@ impl EditorTab for CameraViewTab {
 
 fn clean_camera_view_tab(
     mut ui_state: ResMut<CameraViewTab>,
-    mut cameras: Query<(&mut Camera, &mut GlobalTransform), Without<EditorCameraMarker>>,
+    mut cameras: Query<(&mut Camera, &mut GlobalTransform) /*, Without<EditorCameraMarker> */ >,
 ) {
     let Some(real_cam_entity) = ui_state.real_camera else {
         return;
@@ -296,7 +296,7 @@ fn set_camera_viewport(
     primary_window: Query<&mut Window, With<PrimaryWindow>>,
     mut cameras: Query<
         (&mut Camera, &mut GlobalTransform, &mut Transform),
-        Without<EditorCameraMarker>,
+        //Without<EditorCameraMarker>,
     >,
     mut ctxs: EguiContexts,
     images: Res<Assets<Image>>,