Browse Source

Updated examples that used Icosahedron.
Some broken stuff... :/

Mr.doob 13 years ago
parent
commit
75242fec8f

+ 1 - 2
examples/canvas_sandbox.html

@@ -91,8 +91,7 @@
 
 				objects = [];
 
-				geometry = new THREE.IcosahedronGeometry( 1 );
-				geometry.applyMatrix( new THREE.Matrix4().setScale( 100, 100, 100 ) );
+				geometry = new THREE.IcosahedronGeometry( 100, 1 );
 
 				material = new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ), overdraw: true } );
 

+ 3 - 6
examples/webgl_geometry_colors.html

@@ -95,9 +95,9 @@
 
 				var color, f, f2, f3, p, n, vertexIndex,
 
-					geometry  = new THREE.IcosahedronGeometry( 1 ),
-					geometry2 = new THREE.IcosahedronGeometry( 1 ),
-					geometry3 = new THREE.IcosahedronGeometry( 1 );
+					geometry  = new THREE.IcosahedronGeometry( 200, 1 ),
+					geometry2 = new THREE.IcosahedronGeometry( 200, 1 ),
+					geometry3 = new THREE.IcosahedronGeometry( 200, 1 );
 
 				for ( var i = 0; i < geometry.faces.length; i ++ ) {
 
@@ -143,19 +143,16 @@
 				group1 = THREE.SceneUtils.createMultiMaterialObject( geometry, materials );
 				group1.position.x = -400;
 				group1.rotation.x = -1.87;
-				group1.scale.set( 200, 200, 200 );
 				scene.add( group1 );
 
 				group2 = THREE.SceneUtils.createMultiMaterialObject( geometry2, materials );
 				group2.position.x = 400;
 				group2.rotation.x = 0;
-				group2.scale = group1.scale;
 				scene.add( group2 );
 
 				group3 = THREE.SceneUtils.createMultiMaterialObject( geometry3, materials );
 				group3.position.x = 0;
 				group3.rotation.x = 0;
-				group3.scale = group1.scale;
 				scene.add( group3 );
 
 				renderer = new THREE.WebGLRenderer( { antialias: true } );

+ 1 - 1
examples/webgl_geometry_subdivison.html

@@ -80,7 +80,7 @@
 				{ type: 'TorusGeometry', args: [ 100, 60, 4, 8, Math.PI*2 ] },
 				{ type: 'TorusKnotGeometry', args: [  ], scale:0.25, meshScale:4 },
 				{ type: 'SphereGeometry', args: [ 100, 3, 3 ], meshScale:2 },
-				{ type: 'IcosahedronGeometry', args: [ 1 ], scale: 100, meshScale:2 },
+				{ type: 'IcosahedronGeometry', args: [ 100, 1 ], meshScale:2 },
 				{ type: 'CylinderGeometry', args: [ 25, 75, 200, 8, 3 ]} ,
 				{ type: 'OctahedronGeometry', args: [200, 0], meshScale:2 },
 				{ type: 'LatheGeometry', args: [ [

+ 1 - 4
examples/webgl_multiple_canvases_circle.html

@@ -239,7 +239,7 @@
 
 					var color, f1, p, n, vertexIndex,
 
-					geometry1 = new THREE.IcosahedronGeometry( 1 );
+					geometry1 = new THREE.IcosahedronGeometry( 200, 1 );
 
 					for ( var i = 0; i < geometry1.faces.length; i ++ ) {
 
@@ -272,9 +272,6 @@
 
 					];
 
-					var scaleMatrix = new THREE.Matrix4().setScale( 200, 200, 200 );
-					geometry1.applyMatrix( scaleMatrix );
-
 					for ( var i = 0; i < noof_balls; i ++ ) { // create balls
 
 						var mesh = THREE.SceneUtils.createMultiMaterialObject( geometry1, materials );

+ 3 - 8
examples/webgl_multiple_canvases_complex.html

@@ -155,9 +155,9 @@
 
 					var color, f1, f2, f3, p, n, vertexIndex,
 
-						geometry1 = new THREE.IcosahedronGeometry( 1 ),
-						geometry2 = new THREE.IcosahedronGeometry( 1 ),
-						geometry3 = new THREE.IcosahedronGeometry( 1 );
+						geometry1 = new THREE.IcosahedronGeometry( 200, 1 ),
+						geometry2 = new THREE.IcosahedronGeometry( 200, 1 ),
+						geometry3 = new THREE.IcosahedronGeometry( 200, 1 );
 
 					for ( var i = 0; i < geometry1.faces.length; i ++ ) {
 
@@ -200,11 +200,6 @@
 
 					];
 
-					var scaleMatrix = new THREE.Matrix4().setScale( 200, 200, 200 );
-					geometry1.applyMatrix( scaleMatrix );
-					geometry2.applyMatrix( scaleMatrix );
-					geometry3.applyMatrix( scaleMatrix );
-
 					group1 = THREE.SceneUtils.createMultiMaterialObject( geometry1, materials );
 					group1.position.x = -400;
 					group1.rotation.x = -1.87;

+ 3 - 8
examples/webgl_multiple_canvases_grid.html

@@ -171,9 +171,9 @@
 
 					var color, f1, f2, f3, p, n, vertexIndex,
 
-						geometry1 = new THREE.IcosahedronGeometry( 1 ),
-						geometry2 = new THREE.IcosahedronGeometry( 1 ),
-						geometry3 = new THREE.IcosahedronGeometry( 1 );
+						geometry1 = new THREE.IcosahedronGeometry( 200, 1 ),
+						geometry2 = new THREE.IcosahedronGeometry( 200, 1 ),
+						geometry3 = new THREE.IcosahedronGeometry( 200, 1 );
 
 					for ( var i = 0; i < geometry1.faces.length; i ++ ) {
 
@@ -216,11 +216,6 @@
 
 					];
 
-					var scaleMatrix = new THREE.Matrix4().setScale( 200, 200, 200 );
-					geometry1.applyMatrix( scaleMatrix );
-					geometry2.applyMatrix( scaleMatrix );
-					geometry3.applyMatrix( scaleMatrix );
-
 					group1 = THREE.SceneUtils.createMultiMaterialObject( geometry1, materials );
 					group1.position.x = -400;
 					group1.rotation.x = -1.87;

+ 0 - 2
examples/webgl_postprocessing_dof.html

@@ -104,8 +104,6 @@
 
 				if( singleMaterial ) zmaterial = [ cubeMaterial ];
 
-				//var geo = new THREE.CubeGeometry( 1, 1, 1 );
-				//var geo = new THREE.IcosahedronGeometry( 2 );
 				var geo = new THREE.SphereGeometry( 1, 20, 10 );
 
 				var start = new Date().getTime();