Merge pull request #14551 from WestLangley/dev-clean_up

Examples: clean up

examples/webgl_custom_attributes_points2.html

@@ -79,7 +79,7 @@
 		if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
 		var renderer, scene, camera, stats;
-		var sphere, vertices1;
+		var sphere, length1;
 
 		var WIDTH = window.innerWidth;
 		var HEIGHT = window.innerHeight;
@@ -96,12 +96,12 @@
 
 			var radius = 100, segments = 68, rings = 38;
 
-			var geometry1 = new THREE.SphereGeometry( radius, segments, rings );
-			var geometry2 = new THREE.BoxGeometry( 0.8 * radius, 0.8 * radius, 0.8 * radius, 10, 10, 10 );
+			var vertices1 = new THREE.SphereGeometry( radius, segments, rings ).vertices;
+			var vertices2 = new THREE.BoxGeometry( 0.8 * radius, 0.8 * radius, 0.8 * radius, 10, 10, 10 ).vertices;
 
-			vertices1 = geometry1.vertices.length;
+			length1 = vertices1.length;
 
-			var vertices = geometry1.vertices.concat( geometry2.vertices );
+			var vertices = vertices1.concat( vertices2 );
 
 			var positions = new Float32Array( vertices.length * 3 );
 			var colors = new Float32Array( vertices.length * 3 );
@@ -115,9 +115,9 @@
 				vertex = vertices[ i ];
 				vertex.toArray( positions, i * 3 );
 
-				if ( i < vertices1 ) {
+				if ( i < length1 ) {
 
-					color.setHSL( 0.01 + 0.1 * ( i / vertices1 ), 0.99, ( vertex.y + radius ) / ( 4 * radius ) );
+					color.setHSL( 0.01 + 0.1 * ( i / length1 ), 0.99, ( vertex.y + radius ) / ( 4 * radius ) );
 
 				} else {
 
@@ -127,7 +127,7 @@
 
 				color.toArray( colors, i * 3 );
 
-				sizes[ i ] = i < vertices1 ? 10 : 40;
+				sizes[ i ] = i < length1 ? 10 : 40;
 
 			}
 
@@ -273,7 +273,7 @@
 
 			for ( var i = 0; i < attributes.size.array.length; i ++ ) {
 
-				if ( i < vertices1 ) {
+				if ( i < length1 ) {
 
 					attributes.size.array[ i ] = 16 + 12 * Math.sin( 0.1 * i + time );
 

examples/webgl_geometry_convex.html

@@ -87,11 +87,11 @@
 
 				// points
 
-				var pointsGeometry = new THREE.DodecahedronGeometry( 10 );
+				var vertices = new THREE.DodecahedronGeometry( 10 ).vertices;
 
-				for ( var i = 0; i < pointsGeometry.vertices.length; i ++ ) {
+				for ( var i = 0; i < vertices.length; i ++ ) {
 
-					//pointsGeometry.vertices[ i ].add( randomPoint().multiplyScalar( 2 ) ); // wiggle the points
+					//vertices[ i ].add( randomPoint().multiplyScalar( 2 ) ); // wiggle the points
 
 				}
 
@@ -104,6 +104,8 @@
 
 				} );
 
+				var pointsGeometry = new THREE.BufferGeometry().setFromPoints( vertices );
+
 				var points = new THREE.Points( pointsGeometry, pointsMaterial );
 				group.add( points );
 
@@ -115,7 +117,7 @@
 					transparent: true
 				} );
 
-				var meshGeometry = new THREE.ConvexBufferGeometry( pointsGeometry.vertices );
+				var meshGeometry = new THREE.ConvexBufferGeometry( vertices );
 
 				var mesh = new THREE.Mesh( meshGeometry, meshMaterial );
 				mesh.material.side = THREE.BackSide; // back faces

examples/webgl_geometry_minecraft.html

@@ -180,7 +180,7 @@
 				var texture = new THREE.TextureLoader().load( 'textures/minecraft/atlas.png' );
 				texture.magFilter = THREE.NearestFilter;
 
-				var mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: texture } ) );
+				var mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: texture, side: THREE.DoubleSide } ) );
 				scene.add( mesh );
 
 				var ambientLight = new THREE.AmbientLight( 0xcccccc );

examples/webgl_geometry_minecraft_ao.html

@@ -275,11 +275,16 @@
 
 				}
 
+				geometry = new THREE.BufferGeometry().fromGeometry( geometry );
+
 				var texture = new THREE.TextureLoader().load( 'textures/minecraft/atlas.png' );
 				texture.magFilter = THREE.NearestFilter;
 				texture.minFilter = THREE.LinearMipMapLinearFilter;
 
-				var mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: texture, vertexColors: THREE.VertexColors } ) );
+				var mesh = new THREE.Mesh(
+					geometry,
+					new THREE.MeshLambertMaterial( { map: texture, vertexColors: THREE.VertexColors, side: THREE.DoubleSide } )
+				);
 				scene.add( mesh );
 
 				var ambientLight = new THREE.AmbientLight( 0xcccccc );

examples/webgl_interactive_points.html

@@ -104,8 +104,7 @@
 
 				//
 
-				var geometry1 = new THREE.BoxGeometry( 200, 200, 200, 16, 16, 16 );
-				var vertices = geometry1.vertices;
+				var vertices = new THREE.BoxGeometry( 200, 200, 200, 16, 16, 16 ).vertices;
 
 				var positions = new Float32Array( vertices.length * 3 );
 				var colors = new Float32Array( vertices.length * 3 );

examples/webgl_morphtargets.html

@@ -62,7 +62,7 @@
 
 				container = document.getElementById( 'container' );
 
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 15000 );
+				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
 				camera.position.z = 500;
 
 				scene = new THREE.Scene();
@@ -70,8 +70,8 @@
 				scene.fog = new THREE.Fog( 0x000000, 1, 15000 );
 
 				var light = new THREE.PointLight( 0xff2200 );
-				light.position.set( 100, 100, 100 );
-				scene.add( light );
+				camera.add( light );
+				scene.add( camera );
 
 				var light = new THREE.AmbientLight( 0x111111 );
 				scene.add( light );
@@ -103,6 +103,8 @@
 
 				}
 
+				geometry = new THREE.BufferGeometry().fromGeometry( geometry );
+
 				mesh = new THREE.Mesh( geometry, material );
 
 				scene.add( mesh );
@@ -143,6 +145,8 @@
 				//
 
 				controls = new THREE.OrbitControls( camera, renderer.domElement );
+				controls.minDistance = 400;
+				controls.maxDistance = 1000;
 
 				//