Panic when attempting to render with a Camera without Viewport.

bevyengine · Mar 4, 2021 · afe0165 · afe0165
1 parent ef79790
commit afe0165
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs
@@ -223,24 +223,17 @@ where
                         continue;
                     };
 
+                    // get camera viewport and apply it
+                    let viewport = world.get::<Viewport>(camera_entity)
+                    .expect("A camera requires a Viewport component.");
+                    let origin = viewport.physical_origin();
+                    let size = viewport.physical_size();
+                    let (min_depth, max_depth) = viewport.depth_range().into_inner();
+                    render_pass.set_viewport(origin.x, origin.y, size.x, size.y, min_depth, max_depth);
+
                     // get an ordered list of entities visible to the camera
                     let visible_entities = world.get::<VisibleEntities>(camera_entity).unwrap();
 
-                    // get camera viewport and apply it
-                    if let Ok(viewport) = world.get::<Viewport>(camera_entity) {
-                        let origin = viewport.physical_origin();
-                        let size = viewport.physical_size();
-                        let (min_depth, max_depth) = viewport.depth_range().into_inner();
-                        render_pass.set_viewport(
-                            origin.x, origin.y,
-                            size.x, size.y,
-                            min_depth, max_depth,
-                        );
-                    } else {
-                        // a camera requires a valid viewport
-                        continue;
-                    }
-
                     // attempt to draw each visible entity
                     let mut draw_state = DrawState::default();
                     for visible_entity in visible_entities.iter() {