From 1dd59fd5b83c48fb729f8757fc26011eb2e606b2 Mon Sep 17 00:00:00 2001
From: Irlan <->
Date: Wed, 9 May 2018 14:48:58 -0300
Subject: [PATCH] make polygon normal computation more robust

---
 src/bounce/quickhull/qh_hull.cpp | 45 ++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/bounce/quickhull/qh_hull.cpp b/src/bounce/quickhull/qh_hull.cpp
index 9f73a7a..d74ba64 100644
--- a/src/bounce/quickhull/qh_hull.cpp
+++ b/src/bounce/quickhull/qh_hull.cpp
@@ -664,40 +664,57 @@ static B3_FORCE_INLINE b3Vec3 b3Newell(const b3Vec3& a, const b3Vec3& b)
 	return b3Vec3((a.y - b.y) * (a.z + b.z), (a.z - b.z) * (a.x + b.x), (a.x - b.x) * (a.y + b.y));
 }
 
+// Compute face centroid, normal, and area
 static void b3ResetFaceData(qhFace* face)
 {
-	b3Vec3 n;
-	n.SetZero();
-
+	// Compute polygon centroid
 	b3Vec3 c;
 	c.SetZero();
-
+	
 	u32 count = 0;
 	qhHalfEdge* e = face->edge;
 	do
+	{
+		b3Vec3 v = e->tail->position;
+		c += v;
+		++count;
+		e = e->next;
+	} while (e != face->edge);
+
+	B3_ASSERT(count >= 3);
+	c /= float32(count);
+
+	// Compute normal  
+	b3Vec3 n; 
+	n.SetZero();
+	
+	e = face->edge;
+	do
 	{
 		b3Vec3 v1 = e->tail->position;
 		b3Vec3 v2 = e->next->tail->position;
 
-		n += b3Newell(v1, v2);
-		c += v1;
+		// Shift the polygon origin to the centroid
+		v1 -= c;
+		v2 -= c;
 
-		++count;
+		// Apply Newew's method
+		n += b3Newell(v1, v2);
+		
 		e = e->next;
 	} while (e != face->edge);
 
-	B3_ASSERT(count > 0);
-	c /= float32(count);
-
+	// Centroid
 	face->center = c;
-
+	
 	float32 len = b3Length(n);
-
-	face->area = 0.5f * len;
-
 	B3_ASSERT(len > B3_EPSILON);
 	n /= len;
 
+	// Area
+	face->area = 0.5f * len;
+
+	// Normal
 	face->plane.normal = n;
 	face->plane.offset = b3Dot(n, c);
 }