Etusivu Tutki Apua
Kirjaudu sisään
javascript
/
three.js
peilaus alkaen https://github.com/tazdij/three.js.git
2
0
Fork 0
Tiedostot Ongelmat 0 Wiki
Selaa lähdekoodia

Merge pull request #8306 from Mugen87/dev

New TorusKnotBufferGeometry
Mr.doob 9 vuotta sitten
vanhempi
7aa6a606a9 585ab615c5
commit
d44187d8e6
13 muutettua tiedostoa jossa 315 lisäystä ja 161 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 57 0
      docs/api/extras/geometries/TorusKnotBufferGeometry.html
  2. 9 8
      docs/api/extras/geometries/TorusKnotGeometry.html
  3. 1 0
      docs/list.js
  4. 43 10
      docs/scenes/js/geometry.js
  5. 3 4
      editor/js/Menubar.Add.js
  6. 12 23
      editor/js/Sidebar.Geometry.TorusKnotGeometry.js
  7. 6 8
      examples/js/ParametricGeometries.js
  8. 3 5
      examples/webgl_geometries2.html
  9. 164 0
      src/extras/geometries/TorusKnotBufferGeometry.js
  10. 6 92
      src/extras/geometries/TorusKnotGeometry.js
  11. 4 4
      src/loaders/ObjectLoader.js
  12. 6 7
      test/unit/extras/geometries/TorusKnotGeometry.tests.js
  13. 1 0
      utils/build/includes/extras.json

+ 57 - 0
docs/api/extras/geometries/TorusKnotBufferGeometry.html
Näytä tiedosto 

@@ -0,0 +1,57 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+	<head>
 
+		<meta charset="utf-8" />

+		<base href="../../../" />
 
+		<script src="list.js"></script>
 
+		<script src="page.js"></script>
 
+		<link type="text/css" rel="stylesheet" href="page.css" />
 
+	</head>
 
+	<body>
 
+		[page:BufferGeometry] &rarr;
 
+
 
+		<h1>[name]</h1>
 
+
 
+		<div class="desc">This is the [page:BufferGeometry] port of [page:TorusKnotGeometry].</div>
 
+
 
+		<iframe src='scenes/geometry-browser.html#TorusKnotBufferGeometry'></iframe>
 
+
 
+
 
+		<h2>Example</h2>
 
+
 
+		<code>var geometry = new THREE.TorusKnotBufferGeometry( 10, 3, 100, 16 );
 
+		var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
 
+		var torusKnot = new THREE.Mesh( geometry, material );
 
+		scene.add( torusKnot );
 
+		</code>
 
+
 
+
 
+		<h2>Constructor</h2>
 
+
 
+
 
+		<h3>[name]([page:Float radius], [page:Float tube], [page:Integer tubularSegments], [page:Integer radialSegments], [page:Integer p], [page:Integer q])</h3>
 
+		<div>
 
+			<ul>
 
+				<li>radius — Default is 100.</li>
 
+				<li>tube — Diameter of the tube. Default is 40.</li>
 
+				<li>tubularSegments — Default is 64.</li>
 
+				<li>radialSegments — Default is 8.</li>
 
+				<li>p — This value determines, how many times the geometry winds around its axis of rotational symmetry. Default is 2.</li>
 
+				<li>q — This value determines, how many times the geometry winds around a circle in the interior of the torus. Default is 3.</li>
 
+			</ul>
 
+		</div>
 
+
 
+
 
+		<h2>Properties</h2>
 
+
 
+
 
+		<div>
 
+		Each of the contructor parameters is accessible as a property of the same name. Any modification of these properties after instantiation does not change the geometry.
 
+		</div>
 
+
 
+
 
+		<h2>Source</h2>
 
+
 
+		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
+	</body>
 
+</html>

+ 9 - 8
docs/api/extras/geometries/TorusKnotGeometry.html
Näytä tiedosto 

@@ -29,15 +29,16 @@
 
 		<h2>Constructor</h2>
 
 		<h2>Constructor</h2>
 
 
 
 
 
-		<h3>[name]([page:Float radius], [page:Float tube], [page:Integer radialSegments], [page:Integer tubularSegments], [page:Integer p], [page:Integer q], [page:Float heightScale])</h3>
 
+		<h3>[name]([page:Float radius], [page:Float tube], [page:Integer tubularSegments], [page:Integer radialSegments], [page:Integer p], [page:Integer q])</h3>
 
 		<div>
 
 		<div>
 
-		radius — Default is 100. <br />
 
-		tube — Default is 40. <br />
 
-		radialSegments — Default is 64. <br />
 
-		tubularSegments — Default is 8. <br />
 
-		p — Default is 2. <br />
 
-		q — Default is 3. <br />
 
-		heightScale — Default is 1.
 
+			<ul>
 
+				<li>radius — Default is 100.</li>
 
+				<li>tube — Diameter of the tube. Default is 40.</li>
 
+				<li>tubularSegments — Default is 64.</li>
 
+				<li>radialSegments — Default is 8.</li>
 
+				<li>p — This value determines, how many times the geometry winds around its axis of rotational symmetry. Default is 2.</li>
 
+				<li>q — This value determines, how many times the geometry winds around a circle in the interior of the torus. Default is 3.</li>
 
+			</ul>
 
 		</div>
 
 		</div>

+ 1 - 0
docs/list.js
Näytä tiedosto 

@@ -215,6 +215,7 @@ var list = {
 
 			[ "TextGeometry", "api/extras/geometries/TextGeometry" ],
 
 			[ "TextGeometry", "api/extras/geometries/TextGeometry" ],
 
 			[ "TorusBufferGeometry", "api/extras/geometries/TorusBufferGeometry" ],
 
 			[ "TorusBufferGeometry", "api/extras/geometries/TorusBufferGeometry" ],
 
 			[ "TorusGeometry", "api/extras/geometries/TorusGeometry" ],
 
 			[ "TorusGeometry", "api/extras/geometries/TorusGeometry" ],
 
+			[ "TorusKnotBufferGeometry", "api/extras/geometries/TorusKnotBufferGeometry" ],
 
 			[ "TorusKnotGeometry", "api/extras/geometries/TorusKnotGeometry" ],
 
 			[ "TorusKnotGeometry", "api/extras/geometries/TorusKnotGeometry" ],
 
 			[ "TubeGeometry", "api/extras/geometries/TubeGeometry" ]
 
 			[ "TubeGeometry", "api/extras/geometries/TubeGeometry" ]
 
 		],
 
 		],

+ 43 - 10
docs/scenes/js/geometry.js
Näytä tiedosto 

@@ -747,38 +747,71 @@ var guis = {
 
 
 
 	},
 
 	},
 
 
 
+	TorusKnotBufferGeometry : function( mesh ) {
 
+
 
+		var data = {
 
+			radius : 10,
 
+			tube : 3,
 
+			tubularSegments : 64,
 
+			radialSegments : 8,
 
+			p : 2,
 
+			q : 3
 
+		};
 
+
 
+		function generateGeometry() {
 
+
 
+			updateGroupGeometry( mesh,
 
+				new THREE.TorusKnotBufferGeometry(
 
+					data.radius, data.tube, data.tubularSegments, data.radialSegments,
 
+					data.p, data.q
 
+				)
 
+			);
 
+
 
+		}
 
+
 
+		var folder = gui.addFolder( 'THREE.TorusKnotBufferGeometry' );
 
+
 
+		folder.add( data, 'radius', 1, 20 ).onChange( generateGeometry );
 
+		folder.add( data, 'tube', 0.1, 10 ).onChange( generateGeometry );
 
+		folder.add( data, 'tubularSegments', 3, 300 ).step( 1 ).onChange( generateGeometry );
 
+		folder.add( data, 'radialSegments', 3, 20 ).step( 1 ).onChange( generateGeometry );
 
+		folder.add( data, 'p', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
+		folder.add( data, 'q', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
+
 
+		generateGeometry();
 
+
 
+	},
 
+
 
 	TorusKnotGeometry : function( mesh ) {
 
 	TorusKnotGeometry : function( mesh ) {
 
 
 
 		var data = {
 
 		var data = {
 
 			radius : 10,
 
 			radius : 10,
 
 			tube : 3,
 
 			tube : 3,
 
-			radialSegments : 64,
 
-			tubularSegments : 8,
 
+			tubularSegments : 64,
 
+			radialSegments : 8,
 
 			p : 2,
 
 			p : 2,
 
-			q : 3,
 
-			heightScale : 1
 
+			q : 3
 
 		};
 
 		};
 
 
 
 		function generateGeometry() {
 
 		function generateGeometry() {
 
 
 
 			updateGroupGeometry( mesh,
 
 			updateGroupGeometry( mesh,
 
 				new THREE.TorusKnotGeometry(
 
 				new THREE.TorusKnotGeometry(
 
-					data.radius, data.tube, data.radialSegments, data.tubularSegments,
 
-					data.p, data.q, data.heightScale
 
+					data.radius, data.tube, data.tubularSegments, data.radialSegments,
 
+					data.p, data.q
 
 				)
 
 				)
 
 			);
 
 			);
 
 
 
 		}
 
 		}
 
 
 
-		var folder = gui.addFolder( 'THREE.TorusGeometry' );
 
+		var folder = gui.addFolder( 'THREE.TorusKnotGeometry' );
 
 
 
 		folder.add( data, 'radius', 1, 20 ).onChange( generateGeometry );
 
 		folder.add( data, 'radius', 1, 20 ).onChange( generateGeometry );
 
 		folder.add( data, 'tube', 0.1, 10 ).onChange( generateGeometry );
 
 		folder.add( data, 'tube', 0.1, 10 ).onChange( generateGeometry );
 
-		folder.add( data, 'radialSegments', 3, 300 ).step( 1 ).onChange( generateGeometry );
 
-		folder.add( data, 'tubularSegments', 3, 20 ).step( 1 ).onChange( generateGeometry );
 
+		folder.add( data, 'tubularSegments', 3, 300 ).step( 1 ).onChange( generateGeometry );
 
+		folder.add( data, 'radialSegments', 3, 20 ).step( 1 ).onChange( generateGeometry );
 
 		folder.add( data, 'p', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
 		folder.add( data, 'p', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
 		folder.add( data, 'q', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
 		folder.add( data, 'q', 1, 20 ).step( 1 ).onChange( generateGeometry );
 
-		folder.add( data, 'heightScale', 1, 20 ).onChange( generateGeometry );
 
 
 
 		generateGeometry();
 
 		generateGeometry();

+ 3 - 4
editor/js/Menubar.Add.js
Näytä tiedosto 

@@ -198,13 +198,12 @@ Menubar.Add = function ( editor ) {
 
 
 
 		var radius = 2;
 
 		var radius = 2;
 
 		var tube = 0.8;
 
 		var tube = 0.8;
 
-		var radialSegments = 64;
 
-		var tubularSegments = 12;
 
+		var tubularSegments = 64;
 
+		var radialSegments = 12;
 
 		var p = 2;
 
 		var p = 2;
 
 		var q = 3;
 
 		var q = 3;
 
-		var heightScale = 1;
 
 
 
-		var geometry = new THREE.TorusKnotGeometry( radius, tube, radialSegments, tubularSegments, p, q, heightScale );
 
+		var geometry = new THREE.TorusKnotGeometry( radius, tube, tubularSegments, radialSegments, p, q );
 
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 
 		mesh.name = 'TorusKnot ' + ( ++ meshCount );
 
 		mesh.name = 'TorusKnot ' + ( ++ meshCount );

+ 12 - 23
editor/js/Sidebar.Geometry.TorusKnotGeometry.js
Näytä tiedosto 

@@ -30,16 +30,6 @@ Sidebar.Geometry.TorusKnotGeometry = function ( editor, object ) {
 
 
 
 	container.add( tubeRow );
 
 	container.add( tubeRow );
 
 
 
-	// radialSegments
 
-
 
-	var radialSegmentsRow = new UI.Row();
 
-	var radialSegments = new UI.Integer( parameters.radialSegments ).setRange( 1, Infinity ).onChange( update );
 
-
 
-	radialSegmentsRow.add( new UI.Text( 'Radial segments' ).setWidth( '90px' ) );
 
-	radialSegmentsRow.add( radialSegments );
 
-
 
-	container.add( radialSegmentsRow );
 
-
 
 	// tubularSegments
 
 	// tubularSegments
 
 
 
 	var tubularSegmentsRow = new UI.Row();
 
 	var tubularSegmentsRow = new UI.Row();
 
@@ -50,6 +40,16 @@ Sidebar.Geometry.TorusKnotGeometry = function ( editor, object ) {
 
 
 
 	container.add( tubularSegmentsRow );
 
 	container.add( tubularSegmentsRow );
 
 
 
+	// radialSegments
 
+
 
+	var radialSegmentsRow = new UI.Row();
 
+	var radialSegments = new UI.Integer( parameters.radialSegments ).setRange( 1, Infinity ).onChange( update );
 
+
 
+	radialSegmentsRow.add( new UI.Text( 'Radial segments' ).setWidth( '90px' ) );
 
+	radialSegmentsRow.add( radialSegments );
 
+
 
+	container.add( radialSegmentsRow );
 
+
 
 	// p
 
 	// p
 
 
 
 	var pRow = new UI.Row();
 
 	var pRow = new UI.Row();
 
@@ -70,16 +70,6 @@ Sidebar.Geometry.TorusKnotGeometry = function ( editor, object ) {
 
 
 
 	container.add( qRow );
 
 	container.add( qRow );
 
 
 
-	// heightScale
 
-
 
-	var heightScaleRow = new UI.Row();
 
-	var heightScale = new UI.Number( parameters.heightScale ).onChange( update );
 
-
 
-	pRow.add( new UI.Text( 'Height scale' ).setWidth( '90px' ) );
 
-	pRow.add( heightScale );
 
-
 
-	container.add( heightScaleRow );
 
-
 
 
 
 	//
 
 	//
 
 
 
@@ -88,11 +78,10 @@ Sidebar.Geometry.TorusKnotGeometry = function ( editor, object ) {
 
 		editor.execute( new SetGeometryCommand( object, new THREE.TorusKnotGeometry(
 
 		editor.execute( new SetGeometryCommand( object, new THREE.TorusKnotGeometry(
 
 			radius.getValue(),
 
 			radius.getValue(),
 
 			tube.getValue(),
 
 			tube.getValue(),
 
-			radialSegments.getValue(),
 
 			tubularSegments.getValue(),
 
 			tubularSegments.getValue(),
 
+			radialSegments.getValue(),
 
 			p.getValue(),
 
 			p.getValue(),
 
-			q.getValue(),
 
-			heightScale.getValue()
 
+			q.getValue()
 
 		) ) );
 
 		) ) );
 
 
 
 	}
 
 	}

+ 6 - 8
examples/js/ParametricGeometries.js
Näytä tiedosto 

@@ -170,18 +170,16 @@ THREE.ParametricGeometries.TubeGeometry.prototype.constructor = THREE.Parametric
 
   * Parametric Replacement for TorusKnotGeometry
 
   * Parametric Replacement for TorusKnotGeometry
 
   *
 
   *
 
   *********************************************/
 
   *********************************************/
 
-THREE.ParametricGeometries.TorusKnotGeometry = function ( radius, tube, segmentsR, segmentsT, p, q, heightScale ) {
 
+THREE.ParametricGeometries.TorusKnotGeometry = function ( radius, tube, segmentsT, segmentsR, p, q ) {
 
 
 
 	var scope = this;
 
 	var scope = this;
 
 
 
 	this.radius = radius || 200;
 
 	this.radius = radius || 200;
 
 	this.tube = tube || 40;
 
 	this.tube = tube || 40;
 
-	this.segmentsR = segmentsR || 64;
 
-	this.segmentsT = segmentsT || 8;
 
+	this.segmentsT = segmentsT || 64;
 
+	this.segmentsR = segmentsR || 8;
 
 	this.p = p || 2;
 
 	this.p = p || 2;
 
 	this.q = q || 3;
 
 	this.q = q || 3;
 
-	this.heightScale = heightScale || 1;
 
-
 
 
 
 	var TorusKnotCurve = THREE.Curve.create(
 
 	var TorusKnotCurve = THREE.Curve.create(
 
 
 
@@ -198,13 +196,13 @@ THREE.ParametricGeometries.TorusKnotGeometry = function ( radius, tube, segments
 
 				ty = ( 1 + r * Math.cos( q * t ) ) * Math.sin( p * t ),
 
 				ty = ( 1 + r * Math.cos( q * t ) ) * Math.sin( p * t ),
 
 				tz = r * Math.sin( q * t );
 
 				tz = r * Math.sin( q * t );
 
 
 
-			return new THREE.Vector3( tx, ty * heightScale, tz ).multiplyScalar( radius );
 
+			return new THREE.Vector3( tx, ty, tz ).multiplyScalar( radius );
 
 
 
 		}
 
 		}
 
 
 
 	);
 
 	);
 
-	var segments = segmentsR;
 
-	var radiusSegments = segmentsT;
 
+	var segments = segmentsT;
 
+	var radiusSegments = segmentsR;
 
 	var extrudePath = new TorusKnotCurve();
 
 	var extrudePath = new TorusKnotCurve();
 
 
 
 	THREE.ParametricGeometries.TubeGeometry.call( this, extrudePath, segments, tube, radiusSegments, true, false );
 
 	THREE.ParametricGeometries.TubeGeometry.call( this, extrudePath, segments, tube, radiusSegments, true, false );

+ 3 - 5
examples/webgl_geometries2.html
Näytä tiedosto 

@@ -63,19 +63,17 @@
 
 					new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true, transparent: true, opacity: 0.1, side: THREE.DoubleSide } )
 
 					new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true, transparent: true, opacity: 0.1, side: THREE.DoubleSide } )
 
 				];
 
 				];
 
 
 
-
 
-				var heightScale = 1;
 
 				var p = 2;
 
 				var p = 2;
 
 				var q = 3;
 
 				var q = 3;
 
-				var radius = 150, tube = 10, segmentsR = 50, segmentsT = 20;
 
+				var radius = 150, tube = 10, segmentsT = 50, segmentsR = 20;
 
 
 
 				var GrannyKnot =  new THREE.Curves.GrannyKnot();
 
 				var GrannyKnot =  new THREE.Curves.GrannyKnot();
 
 
 
-				var torus2 = new THREE.ParametricGeometries.TorusKnotGeometry( radius, tube, segmentsR, segmentsT, p , q, heightScale );
 
+				var torus2 = new THREE.ParametricGeometries.TorusKnotGeometry( radius, tube, segmentsT, segmentsR, p , q );
 
 				var sphere2 = new THREE.ParametricGeometries.SphereGeometry( 75, 20, 10 );
 
 				var sphere2 = new THREE.ParametricGeometries.SphereGeometry( 75, 20, 10 );
 
 				var tube2 = new THREE.ParametricGeometries.TubeGeometry( GrannyKnot, 150, 2, 8, true, false );
 
 				var tube2 = new THREE.ParametricGeometries.TubeGeometry( GrannyKnot, 150, 2, 8, true, false );
 
 
 
-				// var torus = new THREE.TorusKnotGeometry( radius, tube, segmentsR, segmentsT, p , q, heightScale );
 
+				// var torus = new THREE.TorusKnotGeometry( radius, tube, segmentsR, segmentsT, p , q );
 
 				// var sphere = new THREE.SphereGeometry( 75, 20, 10 );
 
 				// var sphere = new THREE.SphereGeometry( 75, 20, 10 );
 
 				// var tube = new THREE.TubeGeometry( GrannyKnot, 150, 2, 8, true, false );
 
 				// var tube = new THREE.TubeGeometry( GrannyKnot, 150, 2, 8, true, false );

+ 164 - 0
src/extras/geometries/TorusKnotBufferGeometry.js
Näytä tiedosto 

@@ -0,0 +1,164 @@
 
+/**
 
+ * @author Mugen87 / https://github.com/Mugen87
 
+ *
 
+ * see: http://www.blackpawn.com/texts/pqtorus/
 
+ */
 
+THREE.TorusKnotBufferGeometry = function ( radius, tube, tubularSegments, radialSegments, p, q ) {
 
+
 
+	THREE.BufferGeometry.call( this );
 
+
 
+	this.type = 'TorusKnotBufferGeometry';
 
+
 
+	this.parameters = {
 
+		radius: radius,
 
+		tube: tube,
 
+		tubularSegments: tubularSegments,
 
+		radialSegments: radialSegments,
 
+		p: p,
 
+		q: q
 
+	};
 
+
 
+	radius = radius || 100;
 
+	tube = tube || 40;
 
+	tubularSegments = Math.floor( tubularSegments ) || 64;
 
+	radialSegments = Math.floor( radialSegments ) || 8;
 
+	p = p || 2;
 
+	q = q || 3;
 
+
 
+	// used to calculate buffer length
 
+	var vertexCount = ( ( radialSegments + 1 ) * ( tubularSegments + 1 ) );
 
+	var indexCount = radialSegments * tubularSegments * 2 * 3;
 
+
 
+	// buffers
 
+	var indices = new THREE.BufferAttribute( new ( indexCount > 65535 ? Uint32Array : Uint16Array )( indexCount ) , 1 );
 
+	var vertices = new THREE.BufferAttribute( new Float32Array( vertexCount * 3 ), 3 );
 
+	var normals = new THREE.BufferAttribute( new Float32Array( vertexCount * 3 ), 3 );
 
+	var uvs = new THREE.BufferAttribute( new Float32Array( vertexCount * 2 ), 2 );
 
+
 
+	// helper variables
 
+	var i, j, index = 0, indexOffset = 0;
 
+
 
+	var vertex = new THREE.Vector3();
 
+	var normal = new THREE.Vector3();
 
+	var uv = new THREE.Vector2();
 
+
 
+	var P1 = new THREE.Vector3();
 
+	var P2 = new THREE.Vector3();
 
+
 
+	var B = new THREE.Vector3();
 
+	var T = new THREE.Vector3();
 
+	var N = new THREE.Vector3();
 
+
 
+	// generate vertices, normals and uvs
 
+
 
+	for ( i = 0; i <= tubularSegments; ++ i ) {
 
+
 
+		// the radian "u" is used to calculate the position on the torus curve of the current tubular segement
 
+
 
+		var u = i / tubularSegments * p * Math.PI * 2;
 
+
 
+		// now we calculate two points. P1 is our current position on the curve, P2 is a little farther ahead.
 
+		// these points are used to create a special "coordinate space", which is necessary to calculate the correct vertex positions
 
+
 
+		calculatePositionOnCurve( u, p, q, radius, P1 );
 
+		calculatePositionOnCurve( u + 0.01, p, q, radius, P2 );
 
+
 
+		// calculate orthonormal basis
 
+
 
+		T.subVectors( P2, P1 );
 
+		N.addVectors( P2, P1 );
 
+		B.crossVectors( T, N );
 
+		N.crossVectors( B, T );
 
+
 
+		// normalize B, N. T can be ignored, we don't use it
 
+
 
+		B.normalize();
 
+		N.normalize();
 
+
 
+		for ( j = 0; j <= radialSegments; ++ j ) {
 
+
 
+			// now calculate the vertices. they are nothing more than an extrusion of the torus curve.
 
+			// because we extrude a shape in the xy-plane, there is no need to calculate a z-value.
 
+
 
+			var v = j / radialSegments * Math.PI * 2;
 
+			var cx = - tube * Math.cos( v );
 
+			var cy = tube * Math.sin( v );
 
+
 
+			// now calculate the final vertex position.
 
+			// first we orient the extrusion with our basis vectos, then we add it to the current position on the curve
 
+
 
+			vertex.x = P1.x + ( cx * N.x + cy * B.x );
 
+			vertex.y = P1.y + ( cx * N.y + cy * B.y );
 
+			vertex.z = P1.z + ( cx * N.z + cy * B.z );
 
+
 
+			// vertex
 
+			vertices.setXYZ( index, vertex.x, vertex.y, vertex.z );
 
+
 
+			// normal (P1 is always the center/origin of the extrusion, thus we can use it to calculate the normal)
 
+			normal.subVectors( vertex, P1 ).normalize();
 
+			normals.setXYZ( index, normal.x, normal.y, normal.z );
 
+
 
+			// uv
 
+			uv.x = i / tubularSegments;
 
+			uv.y = j / radialSegments;
 
+			uvs.setXY( index, uv.x, uv.y );
 
+
 
+			// increase index
 
+			index ++;
 
+
 
+		}
 
+
 
+	}
 
+
 
+	// generate indices
 
+
 
+	for ( j = 1; j <= tubularSegments; j ++ ) {
 
+
 
+		for ( i = 1; i <= radialSegments; i ++ ) {
 
+
 
+			// indices
 
+			var a = ( radialSegments + 1 ) * ( j - 1 ) + ( i - 1 );
 
+			var b = ( radialSegments + 1 ) * j + ( i - 1 );
 
+			var c = ( radialSegments + 1 ) * j + i;
 
+			var d = ( radialSegments + 1 ) * ( j - 1 ) + i;
 
+
 
+			// face one
 
+			indices.setX( indexOffset, a ); indexOffset++;
 
+			indices.setX( indexOffset, b ); indexOffset++;
 
+			indices.setX( indexOffset, d ); indexOffset++;
 
+
 
+			// face two
 
+			indices.setX( indexOffset, b ); indexOffset++;
 
+			indices.setX( indexOffset, c ); indexOffset++;
 
+			indices.setX( indexOffset, d ); indexOffset++;
 
+
 
+		}
 
+
 
+	}
 
+
 
+	// build geometry
 
+
 
+	this.setIndex( indices );
 
+	this.addAttribute( 'position', vertices );
 
+	this.addAttribute( 'normal', normals );
 
+	this.addAttribute( 'uv', uvs );
 
+
 
+	// this function calculates the current position on the torus curve
 
+
 
+	function calculatePositionOnCurve( u, p, q, radius, position ) {
 
+
 
+		var cu = Math.cos( u );
 
+		var su = Math.sin( u );
 
+		var quOverP = q / p * u;
 
+		var cs = Math.cos( quOverP );
 
+
 
+		position.x = radius * ( 2 + cs ) * 0.5 * cu;
 
+		position.y = radius * ( 2 + cs ) * su * 0.5;
 
+		position.z = radius * Math.sin( quOverP ) * 0.5;
 
+
 
+	}
 
+
 
+};
 
+
 
+THREE.TorusKnotBufferGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 
+THREE.TorusKnotBufferGeometry.prototype.constructor = THREE.TorusKnotBufferGeometry;

+ 6 - 92
src/extras/geometries/TorusKnotGeometry.js
Näytä tiedosto 

@@ -1,9 +1,8 @@
 
 /**
 
 /**
 
  * @author oosmoxiecode
 
  * @author oosmoxiecode
 
- * based on http://code.google.com/p/away3d/source/browse/trunk/fp10/Away3D/src/away3d/primitives/TorusKnot.as?spec=svn2473&r=2473
 
  */
 
  */
 
 
 
-THREE.TorusKnotGeometry = function ( radius, tube, radialSegments, tubularSegments, p, q, heightScale ) {
 
+THREE.TorusKnotGeometry = function ( radius, tube, tubularSegments, radialSegments, p, q, heightScale ) {
 
 
 
 	THREE.Geometry.call( this );
 
 	THREE.Geometry.call( this );
 
 
 
@@ -12,101 +11,16 @@ THREE.TorusKnotGeometry = function ( radius, tube, radialSegments, tubularSegmen
 
 	this.parameters = {
 
 	this.parameters = {
 
 		radius: radius,
 
 		radius: radius,
 
 		tube: tube,
 
 		tube: tube,
 
-		radialSegments: radialSegments,
 
 		tubularSegments: tubularSegments,
 
 		tubularSegments: tubularSegments,
 
+		radialSegments: radialSegments,
 
 		p: p,
 
 		p: p,
 
-		q: q,
 
-		heightScale: heightScale
 
+		q: q
 
 	};
 
 	};
 
 
 
-	radius = radius || 100;
 
-	tube = tube || 40;
 
-	radialSegments = radialSegments || 64;
 
-	tubularSegments = tubularSegments || 8;
 
-	p = p || 2;
 
-	q = q || 3;
 
-	heightScale = heightScale || 1;
 
-
 
-	var grid = new Array( radialSegments );
 
-	var tang = new THREE.Vector3();
 
-	var n = new THREE.Vector3();
 
-	var bitan = new THREE.Vector3();
 
-
 
-	for ( var i = 0; i < radialSegments; ++ i ) {
 
-
 
-		grid[ i ] = new Array( tubularSegments );
 
-		var u = i / radialSegments * 2 * p * Math.PI;
 
-		var p1 = getPos( u, q, p, radius, heightScale );
 
-		var p2 = getPos( u + 0.01, q, p, radius, heightScale );
 
-		tang.subVectors( p2, p1 );
 
-		n.addVectors( p2, p1 );
 
-
 
-		bitan.crossVectors( tang, n );
 
-		n.crossVectors( bitan, tang );
 
-		bitan.normalize();
 
-		n.normalize();
 
-
 
-		for ( var j = 0; j < tubularSegments; ++ j ) {
 
-
 
-			var v = j / tubularSegments * 2 * Math.PI;
 
-			var cx = - tube * Math.cos( v ); // TODO: Hack: Negating it so it faces outside.
 
-			var cy = tube * Math.sin( v );
 
-
 
-			var pos = new THREE.Vector3();
 
-			pos.x = p1.x + cx * n.x + cy * bitan.x;
 
-			pos.y = p1.y + cx * n.y + cy * bitan.y;
 
-			pos.z = p1.z + cx * n.z + cy * bitan.z;
 
-
 
-			grid[ i ][ j ] = this.vertices.push( pos ) - 1;
 
-
 
-		}
 
-
 
-	}
 
-
 
-	for ( var i = 0; i < radialSegments; ++ i ) {
 
-
 
-		for ( var j = 0; j < tubularSegments; ++ j ) {
 
-
 
-			var ip = ( i + 1 ) % radialSegments;
 
-			var jp = ( j + 1 ) % tubularSegments;
 
-
 
-			var a = grid[ i ][ j ];
 
-			var b = grid[ ip ][ j ];
 
-			var c = grid[ ip ][ jp ];
 
-			var d = grid[ i ][ jp ];
 
-
 
-			var uva = new THREE.Vector2( i / radialSegments, j / tubularSegments );
 
-			var uvb = new THREE.Vector2( ( i + 1 ) / radialSegments, j / tubularSegments );
 
-			var uvc = new THREE.Vector2( ( i + 1 ) / radialSegments, ( j + 1 ) / tubularSegments );
 
-			var uvd = new THREE.Vector2( i / radialSegments, ( j + 1 ) / tubularSegments );
 
-
 
-			this.faces.push( new THREE.Face3( a, b, d ) );
 
-			this.faceVertexUvs[ 0 ].push( [ uva, uvb, uvd ] );
 
-
 
-			this.faces.push( new THREE.Face3( b, c, d ) );
 
-			this.faceVertexUvs[ 0 ].push( [ uvb.clone(), uvc, uvd.clone() ] );
 
-
 
-		}
 
-
 
-	}
 
-
 
-	this.computeFaceNormals();
 
-	this.computeVertexNormals();
 
-
 
-	function getPos( u, in_q, in_p, radius, heightScale ) {
 
-
 
-		var cu = Math.cos( u );
 
-		var su = Math.sin( u );
 
-		var quOverP = in_q / in_p * u;
 
-		var cs = Math.cos( quOverP );
 
-
 
-		var tx = radius * ( 2 + cs ) * 0.5 * cu;
 
-		var ty = radius * ( 2 + cs ) * su * 0.5;
 
-		var tz = heightScale * radius * Math.sin( quOverP ) * 0.5;
 
-
 
-		return new THREE.Vector3( tx, ty, tz );
 
+	if( heightScale !== undefined ) console.warn( 'THREE.TorusKnotGeometry: heightScale has been deprecated. Use .scale( x, y, z ) instead.' );
 
 
 
-	}
 
+	this.fromBufferGeometry( new THREE.TorusKnotBufferGeometry( radius, tube, tubularSegments, radialSegments, p, q ) );
 
+	this.mergeVertices();
 
 
 
 };
 
 };

+ 4 - 4
src/loaders/ObjectLoader.js
Näytä tiedosto 

@@ -225,15 +225,15 @@ THREE.ObjectLoader.prototype = {
 
 						break;
 
 						break;
 
 
 
 					case 'TorusKnotGeometry':
 
 					case 'TorusKnotGeometry':
 
+					case 'TorusKnotBufferGeometry':
 
 
 
-						geometry = new THREE.TorusKnotGeometry(
 
+						geometry = new THREE[ data.type ](
 
 							data.radius,
 
 							data.radius,
 
 							data.tube,
 
 							data.tube,
 
-							data.radialSegments,
 
 							data.tubularSegments,
 
 							data.tubularSegments,
 
+							data.radialSegments,
 
 							data.p,
 
 							data.p,
 
-							data.q,
 
-							data.heightScale
 
+							data.q
 
 						);
 
 						);
 
 
 
 						break;
 
 						break;

+ 6 - 7
test/unit/extras/geometries/TorusKnotGeometry.tests.js
Näytä tiedosto 

@@ -5,11 +5,10 @@
 
 	var parameters = {
 
 	var parameters = {
 
 		radius: 10,
 
 		radius: 10,
 
 		tube: 20,
 
 		tube: 20,
 
-		radialSegments: 30,
 
-		tubularSegments: 10,
 
+		tubularSegments: 30,
 
+		radialSegments: 10,
 
 		p: 3,
 
 		p: 3,
 
-		q: 2,
 
-		heightScale: 2.0
 
+		q: 2
 
 	};
 
 	};
 
 
 
 	var geometries;
 
 	var geometries;
 
@@ -23,9 +22,9 @@
 
 				new THREE.TorusKnotGeometry(),
 
 				new THREE.TorusKnotGeometry(),
 
 				new THREE.TorusKnotGeometry( parameters.radius ),
 
 				new THREE.TorusKnotGeometry( parameters.radius ),
 
 				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube ),
 
 				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube ),
 
-				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.radialSegments ),
 
-				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments ),
 
-				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments, parameters.p, parameters.q, parameters.heightScale ),
 
+				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments ),
 
+				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments ),
 
+				new THREE.TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments, parameters.p, parameters.q ),
 
 
 
 			];
 
 			];

+ 1 - 0
utils/build/includes/extras.json
Näytä tiedosto 

@@ -38,6 +38,7 @@
 
 	"src/extras/geometries/TextGeometry.js",
 
 	"src/extras/geometries/TextGeometry.js",
 
 	"src/extras/geometries/TorusBufferGeometry.js",
 
 	"src/extras/geometries/TorusBufferGeometry.js",
 
 	"src/extras/geometries/TorusGeometry.js",
 
 	"src/extras/geometries/TorusGeometry.js",
 
+	"src/extras/geometries/TorusKnotBufferGeometry.js",
 
 	"src/extras/geometries/TorusKnotGeometry.js",
 
 	"src/extras/geometries/TorusKnotGeometry.js",
 
 	"src/extras/geometries/TubeGeometry.js",
 
 	"src/extras/geometries/TubeGeometry.js",
 
 	"src/extras/geometries/PolyhedronGeometry.js",
 
 	"src/extras/geometries/PolyhedronGeometry.js",