fix formatting, name

Author: keptsecret

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

@@ -18,25 +18,25 @@ namespace shapes
 
 namespace util
 {
-    // Use this convetion e_i = v_{i+2}-v_{i+1}. vertex index is modulo by 3.
-    template <typename float_t>
-    vector<float_t, 3> anglesFromTriangleEdge(const vector<float_t, 3> e0, vector<float_t, 3> e1, const vector<float_t, 3> e2)
-    {
-        // Calculate this triangle's weight for each of its three m_vertices
-        // start by calculating the lengths of its sides
-        const float_t a = hlsl::dot(e0, e0);
-        const float_t asqrt = hlsl::sqrt(a);
-        const float_t b = hlsl::dot(e1, e1);
-        const float_t bsqrt = hlsl::sqrt(b);
-        const float_t c = hlsl::dot(e2, e2);
-        const float_t csqrt = hlsl::sqrt(c);
+// Use this convetion e_i = v_{i+2}-v_{i+1}. vertex index is modulo by 3.
+template <typename float_t>
+vector<float_t, 3> anglesFromTriangleEdges(const vector<float_t, 3> e0, vector<float_t, 3> e1, const vector<float_t, 3> e2)
+{
+    // Calculate this triangle's weight for each of its three m_vertices
+    // start by calculating the lengths of its sides
+    const float_t a = hlsl::dot(e0, e0);
+    const float_t asqrt = hlsl::sqrt(a);
+    const float_t b = hlsl::dot(e1, e1);
+    const float_t bsqrt = hlsl::sqrt(b);
+    const float_t c = hlsl::dot(e2, e2);
+    const float_t csqrt = hlsl::sqrt(c);
 
-        const float_t angle0 = hlsl::acos((b + c - a) / (2.f * bsqrt * csqrt));
-        const float_t angle1 = hlsl::acos((-b + c + a) / (2.f * asqrt * csqrt));
-        const float_t angle2 = hlsl::numbers::pi<float_t> - (angle0 + angle1);
-        // use them to find the angle at each vertex
-        return vector<float_t, 3>(angle0, angle1, angle2);
-    }
+    const float_t angle0 = hlsl::acos((b + c - a) / (2.f * bsqrt * csqrt));
+    const float_t angle1 = hlsl::acos((-b + c + a) / (2.f * asqrt * csqrt));
+    const float_t angle2 = hlsl::numbers::pi<float_t> - (angle0 + angle1);
+    // use them to find the angle at each vertex
+    return vector<float_t, 3>(angle0, angle1, angle2);
+}
 }
 
 }

src/nbl/asset/utils/CSmoothNormalGenerator.cpp

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