Merge pull request #41 from dexsper/main

Major Editor Improvements

Author: idanarye

.cargo/config.toml

@@ -0,0 +1,5 @@
+[alias]
+example2d = "run --example example2d --features _example2d_full"
+example3d = "run --example example3d --features _example3d_full"
+custom_camera3d = "run --example custom_camera3d --features _example3d_full"
+doors_to_other_levels = "run --example doors_to_other_levels --features _doors_to_other_levels_full"

.gitignore

@@ -9,4 +9,7 @@ assets/levels3d/*.yol
 assets/levels3d/*.yoli
 !assets/levels3d/example.yol
 
+#IDES
+/.vscode
+
 # No ignored level files in levels_doors

CHANGELOG.md

@@ -5,6 +5,59 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## 0.30.0 - 2025-12-04
+### Added
+- `console_layer_factory` for routing Bevy logs into the Yoleck console
+- `YoleckConsoleLogHistory` for storing up to 1000 recent log entries
+- `YoleckConsoleState` for managing console UI state
+- `YoleckEditorBottomPanelSections` for extensible bottom-panel tabs
+- `Vpeol3dCameraMode` enum with variants: `Fps`, `Sidescroller`, `Topdown`, `Custom(u32)`
+- `YoleckCameraChoices` resource for customizing available camera modes in 3D editor
+- Camera mode selector dropdown in editor top panel for switching between camera modes
+- `Vpeol3dCameraControl::fps()` preset for FPS-style camera with full rotation freedom
+- Support for custom camera modes with user-defined movement logic
+- `custom_camera3d.rs` example demonstrating custom camera modes (Isometric and Orbital)
+- Custom camera modes documentation in vpeol_3d module
+- World/Local mode toggle for axis knobs in 3D editor top panel
+- Keyboard shortcut to delete selected entities: Press `Delete` key to remove selected entity from the level
+- Copy/paste support for entities: Use `Ctrl+C` to copy and `Ctrl+V` to paste entities with all their components and values
+- Cross-level entity copying: Entities can be copied between different level editors through system clipboard
+- Auto-selection of pasted entities: Newly pasted entities are automatically selected for immediate editing
+- UI editing support for `Vpeol3dRotation` using Euler angles (X, Y, Z in degrees)
+- UI editing support for `Vpeol3dScale` with separate X, Y, Z drag values
+- UI editing support for `Vpeol2dRotatation` using degrees
+- UI editing support for `Vpeol2dScale` with separate X, Y drag values
+- Drag and drop support for entity references: entities with UUID can now be dragged from the entity list and dropped onto `YoleckEntityRef` fields in the properties panel
+- Entity type filtering is automatically applied when dropping entities onto entity reference fields with type constraints
+
+### Changed
+- Removed unused `plane_origin` field from `Vpeol3dCameraControl`
+- **BREAKING:** `Vpeol3dRotation` now stores Euler angles (`Vec3`) instead of quaternion
+- Entity deletion now works via keyboard in addition to the existing UI button
+- Updated documentation for vpeol_3d and vpeol_2d to reflect that rotation and scale components now have UI editing support
+- Updated code examples in documentation to show optional rotation and scale components
+- Improved documentation for `YoleckEntityRef`, `with_uuid()`, and entity reference requirements
+- `YoleckEntityRef` now includes comprehensive documentation about requirements and editor features
+- Improved editor ergonomics with better organized workspace instead of single cluttered panel
+- Axis knobs are now always displayed for all 3 world axes (X, Y, Z) by default
+- Scene gizmo now displays axis labels (X, Y, Z) at the end of positive axes
+- `YoleckAutoEdit` derive macro now also implements `YoleckEntityRefAccessor`, eliminating the need for separate `YoleckEntityRefs` derive
+- `add_yoleck_auto_edit` now registers both auto edit and entity ref edit systems automatically
+- `YoleckEntityRef` fields are now automatically hidden from auto edit UI (rendered only by entity ref system)
+- Added scene gizmo for camera orientation
+- Added automatic UI generation for components using reflection and attributes.
+- Supported numeric, boolean, string, vector, color, enum, option, list, asset, and entity fields.
+- Added EntityRef type with automatic UI, filtering, and runtime UUID resolution.
+- Enabled entity linking with drag-and-drop selection.
+- Make camera controls fps style 
+- Update bevy_egui version to 0.38.
+
+### Removed
+- [**BREAKING**] Removed `Vpeol3dThirdAxisWithKnob` component (no longer needed as all axes have knobs by default)
+- Removed `YoleckEntityRefPlugin` (was empty/no-op)
+- Removed `add_yoleck_entity_ref_edit` method (merged into `add_yoleck_auto_edit`)
+- Removed `add_yoleck_full_edit` method (no longer needed)
+- Removed `YoleckEntityRefs` derive macro (merged into `YoleckAutoEdit`)
 
 ## 0.29.0 - 2025-10-03
 ### Changed

Cargo.toml

@@ -4,18 +4,16 @@ members = ["macros"]
 [package]
 name = "bevy-yoleck"
 description = "Your Own Level Editor Creation Kit"
-version = "0.29.0"
+version = "0.30.0"
 edition = "2021"
-authors = ["IdanArye <idanarye@gmail.com>"]
+authors = ["dexsper <dexsperpro@gmail.com>", "IdanArye <idanarye@gmail.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/idanarye/bevy-yoleck"
 documentation = "https://docs.rs/bevy-yoleck"
 readme = "README.md"
 categories = ["game-development"]
 keywords = ["bevy", "gamedev", "level-editor"]
-exclude = [
-    "assets",
-]
+exclude = ["assets"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -27,25 +25,35 @@ bevy = { version = "^0.17", default-features = false, features = [
     "bevy_asset",
     "bevy_log",
 ] }
-bevy_egui = { version = "^0.37", default-features = false, features = ["default_fonts", "render"] }
+bevy_egui = { version = "^0.38", default-features = false, features = [
+    "default_fonts",
+    "render",
+] }
 serde = "^1"
 serde_json = "^1"
 thiserror = "^2"
 uuid = "1.9.1"
+arboard = "3.4"
 
 [features]
 bevy_reflect = []
 vpeol = []
-vpeol_2d = [
-    "vpeol",
-    "bevy/bevy_text",
-    "bevy/bevy_sprite",
-    "bevy/png",
-]
-vpeol_3d = [
-    "vpeol",
-    "bevy/bevy_pbr",
+vpeol_2d = ["vpeol", "bevy/bevy_text", "bevy/bevy_sprite", "bevy/png"]
+vpeol_3d = ["vpeol", "bevy/bevy_pbr"]
+_example2d_full = ["vpeol_2d", "bevy/bevy_gizmos", "bevy/bevy_sprite_render"]
+_example3d_full = [
+    "vpeol_3d",
+    "bevy/bevy_scene",
+    "bevy/bevy_gltf",
+    "bevy/animation",
+    "bevy/ktx2",
+    "bevy/zstd_rust",
+    "bevy/tonemapping_luts",
+    "bevy/bevy_gizmos",
+    "bevy/reflect_auto_register",
+    "bevy/bevy_sprite_render",
 ]
+_doors_to_other_levels_full = ["vpeol_2d", "bevy/bevy_sprite_render"]
 
 [dev-dependencies]
 bevy = { version = "^0.17", default-features = false, features = [
@@ -58,41 +66,24 @@ bevy = { version = "^0.17", default-features = false, features = [
 
 [[example]]
 name = "example2d"
-required-features = [
-    "vpeol_2d",
-    "bevy/png",
-    "bevy/bevy_gizmos",
-    "bevy/bevy_sprite_render",
-]
+required-features = ["_example2d_full"]
 
 [[example]]
 name = "example3d"
-required-features = [
-    "vpeol_3d",
-    "bevy/bevy_scene",
-    "bevy/bevy_gltf",
-    "bevy/animation",
-    "bevy/ktx2",
-    "bevy/zstd_rust",
-    "bevy/tonemapping_luts",
-    "bevy/bevy_gizmos",
-    "bevy/reflect_auto_register",
-    "bevy/bevy_pbr",
-    "bevy/bevy_sprite_render",
-]
+required-features = ["_example3d_full"]
+
+[[example]]
+name = "custom_camera3d"
+required-features = ["_example3d_full"]
 
 [[example]]
 name = "doors_to_other_levels"
-required-features = [
-    "vpeol_2d",
-    "bevy/png",
-    "bevy/bevy_sprite_render",
-]
+required-features = ["_doors_to_other_levels_full"]
 
 [package.metadata.docs.rs]
 
 all-features = true
 features = [
-    "bevy/x11", # required for bevy_egui
-    "bevy/bevy_gltf",  # required for SceneRoot in vpeol_3d's doctests
+    "bevy/x11",       # required for bevy_egui
+    "bevy/bevy_gltf", # required for SceneRoot in vpeol_3d's doctests
 ]

README.md

@@ -1,7 +1,20 @@
-[![Build Status](https://github.com/idanarye/bevy-yoleck/workflows/CI/badge.svg)](https://github.com/idanarye/bevy-yoleck/actions)
-[![Latest Version](https://img.shields.io/crates/v/bevy-yoleck.svg)](https://crates.io/crates/bevy-yoleck)
-[![Rust Documentation](https://img.shields.io/badge/nightly-rustdoc-blue.svg)](https://idanarye.github.io/bevy-yoleck/)
-[![Rust Documentation](https://img.shields.io/badge/stable-rustdoc-purple.svg)](https://docs.rs/bevy-yoleck/)
+> **Fork Notice:** This project is a fork of [bevy-yoleck](https://github.com/idanarye/bevy-yoleck) by IdanArye.
+
+<img width="1919" height="1034" alt="image" src="https://github.com/user-attachments/assets/9c6b353e-59fa-4967-a484-b20dc873a722" />
+
+## Fork Improvements
+
+| Feature | Description |
+|---------|-------------|
+| **Redesigned Editor UI** | Complete UI/UX overhaul with split-screen layout: top panel for level management and playmode controls, right panel for entity properties editor, bottom panel for entity list, left panel for entity creation tools |
+| **Automatic UI Generation** | Automatic UI generation for components with support for numeric, boolean, string, vector, color, enum, option, list, asset, and entity fields |
+| **EntityRef System** | Entity linking system with automatic UI, filtering, and runtime UUID resolution. Supports drag-and-drop |
+| **Scene Gizmo** | Visual scene gizmo for camera orientation and control |
+| **Colored Axis Knobs** | Color-coded axis knobs (red for X, green for Y, blue for Z) automatically displayed for all three world axes |
+| **Camera Schemas** | Add camera controls with FPS-style movement for better 3D navigation, and ui switcher for camera modes |
+| **Simplified Macro API** | Streamlined derive macros with automatic trait implementations - `YoleckAutoEdit` now handles both auto edit and entity ref systems |
+| **Keyboard Shortcuts** | Delete entities with `Delete` key, copy/paste entities with `Ctrl+C`/`Ctrl+V` |
+| **Console System** | Optional console system for displaying logs in the UI |
 
 # Bevy YOLECK - Your Own Level Editor Creation Kit
 
@@ -26,26 +39,24 @@ own level editor.
 
 ## Examples:
 
-* WASM examples - you can't save the levels because it's WASM, but you can edit the levels run playtests:
-  * 2D editor: https://idanarye.github.io/bevy-yoleck/demos/example2d
-
-    https://user-images.githubusercontent.com/1149255/228007948-31a37b3f-7bd3-4a36-a3bc-4617d359c7c2.mp4
-  * 3D editor: https://idanarye.github.io/bevy-yoleck/demos/example3d
+**Note:** This fork is not published on crates.io yet. To run the examples, you need to clone this repository first:
 
-    https://user-images.githubusercontent.com/1149255/228008014-825ef02e-2edc-49f5-a15c-1fa6044f84de.mp4
+```bash
+git clone https://github.com/dexsper/bevy-yoleck-fork
+cd bevy-yoleck
+```
 
-  * Loading multiple levels and unloading them on the fly: https://idanarye.github.io/bevy-yoleck/demos/doors_to_other_levels
+Then you can run the examples:
 
-    https://github.com/idanarye/bevy-yoleck/assets/1149255/590beba4-2ca5-4218-af52-143321bb5946
+* 2D example:
+  ```bash
+  cargo example2d
+  ```
 
-    The WASM version of this example is gameplay only. To see how the editor for it looks like, clone/download the repository and run:
-    ```rust
-    cargo run --example doors_to_other_levels --features vpeol_2d,bevy/png
-    ```
-* Example game:
-  * Download binaries from https://aeon-felis.itch.io/danger-doofus
-  * See the code at https://github.com/idanarye/sidekick-jam-entry-danger-doofus
-  * Run the exeutable with `--editor` to edit the game levels with Yoleck.
+* 3D example:
+  ```bash
+  cargo example3d
+  ```
 
 ## File Format
 
@@ -78,6 +89,7 @@ at a directory's contents). The index file contains a tuple of two values:
 
 | bevy | bevy-yoleck | bevy_egui |
 |------|-------------|-----------|
+| 0.17 | 0.30        | 0.38      |
 | 0.17 | 0.29        | 0.37      |
 | 0.16 | 0.28        | 0.36      |
 | 0.16 | 0.27        | 0.35      |

assets/levels3d/example.yol

@@ -1 +1 @@
-[{"format_version":2,"app_format_version":0},{},[[{"type":"Planet","name":"","uuid":"f4d84809-0c8e-49a9-8b7c-fb779715c518"},{"Vpeol3dPosition":[10.016812324523926,1.400029182434082,0.0]}],[{"type":"Planet","name":"","uuid":"0ed26981-7f4b-47d2-b5f8-c93c9c8d9c72"},{"Vpeol3dPosition":[-6.555315017700195,1.343174934387207,10.238651275634766]}],[{"type":"Spaceship","name":""},{"Vpeol3dPosition":[0.520146369934082,-6.667301177978516,13.79182243347168]}],[{"type":"PlanetPointer","name":""},{"LaserPointer":{"target":"f4d84809-0c8e-49a9-8b7c-fb779715c518"},"Vpeol3dPosition":[4.84351921081543,4.557557106018066,-9.821765899658203]}]]]
+[{"format_version":2,"app_format_version":0},{},[[{"type":"Planet","name":"","uuid":"c8aa8fdd-5431-473c-8774-b069c95f794f"},{"PlanetSettings":{"radius":1.0},"Vpeol3dPosition":[-7.047080993652344,6.785710334777832,0.0]}],[{"type":"Planet","name":"","uuid":"2d676a47-146f-49f0-bba7-cf58a8833b1f"},{"PlanetSettings":{"radius":1.0},"Vpeol3dPosition":[16.688783645629883,-3.0687923431396484,0.0]}],[{"type":"PlanetPointer","name":""},{"LaserPointer":{"target":{"uuid":"c8aa8fdd-5431-473c-8774-b069c95f794f"}},"Vpeol3dPosition":[15.614945411682129,-6.67572021484375e-6,-34.80355453491211]}],[{"type":"Spaceship","name":""},{"SpaceshipSettings":{"enabled":true,"rotation_speed":2.0,"speed":2.0},"Vpeol3dPosition":[1.2451118230819702,-2.86102294921875e-6,21.062850952148438]}]]]