Jelajahi Sumber

Fix software demos indentations and replace LinePieces with LineSegments.

Daosheng Mu 10 tahun lalu
induk
melakukan
9c93a0a03b

+ 4 - 13
examples/software_lines_colors.html

@@ -83,10 +83,10 @@
 				container.appendChild( renderer.domElement );
 
 				var geometry = new THREE.Geometry(),
-					geometry2 = new THREE.Geometry(),
-					geometry3 = new THREE.Geometry(),
-					points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 2, 0, 1, 2, 3, 4, 5, 6, 7 ),
-					colors = [], colors2 = [], colors3 = [];
+				geometry2 = new THREE.Geometry(),
+				geometry3 = new THREE.Geometry(),
+				points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 2, 0, 1, 2, 3, 4, 5, 6, 7 ),
+				colors = [], colors2 = [], colors3 = [];
 
 				for ( i = 0; i < points.length; i ++ ) {
 
@@ -132,14 +132,9 @@
 
 				}
 
-				//
-
 				stats = new Stats();
 				stats.domElement.style.position = 'absolute';
 				stats.domElement.style.top = '0px';
-				//container.appendChild( stats.domElement );
-
-				//
 
 				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
@@ -160,8 +155,6 @@
 				renderer.setSize( window.innerWidth, window.innerHeight );
 			}
 
-			//
-
 			function onDocumentMouseMove( event ) {
 
 				mouseX = event.clientX - windowHalfX;
@@ -194,8 +187,6 @@
 
 			}
 
-			//
-
 			function animate() {
 
 				requestAnimationFrame( animate );

+ 14 - 20
examples/software_lines_cubes.html

@@ -84,7 +84,7 @@
 				container.appendChild( renderer.domElement );
 
 				var geometry = new THREE.Geometry(),
-					points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 4, 0, 1, 2, 3, 4, 5, 6, 7 );
+				points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 4, 0, 1, 2, 3, 4, 5, 6, 7 );
 
 				for ( i = 0; i < points.length; i ++ ) {
 
@@ -92,21 +92,21 @@
 
 				}
 
-
 				// lines
 
-				var line, p, scale = 0.3, d = 125, c1 = 0x553300, c2 = 0x555555, c3 = 0x992800, g1 = geometry,
-					m1 = new THREE.LineBasicMaterial( { color: c1, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
-					m2 = new THREE.LineBasicMaterial( { color: c2, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
-					m3 = new THREE.LineBasicMaterial( { color: c3, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
-					parameters = [ [ m3, scale*0.5, [0,0,0],  g1 ], [ m2, scale*0.5, [d, 0, 0],  g1 ], [ m2, scale*0.5, [-d, 0, 0],  g1 ],
-								   [ m2, scale*0.5, [0,d,0],  g1 ], [ m2, scale*0.5, [d, d, 0],  g1 ], [ m2, scale*0.5, [-d, d, 0],  g1 ],
-								   [ m2, scale*0.5, [0,-d,0], g1 ], [ m2, scale*0.5, [d, -d, 0], g1 ], [ m2, scale*0.5, [-d, -d, 0], g1 ],
-
-								   [ m1, scale*0.5, [2*d, 0, 0],  g1 ], [ m1, scale*0.5, [-2*d, 0, 0],  g1 ],
-								   [ m1, scale*0.5, [2*d, d, 0],  g1 ], [ m1, scale*0.5, [-2*d, d, 0],  g1 ],
-								   [ m1, scale*0.5, [2*d, -d, 0], g1 ], [ m1, scale*0.5, [-2*d, -d, 0], g1 ],
-								   ];
+				var line, p, scale = 0.3, d = 125, c1 = 0x553300, c2 = 0x555555, c3 = 0x992800, 
+				g1 = geometry,
+				m1 = new THREE.LineBasicMaterial( { color: c1, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
+				m2 = new THREE.LineBasicMaterial( { color: c2, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
+				m3 = new THREE.LineBasicMaterial( { color: c3, opacity: 1, blending: THREE.AdditiveBlending, transparent: true } ),
+				parameters = [ [ m3, scale*0.5, [0,0,0],  g1 ], [ m2, scale*0.5, [d, 0, 0],  g1 ], 
+						[ m2, scale*0.5, [-d, 0, 0],  g1 ], [ m2, scale*0.5, [0,d,0],  g1 ],
+						[ m2, scale*0.5, [d, d, 0],  g1 ], [ m2, scale*0.5, [-d, d, 0],  g1 ],
+						[ m2, scale*0.5, [0,-d,0], g1 ], [ m2, scale*0.5, [d, -d, 0], g1 ], 
+						[ m2, scale*0.5, [-d, -d, 0], g1 ], [ m1, scale*0.5, [2*d, 0, 0],  g1 ],
+						[ m1, scale*0.5, [-2*d, 0, 0],  g1 ], [ m1, scale*0.5, [2*d, d, 0],  g1 ],
+						[ m1, scale*0.5, [-2*d, d, 0],  g1 ], [ m1, scale*0.5, [2*d, -d, 0], g1 ], 
+						[ m1, scale*0.5, [-2*d, -d, 0], g1 ]];
 
 				for ( i = 0; i < parameters.length; i ++ ) {
 
@@ -128,8 +128,6 @@
 				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
 				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
 
-				//
-
 				window.addEventListener( 'resize', onWindowResize, false );
 
 			}
@@ -146,8 +144,6 @@
 
 			}
 
-			//
-
 			function onDocumentMouseMove(event) {
 
 				mouseX = event.clientX - windowHalfX;
@@ -180,8 +176,6 @@
 
 			}
 
-			//
-
 			function animate() {
 
 				requestAnimationFrame( animate );

+ 32 - 26
examples/software_lines_sphere.html

@@ -82,28 +82,13 @@
 				scene = new THREE.Scene();
 
 				var i, line, vertex1, vertex2, material, p,
-					parameters = [ [ 0.25, 0xff7700, 1, 2 ], [ 0.5, 0xff9900, 1, 1 ], [ 0.75, 0xffaa00, 0.75, 1 ], [ 1, 0xffaa00, 0.5, 1 ], [ 1.25, 0x000833, 0.8, 1 ],
-							       [ 3.0, 0xaaaaaa, 0.75, 2 ], [ 3.5, 0xffffff, 0.5, 1 ], [ 4.5, 0xffffff, 0.25, 1 ], [ 5.5, 0xffffff, 0.125, 1 ] ],
+				parameters = [ [ 0.25, 0xff7700, 1, 2 ], [ 0.5, 0xff9900, 1, 1 ], 
+						[ 0.75, 0xffaa00, 0.75, 1 ], [ 1, 0xffaa00, 0.5, 1 ],
+						[ 1.25, 0x000833, 0.8, 1 ], [ 3.0, 0xaaaaaa, 0.75, 2 ],
+						[ 3.5, 0xffffff, 0.5, 1 ], [ 4.5, 0xffffff, 0.25, 1 ], 
+						[ 5.5, 0xffffff, 0.125, 1 ] ];
 
-					geometry = new THREE.Geometry();
-
-
-				for ( i = 0; i < 1500; i ++ ) {
-
-					var vertex1 = new THREE.Vector3();
-					vertex1.x = Math.random() * 2 - 1;
-					vertex1.y = Math.random() * 2 - 1;
-					vertex1.z = Math.random() * 2 - 1;
-					vertex1.normalize();
-					vertex1.multiplyScalar( r );
-
-					vertex2 = vertex1.clone();
-					vertex2.multiplyScalar( Math.random() * 0.09 + 1 );
-
-					geometry.vertices.push( vertex1 );
-					geometry.vertices.push( vertex2 );
-
-				}
+				var geometry = createGeometry();
 
 				for( i = 0; i < parameters.length; ++ i ) {
 
@@ -111,7 +96,7 @@
 
 					material = new THREE.LineBasicMaterial( { color: p[ 1 ], opacity: p[ 2 ], linewidth: p[ 3 ] } );
 
-					line = new THREE.Line( geometry, material, THREE.LinePieces );
+					line = new THREE.LineSegments( geometry, material );
 					line.scale.x = line.scale.y = line.scale.z = p[ 0 ];
 					line.originalScale = p[ 0 ];
 					line.rotation.y = Math.random() * Math.PI;
@@ -128,12 +113,35 @@
 				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
 				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
 
-				//
-
 				window.addEventListener( 'resize', onWindowResize, false );
 
 			}
 
+			function createGeometry() {
+
+				var geometry = new THREE.Geometry();
+
+				for ( i = 0; i < 1500; i ++ ) {
+
+					var vertex1 = new THREE.Vector3();
+					vertex1.x = Math.random() * 2 - 1;
+					vertex1.y = Math.random() * 2 - 1;
+					vertex1.z = Math.random() * 2 - 1;
+					vertex1.normalize();
+					vertex1.multiplyScalar( r );
+
+					vertex2 = vertex1.clone();
+					vertex2.multiplyScalar( Math.random() * 0.09 + 1 );
+
+					geometry.vertices.push( vertex1 );
+					geometry.vertices.push( vertex2 );
+
+				}
+
+				return geometry;
+
+			}
+
 			function onWindowResize() {
 
 				windowHalfX = window.innerWidth / 2;
@@ -179,8 +187,6 @@
 
 			}
 
-			//
-
 			function animate() {
 
 				requestAnimationFrame( animate );

+ 4 - 14
examples/software_lines_splines.html

@@ -85,10 +85,10 @@
 				container.appendChild( renderer.domElement );
 
 				var geometry = new THREE.Geometry(),
-                    geometry2 = new THREE.Geometry(),
-                    geometry3 = new THREE.Geometry(),
-                    points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 ),
-                    colors = [], colors2 = [], colors3 = [];
+				geometry2 = new THREE.Geometry(),
+				geometry3 = new THREE.Geometry(),
+				points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 ),
+				colors = [], colors2 = [], colors3 = [];
 
 				n_sub = 6;
 
@@ -112,7 +112,6 @@
 					colors3[ i ] = new THREE.Color( 0xffffff );
 					colors3[ i ].setHSL( i / ( points.length * n_sub ), 1.0, 0.5 );
 
-
 				}
 
 				geometry2.vertices = geometry3.vertices = geometry.vertices;
@@ -144,19 +143,14 @@
 
 				}
 
-
 				stats = new Stats();
 				stats.domElement.style.position = 'absolute';
 				stats.domElement.style.top = '0px';
-				//container.appendChild(stats.domElement);
-
 
 				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
 				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
 
-				//
-
 				window.addEventListener( 'resize', onWindowResize, false );
 
 			}
@@ -173,8 +167,6 @@
 
 			}
 
-			//
-
 			function onDocumentMouseMove( event ) {
 
 				mouseX = event.clientX - windowHalfX;
@@ -204,8 +196,6 @@
 
 			}
 
-			//
-
 			function animate() {
 
 				requestAnimationFrame( animate );