Detect all-zero projection matrix.

As per bevyengine#8841 (comment)
tormeh · Sep 18, 2023 · 9d212ac · 9d212ac
1 parent 0ed06cf
commit 9d212ac
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs
@@ -234,11 +234,17 @@ impl Camera {
  }
 
  #[inline]
- fn finite_projection_matrix(&self) -> Result<Mat4, ProjectionMatrixNotFiniteError> {
+ fn finite_projection_matrix(&self) -> Result<Mat4, BadProjectionMatrixError> {
  let projection_matrix = self.computed.projection_matrix;
  match projection_matrix.is_finite() {
- true => Ok(projection_matrix),
- false => Err(ProjectionMatrixNotFiniteError(projection_matrix)),
+ false => Err(BadProjectionMatrixError(projection_matrix)),
+ true => {
+ if projection_matrix == Mat4::ZERO {
+ Err(BadProjectionMatrixError(projection_matrix))
+ } else {
+ Ok(projection_matrix)
+ }
+ }
  }
  }
 
@@ -433,14 +439,14 @@ impl Camera {
 pub enum NdcToWorldError {
  WorldSpaceCoordsNotFiniteError(Vec3),
  CameraTransformNotFiniteError(CameraTransformNotFiniteError),
- ProjectionMatrixNotFiniteError(ProjectionMatrixNotFiniteError),
+ ProjectionMatrixNotFiniteError(BadProjectionMatrixError),
 }
 
 #[derive(Debug)]
 pub enum WorldToNdcError {
  NdcSpaceCoordsNotFiniteError(Vec3),
  CameraTransformNotFiniteError(CameraTransformNotFiniteError),
- ProjectionMatrixNotFiniteError(ProjectionMatrixNotFiniteError),
+ ProjectionMatrixNotFiniteError(BadProjectionMatrixError),
 }
 
 #[derive(Debug)]
@@ -453,7 +459,7 @@ pub struct LogicalViewportSizeError {
 pub enum ViewportToWorldError {
  LogicalViewportSizeError(LogicalViewportSizeError),
  CameraTransformNotFiniteError(CameraTransformNotFiniteError),
- ProjectionMatrixNotFiniteError(ProjectionMatrixNotFiniteError),
+ ProjectionMatrixNotFiniteError(BadProjectionMatrixError),
  WorldNearPlaneNotFiniteError(Vec3),
  WorldFarPlaneNanError(Vec3), //Presumably this being infinite is sometimes ok?
 }
@@ -472,7 +478,7 @@ pub enum WorldToViewportError {
 }
 
 #[derive(Debug)]
-pub struct ProjectionMatrixNotFiniteError(Mat4);
+pub struct BadProjectionMatrixError(Mat4);
 
 #[derive(Debug)]
 pub struct CameraTransformNotFiniteError(Mat4);