diff --git a/Cargo.toml b/Cargo.toml index efdd46b0..22e0807b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,36 +1,47 @@ [package] name = "space_editor" -version = "0.3.0" -edition = "2021" -license = "MIT OR Apache-2.0" -keywords = ["gamedev", "editor", "bevy"] -categories = ["game-development"] +version.workspace = true +edition.workspace = true +license.workspace = true +authors.workspace = true +keywords.workspace = true +categories.workspace = true exclude = ["/assets", "/examples"] description = "Prefab editor for bevy game engine. Make levels/object templates with intuitive UI" readme = "README.md" homepage = "https://github.com/rewin123/space_editor" repository = "https://github.com/rewin123/space_editor" +[workspace.package] +version = "0.3.0" +edition = "2021" +license = "MIT OR Apache-2.0" +authors = ["rewin "] +keywords = ["gamedev", "editor", "bevy"] +categories = ["game-development"] + [workspace.dependencies] bevy = "0.12" # Editor Crates -prefab = { path = "crates/prefab" } -shared = { path = "crates/shared" } -undo = { path = "crates/undo" } -persistence = { path = "crates/persistence"} -editor_core = { path = "crates/editor_core", features = ["persistence_editor"] } -editor = { path = "crates/editor", features = ["persistence_editor"] } +space_prefab = { version = "*", path = "crates/prefab" } +space_shared = { version = "*", path = "crates/shared" } +space_undo = { version = "*", path = "crates/undo" } +space_persistence = { version = "*", path = "crates/persistence"} +space_editor_core = { version = "*", path = "crates/editor_core", features = ["persistence_editor"] } +space_editor_ui = { version = "*", path = "crates/editor_ui", features = ["persistence_editor"] } ron = "0.8" serde = "1" +space_bevy_xpbd_plugin = { version = "*", path = "modules/bevy_xpbd_plugin"} + [dependencies] bevy.workspace = true -editor.workspace = true -prefab.workspace = true +space_editor_ui = {workspace = true, version = "*" } +space_prefab = {workspace = true, version = "*" } # Modules for external crates -bevy_xpbd_plugin = { path = "modules/bevy_xpbd_plugin", optional = true } +space_bevy_xpbd_plugin = {version = "*", workspace = true, optional = true } # For versions 1.74+ @@ -55,7 +66,7 @@ too_many_arguments = { level = "allow", priority = 2 } opt-level = 3 [features] -bevy_xpbd_3d = ["dep:bevy_xpbd_plugin"] +bevy_xpbd_3d = ["dep:space_bevy_xpbd_plugin"] persistence_editor = [] editor = [] default = ["bevy_xpbd_3d", "persistence_editor", "editor"] diff --git a/assets/level_test.scn.ron b/assets/level_test.scn.ron index c8de73e5..ce51f23a 100644 --- a/assets/level_test.scn.ron +++ b/assets/level_test.scn.ron @@ -21,7 +21,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.93333334, green: 0.0, @@ -53,13 +53,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -114,7 +114,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 1.0, @@ -146,13 +146,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -207,7 +207,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.972549, @@ -239,13 +239,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -296,7 +296,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -328,7 +328,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, @@ -355,7 +355,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.25490198, @@ -387,13 +387,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -444,14 +444,14 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 17179869206, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( + "space_bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( pos: ( x: -0.25, y: 1.75, @@ -468,7 +468,7 @@ z: 1.3, )), ), - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (697.96954), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -519,7 +519,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -551,7 +551,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.5, @@ -578,7 +578,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 1.0, @@ -610,13 +610,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -667,14 +667,14 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 23, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( + "space_bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( pos: ( x: -0.25, y: 1.75, @@ -691,7 +691,7 @@ z: 1.3, )), ), - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (692.05457), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -746,7 +746,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -778,13 +778,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3674.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -839,7 +839,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -871,13 +871,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -932,7 +932,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.0, @@ -964,13 +964,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1021,7 +1021,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -1053,7 +1053,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, @@ -1080,7 +1080,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.0, @@ -1112,13 +1112,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1173,7 +1173,7 @@ name: "Player", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -1205,14 +1205,14 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), + "space_prefab::save::ChildrenPrefab": ([ 9, 12, 18, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, "bevy_xpbd_3d::components::mass_properties::Mass": (146.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1245,7 +1245,7 @@ y: 0.0, z: 0.0, )), - "bevy_xpbd_plugin::spatial_query::RayCasterPrefab": ( + "space_bevy_xpbd_plugin::spatial_query::RayCasterPrefab": ( direction: ( x: 0.0, y: -1.0, @@ -1302,7 +1302,7 @@ near: 0.1, far: 1000.0, )), - "prefab::component::camera::CameraPlay": (), + "space_prefab::component::camera::CameraPlay": (), "platformer::FollowCamera": ( dist: 34.0, target: ( diff --git a/assets/physics_loading_test.scn.ron b/assets/physics_loading_test.scn.ron index 26985db6..b5a39677 100644 --- a/assets/physics_loading_test.scn.ron +++ b/assets/physics_loading_test.scn.ron @@ -21,7 +21,7 @@ name: "Player", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -53,14 +53,14 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), + "space_prefab::save::ChildrenPrefab": ([ 4294967318, 4294967317, 4294967314, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, "bevy_xpbd_3d::components::mass_properties::Mass": (148.00037), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -111,7 +111,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -143,7 +143,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, @@ -170,7 +170,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -202,13 +202,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3749.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -259,7 +259,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -291,7 +291,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.5, @@ -314,7 +314,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -346,7 +346,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, diff --git a/assets/physics_object.scn.ron b/assets/physics_object.scn.ron index fcdf912a..86c7a511 100644 --- a/assets/physics_object.scn.ron +++ b/assets/physics_object.scn.ron @@ -21,7 +21,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.93333334, green: 0.0, @@ -53,13 +53,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -114,7 +114,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 1.0, @@ -146,13 +146,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -207,7 +207,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.972549, @@ -239,13 +239,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -296,7 +296,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -328,7 +328,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, @@ -355,7 +355,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.25490198, @@ -387,13 +387,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -444,14 +444,14 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 17179869207, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( + "space_bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( pos: ( x: -0.25, y: 1.75, @@ -468,7 +468,7 @@ z: 1.3, )), ), - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (703.8845), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -519,7 +519,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -551,7 +551,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.5, @@ -578,7 +578,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 1.0, @@ -610,13 +610,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -667,14 +667,14 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 24, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( + "space_bevy_xpbd_plugin::collider::ColliderPrefab": Primitive( pos: ( x: -0.25, y: 1.75, @@ -691,7 +691,7 @@ z: 1.3, )), ), - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (697.96954), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -746,7 +746,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -778,13 +778,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3699.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -839,7 +839,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -871,13 +871,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -932,7 +932,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.0, @@ -964,13 +964,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1021,7 +1021,7 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 0.0, green: 0.0, @@ -1053,7 +1053,7 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 0.2, h: 0.2, d: 0.2, @@ -1080,7 +1080,7 @@ name: "Cube", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 0.0, @@ -1112,13 +1112,13 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Box(( + "space_prefab::component::shape::MeshPrimitivePrefab": Box(( w: 5.0, h: 1.0, d: 5.0, )), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Static, "bevy_xpbd_3d::components::mass_properties::Mass": (3724.0), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1173,7 +1173,7 @@ name: "Player", ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::material::MaterialPrefab": ( + "space_prefab::component::material::MaterialPrefab": ( base_color: Rgba( red: 1.0, green: 1.0, @@ -1205,14 +1205,14 @@ parallax_mapping_method: Occlusion, max_parallax_layer_count: 16.0, ), - "prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::component::shape::MeshPrimitivePrefab": Cube(1.0), + "space_prefab::save::ChildrenPrefab": ([ 10, 13, 19, ]), - "bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, - "bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, + "space_bevy_xpbd_plugin::collider::ColliderPrefab": FromPrefabMesh, + "space_bevy_xpbd_plugin::registry::RigidBodyPrefab": Dynamic, "bevy_xpbd_3d::components::mass_properties::Mass": (147.00008), "bevy_xpbd_3d::components::Friction": ( dynamic_coefficient: 0.3, @@ -1245,7 +1245,7 @@ y: 0.0, z: 0.0, )), - "bevy_xpbd_plugin::spatial_query::RayCasterPrefab": ( + "space_bevy_xpbd_plugin::spatial_query::RayCasterPrefab": ( direction: ( x: 0.0, y: -1.0, @@ -1302,7 +1302,7 @@ near: 0.1, far: 1000.0, )), - "prefab::component::camera::CameraPlay": (), + "space_prefab::component::camera::CameraPlay": (), "platformer::FollowCamera": ( dist: 34.0, target: ( diff --git a/assets/tile.scn.ron b/assets/tile.scn.ron index fb915033..196a9617 100644 --- a/assets/tile.scn.ron +++ b/assets/tile.scn.ron @@ -17,11 +17,11 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "cube.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 38654705667, ]), }, @@ -42,11 +42,11 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 9, 12884901901, ]), @@ -68,11 +68,11 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 32, 31, 39, @@ -95,11 +95,11 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 45, 44, 52, @@ -122,11 +122,11 @@ ), ), "bevy_render::view::visibility::Visibility": Inherited, - "prefab::component::GltfPrefab": ( + "space_prefab::component::GltfPrefab": ( path: "colone.glb", scene: "Scene0", ), - "prefab::save::ChildrenPrefab": ([ + "space_prefab::save::ChildrenPrefab": ([ 19, 18, 26, diff --git a/crates/editor_core/Cargo.toml b/crates/editor_core/Cargo.toml index 4c38b448..9c8be338 100644 --- a/crates/editor_core/Cargo.toml +++ b/crates/editor_core/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "editor_core" -version = "0.1.0" +name = "space_editor_core" edition = "2021" +version.workspace = true +authors.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prefab.workspace = true -undo.workspace = true -persistence.workspace = true -shared.workspace = true +space_prefab.workspace = true +space_undo.workspace = true +space_persistence.workspace = true +space_shared.workspace = true bevy.workspace = true diff --git a/crates/editor_core/src/gltf_unpack.rs b/crates/editor_core/src/gltf_unpack.rs index 73ae33a3..acb1f33d 100644 --- a/crates/editor_core/src/gltf_unpack.rs +++ b/crates/editor_core/src/gltf_unpack.rs @@ -6,8 +6,8 @@ use bevy::{ utils::HashMap, }; -use prefab::component::{AssetMaterial, AssetMesh, MaterialPrefab}; -use shared::PrefabMarker; +use space_prefab::component::{AssetMaterial, AssetMesh, MaterialPrefab}; +use space_shared::PrefabMarker; use super::{BackgroundTask, BackgroundTaskStorage}; diff --git a/crates/editor_core/src/hotkeys.rs b/crates/editor_core/src/hotkeys.rs index c6437b40..2cc60b3e 100644 --- a/crates/editor_core/src/hotkeys.rs +++ b/crates/editor_core/src/hotkeys.rs @@ -6,7 +6,7 @@ use bevy::reflect::GetTypeRegistration; use bevy::utils::HashMap; #[cfg(feature = "persistence_editor")] -use persistence::AppPersistenceExt; +use space_persistence::AppPersistenceExt; pub trait Hotkey: Send diff --git a/crates/editor_core/src/lib.rs b/crates/editor_core/src/lib.rs index 6ed66269..93539b0f 100644 --- a/crates/editor_core/src/lib.rs +++ b/crates/editor_core/src/lib.rs @@ -9,18 +9,18 @@ pub mod task_storage; pub mod prelude { pub use super::*; pub use super::{hotkeys::*, load::*, selected::*, task_storage::*}; - pub use undo; + pub use space_undo; } pub mod gltf_unpack; use bevy::prelude::*; -use prefab::save::{SaveConfig, SaveState}; use prelude::load_listener; -use shared::*; +use space_prefab::save::{SaveConfig, SaveState}; +use space_shared::*; +use space_undo::AppAutoUndo; use task_storage::{BackgroundTask, BackgroundTaskStorage, BackgroundTaskStoragePlugin}; -use undo::AppAutoUndo; pub struct EditorCore; @@ -29,7 +29,7 @@ impl Plugin for EditorCore { app.add_plugins(gltf_unpack::UnpackGltfPlugin); #[cfg(feature = "persistence_editor")] - app.add_plugins(persistence::PersistencePlugin); + app.add_plugins(space_persistence::PersistencePlugin); app.add_plugins(BackgroundTaskStoragePlugin); diff --git a/crates/editor_core/src/load.rs b/crates/editor_core/src/load.rs index e402194b..2ead895d 100644 --- a/crates/editor_core/src/load.rs +++ b/crates/editor_core/src/load.rs @@ -1,5 +1,5 @@ use bevy::{prelude::*, utils::HashMap}; -use shared::*; +use space_shared::*; use crate::EditorLoader; diff --git a/crates/editor_core/src/selected.rs b/crates/editor_core/src/selected.rs index 88817467..3e5f6629 100644 --- a/crates/editor_core/src/selected.rs +++ b/crates/editor_core/src/selected.rs @@ -3,7 +3,7 @@ use bevy::{ prelude::*, }; -use shared::EditorSet; +use space_shared::EditorSet; /// A marker for editor selected entities #[derive(Component, Default, Clone)] diff --git a/crates/editor/Cargo.toml b/crates/editor_ui/Cargo.toml similarity index 64% rename from crates/editor/Cargo.toml rename to crates/editor_ui/Cargo.toml index 82b5397f..9235b6f8 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor_ui/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "editor" -version = "0.3.0" -edition = "2021" +name = "space_editor_ui" +version.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,11 +10,11 @@ persistence_editor = [] [dependencies] bevy.workspace = true -editor_core.workspace = true -prefab.workspace = true -undo.workspace = true -persistence.workspace = true -shared.workspace = true +space_editor_core.workspace = true +space_prefab.workspace = true +space_undo.workspace = true +space_persistence.workspace = true +space_shared.workspace = true bevy_egui = "0.23" egui-gizmo = "0.12" diff --git a/crates/editor/src/asset_inspector/mod.rs b/crates/editor_ui/src/asset_inspector/mod.rs similarity index 100% rename from crates/editor/src/asset_inspector/mod.rs rename to crates/editor_ui/src/asset_inspector/mod.rs diff --git a/crates/editor/src/bot_menu.rs b/crates/editor_ui/src/bot_menu.rs similarity index 98% rename from crates/editor/src/bot_menu.rs rename to crates/editor_ui/src/bot_menu.rs index add16849..2a105e8d 100644 --- a/crates/editor/src/bot_menu.rs +++ b/crates/editor_ui/src/bot_menu.rs @@ -1,8 +1,8 @@ use bevy::prelude::*; use bevy_egui::*; -use editor_core::prelude::*; -use prefab::plugins::PrefabPlugin; -use shared::{ext::egui_file, *}; +use space_editor_core::prelude::*; +use space_prefab::plugins::PrefabPlugin; +use space_shared::{ext::egui_file, *}; /// Plugin to activate bot menu in editor UI pub struct BotMenuPlugin; diff --git a/crates/editor/src/change_chain.rs b/crates/editor_ui/src/change_chain.rs similarity index 96% rename from crates/editor/src/change_chain.rs rename to crates/editor_ui/src/change_chain.rs index c4501987..1176d25c 100644 --- a/crates/editor/src/change_chain.rs +++ b/crates/editor_ui/src/change_chain.rs @@ -1,7 +1,7 @@ use bevy::prelude::*; use super::{editor_tab::EditorTab, EditorUiAppExt}; -use undo::ChangeChain; +use space_undo::ChangeChain; pub struct ChangeChainViewPlugin; diff --git a/crates/editor/src/debug_panels.rs b/crates/editor_ui/src/debug_panels.rs similarity index 90% rename from crates/editor/src/debug_panels.rs rename to crates/editor_ui/src/debug_panels.rs index 754171e4..620cc5ea 100644 --- a/crates/editor/src/debug_panels.rs +++ b/crates/editor_ui/src/debug_panels.rs @@ -1,7 +1,7 @@ use super::editor_tab::*; use bevy::prelude::*; use bevy_egui::egui; -use shared::ext::bevy_inspector_egui; +use space_shared::ext::bevy_inspector_egui; #[derive(Resource)] pub struct DebugWorldInspector {} diff --git a/crates/editor/src/editor_tab.rs b/crates/editor_ui/src/editor_tab.rs similarity index 100% rename from crates/editor/src/editor_tab.rs rename to crates/editor_ui/src/editor_tab.rs diff --git a/crates/editor/src/game_view.rs b/crates/editor_ui/src/game_view.rs similarity index 98% rename from crates/editor/src/game_view.rs rename to crates/editor_ui/src/game_view.rs index 7a32d916..f98deaca 100644 --- a/crates/editor/src/game_view.rs +++ b/crates/editor_ui/src/game_view.rs @@ -1,9 +1,9 @@ use bevy::{prelude::*, window::PrimaryWindow}; use bevy_egui::egui::{self}; use egui_gizmo::GizmoMode; -use undo::UndoRedo; +use space_undo::UndoRedo; -use shared::*; +use space_shared::*; use super::{editor_tab::EditorTab, tool::EditorTool}; diff --git a/crates/editor/src/hierarchy.rs b/crates/editor_ui/src/hierarchy.rs similarity index 98% rename from crates/editor/src/hierarchy.rs rename to crates/editor_ui/src/hierarchy.rs index 1c236ac5..6555dedd 100644 --- a/crates/editor/src/hierarchy.rs +++ b/crates/editor_ui/src/hierarchy.rs @@ -2,12 +2,12 @@ use std::sync::Arc; use bevy::{prelude::*, utils::HashMap}; use bevy_egui::{egui::collapsing_header::CollapsingState, *}; -use editor_core::prelude::*; -use prefab::editor_registry::EditorRegistry; -use undo::{AddedEntity, NewChange, RemovedEntity, UndoSet}; +use space_editor_core::prelude::*; +use space_prefab::editor_registry::EditorRegistry; +use space_undo::{AddedEntity, NewChange, RemovedEntity, UndoSet}; use crate::ui_registration::BundleReg; -use shared::*; +use space_shared::*; use super::{editor_tab::EditorTabName, EditorUiAppExt, EditorUiRef}; diff --git a/crates/editor/src/inspector/components_order.rs b/crates/editor_ui/src/inspector/components_order.rs similarity index 100% rename from crates/editor/src/inspector/components_order.rs rename to crates/editor_ui/src/inspector/components_order.rs diff --git a/crates/editor/src/inspector/mod.rs b/crates/editor_ui/src/inspector/mod.rs similarity index 98% rename from crates/editor/src/inspector/mod.rs rename to crates/editor_ui/src/inspector/mod.rs index 192aa47d..fbefeb87 100644 --- a/crates/editor/src/inspector/mod.rs +++ b/crates/editor_ui/src/inspector/mod.rs @@ -14,9 +14,9 @@ use bevy::{ use bevy_egui::*; -use editor_core::prelude::*; -use prefab::{component::EntityLink, editor_registry::EditorRegistry}; -use shared::ext::bevy_inspector_egui::{ +use space_editor_core::prelude::*; +use space_prefab::{component::EntityLink, editor_registry::EditorRegistry}; +use space_shared::ext::bevy_inspector_egui::{ self, inspector_egui_impls::InspectorEguiImpl, reflect_inspector::InspectorUi, }; diff --git a/crates/editor/src/inspector/refl_impl.rs b/crates/editor_ui/src/inspector/refl_impl.rs similarity index 96% rename from crates/editor/src/inspector/refl_impl.rs rename to crates/editor_ui/src/inspector/refl_impl.rs index 26551915..bb3c3353 100644 --- a/crates/editor/src/inspector/refl_impl.rs +++ b/crates/editor_ui/src/inspector/refl_impl.rs @@ -5,11 +5,11 @@ use bevy::{ reflect::Reflect, }; use bevy_egui::egui; -use shared::ext::bevy_inspector_egui::{ +use space_shared::ext::bevy_inspector_egui::{ inspector_egui_impls::InspectorEguiImpl, reflect_inspector::InspectorUi, }; -use prefab::component::EntityLink; +use space_prefab::component::EntityLink; /// Method from `bevy_inspector_egui` to make dummy reflection ui pub fn many_unimplemented( diff --git a/crates/editor/src/inspector/resources.rs b/crates/editor_ui/src/inspector/resources.rs similarity index 98% rename from crates/editor/src/inspector/resources.rs rename to crates/editor_ui/src/inspector/resources.rs index d6c96b0e..ef7af497 100644 --- a/crates/editor/src/inspector/resources.rs +++ b/crates/editor_ui/src/inspector/resources.rs @@ -1,7 +1,7 @@ use bevy::{prelude::*, utils::HashMap}; use bevy_egui::*; -use shared::ext::bevy_inspector_egui; +use space_shared::ext::bevy_inspector_egui; use crate::prelude::*; diff --git a/crates/editor/src/lib.rs b/crates/editor_ui/src/lib.rs similarity index 97% rename from crates/editor/src/lib.rs rename to crates/editor_ui/src/lib.rs index 0e276763..ee3e9acc 100644 --- a/crates/editor/src/lib.rs +++ b/crates/editor_ui/src/lib.rs @@ -48,8 +48,8 @@ use bevy_mod_picking::{ PickableBundle, }; use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin, PanOrbitCameraSystemSet}; -use editor_core::prelude::*; use egui_dock::DockArea; +use space_editor_core::prelude::*; use bevy::{ ecs::system::CommandQueue, input::common_conditions::input_toggle_active, @@ -59,19 +59,19 @@ use bevy::{ use bevy_egui::{egui, EguiContext}; use game_view::has_window_changed; -use prefab::prelude::*; use prelude::{ reset_camera_viewport, set_camera_viewport, ChangeChainViewPlugin, EditorTab, EditorTabCommand, EditorTabGetTitleFn, EditorTabName, EditorTabShowFn, EditorTabViewer, GameViewTab, NewTabBehaviour, NewWindowSettings, ScheduleEditorTab, ScheduleEditorTabStorage, SpaceHierarchyPlugin, SpaceInspectorPlugin, ToolExt, }; -use shared::{ +use space_prefab::prelude::*; +use space_shared::{ ext::bevy_inspector_egui::{quick::WorldInspectorPlugin, DefaultInspectorConfigPlugin}, EditorCameraMarker, EditorSet, EditorState, PrefabMarker, PrefabMemoryCache, }; +use space_undo::UndoPlugin; use ui_registration::BundleReg; -use undo::UndoPlugin; use self::{ mouse_check::MouseCheck, @@ -85,10 +85,10 @@ pub mod prelude { ui_registration::*, }; - pub use editor_core::prelude::*; - pub use persistence::*; - pub use prefab::prelude::*; - pub use shared::prelude::*; + pub use space_editor_core::prelude::*; + pub use space_persistence::*; + pub use space_prefab::prelude::*; + pub use space_shared::prelude::*; pub use crate::simple_editor_setup; pub use crate::EditorPlugin; @@ -101,7 +101,7 @@ pub mod ext { pub use bevy_egui; pub use bevy_mod_picking; pub use bevy_panorbit_camera; - pub use shared::ext::*; + pub use space_shared::ext::*; } /// Editor UI plugin. Must be used with [`PrefabPlugin`] and [`EditorRegistryPlugin`] @@ -344,9 +344,9 @@ impl From>> for SelectEvent { } } -fn save_prefab_before_play(mut editor_events: EventWriter) { - editor_events.send(shared::EditorEvent::Save( - shared::EditorPrefabPath::MemoryCahce, +fn save_prefab_before_play(mut editor_events: EventWriter) { + editor_events.send(space_shared::EditorEvent::Save( + space_shared::EditorPrefabPath::MemoryCahce, )); } @@ -368,11 +368,11 @@ fn clear_and_load_on_start( return; } match save_confg.path.as_ref().unwrap() { - shared::EditorPrefabPath::File(path) => { + space_shared::EditorPrefabPath::File(path) => { info!("Loading prefab from file {}", path); load_server.scene = Some(assets.load(format!("{}.scn.ron", path))); } - shared::EditorPrefabPath::MemoryCahce => { + space_shared::EditorPrefabPath::MemoryCahce => { info!("Loading prefab from cache"); load_server.scene = cache.scene.clone(); } diff --git a/crates/editor/src/mouse_check.rs b/crates/editor_ui/src/mouse_check.rs similarity index 100% rename from crates/editor/src/mouse_check.rs rename to crates/editor_ui/src/mouse_check.rs diff --git a/crates/editor/src/settings.rs b/crates/editor_ui/src/settings.rs similarity index 98% rename from crates/editor/src/settings.rs rename to crates/editor_ui/src/settings.rs index 7b8e063b..17bace52 100644 --- a/crates/editor/src/settings.rs +++ b/crates/editor_ui/src/settings.rs @@ -3,11 +3,11 @@ use bevy::{ utils::{HashMap, HashSet}, }; use bevy_egui::*; -use editor_core::hotkeys::AllHotkeys; -use undo::ChangeChainSettings; +use space_editor_core::hotkeys::AllHotkeys; +use space_undo::ChangeChainSettings; #[cfg(feature = "persistence_editor")] -use persistence::*; +use space_persistence::*; use super::{ editor_tab::{EditorTab, EditorTabName}, diff --git a/crates/editor/src/tool.rs b/crates/editor_ui/src/tool.rs similarity index 100% rename from crates/editor/src/tool.rs rename to crates/editor_ui/src/tool.rs diff --git a/crates/editor/src/tools.rs b/crates/editor_ui/src/tools.rs similarity index 100% rename from crates/editor/src/tools.rs rename to crates/editor_ui/src/tools.rs diff --git a/crates/editor/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs similarity index 99% rename from crates/editor/src/tools/gizmo.rs rename to crates/editor_ui/src/tools/gizmo.rs index 4a518dee..91f3b8de 100644 --- a/crates/editor/src/tools/gizmo.rs +++ b/crates/editor_ui/src/tools/gizmo.rs @@ -1,8 +1,8 @@ use bevy::{prelude::*, render::camera::CameraProjection}; use bevy_egui::egui::{self, Key}; -use editor_core::prelude::*; use egui_gizmo::*; -use shared::EditorCameraMarker; +use space_editor_core::prelude::*; +use space_shared::EditorCameraMarker; use crate::prelude::{CloneEvent, EditorTool}; pub struct GizmoToolPlugin; diff --git a/crates/editor/src/ui_registration.rs b/crates/editor_ui/src/ui_registration.rs similarity index 98% rename from crates/editor/src/ui_registration.rs rename to crates/editor_ui/src/ui_registration.rs index eaad0fbc..c3fe898b 100644 --- a/crates/editor/src/ui_registration.rs +++ b/crates/editor_ui/src/ui_registration.rs @@ -1,7 +1,7 @@ use bevy::{ecs::system::EntityCommands, utils::HashMap}; -use prefab::{component::*, ext::*}; -use shared::PrefabMarker; +use space_prefab::{component::*, ext::*}; +use space_shared::PrefabMarker; pub const MESH_CATEGORY: &str = "mesh"; diff --git a/crates/persistence/Cargo.toml b/crates/persistence/Cargo.toml index 4cb548fb..28931a25 100644 --- a/crates/persistence/Cargo.toml +++ b/crates/persistence/Cargo.toml @@ -1,7 +1,8 @@ [package] -name = "persistence" -version = "0.3.0" -edition = "2021" +name = "space_persistence" +version.workspace = true +authors.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/prefab/Cargo.toml b/crates/prefab/Cargo.toml index 08ff259e..0c55114a 100644 --- a/crates/prefab/Cargo.toml +++ b/crates/prefab/Cargo.toml @@ -1,7 +1,8 @@ [package] -name = "prefab" -version = "0.1.0" -edition = "2021" +name = "space_prefab" +version.workspace = true +authors.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,8 +10,8 @@ edition = "2021" bevy.workspace = true ron.workspace = true serde.workspace = true -shared.workspace = true -undo.workspace = true +space_shared.workspace = true +space_undo.workspace = true bevy-scene-hook = "9" bevy-inspector-egui = { version = "0.21", features = ["bevy_pbr", "highlight_changes"]} diff --git a/crates/prefab/src/component/mod.rs b/crates/prefab/src/component/mod.rs index b73d7055..e9645aaf 100644 --- a/crates/prefab/src/component/mod.rs +++ b/crates/prefab/src/component/mod.rs @@ -21,7 +21,7 @@ use bevy::{prelude::*, reflect::*, utils::HashMap}; /// External dependencies pub mod ext { - pub use shared::ext::*; + pub use space_shared::ext::*; } /// Component to define path to gltf asset that will be loaded after prefab spawn diff --git a/crates/prefab/src/component/path.rs b/crates/prefab/src/component/path.rs index 0261b05b..ad900c06 100644 --- a/crates/prefab/src/component/path.rs +++ b/crates/prefab/src/component/path.rs @@ -1,6 +1,6 @@ //Planned to use trait for support file dialog per field -use shared::ext::egui_file; +use space_shared::ext::egui_file; /// NOT USED. Will be used to auto converting reflected structures with assets to saveble AutoStructs pub trait AssetPath { diff --git a/crates/prefab/src/component/shape.rs b/crates/prefab/src/component/shape.rs index e53f3312..9e7685c1 100644 --- a/crates/prefab/src/component/shape.rs +++ b/crates/prefab/src/component/shape.rs @@ -1,7 +1,7 @@ use bevy::prelude::*; -use shared::ext::bevy_inspector_egui; -use shared::ext::bevy_inspector_egui::prelude::*; +use space_shared::ext::bevy_inspector_egui; +use space_shared::ext::bevy_inspector_egui::prelude::*; /// Component to setup mesh of prefab #[derive(Component, Reflect, Clone)] diff --git a/crates/prefab/src/editor_registry/mod.rs b/crates/prefab/src/editor_registry/mod.rs index c162b08a..aa545ec1 100644 --- a/crates/prefab/src/editor_registry/mod.rs +++ b/crates/prefab/src/editor_registry/mod.rs @@ -6,10 +6,10 @@ use bevy::{ reflect::{GetTypeRegistration, TypePath, TypeRegistryArc}, utils::{HashMap, HashSet}, }; -use shared::*; +use space_shared::*; +use space_undo::AppAutoUndo; use std::any::TypeId; -use undo::AppAutoUndo; use crate::{component::AutoStruct, save::SaveState, PrefabSet}; diff --git a/crates/prefab/src/lib.rs b/crates/prefab/src/lib.rs index f762821a..214dc049 100644 --- a/crates/prefab/src/lib.rs +++ b/crates/prefab/src/lib.rs @@ -20,7 +20,7 @@ pub mod editor_registry; use bevy::prelude::*; -use shared::EditorState; +use space_shared::EditorState; /// Public usage of packages that used in this crate pub mod ext { @@ -35,7 +35,7 @@ pub mod prelude { pub use crate::plugins::*; pub use crate::save::*; pub use crate::PrefabSet; - pub use shared::PrefabMarker; + pub use space_shared::PrefabMarker; } /// All prefab logics collected in this sets to allow easy extend prefab logic diff --git a/crates/prefab/src/load.rs b/crates/prefab/src/load.rs index b23c5ca8..59f90a8f 100644 --- a/crates/prefab/src/load.rs +++ b/crates/prefab/src/load.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; use bevy_scene_hook::SceneHook; -use shared::PrefabMarker; +use space_shared::PrefabMarker; use crate::prelude::EditorRegistryExt; diff --git a/crates/prefab/src/plugins.rs b/crates/prefab/src/plugins.rs index 25391219..389cb18a 100644 --- a/crates/prefab/src/plugins.rs +++ b/crates/prefab/src/plugins.rs @@ -12,7 +12,7 @@ use bevy::{ }, }; use bevy_scene_hook::HookPlugin; -use shared::PrefabMarker; +use space_shared::PrefabMarker; use crate::{ component, editor_registry::EditorRegistryExt, load, prelude::EditorRegistryPlugin, save, diff --git a/crates/prefab/src/save.rs b/crates/prefab/src/save.rs index 2110c4ff..22673e6b 100644 --- a/crates/prefab/src/save.rs +++ b/crates/prefab/src/save.rs @@ -4,7 +4,7 @@ use bevy::{ tasks::IoTaskPool, utils::HashSet, }; -use shared::{EditorPrefabPath, PrefabMarker, PrefabMemoryCache}; +use space_shared::{EditorPrefabPath, PrefabMarker, PrefabMemoryCache}; use std::{any::TypeId, fs::File, io::Write}; use crate::prelude::{EditorRegistry, EditorRegistryExt}; diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 6ff9ff51..074045de 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -1,7 +1,8 @@ [package] -name = "shared" -version = "0.1.0" -edition = "2021" +name = "space_shared" +version.workspace = true +authors.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/undo/Cargo.toml b/crates/undo/Cargo.toml index ee404eff..782fc831 100644 --- a/crates/undo/Cargo.toml +++ b/crates/undo/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "undo" -version = "0.3.0" -edition = "2021" +name = "space_undo" +version.workspace = true +authors.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] bevy.workspace = true -shared.workspace = true \ No newline at end of file +space_shared.workspace = true \ No newline at end of file diff --git a/crates/undo/src/lib.rs b/crates/undo/src/lib.rs index 014a4ab5..eb0e60a6 100644 --- a/crates/undo/src/lib.rs +++ b/crates/undo/src/lib.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use bevy::{prelude::*, utils::HashMap}; -use shared::{EditorSet, PrefabMarker}; +use space_shared::{EditorSet, PrefabMarker}; const MAX_REFLECT_RECURSION: i32 = 10; diff --git a/examples/spawn_prefab.rs b/examples/spawn_prefab.rs index af85b3f0..6be81e45 100644 --- a/examples/spawn_prefab.rs +++ b/examples/spawn_prefab.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; -use editor::ext::bevy_panorbit_camera::{self, PanOrbitCameraPlugin}; use space_editor::prelude::*; +use space_editor_ui::ext::bevy_panorbit_camera::{self, PanOrbitCameraPlugin}; fn main() { App::default() diff --git a/examples/spawn_prefab_with_physics.rs b/examples/spawn_prefab_with_physics.rs index 3adf8423..723a840f 100644 --- a/examples/spawn_prefab_with_physics.rs +++ b/examples/spawn_prefab_with_physics.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; -use editor::ext::bevy_panorbit_camera::{self, PanOrbitCameraPlugin}; use space_editor::prelude::*; +use space_editor_ui::ext::bevy_panorbit_camera::{self, PanOrbitCameraPlugin}; //This example loading prefab with bevy_xpbd types diff --git a/modules/bevy_xpbd_plugin/Cargo.toml b/modules/bevy_xpbd_plugin/Cargo.toml index 7aceed87..19babcad 100644 --- a/modules/bevy_xpbd_plugin/Cargo.toml +++ b/modules/bevy_xpbd_plugin/Cargo.toml @@ -1,11 +1,12 @@ [package] -name = "bevy_xpbd_plugin" -version = "0.3.0" -edition = "2021" +name = "space_bevy_xpbd_plugin" +version.workspace = true +authors.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] bevy.workspace = true -editor.workspace = true +space_editor_ui.workspace = true bevy_xpbd_3d = {version="0.3.2", default-features = false, features = ["3d", "f32", "collider-from-mesh", "debug-plugin"]} \ No newline at end of file diff --git a/modules/bevy_xpbd_plugin/src/collider.rs b/modules/bevy_xpbd_plugin/src/collider.rs index 17c0a5a7..b242d6dd 100644 --- a/modules/bevy_xpbd_plugin/src/collider.rs +++ b/modules/bevy_xpbd_plugin/src/collider.rs @@ -2,9 +2,9 @@ use bevy::prelude::*; use bevy_xpbd_3d::math::*; use bevy_xpbd_3d::prelude::*; -use editor::ext::bevy_inspector_egui; -use editor::ext::bevy_inspector_egui::prelude::*; -use editor::prelude::MeshPrimitivePrefab; +use space_editor_ui::ext::bevy_inspector_egui; +use space_editor_ui::ext::bevy_inspector_egui::prelude::*; +use space_editor_ui::prelude::MeshPrimitivePrefab; use crate::registry::RigidBodyPrefab; diff --git a/modules/bevy_xpbd_plugin/src/registry.rs b/modules/bevy_xpbd_plugin/src/registry.rs index db5c8534..19463c05 100644 --- a/modules/bevy_xpbd_plugin/src/registry.rs +++ b/modules/bevy_xpbd_plugin/src/registry.rs @@ -1,6 +1,6 @@ use bevy::{prelude::*, transform::TransformSystem}; use bevy_xpbd_3d::prelude::*; -use editor::{ +use space_editor_ui::{ prelude::{EditorRegistryExt, EditorState, PrefabSet}, settings::RegisterSettingsBlockExt, EditorUiPlugin, diff --git a/modules/bevy_xpbd_plugin/src/spatial_query.rs b/modules/bevy_xpbd_plugin/src/spatial_query.rs index 3d16de1a..2e673ccc 100644 --- a/modules/bevy_xpbd_plugin/src/spatial_query.rs +++ b/modules/bevy_xpbd_plugin/src/spatial_query.rs @@ -1,9 +1,9 @@ use bevy::prelude::*; use bevy_xpbd_3d::math::Vector; use bevy_xpbd_3d::{math::Quaternion, prelude::*}; -use editor::{ext::bevy_inspector_egui::prelude::*, prelude::*}; +use space_editor_ui::{ext::bevy_inspector_egui::prelude::*, prelude::*}; -use editor::ext::bevy_inspector_egui; +use space_editor_ui::ext::bevy_inspector_egui; use crate::collider::ColliderPrimitive; diff --git a/src/lib.rs b/src/lib.rs index bf9a3571..27e77ca9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,26 +3,26 @@ /// Contains all the functions/structs/plugins of space_editor pub mod prelude { pub use crate::SpaceEditorPlugin; - pub use editor::prelude::*; + pub use space_editor_ui::prelude::*; #[cfg(feature = "bevy_xpbd_3d")] - pub use bevy_xpbd_plugin::prelude::*; + pub use space_bevy_xpbd_plugin::prelude::*; } -pub use editor; -pub use prefab; +pub use space_editor_ui; +pub use space_prefab; #[cfg(feature = "bevy_xpbd_3d")] -pub use bevy_xpbd_plugin; +pub use space_bevy_xpbd_plugin; /// This is the main plugin, connecting it will allow you to use all the functions of space_editor pub struct SpaceEditorPlugin; impl bevy::app::Plugin for SpaceEditorPlugin { fn build(&self, app: &mut bevy::app::App) { - app.add_plugins(editor::EditorPlugin); + app.add_plugins(space_editor_ui::EditorPlugin); #[cfg(feature = "bevy_xpbd_3d")] - app.add_plugins(bevy_xpbd_plugin::XpbdPlugin); + app.add_plugins(space_bevy_xpbd_plugin::XpbdPlugin); } } diff --git a/src/main.rs b/src/main.rs index ff1620ec..36207781 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,8 +5,8 @@ fn main() { app.add_plugins(DefaultPlugins); #[cfg(feature = "editor")] { - use editor::simple_editor_setup; use space_editor::SpaceEditorPlugin; + use space_editor_ui::simple_editor_setup; app.add_plugins(SpaceEditorPlugin) .add_systems(Startup, simple_editor_setup); }