Check camera field of view range.

Author: kovacsv

Sources/EngineTest/CameraTest.cpp

@@ -15,6 +15,7 @@ TEST (IsValidCameraTest)
 	ASSERT (!IsValidCamera (glm::dvec3 (0.0, 0.0, -1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 45.0, 0.1, 100.0));
 	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), -45.0, 0.1, 100.0));
 	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 0.0, 0.1, 100.0));
+	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 180.0, 0.1, 100.0));
 	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 45.0, -0.1, 100.0));
 	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 45.0, 0.1, -100.0));
 	ASSERT (!IsValidCamera (glm::dvec3 (3.0, 2.0, 1.0), glm::dvec3 (0.0, 0.0, 0.0), glm::dvec3 (0.0, 0.0, 1.0), 45.0, 100.0, 10.0));

Sources/Geometry/Geometry.cpp

@@ -26,6 +26,16 @@ bool IsGreater (float a, float b)
 	return a - b > FEPS;
 }
 
+bool IsLowerOrEqual (float a, float b)
+{
+	return IsLower (a, b) || IsEqual (a, b);
+}
+
+bool IsGreaterOrEqual (float a, float b)
+{
+	return IsGreater (a, b) || IsEqual (a, b);
+}
+
 bool IsEqual (double a, double b)
 {
 	return fabs (a - b) < EPS;
@@ -41,6 +51,16 @@ bool IsGreater (double a, double b)
 	return a - b > EPS;
 }
 
+bool IsLowerOrEqual (double a, double b)
+{
+	return IsLower (a, b) || IsEqual (a, b);
+}
+
+bool IsGreaterOrEqual (double a, double b)
+{
+	return IsGreater (a, b) || IsEqual (a, b);
+}
+
 bool IsPositive (double a)
 {
 	return a > EPS;

Sources/Geometry/Geometry.hpp

@@ -13,10 +13,14 @@ extern const double EPS;
 bool IsEqual (float a, float b);
 bool IsLower (float a, float b);
 bool IsGreater (float a, float b);
+bool IsLowerOrEqual (float a, float b);
+bool IsGreaterOrEqual (float a, float b);
 
 bool IsEqual (double a, double b);
 bool IsLower (double a, double b);
 bool IsGreater (double a, double b);
+bool IsLowerOrEqual (double a, double b);
+bool IsGreaterOrEqual (double a, double b);
 
 bool IsPositive (double a);
 bool IsNegative (double a);

Sources/Modeler/Camera.cpp

@@ -163,7 +163,7 @@ bool IsValidCamera (const glm::dvec3& eye,
 		return false;
 	}
 
-	if (!Geometry::IsPositive (fieldOfViewY)) {
+	if (Geometry::IsLowerOrEqual (fieldOfViewY, 0.0) || Geometry::IsGreaterOrEqual (fieldOfViewY, 180.0)) {
 		return false;
 	}