2
0
Эх сурвалжийг харах

Merge pull request #12393 from Mugen87/dev4

Examples: Clean up webgl_geometries2.html
Mr.doob 7 жил өмнө
parent
commit
e8ddb44fe0

+ 1 - 1
examples/files.js

@@ -19,7 +19,7 @@ var files = {
 		"webgl_effects_peppersghost",
 		"webgl_effects_stereo",
 		"webgl_geometries",
-		"webgl_geometries2",
+		"webgl_geometries_parametric",
 		"webgl_geometry_colors",
 		"webgl_geometry_colors_blender",
 		"webgl_geometry_colors_lookuptable",

+ 39 - 41
examples/webgl_geometries2.html → examples/webgl_geometries_parametric.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title>three.js webgl - geometries</title>
+		<title>three.js webgl - parametric geometries</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 		<style>
@@ -27,16 +27,14 @@
 
 			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
-			var container, stats;
-
-			var camera, scene, renderer;
+			var camera, scene, renderer, stats;
 
 			init();
 			animate();
 
 			function init() {
 
-				container = document.createElement( 'div' );
+				var container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
 				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
@@ -44,74 +42,74 @@
 
 				scene = new THREE.Scene();
 
-				var light, object, materials;
+				//
 
 				scene.add( new THREE.AmbientLight( 0x404040 ) );
 
-				light = new THREE.DirectionalLight( 0xffffff );
+				var light = new THREE.DirectionalLight( 0xffffff );
 				light.position.set( 0, 0, 1 );
 				scene.add( light );
 
+				//
+
 				var map = new THREE.TextureLoader().load( 'textures/UV_Grid_Sm.jpg' );
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 
-				materials = [
+				var materials = [
 					new THREE.MeshLambertMaterial( { map: map, side: THREE.DoubleSide } ),
 					new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true, transparent: true, opacity: 0.1, side: THREE.DoubleSide } )
 				];
 
-				var p = 2;
-				var q = 3;
-				var radius = 150, tube = 10, segmentsT = 50, segmentsR = 20;
-
-				var GrannyKnot =  new THREE.Curves.GrannyKnot();
+				//
 
-				var torus2 = new THREE.ParametricGeometries.TorusKnotGeometry( radius, tube, segmentsT, segmentsR, p , q );
-				var sphere2 = new THREE.ParametricGeometries.SphereGeometry( 75, 20, 10 );
-				var tube2 = new THREE.ParametricGeometries.TubeGeometry( GrannyKnot, 150, 2, 8, true, false );
+				var geometry, object;
 
-				var geo;
-
-				// Klein Bottle
-
-				geo = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.klein, 20, 20 );
-				object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );
-				object.position.set( 0, 0, 0 );
-				object.scale.multiplyScalar( 10 );
+				geometry = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.plane( 100, 100 ), 10, 10 );
+				object = THREE.SceneUtils.createMultiMaterialObject( geometry, materials );
+				object.position.set( - 200, 0, 200 );
 				scene.add( object );
 
-				// Mobius Strip
+				geometry = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.klein, 20, 20 );
+				object = THREE.SceneUtils.createMultiMaterialObject( geometry, materials );
+				object.position.set( 0, 0, 200 );
+				object.scale.multiplyScalar( 5 );
+				scene.add( object );
 
-				geo = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.mobius, 20, 20 );
-				object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );
-				object.position.set( 10, 0, 0 );
-				object.scale.multiplyScalar( 100 );
+				geometry = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.mobius, 20, 20 );
+				object = THREE.SceneUtils.createMultiMaterialObject( geometry, materials );
+				object.position.set( 200, 0, 200 );
+				object.scale.multiplyScalar( 30 );
 				scene.add( object );
 
-				// Plane
+				//
 
-				geo = new THREE.ParametricBufferGeometry( THREE.ParametricGeometries.plane( 200, 200 ), 10, 20 );
-				object = THREE.SceneUtils.createMultiMaterialObject( geo, materials );
-				object.position.set( 0, 0, 0 );
-				scene.add( object );
+				var GrannyKnot =  new THREE.Curves.GrannyKnot();
+
+				var torus = new THREE.ParametricGeometries.TorusKnotGeometry( 50, 10, 50, 20, 2, 3 );
+				var sphere = new THREE.ParametricGeometries.SphereGeometry( 50, 20, 10 );
+				var tube = new THREE.ParametricGeometries.TubeGeometry( GrannyKnot, 100, 3, 8, true, false );
 
-				object = THREE.SceneUtils.createMultiMaterialObject( torus2, materials );
-				object.position.set( 0, 100, 0 );
+				object = THREE.SceneUtils.createMultiMaterialObject( torus, materials );
+				object.position.set( - 200, 0, - 200 );
 				scene.add( object );
 
-				object = THREE.SceneUtils.createMultiMaterialObject( sphere2, materials );
-				object.position.set( 200, 0, 0 );
+				object = THREE.SceneUtils.createMultiMaterialObject( sphere, materials );
+				object.position.set( 0, 0, - 200 );
 				scene.add( object );
 
-				object = THREE.SceneUtils.createMultiMaterialObject( tube2, materials );
-				object.position.set( 100, 0, 0 );
+				object = THREE.SceneUtils.createMultiMaterialObject( tube, materials );
+				object.position.set( 200, 0, - 200 );
+				object.scale.multiplyScalar( 2 );
 				scene.add( object );
+				
+				//
 
 				object = new THREE.AxesHelper( 50 );
-				object.position.set( 200, 0, - 200 );
 				scene.add( object );
 
+				//
+
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );