Handle undefined projection matrix.

As per bevyengine#8841 (comment)
tormeh · Sep 18, 2023 · 74cc340 · 74cc340
1 parent ab37ed9
commit 74cc340
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs
@@ -69,7 +69,7 @@ pub struct RenderTargetInfo {
 /// Holds internally computed [`Camera`] values.
 #[derive(Default, Debug, Clone)]
 pub struct ComputedCameraValues {
-    projection_matrix: Mat4,
+    projection_matrix: Option<Mat4>,
     target_info: Option<RenderTargetInfo>,
     // position and size of the `Viewport`
     old_viewport_size: Option<UVec2>,
@@ -230,17 +230,24 @@ impl Camera {
     /// The projection matrix computed using this camera's [`CameraProjection`].
     #[inline]
     pub fn projection_matrix(&self) -> Mat4 {
-        self.computed.projection_matrix
+        self.computed.projection_matrix.unwrap_or_default()
     }
 
     #[inline]
     fn finite_projection_matrix(&self) -> Result<Mat4, BadProjectionMatrixError> {
-        let projection_matrix = self.computed.projection_matrix;
+        let projection_matrix = self
+            .computed
+            .projection_matrix
+            .ok_or(BadProjectionMatrixError::ProjectionMatrixUndefinedError)?;
         match projection_matrix.is_finite() {
-            false => Err(BadProjectionMatrixError(projection_matrix)),
+            false => Err(BadProjectionMatrixError::BadProjectionMatrixError(
+                projection_matrix,
+            )),
             true => {
                 if projection_matrix == Mat4::ZERO {
-                    Err(BadProjectionMatrixError(projection_matrix))
+                    Err(BadProjectionMatrixError::BadProjectionMatrixError(
+                        projection_matrix,
+                    ))
                 } else {
                     Ok(projection_matrix)
                 }
@@ -478,7 +485,10 @@ pub enum WorldToViewportError {
 }
 
 #[derive(Debug)]
-pub struct BadProjectionMatrixError(Mat4);
+pub enum BadProjectionMatrixError {
+    BadProjectionMatrixError(Mat4),
+    ProjectionMatrixUndefinedError,
+}
 
 #[derive(Debug)]
 pub struct CameraTransformNotFiniteError(Mat4);
@@ -735,7 +745,8 @@ pub fn camera_system<T: CameraProjection + Component>(
                 );
                 if let Ok(size) = camera.logical_viewport_size() {
                     camera_projection.update(size.x, size.y);
-                    camera.computed.projection_matrix = camera_projection.get_projection_matrix();
+                    camera.computed.projection_matrix =
+                        Some(camera_projection.get_projection_matrix());
                 }
             }
         }