Fix triangle.hlsl

Author: kevyuu

include/nbl/asset/utils/CVertexHashGrid.h

@@ -182,7 +182,7 @@ class CVertexHashGrid
 			hash,
 			[](const VertexData& vertex, uint32_t hash)
 			{
-				return vertex.hash < hash;
+				return vertex.getHash() < hash;
 			});
 
 		auto end = std::upper_bound(
@@ -191,7 +191,7 @@ class CVertexHashGrid
 			hash, 
 			[](uint32_t hash, const VertexData& vertex)
 			{
-				return hash < vertex.hash;
+				return hash < vertex.getHash();
 			});
 
 		const auto beginIx = begin - m_vertices.begin();

include/nbl/builtin/hlsl/shapes/triangle.hlsl

@@ -6,6 +6,8 @@
 #define _NBL_BUILTIN_HLSL_SHAPES_TRIANGLE_INCLUDED_
 
 #include <nbl/builtin/hlsl/cpp_compat.hlsl>
+#include <nbl/builtin/hlsl/tgmath.hlsl>
+#include <nbl/builtin/hlsl/numbers.hlsl>
 
 namespace nbl
 {
@@ -17,22 +19,22 @@ namespace shapes
 namespace util
 {
   template <typename float_t>
-  vector<float_t, 3> GetAngleWeight(const vector<float_t, 3>& e1, const vector<float_t, 3>& e2, const vector<float_t, 3>& e3)
+  vector<float_t, 3> compInternalAngle(NBL_CONST_REF_ARG(vector<float_t, 3>) e1, NBL_CONST_REF_ARG(vector<float_t, 3>) e2, NBL_CONST_REF_ARG(vector<float_t, 3>) e3)
   {
     // Calculate this triangle's weight for each of its three m_vertices
     // start by calculating the lengths of its sides
-    const float_t a = dot(e1, e1);
-    const float_t asqrt = sqrt(a);
-    const float_t b = dot(e2, e2);
-    const float_t bsqrt = sqrt(b);
-    const float_t c = dot(e3, e3);
-    const float_t csqrt = sqrt(c);
+    const float_t a = hlsl::dot(e1, e1);
+    const float_t asqrt = hlsl::sqrt(a);
+    const float_t b = hlsl::dot(e2, e2);
+    const float_t bsqrt = hlsl::sqrt(b);
+    const float_t c = hlsl::dot(e3, e3);
+    const float_t csqrt = hlsl::sqrt(c);
 
+    const float_t angle1 = hlsl::acos((b + c - a) / (2.f * bsqrt * csqrt));
+    const float_t angle2 = hlsl::acos((-b + c + a) / (2.f * asqrt * csqrt));
+    const float_t angle3 = hlsl::numbers::pi<float_t> - (angle1 + angle2);
     // use them to find the angle at each vertex
-    return vector<float_t, 3>(
-      acosf((b + c - a) / (2.f * bsqrt * csqrt)),
-      acosf((-b + c + a) / (2.f * asqrt * csqrt)),
-      acosf((b - c + a) / (2.f * bsqrt * asqrt)));
+    return vector<float_t, 3>(angle1, angle2, angle3);
   }
 }
 

src/nbl/asset/utils/CSmoothNormalGenerator.cpp

@@ -55,7 +55,7 @@ CSmoothNormalGenerator::VertexHashMap CSmoothNormalGenerator::setupData(const as
 		const auto faceNormal = normalize(cross(v2 - v1, v3 - v1));
 
 		//set data for m_vertices
-		const auto angleWages = hlsl::shapes::util::GetAngleWeight(v2 - v3, v1 - v3, v1 - v2);
+		const auto angleWages = hlsl::shapes::util::compInternalAngle(v2 - v3, v1 - v3, v1 - v2);
 
 		vertices.add({ i,	0,	faceNormal * angleWages.x, v1});
 		vertices.add({ i + 1,	0,	faceNormal * angleWages.y,v2});