Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #16587 from Mugen87/dev33

Examples: Rename QuickHull to ConvexHull
Mr.doob 6 years ago
parent
a0c48d6a4a cad3b50556
commit
a280812b9d
10 changed files with 76 additions and 90 deletions
Split View Show Diff Stats
  1. 18 18
      docs/examples/math/convexhull/ConvexHull.html
  2. 2 2
      docs/examples/math/convexhull/Face.html
  3. 2 2
      docs/examples/math/convexhull/HalfEdge.html
  4. 2 2
      docs/examples/math/convexhull/VertexList.html
  5. 2 2
      docs/examples/math/convexhull/VertexNode.html
  6. 6 6
      docs/list.js
  7. 36 47
      examples/js/geometries/ConvexGeometry.js
  8. 6 9
      examples/js/math/ConvexHull.js
  9. 1 1
      examples/webgl_geometry_convex.html
  10. 1 1
      examples/webgl_physics_convex_break.html

+ 18 - 18
docs/examples/quickhull/QuickHull.html → docs/examples/math/convexhull/ConvexHull.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<base href="../../" />
 
+		<base href="../../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
@@ -11,7 +11,7 @@
 
 		<h1>[name]</h1>
 
 
 		<p class="desc">
 
-			General information about the Quickhull algorithm: Dirk Gregorius. March 2014, Game Developers Conference: [link:http://media.steampowered.com/apps/valve/2014/DirkGregorius_ImplementingQuickHull.pdf Implementing QuickHull].
 
+			A convex hull class. Implements the Quickhull algorithm by: Dirk Gregorius. March 2014, Game Developers Conference: [link:http://media.steampowered.com/apps/valve/2014/DirkGregorius_ImplementingQuickHull.pdf Implementing QuickHull].
 
 		</p>
 
 
 
@@ -63,19 +63,19 @@
 
 		<p>Creates a face with the vertices 'eyeVertex.point', 'horizonEdge.tail' and 'horizonEdge.head' in CCW order.
 
 			All the half edges are created in CCW order thus the face is always pointing outside the hull</p>
 
 
-		<h3>[method:QuickHull addNewFaces]( [param:VertexNode eyeVertex], [param:HalfEdge horizonEdge] )</h3>
 
+		<h3>[method:ConvexHull addNewFaces]( [param:VertexNode eyeVertex], [param:HalfEdge horizonEdge] )</h3>
 
 		[page:VertexNode eyeVertex] - The vertex that is added to the hull.<br /><br />
 
 		[page:HalfEdge horizon] - An array of half-edges that form the horizon.<br /><br />
 
 
 		<p>Adds 'horizon.length' faces to the hull, each face will be linked with the horizon opposite face and the face on the left/right.</p>
 
 
-		<h3>[method:QuickHull addVertexToFace]( [param:VertexNode vertex], [param:Face face]	)</h3>
 
+		<h3>[method:ConvexHull addVertexToFace]( [param:VertexNode vertex], [param:Face face]	)</h3>
 
 		[page:VertexNodeNode vertex] - The vertex to add.<br /><br />
 
 		[page:Face face] - The target face.<br /><br />
 
 
 		<p>Adds a vertex to the 'assigned' list of vertices and assigns it to the given face.</p>
 
 
-		<h3>[method:QuickHull addVertexToHull]( [param:VertexNode eyeVertex] )</h3>
 
+		<h3>[method:ConvexHull addVertexToHull]( [param:VertexNode eyeVertex] )</h3>
 
 		[page:VertexNode eyeVertex] - The vertex that is added to the hull.<br /><br />
 
 
 		<p>Adds a vertex to the hull with the following algorithm
 
@@ -87,11 +87,11 @@
 
 			</ul>
 
 		</p>
 
 
-		<h3>[method:QuickHull cleanup]()</h3>
 
+		<h3>[method:ConvexHull cleanup]()</h3>
 
 
 		<p>Cleans up internal properties after computing the convex hull.</p>
 
 
-		<h3>[method:QuickHull compute]()</h3>
 
+		<h3>[method:ConvexHull compute]()</h3>
 
 
 		<p>Starts the execution of the quick hull algorithm.</p>
 
 
@@ -99,7 +99,7 @@
 
 
 		<p>Computes the extremes values (min/max vectors) which will be used to compute the inital hull.</p>
 
 
-		<h3>[method:QuickHull computeHorizon]( [param:Vector3 eyePoint], [param:HalfEdge crossEdge], [param:Face face], [param:Array horizon]	)</h3>
 
+		<h3>[method:ConvexHull computeHorizon]( [param:Vector3 eyePoint], [param:HalfEdge crossEdge], [param:Face face], [param:Array horizon]	)</h3>
 
 		[page:Vector3 eyePoint] - The 3D-coordinates of a point.<br /><br />
 
 		[page:HalfEdge crossEdge] - The edge used to jump to the current face.<br /><br />
 
 		[page:Face face] - The current face being tested.<br /><br />
 
@@ -107,16 +107,16 @@
 
 
 		<p>Computes a chain of half edges in CCW order called the 'horizon'. For an edge to be part of the horizon it must join a face that can see 'eyePoint' and a face that cannot see 'eyePoint'.</p>
 
 
-		<h3>[method:QuickHull computeInitialHull]()</h3>
 
+		<h3>[method:ConvexHull computeInitialHull]()</h3>
 
 
 		<p>Computes the initial simplex assigning to its faces all the points that are candidates to form part of the hull.</p>
 
 
-		<h3>[method:QuickHull containsPoint]( [param:Vector3 point] )</h3>
 
+		<h3>[method:ConvexHull containsPoint]( [param:Vector3 point] )</h3>
 
 		[page:Vector3 point] - A point in 3D space.<br /><br />
 
 
 		<p>Returns *true* if the given point is inside this convex hull.</p>
 
 
-		<h3>[method:QuickHull deleteFaceVertices]( [param:Face face], [param:Face absorbingFace]	)</h3>
 
+		<h3>[method:ConvexHull deleteFaceVertices]( [param:Face face], [param:Face absorbingFace]	)</h3>
 
 		[page:Face face] - The given face.<br /><br />
 
 		[page:Face absorbingFace] - An optional face that tries to absorb the vertices of the first face.<br /><br />
 
 
@@ -139,7 +139,7 @@
 
 
 		<p>Returns *true* if the given ray intersects with this convex hull.</p>
 
 
-		<h3>[method:QuickHull makeEmpty]()</h3>
 
+		<h3>[method:ConvexHull makeEmpty]()</h3>
 
 
 		<p>Makes this convex hull empty.</p>
 
 
@@ -153,7 +153,7 @@
 
 			</ul>
 
 		</p>
 
 
-		<h3>[method:QuickHull reindexFaces]()</h3>
 
+		<h3>[method:ConvexHull reindexFaces]()</h3>
 
 
 		<p>Removes inactive (e.g. deleted) faces from the internal face list.</p>
 
 
@@ -162,30 +162,30 @@
 
 
 		<p>Removes all the visible vertices that a given face is able to see which are stored in the 'assigned' vertext list.</p>
 
 
-		<h3>[method:QuickHull removeVertexFromFace]( [param:VertexNode vertex], [param:Face face]	)</h3>
 
+		<h3>[method:ConvexHull removeVertexFromFace]( [param:VertexNode vertex], [param:Face face]	)</h3>
 
 		[page:VertexNode vertex] - The vertex to remove.<br /><br />
 
 		[page:Face face] - The target face.<br /><br />
 
 
 		<p>Removes a vertex from the 'assigned' list of vertices and from the given face. It also makes sure that the link from 'face' to the first vertex it sees in 'assigned' is linked correctly after the removal.</p>
 
 
-		<h3>[method:QuickHull resolveUnassignedPoints]( [param:Array newFaces]	)</h3>
 
+		<h3>[method:ConvexHull resolveUnassignedPoints]( [param:Array newFaces]	)</h3>
 
 		[page:Face newFaces] - An array of new faces.<br /><br />
 
 
 		<p>Reassigns as many vertices as possible from the unassigned list to the new faces.</p>
 
 
-		<h3>[method:QuickHull setFromObject]( [param:Object3D object] )</h3>
 
+		<h3>[method:ConvexHull setFromObject]( [param:Object3D object] )</h3>
 
 		[page:Object3D object] - [page:Object3D] to compute the convex hull of.<br /><br />
 
 
 		<p>Computes the convex hull of an [page:Object3D] (including its children),
 
 		accounting for the world transforms of both the object and its childrens.</p>
 
 
-		<h3>[method:QuickHull setFromPoints]( [param:Array points] )</h3>
 
+		<h3>[method:ConvexHull setFromPoints]( [param:Array points] )</h3>
 
 		[page:Array points] - Array of [page:Vector3 Vector3s] that the resulting convex hull will contain.<br /><br />
 
 
 		<p>Computes to convex hull for the given array of points.</p>
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/QuickHull.js examples/js/QuickHull.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/ConvexHull.js]
 
 	</body>
 
 </html>

+ 2 - 2
docs/examples/quickhull/Face.html → docs/examples/math/convexhull/Face.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<base href="../../" />
 
+		<base href="../../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
@@ -84,6 +84,6 @@
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/QuickHull.js examples/js/QuickHull.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
 
 	</body>
 
 </html>

+ 2 - 2
docs/examples/quickhull/HalfEdge.html → docs/examples/math/convexhull/HalfEdge.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<base href="../../" />
 
+		<base href="../../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
@@ -74,6 +74,6 @@
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/QuickHull.js examples/js/QuickHull.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
 
 	</body>
 
 </html>

+ 2 - 2
docs/examples/quickhull/VertexList.html → docs/examples/math/convexhull/VertexList.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<base href="../../" />
 
+		<base href="../../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
@@ -86,6 +86,6 @@
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/QuickHull.js examples/js/QuickHull.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
 
 	</body>
 
 </html>

+ 2 - 2
docs/examples/quickhull/VertexNode.html → docs/examples/math/convexhull/VertexNode.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<base href="../../" />
 
+		<base href="../../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
 		<link type="text/css" rel="stylesheet" href="page.css" />
 
@@ -47,6 +47,6 @@
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/QuickHull.js examples/js/QuickHull.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/math/ConvexHull.js examples/js/math/ConvexHull.js]
 
 	</body>
 
 </html>

+ 6 - 6
docs/list.js
View File 

@@ -393,12 +393,12 @@ var list = {
 
 				"LookupTable": "examples/Lut",
 
 			},
 
 
-			"QuickHull": {
 
-				"Face": "examples/quickhull/Face",
 
-				"HalfEdge": "examples/quickhull/HalfEdge",
 
-				"QuickHull": "examples/quickhull/QuickHull",
 
-				"VertexNode": "examples/quickhull/VertexNode",
 
-				"VertexList": "examples/quickhull/VertexList"
 
+			"ConvexHull": {
 
+				"Face": "examples/math/convexhull/Face",
 
+				"HalfEdge": "examples/math/convexhull/HalfEdge",
 
+				"ConvexHull": "examples/math/convexhull/ConvexHull",
 
+				"VertexNode": "examples/math/convexhull/VertexNode",
 
+				"VertexList": "examples/math/convexhull/VertexList"
 
 			},
 
 
 			"Renderers": {

+ 36 - 47
examples/js/geometries/ConvexGeometry.js
View File 

@@ -2,80 +2,69 @@
 
  * @author Mugen87 / https://github.com/Mugen87
 
  */
 
 
-( function () {
 
+// ConvexGeometry
 
 
-	// ConvexGeometry
 
+THREE.ConvexGeometry = function ( points ) {
 
 
-	function ConvexGeometry( points ) {
 
+	THREE.Geometry.call( this );
 
 
-		THREE.Geometry.call( this );
 
+	this.fromBufferGeometry( new THREE.ConvexBufferGeometry( points ) );
 
+	this.mergeVertices();
 
 
-		this.fromBufferGeometry( new ConvexBufferGeometry( points ) );
 
-		this.mergeVertices();
 
+};
 
 
-	}
 
-
 
-	ConvexGeometry.prototype = Object.create( THREE.Geometry.prototype );
 
-	ConvexGeometry.prototype.constructor = ConvexGeometry;
 
-
 
-	// ConvexBufferGeometry
 
-
 
-	function ConvexBufferGeometry( points ) {
 
+THREE.ConvexGeometry.prototype = Object.create( THREE.Geometry.prototype );
 
+THREE.ConvexGeometry.prototype.constructor = THREE.ConvexGeometry;
 
 
-		THREE.BufferGeometry.call( this );
 
+// ConvexBufferGeometry
 
 
-		// buffers
 
+THREE.ConvexBufferGeometry = function ( points ) {
 
 
-		var vertices = [];
 
-		var normals = [];
 
+	THREE.BufferGeometry.call( this );
 
 
-		// execute QuickHull
 
+	// buffers
 
 
-		if ( THREE.QuickHull === undefined ) {
 
+	var vertices = [];
 
+	var normals = [];
 
 
-			console.error( 'THREE.ConvexBufferGeometry: ConvexBufferGeometry relies on THREE.QuickHull' );
 
+	if ( THREE.ConvexHull === undefined ) {
 
 
-		}
 
+		console.error( 'THREE.ConvexBufferGeometry: ConvexBufferGeometry relies on THREE.ConvexHull' );
 
 
-		var quickHull = new THREE.QuickHull().setFromPoints( points );
 
-
 
-		// generate vertices and normals
 
-
 
-		var faces = quickHull.faces;
 
+	}
 
 
-		for ( var i = 0; i < faces.length; i ++ ) {
 
+	var convexHull = new THREE.ConvexHull().setFromPoints( points );
 
 
-			var face = faces[ i ];
 
-			var edge = face.edge;
 
+	// generate vertices and normals
 
 
-			// we move along a doubly-connected edge list to access all face points (see HalfEdge docs)
 
+	var faces = convexHull.faces;
 
 
-			do {
 
+	for ( var i = 0; i < faces.length; i ++ ) {
 
 
-				var point = edge.head().point;
 
+		var face = faces[ i ];
 
+		var edge = face.edge;
 
 
-				vertices.push( point.x, point.y, point.z );
 
-				normals.push( face.normal.x, face.normal.y, face.normal.z );
 
+		// we move along a doubly-connected edge list to access all face points (see HalfEdge docs)
 
 
-				edge = edge.next;
 
+		do {
 
 
-			} while ( edge !== face.edge );
 
+			var point = edge.head().point;
 
 
-		}
 
+			vertices.push( point.x, point.y, point.z );
 
+			normals.push( face.normal.x, face.normal.y, face.normal.z );
 
 
-		// build geometry
 
+			edge = edge.next;
 
 
-		this.addAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
 
-		this.addAttribute( 'normal', new THREE.Float32BufferAttribute( normals, 3 ) );
 
+		} while ( edge !== face.edge );
 
 
 	}
 
 
-	ConvexBufferGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 
-	ConvexBufferGeometry.prototype.constructor = ConvexBufferGeometry;
 
+	// build geometry
 
 
-	// export
 
+	this.addAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
 
+	this.addAttribute( 'normal', new THREE.Float32BufferAttribute( normals, 3 ) );
 
 
-	THREE.ConvexGeometry = ConvexGeometry;
 
-	THREE.ConvexBufferGeometry = ConvexBufferGeometry;
 
+};
 
 
-} )();
 
+THREE.ConvexBufferGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 
+THREE.ConvexBufferGeometry.prototype.constructor = THREE.ConvexBufferGeometry;

+ 6 - 9
examples/js/QuickHull.js → examples/js/math/ConvexHull.js
View File 

@@ -5,14 +5,14 @@
 
  *
 
  */
 
 
-( function () {
 
+THREE.ConvexHull = ( function () {
 
 
 	var Visible = 0;
 
 	var Deleted = 1;
 
 
 	var v1 = new THREE.Vector3();
 
 
-	function QuickHull() {
 
+	function ConvexHull() {
 
 
 		this.tolerance = - 1;
 
 
@@ -36,19 +36,19 @@
 
 
 	}
 
 
-	Object.assign( QuickHull.prototype, {
 
+	Object.assign( ConvexHull.prototype, {
 
 
 		setFromPoints: function ( points ) {
 
 
 			if ( Array.isArray( points ) !== true ) {
 
 
-				console.error( 'THREE.QuickHull: Points parameter is not an array.' );
 
+				console.error( 'THREE.ConvexHull: Points parameter is not an array.' );
 
 
 			}
 
 
 			if ( points.length < 4 ) {
 
 
-				console.error( 'THREE.QuickHull: The algorithm needs at least four points.' );
 
+				console.error( 'THREE.ConvexHull: The algorithm needs at least four points.' );
 
 
 			}
 
 
@@ -1311,9 +1311,6 @@
 
 
 	} );
 
 
-	// export
 
-
 
-	THREE.QuickHull = QuickHull;
 
-
 
+	return ConvexHull;
 
 
 } )();

+ 1 - 1
examples/webgl_geometry_convex.html
View File 

@@ -30,7 +30,7 @@
 
 
 		<script src="../build/three.js"></script>
 
 		<script src="js/controls/OrbitControls.js"></script>
 
-		<script src="js/QuickHull.js"></script>
 
+		<script src="js/math/ConvexHull.js"></script>
 
 		<script src="js/geometries/ConvexGeometry.js"></script>
 
 		<script src="js/WebGL.js"></script>
 
 		<script src="js/libs/stats.min.js"></script>

+ 1 - 1
examples/webgl_physics_convex_break.html
View File 

@@ -38,7 +38,7 @@
 
 	<script src="js/WebGL.js"></script>
 
 	<script src="js/libs/stats.min.js"></script>
 
 	<script src="js/ConvexObjectBreaker.js"></script>
 
-	<script src="js/QuickHull.js"></script>
 
+	<script src="js/math/ConvexHull.js"></script>
 
 	<script src="js/geometries/ConvexGeometry.js"></script>
 
 
 		<script>