Updated incidence angle definition for triangle primitives

3dgeo-heidelberg · Jan 9, 2024 · 78047e3 · 78047e3
1 parent 3190438
commit 78047e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/helios_version.cpp b/src/main/helios_version.cpp
@@ -4,7 +4,7 @@
 
 const char * HELIOS_VERSION = "1.3.0";
 
-const char * HELIOS_GIT_HASH = "253259cf";
+const char * HELIOS_GIT_HASH = "31904380";
 
 const char * getHeliosVersion(){
     return HELIOS_VERSION;

diff --git a/src/scene/primitives/Triangle.cpp b/src/scene/primitives/Triangle.cpp
@@ -2,6 +2,7 @@
 
 #define _USE_MATH_DEFINES
 #include "math.h"
+#include <MathConstants.h>
 
 #include <algorithm>
 #include <sstream>
@@ -67,7 +68,8 @@ double Triangle::getIncidenceAngle_rad(
         const glm::dvec3 &rayDir,
         const glm::dvec3 &intersectionPoint
  ){
-    return M_PI - glm::angle(faceNormal, rayDir);
+    double const angle = glm::angle(faceNormal, rayDir);
+    return (angle > PI_HALF) ? M_PI - angle : angle;  // Return min. angle
 }
 
 // These naive methods are much faster than the built-in in Vector3D