Testbed: don’t panic when trying to render an unknown custom shape.

1 files changed, 14 insertions, 12 deletions

diff --git a/src_testbed/objects/node.rs b/src_testbed/objects/node.rs
index 9bbece2..aea11d8 100644
--- a/src_testbed/objects/node.rs
+++ b/src_testbed/objects/node.rs
@@ -48,8 +48,7 @@ impl EntityWithGraphics {
         let mesh = prefab_meshs
             .get(&shape.shape_type())
             .cloned()
-            .or_else(|| generate_collider_mesh(shape).map(|m| meshes.add(m)))
-            .expect("Could not build the collider's render mesh");
+            .or_else(|| generate_collider_mesh(shape).map(|m| meshes.add(m)));
 
         let opacity = 1.0;
         let bevy_color = Color::rgba(color.x, color.y, color.z, opacity);
@@ -83,18 +82,21 @@ impl EntityWithGraphics {
         };
         let material_handle = materials.add(material);
         let material_weak_handle = material_handle.clone_weak();
-        let pbr = PbrBundle {
-            mesh,
-            material: material_handle,
-            transform,
-            ..Default::default()
-        };
 
-        let mut entity_commands = commands.entity(entity);
-        entity_commands.insert_bundle(pbr);
+        if let Some(mesh) = mesh {
+            let pbr = PbrBundle {
+                mesh,
+                material: material_handle,
+                transform,
+                ..Default::default()
+            };
+
+            let mut entity_commands = commands.entity(entity);
+            entity_commands.insert_bundle(pbr);
 
-        if sensor {
-            entity_commands.insert(Wireframe);
+            if sensor {
+                entity_commands.insert(Wireframe);
+            }
         }
 
         EntityWithGraphics {