Use connected faces from generated convex hull

Motivation:
- Generated convex hulls did not have connected faces, which is required for convex-convex collision in cannon-es
- Using the connected faces generated by ConvexHull addresses this
- Fixes donmccurdy#76

Author: isaac-mason

lib/ConvexHull.d.ts

@@ -10,7 +10,15 @@ declare class Face {
     normal: Vector3;
 }
 
+declare class VertexNode {
+    point: Vector3;
+    index: number;
+}
+
 declare class ConvexHull {
     public faces: Face[];
+    public vertices: VertexNode[];
     setFromObject(mesh: Mesh): this;
+    collectFaces(): number[][];
+    collectFacesAndVertices(): { faces: number[][]; vertices: Vector3[]; }
 }

lib/ConvexHull.js

@@ -1,10 +1,10 @@
 import {
-	BufferGeometry,
 	Line3,
 	Plane,
 	Triangle,
 	Vector3
 } from 'three';
+
 /**
  * Ported from: https://github.com/maurizzzio/quickhull3d/ by Mauricio Poppe (https://github.com/maurizzzio)
  */
@@ -42,6 +42,41 @@ var ConvexHull = ( function () {
 
 	Object.assign( ConvexHull.prototype, {
 
+		collectFacesAndVertices: function () {
+			// Get face indices.
+			// These are the indices of all input faces, including vertices inside the convex hull.
+			const faceIndices = this.faces.map((f) => f.collectIndices());
+
+			// Get distinct vertex indices referenced by faces.
+			const referencedFaceIndices = Array.from(
+				new Set(faceIndices.flatMap((f) => f)).values()
+			).sort((a, b) => a - b);
+
+			// Create a mapping between original vertex indices to new vertex indices.
+			const originalToNewIndex = new Map();
+			for (let i = 0; i < referencedFaceIndices.length; i++) {
+				originalToNewIndex.set(referencedFaceIndices[i], i);
+			}
+
+			// Get faces with remapped vertex indices
+			const faces = [];
+			for (let i = 0; i < faceIndices.length; i++) {
+				const indices = faceIndices[i];
+				const a = originalToNewIndex.get(indices[0]);
+				const b = originalToNewIndex.get(indices[1]);
+				const c = originalToNewIndex.get(indices[2]);
+				faces.push([a, b, c]);
+			}
+
+			// Get vertices referenced by faces
+			const vertices = [];
+			for (let i = 0; i < referencedFaceIndices.length; i++) {
+				vertices.push(this.vertices[referencedFaceIndices[i]].point);
+			}
+
+			return { faces, vertices };
+		},
+
 		setFromPoints: function ( points ) {
 
 			if ( Array.isArray( points ) !== true ) {
@@ -60,7 +95,7 @@ var ConvexHull = ( function () {
 
 			for ( var i = 0, l = points.length; i < l; i ++ ) {
 
-				this.vertices.push( new VertexNode( points[ i ] ) );
+				this.vertices.push( new VertexNode( points[ i ], i ) );
 
 			}
 
@@ -980,6 +1015,16 @@ var ConvexHull = ( function () {
 
 	Object.assign( Face.prototype, {
 
+		collectIndices: function () {
+			const indices = [];
+			let edge = this.edge;
+			do {
+				indices.push(edge.head().index);
+				edge = edge.next;
+			} while (edge !== this.edge);
+			return indices;
+		},
+
 		getEdge: function ( i ) {
 
 			var edge = this.edge;
@@ -1105,12 +1150,15 @@ var ConvexHull = ( function () {
 
 	// A vertex as a double linked list node.
 
-	function VertexNode( point ) {
+	function VertexNode( point, index ) {
 
 		this.point = point;
+		// index in the input array
+		this.index = index;
 		this.prev = null;
 		this.next = null;
-		this.face = null; // the face that is able to see this vertex
+		// the face that is able to see this vertex
+		this.face = null;
 
 	}
 

src/index.ts

@@ -1,6 +1,6 @@
-import { Box, Quaternion as CQuaternion, ConvexPolyhedron, Cylinder, Shape, Sphere, Trimesh, Vec3 } from 'cannon-es';
+import { Box, ConvexPolyhedron, Cylinder, Quaternion as CQuaternion, Shape, Sphere, Trimesh, Vec3 } from 'cannon-es';
 import { Box3, BufferGeometry, CylinderGeometry, MathUtils, Mesh, Object3D, SphereGeometry, Vector3 } from 'three';
-import { ConvexHull } from '../lib/ConvexHull.js';
+import { ConvexHull } from '../lib/ConvexHull';
 import { getComponent, getGeometry, getVertices } from './utils';
 
 const PI_2 = Math.PI / 2;
@@ -254,34 +254,22 @@ function getConvexPolyhedronParameters (object: Object3D): ShapeParameters<Shape
 		);
 	}
 
-	// Compute the 3D convex hull.
-	const hull = new ConvexHull().setFromObject(new Mesh(geometry));
-	const hullFaces = hull.faces;
-	const vertices: number[] = [];
-	const faces: number[][] = [];
-
-	let currentFaceVertex = 0;
-	for (let i = 0; i < hullFaces.length; i++) {
-		const hullFace = hullFaces[ i ];
-		const face: number[] = [];
-		faces.push(face);
-
-		let edge = hullFace.edge;
-		do {
-			const point = edge.head().point;
-			vertices.push(point.x, point.y, point.z);
-			face.push(currentFaceVertex);
-			currentFaceVertex++;
-			edge = edge.next;
-		} while ( edge !== hullFace.edge );
+	// Get convex hull vertices and faces
+	const { vertices: verticesArray, faces } = new ConvexHull()
+		.setFromObject(new Mesh(geometry))
+		.collectFacesAndVertices();
+
+	const vertices = new Float32Array(verticesArray.length * 3);
+	for (let i = 0; i < verticesArray.length; i++) {
+		const v = i * 3;
+		vertices[v] = verticesArray[i].x;
+		vertices[v + 1] = verticesArray[i].y;
+		vertices[v + 2] = verticesArray[i].z;
 	}
 
-	const verticesTypedArray = new Float32Array(vertices.length);
-	verticesTypedArray.set(vertices);
-
 	return {
 		type: ShapeType.HULL,
-		params: { vertices: verticesTypedArray, faces },
+		params: { vertices, faces },
 	};
 }
 
@@ -373,7 +361,7 @@ function getBoundingSphereParameters (
 	const geometry = getGeometry(object);
 	if (!geometry) return null;
 	geometry.computeBoundingSphere();
-
+ 
 	return {
 		type: ShapeType.SPHERE,
 		params: { radius: geometry.boundingSphere!.radius },