refactored parametric argument signature. new THREE.ParametricGeometry( parametricFunction, uSements, ySegements, useQuads );

examples/webgl_geometries2.html

@@ -91,7 +91,7 @@
 				var geo;
 
 				// Klein Bottle
-				geo = new THREE.ParametricGeometry(20, 20, THREE.ParametricGeometries.klein);
+				geo = new THREE.ParametricGeometry(THREE.ParametricGeometries.klein, 20, 20);
 				object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );
 				object.children[ 0 ].doubleSided = true;
 				object.position.set( 0, 0, 0 );
@@ -99,14 +99,14 @@
 				scene.add( object );
 
 				// Mobius Strip
-				geo = new THREE.ParametricGeometry(20, 20, THREE.ParametricGeometries.mobius);
+				geo = new THREE.ParametricGeometry(THREE.ParametricGeometries.mobius, 20, 20);
 				object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );
 				// object.children[ 0 ].doubleSided = true;
 				object.position.set( 10, 0, 0 );
 				object.scale.multiplyScalar(100);
 				scene.add( object );
 
-				// var geo = new THREE.ParametricGeometry(10, 10, THREE.ParametricGeometries.plane(200, 200));
+				// var geo = new THREE.ParametricGeometry(THREE.ParametricGeometries.plane(200, 200), 10, 10);
 				// THREE.UVsDebug( geo );
 				// document.body.appendChild( THREE.UVsDebug( geo ));
 				// object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );

src/extras/geometries/ParametricGeometries.js

@@ -67,7 +67,7 @@ THREE.TubeGeometry2 = function(path, segments, radius, segmentsRadius, closed, d
         return pos2.clone();
     };
 
-    THREE.ParametricGeometry.call(this, segments, segmentsRadius, ParametricTube);
+    THREE.ParametricGeometry.call(this, ParametricTube, segments, segmentsRadius);
 
 };
 
@@ -202,7 +202,7 @@ THREE.SphereGeometry2 = function(size, x, y) {
         return new THREE.Vector3(x, y, z).multiplyScalar(size);
     }
   
-    THREE.ParametricGeometry.call(this, y, x, sphere);
+    THREE.ParametricGeometry.call(this, sphere, y, x);
 
 };
 
@@ -221,7 +221,7 @@ THREE.PlaneGeometry2 = function(width, depth, segmentsWidth, segmentsDepth) {
         return new THREE.Vector3(x, y, z);
     }
   
-    THREE.ParametricGeometry.call(this, segmentsWidth, segmentsDepth, plane);
+    THREE.ParametricGeometry.call(this, plane, segmentsWidth, segmentsDepth);
 
 };
 

src/extras/geometries/ParametricGeometry.js

@@ -4,7 +4,7 @@
  * based on the brilliant article by @prideout http://prideout.net/blog/?p=44
  */
 
-THREE.ParametricGeometry = function ( slices, stacks, func, face4 ) {
+THREE.ParametricGeometry = function ( func, slices, stacks, face4 ) {
 
 	THREE.Geometry.call( this );