Skip to content

Commit 0cc62a7

Browse files
committed
more use of the bundle
1 parent 696cc7c commit 0cc62a7

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

examples/3d/load_gltf.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ fn main() {
1414
.run();
1515
}
1616

17-
fn setup(
18-
mut commands: Commands,
19-
asset_server: Res<AssetServer>,
20-
mut scene_spawner: ResMut<SceneSpawner>,
21-
) {
22-
scene_spawner.spawn(asset_server.load("models/FlightHelmet/FlightHelmet.gltf#Scene0"));
17+
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
2318
commands.spawn_bundle(Camera3dBundle {
2419
transform: Transform::from_xyz(0.7, 0.7, 1.0).looking_at(Vec3::new(0.0, 0.3, 0.0), Vec3::Y),
2520
..default()
@@ -41,6 +36,10 @@ fn setup(
4136
},
4237
..default()
4338
});
39+
commands.spawn_bundle(SceneBundle {
40+
scene: asset_server.load("models/FlightHelmet/FlightHelmet.gltf#Scene0"),
41+
..default()
42+
});
4443
}
4544

4645
fn animate_light_direction(

examples/asset/hot_asset_reloading.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@ fn main() {
1616
.run();
1717
}
1818

19-
fn setup(
20-
mut commands: Commands,
21-
asset_server: Res<AssetServer>,
22-
mut scene_spawner: ResMut<SceneSpawner>,
23-
) {
19+
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
2420
// Load our mesh:
2521
let scene_handle = asset_server.load("models/monkey/Monkey.gltf#Scene0");
2622

2723
// Any changes to the mesh will be reloaded automatically! Try making a change to Monkey.gltf.
2824
// You should see the changes immediately show up in your app.
2925

3026
// mesh
31-
scene_spawner.spawn(scene_handle);
27+
commands.spawn_bundle(SceneBundle {
28+
scene: scene_handle,
29+
..default()
30+
});
3231
// light
3332
commands.spawn_bundle(PointLightBundle {
3433
transform: Transform::from_xyz(4.0, 5.0, 4.0),

0 commit comments

Comments
 (0)