Rename bevy_scene2 to bevy_scene

Cargo.toml

@@ -164,7 +164,7 @@ audio = ["bevy_audio", "vorbis"]
 audio-all-formats = ["bevy_audio", "aac", "flac", "mp3", "mp4", "vorbis", "wav"]
 
 # COLLECTION: Features used to compose Bevy scenes.
-scene = ["bevy_world_serialization", "bevy_scene2"]
+scene = ["bevy_world_serialization", "bevy_scene"]
 
 # COLLECTION: Enables picking with all backends.
 picking = ["bevy_picking", "mesh_picking", "sprite_picking", "ui_picking"]
@@ -321,7 +321,7 @@ bevy_render = ["bevy_internal/bevy_render"]
 bevy_world_serialization = ["bevy_internal/bevy_world_serialization"]
 
 # Provides scene functionality
-bevy_scene2 = ["bevy_internal/bevy_scene2"]
+bevy_scene = ["bevy_internal/bevy_scene"]
 
 # Provides raytraced lighting (experimental)
 bevy_solari = ["bevy_internal/bevy_solari"]
@@ -734,7 +734,7 @@ bevy_image = { path = "crates/bevy_image", version = "0.19.0-dev", default-featu
 bevy_reflect = { path = "crates/bevy_reflect", version = "0.19.0-dev", default-features = false }
 bevy_render = { path = "crates/bevy_render", version = "0.19.0-dev", default-features = false }
 bevy_state = { path = "crates/bevy_state", version = "0.19.0-dev", default-features = false }
-bevy_scene2 = { path = "crates/bevy_scene2", version = "0.19.0-dev", default-features = false }
+bevy_scene = { path = "crates/bevy_scene", version = "0.19.0-dev", default-features = false }
 # Needed to poll Task examples
 futures-lite = "2.0.1"
 futures-timer = { version = "3", features = ["wasm-bindgen", "gloo-timers"] }

benches/Cargo.toml

@@ -24,7 +24,7 @@ bevy_camera = { path = "../crates/bevy_camera" }
 bevy_mesh = { path = "../crates/bevy_mesh" }
 bevy_asset = { path = "../crates/bevy_asset" }
 bevy_render = { path = "../crates/bevy_render" }
-bevy_scene2 = { path = "../crates/bevy_scene2" }
+bevy_scene = { path = "../crates/bevy_scene" }
 bevy_tasks = { path = "../crates/bevy_tasks" }
 bevy_ui = { path = "../crates/bevy_ui" }
 bevy_platform = { path = "../crates/bevy_platform", default-features = false, features = [

benches/benches/bevy_scene/spawn.rs

@@ -11,7 +11,7 @@ use bevy_asset::{
     AssetApp, AssetLoader, AssetServer, Assets,
 };
 use bevy_ecs::prelude::*;
-use bevy_scene2::{prelude::*, ScenePatch};
+use bevy_scene::{prelude::*, ScenePatch};
 use bevy_ui::prelude::*;
 
 criterion_group!(benches, spawn);
@@ -144,7 +144,7 @@ fn spawn(c: &mut Criterion) {
     group.measurement_time(Duration::from_secs(4));
     group.bench_function("ui_immediate_function_scene", |b| {
         let mut app = App::new();
-        app.add_plugins((bevy_asset::AssetPlugin::default(), bevy_scene2::ScenePlugin));
+        app.add_plugins((bevy_asset::AssetPlugin::default(), bevy_scene::ScenePlugin));
 
         b.iter(move || {
             app.world_mut().spawn_scene(ui()).unwrap();
@@ -165,7 +165,7 @@ fn spawn(c: &mut Criterion) {
         app.add_plugins((
             bevy_app::TaskPoolPlugin::default(),
             bevy_asset::AssetPlugin::default(),
-            bevy_scene2::ScenePlugin,
+            bevy_scene::ScenePlugin,
         ));
         app.finish();
         app.cleanup();
@@ -215,7 +215,7 @@ fn spawn(c: &mut Criterion) {
     });
     group.bench_function("ui_raw_bundle_no_scene", |b| {
         let mut app = App::new();
-        app.add_plugins((bevy_asset::AssetPlugin::default(), bevy_scene2::ScenePlugin));
+        app.add_plugins((bevy_asset::AssetPlugin::default(), bevy_scene::ScenePlugin));
 
         b.iter(move || {
             app.world_mut().spawn(raw_ui());

crates/bevy_feathers/Cargo.toml

@@ -25,7 +25,7 @@ bevy_shader = { path = "../bevy_shader", version = "0.19.0-dev" }
 bevy_platform = { path = "../bevy_platform", version = "0.19.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev" }
 bevy_render = { path = "../bevy_render", version = "0.19.0-dev" }
-bevy_scene2 = { path = "../bevy_scene2", version = "0.19.0-dev" }
+bevy_scene = { path = "../bevy_scene", version = "0.19.0-dev" }
 bevy_text = { path = "../bevy_text", version = "0.19.0-dev" }
 bevy_ui = { path = "../bevy_ui", version = "0.19.0-dev", features = [
   "bevy_picking",

crates/bevy_feathers/src/controls/button.rs

@@ -14,7 +14,7 @@ use bevy_ecs::{
 use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_picking::{hover::Hovered, PickingSystems};
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::{prelude::*, template_value};
+use bevy_scene::{prelude::*, template_value};
 use bevy_text::{FontSize, FontWeight};
 use bevy_ui::{AlignItems, InteractionDisabled, JustifyContent, Node, Pressed, UiRect, Val};
 use bevy_ui_widgets::Button;

crates/bevy_feathers/src/controls/checkbox.rs

@@ -17,7 +17,7 @@ use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_math::Rot2;
 use bevy_picking::{hover::Hovered, PickingSystems};
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_text::{FontSize, FontWeight};
 use bevy_ui::{
     AlignItems, BorderRadius, Checked, Display, FlexDirection, InteractionDisabled, JustifyContent,

crates/bevy_feathers/src/controls/color_plane.rs

@@ -18,7 +18,7 @@ use bevy_picking::{
 };
 use bevy_reflect::{prelude::ReflectDefault, Reflect, TypePath};
 use bevy_render::render_resource::AsBindGroup;
-use bevy_scene2::{prelude::*, template_value};
+use bevy_scene::{prelude::*, template_value};
 use bevy_shader::{ShaderDefVal, ShaderRef};
 use bevy_ui::{
     px, AlignSelf, BorderColor, BorderRadius, ComputedNode, ComputedUiRenderTargetInfo, Display,

crates/bevy_feathers/src/controls/color_slider.rs

@@ -16,7 +16,7 @@ use bevy_ecs::{
 use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_log::warn_once;
 use bevy_picking::PickingSystems;
-use bevy_scene2::{prelude::*, template_value};
+use bevy_scene::{prelude::*, template_value};
 use bevy_ui::{
     AlignItems, BackgroundColor, BackgroundGradient, BorderColor, BorderRadius, ColorStop, Display,
     FlexDirection, Gradient, InterpolationColorSpace, LinearGradient, Node, Outline, PositionType,

crates/bevy_feathers/src/controls/color_swatch.rs

@@ -11,7 +11,7 @@ use bevy_ecs::{
     system::{Commands, Query},
 };
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_ui::{BackgroundColor, BorderRadius, Node, PositionType, Val};
 use bevy_ui_render::ui_material::MaterialNode;
 

crates/bevy_feathers/src/controls/radio.rs

@@ -16,7 +16,7 @@ use bevy_ecs::{
 use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_picking::{hover::Hovered, PickingSystems};
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_text::{FontSize, FontWeight};
 use bevy_ui::{
     AlignItems, BorderRadius, Checked, Display, FlexDirection, InteractionDisabled, JustifyContent,

crates/bevy_feathers/src/controls/slider.rs

@@ -17,7 +17,7 @@ use bevy_ecs::{
 use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_picking::PickingSystems;
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_text::{FontSize, FontWeight};
 use bevy_ui::{
     widget::Text, AlignItems, BackgroundGradient, ColorStop, Display, FlexDirection, Gradient,

crates/bevy_feathers/src/controls/toggle_switch.rs

@@ -17,7 +17,7 @@ use bevy_ecs::{
 use bevy_input_focus::tab_navigation::TabIndex;
 use bevy_picking::{hover::Hovered, PickingSystems};
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_ui::{BorderRadius, Checked, InteractionDisabled, Node, PositionType, UiRect, Val};
 use bevy_ui_widgets::Checkbox;
 

crates/bevy_feathers/src/controls/virtual_keyboard.rs

@@ -1,6 +1,6 @@
 use bevy_ecs::prelude::*;
 use bevy_input_focus::tab_navigation::TabGroup;
-use bevy_scene2::prelude::*;
+use bevy_scene::prelude::*;
 use bevy_ui::Node;
 use bevy_ui::Val;
 use bevy_ui::{widget::Text, FlexDirection};

crates/bevy_internal/Cargo.toml

@@ -538,7 +538,7 @@ bevy_remote = { path = "../bevy_remote", optional = true, version = "0.19.0-dev"
 ] }
 bevy_render = { path = "../bevy_render", optional = true, version = "0.19.0-dev" }
 bevy_world_serialization = { path = "../bevy_world_serialization", optional = true, version = "0.19.0-dev" }
-bevy_scene2 = { path = "../bevy_scene2", optional = true, version = "0.19.0-dev" }
+bevy_scene = { path = "../bevy_scene", optional = true, version = "0.19.0-dev" }
 bevy_solari = { path = "../bevy_solari", optional = true, version = "0.19.0-dev" }
 bevy_sprite = { path = "../bevy_sprite", optional = true, version = "0.19.0-dev" }
 bevy_sprite_render = { path = "../bevy_sprite_render", optional = true, version = "0.19.0-dev" }

crates/bevy_internal/src/default_plugins.rs

@@ -31,8 +31,8 @@ plugin_group! {
         bevy_asset:::AssetPlugin,
         #[cfg(feature = "bevy_world_serialization")]
         bevy_world_serialization:::WorldSerializationPlugin,
-        #[cfg(feature = "bevy_scene2")]
-        bevy_scene2:::ScenePlugin,
+        #[cfg(feature = "bevy_scene")]
+        bevy_scene:::ScenePlugin,
         // NOTE: WinitPlugin needs to be after AssetPlugin because of custom cursors.
         #[cfg(feature = "bevy_winit")]
         bevy_winit:::WinitPlugin,

crates/bevy_internal/src/lib.rs

@@ -76,8 +76,8 @@ pub use bevy_reflect as reflect;
 pub use bevy_remote as remote;
 #[cfg(feature = "bevy_render")]
 pub use bevy_render as render;
-#[cfg(feature = "bevy_scene2")]
-pub use bevy_scene2 as scene2;
+#[cfg(feature = "bevy_scene")]
+pub use bevy_scene as scene;
 #[cfg(feature = "bevy_settings")]
 pub use bevy_settings as settings;
 #[cfg(feature = "bevy_shader")]

crates/bevy_internal/src/prelude.rs

@@ -63,6 +63,10 @@ pub use crate::pbr::prelude::*;
 #[cfg(feature = "bevy_render")]
 pub use crate::render::prelude::*;
 
+#[doc(hidden)]
+#[cfg(feature = "bevy_scene")]
+pub use crate::scene::prelude::*;
+
 #[doc(hidden)]
 #[cfg(feature = "bevy_world_serialization")]
 pub use crate::world_serialization::prelude::*;

crates/bevy_scene2/Cargo.toml → crates/bevy_scene/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bevy_scene2"
+name = "bevy_scene"
 version = "0.19.0-dev"
 edition = "2024"
 description = "Provides scene functionality for Bevy Engine"
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
 [dependencies]
-bevy_scene2_macros = { path = "macros", version = "0.19.0-dev" }
+bevy_scene_macros = { path = "macros", version = "0.19.0-dev" }
 
 bevy_app = { path = "../bevy_app", version = "0.19.0-dev" }
 bevy_asset = { path = "../bevy_asset", version = "0.19.0-dev" }

crates/bevy_scene2/macros/Cargo.toml → crates/bevy_scene/macros/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bevy_scene2_macros"
+name = "bevy_scene_macros"
 version = "0.19.0-dev"
 edition = "2024"
 description = "Derive implementations for bevy_scene"

crates/bevy_scene2/macros/src/bsn/mod.rs → crates/bevy_scene/macros/src/bsn/mod.rs

@@ -21,7 +21,7 @@ fn bsn_token_stream<T: BsnTokenStream>(input: TokenStream) -> TokenStream {
     let scene = parse_macro_input!(input as T);
     let (bevy_scene, bevy_ecs) = BevyManifest::shared(|manifest| {
         (
-            manifest.get_path("bevy_scene2"),
+            manifest.get_path("bevy_scene"),
             manifest.get_path("bevy_ecs"),
         )
     });

crates/bevy_scene2/src/lib.rs → crates/bevy_scene/src/lib.rs

@@ -34,7 +34,7 @@
 //!
 //! ```
 //! # use bevy_app::App;
-//! # use bevy_scene2::{prelude::*, ScenePlugin};
+//! # use bevy_scene::{prelude::*, ScenePlugin};
 //! # use bevy_ecs::prelude::*;
 //! # use bevy_asset::AssetPlugin;
 //! # use bevy_app::TaskPoolPlugin;
@@ -234,7 +234,7 @@
 //!
 //! ```
 //! # use bevy_app::App;
-//! # use bevy_scene2::{prelude::*, ScenePlugin};
+//! # use bevy_scene::{prelude::*, ScenePlugin};
 //! # use bevy_ecs::prelude::*;
 //! # use bevy_asset::AssetPlugin;
 //! # use bevy_app::TaskPoolPlugin;
@@ -522,7 +522,7 @@ mod scene_list;
 mod scene_patch;
 mod spawn;
 
-pub use bevy_scene2_macros::*;
+pub use bevy_scene_macros::*;
 pub use resolved_scene::*;
 pub use scene::*;
 pub use scene_list::*;
@@ -556,7 +556,7 @@ impl Plugin for ScenePlugin {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::{self as bevy_scene2, ScenePlugin};
+    use crate::{self as bevy_scene, ScenePlugin};
     use bevy_app::{App, TaskPoolPlugin};
     use bevy_asset::{Asset, AssetApp, AssetPlugin, AssetServer, Handle};
     use bevy_ecs::prelude::*;

crates/bevy_scene2/src/scene.rs → crates/bevy_scene/src/scene.rs

@@ -189,7 +189,7 @@ all_tuples!(scene_impl, 0, 12, P);
 /// any other fields:
 /// ```
 /// # use bevy_ecs::prelude::*;
-/// # use bevy_scene2::PatchFromTemplate;
+/// # use bevy_scene::PatchFromTemplate;
 /// #[derive(FromTemplate)]
 /// struct Position {
 ///     x: usize,

crates/bevy_scene2/src/spawn.rs → crates/bevy_scene/src/spawn.rs

@@ -18,7 +18,7 @@ pub trait WorldSceneExt {
     ///
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::{prelude::*, ScenePlugin};
+    /// # use bevy_scene::{prelude::*, ScenePlugin};
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;
@@ -58,7 +58,7 @@ pub trait WorldSceneExt {
     ///
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::{prelude::*, ScenePlugin};
+    /// # use bevy_scene::{prelude::*, ScenePlugin};
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;
@@ -103,7 +103,7 @@ pub trait WorldSceneExt {
     ///
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::{prelude::*, ScenePlugin};
+    /// # use bevy_scene::{prelude::*, ScenePlugin};
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;
@@ -142,7 +142,7 @@ pub trait WorldSceneExt {
     /// If the dependencies are already loaded (or there are no dependencies), then the scene list will be spawned this frame.
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::{prelude::*, ScenePlugin};
+    /// # use bevy_scene::{prelude::*, ScenePlugin};
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;
@@ -224,7 +224,7 @@ pub trait CommandsSceneExt {
     /// If your scene has a dependency that might not be loaded yet (for example, it inherits from a `.bsn` asset file), consider using [`Commands::queue_spawn_scene`].
     ///
     /// ```
-    /// # use bevy_scene2::prelude::*;
+    /// # use bevy_scene::prelude::*;
     /// # use bevy_ecs::prelude::*;
     /// # let mut world = World::new();
     /// # let mut commands = world.commands();
@@ -256,7 +256,7 @@ pub trait CommandsSceneExt {
     /// See [`Scene`] for the features of the scene system (and how to use it).
     ///
     /// ```
-    /// # use bevy_scene2::prelude::*;
+    /// # use bevy_scene::prelude::*;
     /// # use bevy_ecs::prelude::*;
     /// # let mut world = World::new();
     /// # let mut commands = world.commands();
@@ -293,7 +293,7 @@ pub trait CommandsSceneExt {
     /// If your scene list has a dependency that might not be loaded yet (for example, it inherits from a `.bsn` asset file), consider using [`Commands::queue_spawn_scene_list`].
     ///
     /// ```
-    /// # use bevy_scene2::prelude::*;
+    /// # use bevy_scene::prelude::*;
     /// # use bevy_ecs::prelude::*;
     /// # let mut world = World::new();
     /// # let mut commands = world.commands();
@@ -325,7 +325,7 @@ pub trait CommandsSceneExt {
     /// If the dependencies are already loaded (or there are no dependencies), then the scene will be spawned this frame.
     ///
     /// ```
-    /// # use bevy_scene2::prelude::*;
+    /// # use bevy_scene::prelude::*;
     /// # use bevy_ecs::prelude::*;
     /// # let mut world = World::new();
     /// # let mut commands = world.commands();
@@ -405,7 +405,7 @@ pub trait EntityWorldMutSceneExt {
     ///
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::{prelude::*, ScenePlugin};
+    /// # use bevy_scene::{prelude::*, ScenePlugin};
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;
@@ -506,7 +506,7 @@ pub trait EntityCommandsSceneExt {
     ///
     /// ```
     /// # use bevy_app::App;
-    /// # use bevy_scene2::prelude::*;
+    /// # use bevy_scene::prelude::*;
     /// # use bevy_ecs::prelude::*;
     /// # use bevy_asset::AssetPlugin;
     /// # use bevy_app::TaskPoolPlugin;

docs/cargo_features.md

@@ -39,7 +39,7 @@ collections to build your own "profile" equivalent, without needing to manually
 |dev|Enable this feature during development to improve the development experience. This adds features like asset hot-reloading and debugging tools. This should not be enabled for published apps! **Feature set:** `debug`, `bevy_dev_tools`, `file_watcher`.|
 |audio|Features used to build audio Bevy apps. **Feature set:** `bevy_audio`, `vorbis`.|
 |audio-all-formats|Enables audio features and all supported formats. **Feature set:** `bevy_audio`, `aac`, `flac`, `mp3`, `mp4`, `vorbis`, `wav`.|
-|scene|Features used to compose Bevy scenes. **Feature set:** `bevy_world_serialization`, `bevy_scene2`.|
+|scene|Features used to compose Bevy scenes. **Feature set:** `bevy_world_serialization`, `bevy_scene`.|
 |picking|Enables picking with all backends. **Feature set:** `bevy_picking`, `mesh_picking`, `sprite_picking`, `ui_picking`.|
 |default_app|The core pieces that most apps need. This serves as a baseline feature set for other higher level feature collections (such as "2d" and "3d"). It is also useful as a baseline feature set for scenarios like headless apps that require no rendering (ex: command line tools, servers, etc). **Feature set:** `async_executor`, `bevy_asset`, `bevy_input_focus`, `bevy_log`, `bevy_state`, `bevy_window`, `custom_cursor`, `reflect_auto_register`.|
 |default_platform|These are platform support features, such as OS support/features, windowing and input backends, etc. **Feature set:** `std`, `android-game-activity`, `bevy_gilrs`, `bevy_winit`, `default_font`, `multi_threaded`, `webgl2`, `x11`, `wayland`, `sysinfo_plugin`.|
@@ -93,7 +93,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |bevy_post_process|Provides post process effects such as depth of field, bloom, chromatic aberration.|
 |bevy_remote|Enable the Bevy Remote Protocol|
 |bevy_render|Provides rendering functionality|
-|bevy_scene2|Provides scene functionality|
+|bevy_scene|Provides scene functionality|
 |bevy_settings|Load and save user preferences|
 |bevy_shader|Provides shaders usable through asset handles.|
 |bevy_solari|Provides raytraced lighting (experimental)|

examples/large_scenes/bevy_city/src/settings.rs

@@ -8,7 +8,6 @@ use bevy::{
     },
     pbr::wireframe::WireframeConfig,
     prelude::*,
-    scene2::prelude::{Scene, *},
     ui::Checked,
     ui_widgets::{checkbox_self_update, Activate, ValueChange},
 };