Browse Source

Reverted examples that were using DirectGeometry.

Mr.doob 10 years ago
parent
commit
b8d2d8433a

+ 6 - 2
examples/webgl_animation_cloth.html

@@ -187,11 +187,12 @@
 				clothTexture.wrapS = clothTexture.wrapT = THREE.RepeatWrapping;
 				clothTexture.anisotropy = 16;
 
-				var clothMaterial = new THREE.MeshPhongMaterial( { alphaTest: 0.5, color: 0xffffff, specular: 0x030303, emissive: 0x111111, shininess: 10, map: clothTexture, side: THREE.DoubleSide } );
+				var clothMaterial = new THREE.MeshPhongMaterial( { alphaTest: 0.5, color: 0xffffff, specular: 0x030303, emissive: 0x111111, shiness: 10, map: clothTexture, side: THREE.DoubleSide } );
 
 				// cloth geometry
 				clothGeometry = new THREE.ParametricGeometry( clothFunction, cloth.w, cloth.h );
-				clothGeometry = new THREE.DirectGeometry().fromGeometry( clothGeometry );
+				clothGeometry.dynamic = true;
+				clothGeometry.computeFaceNormals();
 
 				var uniforms = { texture:  { type: "t", value: clothTexture } };
 				var vertexShader = document.getElementById( 'vertexShaderDepth' ).textContent;
@@ -348,6 +349,9 @@
 
 				}
 
+				clothGeometry.computeFaceNormals();
+				clothGeometry.computeVertexNormals();
+
 				clothGeometry.normalsNeedUpdate = true;
 				clothGeometry.verticesNeedUpdate = true;
 

+ 7 - 2
examples/webgl_decals.html

@@ -111,8 +111,11 @@
 			light.position.set( 1, 0.75, 0.5 );
 			scene.add( light );
 
-			line = new THREE.Line( new THREE.DirectGeometry(), new THREE.LineBasicMaterial( { linewidth: 4 } ) );
-			line.geometry.vertices.push( new THREE.Vector3(), new THREE.Vector3() );
+			var geometry = new THREE.Geometry();
+			geometry.vertices.push( new THREE.Vector3(), new THREE.Vector3() );
+			geometry.dynamic = true;
+
+			line = new THREE.Line( geometry, new THREE.LineBasicMaterial( { linewidth: 4 }) );
 			scene.add( line );
 
 			loadLeePerrySmith();
@@ -179,9 +182,11 @@
 					var p = intersects[ 0 ].point;
 					mouseHelper.position.copy( p );
 					intersection.point.copy( p );
+
 					var n = intersects[ 0 ].face.normal.clone();
 					n.multiplyScalar( 10 );
 					n.add( intersects[ 0 ].point );
+
 					intersection.normal.copy( intersects[ 0 ].face.normal );
 					mouseHelper.lookAt( n );
 

+ 5 - 1
examples/webgl_geometry_dynamic.html

@@ -96,7 +96,11 @@
 
 				}
 
-				geometry = new THREE.DirectGeometry().fromGeometry( geometry );
+
+				//console.log( "triangles: " + geometry.faces.length * 2 + " faces: " + geometry.faces.length + " vertices: " + geometry.vertices.length );
+
+				geometry.computeFaceNormals();
+				geometry.computeVertexNormals();
 
 				var texture = THREE.ImageUtils.loadTexture( "textures/water.jpg" );
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;