remove SpawnScene command

Author: mockersf

crates/bevy_scene/src/command.rs

@@ -1,24 +1,19 @@
 mod bundle;
-mod command;
 mod dynamic_scene;
 mod scene;
 mod scene_loader;
 mod scene_spawner;
 pub mod serde;
 
 pub use bundle::*;
-pub use command::*;
 pub use dynamic_scene::*;
 pub use scene::*;
 pub use scene_loader::*;
 pub use scene_spawner::*;
 
 pub mod prelude {
     #[doc(hidden)]
-    pub use crate::{
-        DynamicScene, DynamicSceneBundle, Scene, SceneBundle, SceneSpawner,
-        SpawnSceneAsChildCommands, SpawnSceneCommands,
-    };
+    pub use crate::{DynamicScene, DynamicSceneBundle, Scene, SceneBundle, SceneSpawner};
 }
 
 use bevy_app::prelude::*;

crates/bevy_scene/src/lib.rs

@@ -37,11 +37,11 @@ fn setup(
 
     // Spawn the scene as a child of another entity. This first scene will be translated backward
     // with its parent
-    commands
-        .spawn_bundle(TransformBundle::from(Transform::from_xyz(0.0, 0.0, -1.0)))
-        .with_children(|parent| {
-            parent.spawn_scene(asset_server.load("models/FlightHelmet/FlightHelmet.gltf#Scene0"));
-        });
+    commands.spawn_bundle(SceneBundle {
+        transform: Transform::from_xyz(0.0, 0.0, -1.0),
+        scene: asset_server.load("models/FlightHelmet/FlightHelmet.gltf#Scene0"),
+        ..Default::default()
+    });
 
     // Spawn a second scene, and keep its `instance_id`
     let instance_id =

examples/3d/update_gltf_scene.rs

@@ -23,7 +23,10 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     // You should see the changes immediately show up in your app.
 
     // mesh
-    commands.spawn_scene(scene_handle);
+    commands.spawn_bundle(SceneBundle {
+        scene: scene_handle,
+        ..Default::default()
+    });
     // light
     commands.spawn_bundle(PointLightBundle {
         transform: Transform::from_xyz(4.0, 5.0, 4.0),

examples/asset/hot_asset_reloading.rs

@@ -118,15 +118,11 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>, mut game: ResMu
             (0..BOARD_SIZE_I)
                 .map(|i| {
                     let height = rand::thread_rng().gen_range(-0.1..0.1);
-                    commands
-                        .spawn_bundle(TransformBundle::from(Transform::from_xyz(
-                            i as f32,
-                            height - 0.2,
-                            j as f32,
-                        )))
-                        .with_children(|cell| {
-                            cell.spawn_scene(cell_scene.clone());
-                        });
+                    commands.spawn_bundle(SceneBundle {
+                        transform: Transform::from_xyz(i as f32, height - 0.2, j as f32),
+                        scene: cell_scene.clone(),
+                        ..Default::default()
+                    });
                     Cell { height }
                 })
                 .collect()
@@ -136,17 +132,18 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>, mut game: ResMu
     // spawn the game character
     game.player.entity = Some(
         commands
-            .spawn_bundle(TransformBundle::from(Transform {
-                translation: Vec3::new(
-                    game.player.i as f32,
-                    game.board[game.player.j][game.player.i].height,
-                    game.player.j as f32,
-                ),
-                rotation: Quat::from_rotation_y(-std::f32::consts::FRAC_PI_2),
+            .spawn_bundle(SceneBundle {
+                transform: Transform {
+                    translation: Vec3::new(
+                        game.player.i as f32,
+                        game.board[game.player.j][game.player.i].height,
+                        game.player.j as f32,
+                    ),
+                    rotation: Quat::from_rotation_y(-std::f32::consts::FRAC_PI_2),
+                    ..Default::default()
+                },
+                scene: asset_server.load("models/AlienCake/alien.glb#Scene0"),
                 ..Default::default()
-            }))
-            .with_children(|cell| {
-                cell.spawn_scene(asset_server.load("models/AlienCake/alien.glb#Scene0"));
             })
             .id(),
     );
@@ -329,11 +326,15 @@ fn spawn_bonus(
     }
     game.bonus.entity = Some(
         commands
-            .spawn_bundle(TransformBundle::from(Transform::from_xyz(
-                game.bonus.i as f32,
-                game.board[game.bonus.j][game.bonus.i].height + 0.2,
-                game.bonus.j as f32,
-            )))
+            .spawn_bundle(SceneBundle {
+                transform: Transform::from_xyz(
+                    game.bonus.i as f32,
+                    game.board[game.bonus.j][game.bonus.i].height + 0.2,
+                    game.bonus.j as f32,
+                ),
+                scene: game.bonus.handle.clone(),
+                ..Default::default()
+            })
             .with_children(|children| {
                 children.spawn_bundle(PointLightBundle {
                     point_light: PointLight {

examples/game/alien_cake_addict.rs

@@ -97,7 +97,10 @@ impl Node for SecondaryCameraDriver {
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     // add entities to the world
-    commands.spawn_scene(asset_server.load("models/monkey/Monkey.gltf#Scene0"));
+    commands.spawn_bundle(SceneBundle {
+        scene: asset_server.load("models/monkey/Monkey.gltf#Scene0"),
+        ..Default::default()
+    });
     // light
     commands.spawn_bundle(PointLightBundle {
         transform: Transform::from_xyz(4.0, 5.0, 4.0),