Fixes for upstream bevyengine/bevy#1703

aevyrie · Mar 23, 2021 · 5f30c9e · 5f30c9e
1 parent 8605fb2
commit 5f30c9e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 151 deletions.
diff --git a/assets/models/monkey/Monkey.gltf b/assets/models/monkey/Monkey.gltf
diff --git a/examples/demo.rs b/examples/demo.rs
@@ -27,43 +27,45 @@ fn setup(
         Vec3::new(0.0, 0.0, 0.0),
         Vec3::new(0.0, 1.0, 0.0),
     ));
+    commands.spawn_bundle(ortho_cam);
+    // AABB
     commands
-        .spawn(ortho_cam)
-        // AABB
-        .spawn(PbrBundle {
+        .spawn_bundle(PbrBundle {
             mesh: asset_server.get_handle(mesh_path),
             material: materials.add(Color::rgb(1.0, 1.0, 1.0).into()),
             transform: Transform::from_translation(Vec3::new(-1.0, 0.0, 0.0)),
             ..Default::default()
         })
-        .with(Bounded::<aabb::AxisAlignedBB>::default())
-        .with(debug::DebugBounds)
-        .with(Rotator)
-        // OBB
-        .spawn(PbrBundle {
+        .insert(Bounded::<aabb::AxisAlignedBB>::default())
+        .insert(debug::DebugBounds)
+        .insert(Rotator);
+    // OBB
+    commands
+        .spawn_bundle(PbrBundle {
             mesh: asset_server.get_handle(mesh_path),
             material: materials.add(Color::rgb(1.0, 1.0, 1.0).into()),
             transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
             ..Default::default()
         })
-        .with(Bounded::<obb::OrientedBB>::default())
-        .with(debug::DebugBounds)
-        .with(Rotator)
-        // Sphere
-        .spawn(PbrBundle {
+        .insert(Bounded::<obb::OrientedBB>::default())
+        .insert(debug::DebugBounds)
+        .insert(Rotator);
+    // Sphere
+    commands
+        .spawn_bundle(PbrBundle {
             mesh: asset_server.get_handle(mesh_path),
             material: materials.add(Color::rgb(1.0, 1.0, 1.0).into()),
             transform: Transform::from_translation(Vec3::new(1.0, 0.0, 0.0)),
             ..Default::default()
         })
-        .with(Bounded::<sphere::BSphere>::default())
-        .with(debug::DebugBounds)
-        .with(Rotator)
-        // Light
-        .spawn(LightBundle {
-            transform: Transform::from_translation(Vec3::new(4.0, 8.0, 4.0)),
-            ..Default::default()
-        });
+        .insert(Bounded::<sphere::BSphere>::default())
+        .insert(debug::DebugBounds)
+        .insert(Rotator);
+    // Light
+    commands.spawn_bundle(LightBundle {
+        transform: Transform::from_translation(Vec3::new(4.0, 8.0, 4.0)),
+        ..Default::default()
+    });
 }
 
 /// Rotate the meshes to demonstrate how the bounding volumes update

diff --git a/src/debug.rs b/src/debug.rs
@@ -41,19 +41,18 @@ pub fn update_debug_meshes<T>(
         // if the entity had a child, we don't need to create a new one
         if !updated_existing_child {
             let mesh_handle = meshes.add(bound_vol.new_debug_mesh(transform));
-            commands.set_current_entity(entity);
-            commands.with_children(|parent| {
+            commands.entity(entity).with_children(|parent| {
                 parent
-                    .spawn(PbrBundle {
+                    .spawn_bundle(PbrBundle {
                         mesh: mesh_handle,
                         material: materials.add(StandardMaterial {
-                            albedo: Color::rgb(0.0, 1.0, 0.0),
+                            base_color: Color::rgb(0.0, 1.0, 0.0),
                             unlit: true,
                             ..Default::default()
                         }),
                         ..Default::default()
                     })
-                    .with(DebugBoundsMesh);
+                    .insert(DebugBoundsMesh);
             });
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -103,11 +103,12 @@ pub fn spawn<T: 'static + BoundingVolume + Send + Sync + Debug>(
 ) {
     for (handle, transform, entity) in query.iter() {
         if let Some(mesh) = meshes.get(handle) {
-            commands.set_current_entity(entity);
             let new_bound = T::new(mesh, transform);
             info!("New bounding volume generated: {:?}", new_bound);
-            commands.with(new_bound);
-            commands.remove::<Bounded<T>>(entity);
+            commands
+                .entity(entity)
+                .insert(new_bound)
+                .remove::<Bounded<T>>();
         }
     }
 }