فهرست منبع

Merge pull request #13920 from Mugen87/dev11

Examples: Clean up
Mr.doob 7 سال پیش
والد
کامیت
a29f8d25ae

+ 7 - 8
examples/webgl_camera.html

@@ -120,19 +120,19 @@
 
 				//
 
-				var geometry = new THREE.Geometry();
+				var geometry = new THREE.BufferGeometry();
+				var vertices = [];
 
 				for ( var i = 0; i < 10000; i ++ ) {
 
-					var vertex = new THREE.Vector3();
-					vertex.x = THREE.Math.randFloatSpread( 2000 );
-					vertex.y = THREE.Math.randFloatSpread( 2000 );
-					vertex.z = THREE.Math.randFloatSpread( 2000 );
-
-					geometry.vertices.push( vertex );
+					vertices.push(  THREE.Math.randFloatSpread( 2000 ) ); // x
+					vertices.push(  THREE.Math.randFloatSpread( 2000 ) ); // y
+					vertices.push(  THREE.Math.randFloatSpread( 2000 ) ); // z
 
 				}
 
+				geometry.addAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
+
 				var particles = new THREE.Points( geometry, new THREE.PointsMaterial( { color: 0x888888 } ) );
 				scene.add( particles );
 
@@ -142,7 +142,6 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
-				renderer.domElement.style.position = "relative";
 				container.appendChild( renderer.domElement );
 
 				renderer.autoClear = false;

+ 1 - 1
examples/webgl_lines_dashed.html

@@ -66,7 +66,7 @@
 				var spline = new THREE.CatmullRomCurve3( points );
 
 				var samples = spline.getPoints( points.length * subdivisions );
-				var geometrySpline = new THREE.Geometry().setFromPoints( samples );
+				var geometrySpline = new THREE.BufferGeometry().setFromPoints( samples );
 
 				var line = new THREE.Line( geometrySpline, new THREE.LineDashedMaterial( { color: 0xffffff, dashSize: 1, gapSize: 0.5 } ) );
 				line.computeLineDistances();

+ 1 - 1
examples/webgl_physics_cloth.html

@@ -301,7 +301,7 @@
 
 			function createParalellepiped( sx, sy, sz, mass, pos, quat, material ) {
 
-				var threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
+				var threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
 				var shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 				shape.setMargin( margin );
 

+ 38 - 39
examples/webgl_physics_rope.html

@@ -1,49 +1,48 @@
 <html lang="en">
-    <head>
-        <title>Amjs softbody rope demo</title>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-        <style>
-            body {
-                color: #61443e;
-                font-family:Monospace;
-                font-size:13px;
-                text-align:center;
-
-                background-color: #bfd1e5;
-                margin: 0px;
-                overflow: hidden;
-            }
-
-            #info {
-                position: absolute;
-                top: 0px; width: 100%;
-                padding: 5px;
-            }
-
-            a {
-
-                color: #a06851;
-            }
-
-        </style>
-    </head>
-    <body>
+	<head>
+		<title>Amjs softbody rope demo</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+		<style>
+				body {
+					color: #61443e;
+					font-family:Monospace;
+					font-size:13px;
+					text-align:center;
+
+					background-color: #bfd1e5;
+					margin: 0px;
+					overflow: hidden;
+				}
+
+				#info {
+					position: absolute;
+					top: 0px; width: 100%;
+					padding: 5px;
+				}
+
+				a {
+					color: #a06851;
+				}
+
+		</style>
+	</head>
+	<body>
 	<div id="info">Ammo.js physics soft body rope demo<br>Press Q or A to move the arm.</div>
-        <div id="container"><br /><br /><br /><br /><br />Loading...</div>
+	<div id="container"><br /><br /><br /><br /><br />Loading...</div>
 
 	<script src="../build/three.js"></script>
 	<script src="js/libs/ammo.js"></script>
 	<script src="js/controls/OrbitControls.js"></script>
-        <script src="js/Detector.js"></script>
+	<script src="js/Detector.js"></script>
 	<script src="js/libs/stats.min.js"></script>
 
-        <script>
+	<script>
 
 		// Detects webgl
 		if ( ! Detector.webgl ) {
-		    Detector.addGetWebGLMessage();
-		    document.getElementById( 'container' ).innerHTML = "";
+			Detector.addGetWebGLMessage();
+			document.getElementById( 'container' ).innerHTML = "";
 		}
 
 		// - Global variables -
@@ -188,7 +187,7 @@
 			var ballMass = 1.2;
 			var ballRadius = 0.6;
 
-			var ball = new THREE.Mesh( new THREE.SphereGeometry( ballRadius, 20, 20 ), new THREE.MeshPhongMaterial( { color: 0x202020 } ) );
+			var ball = new THREE.Mesh( new THREE.SphereBufferGeometry( ballRadius, 20, 20 ), new THREE.MeshPhongMaterial( { color: 0x202020 } ) );
 			ball.castShadow = true;
 			ball.receiveShadow = true;
 			var ballShape = new Ammo.btSphereShape( ballRadius );
@@ -324,7 +323,7 @@
 
 		function createParalellepiped( sx, sy, sz, mass, pos, quat, material ) {
 
-			var threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
+			var threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
 			var shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 			shape.setMargin( margin );
 
@@ -473,7 +472,7 @@
 
 		}
 
-        </script>
+		</script>
 
-    </body>
+	</body>
 </html>

+ 4 - 4
examples/webgl_physics_terrain.html

@@ -321,7 +321,7 @@
 							case 1:
 								// Sphere
 								var radius = 1 + Math.random() * objectSize;
-								threeObject = new THREE.Mesh( new THREE.SphereGeometry( radius, 20, 20 ), createObjectMaterial() );
+								threeObject = new THREE.Mesh( new THREE.SphereBufferGeometry( radius, 20, 20 ), createObjectMaterial() );
 								shape = new Ammo.btSphereShape( radius );
 								shape.setMargin( margin );
 								break;
@@ -330,7 +330,7 @@
 								var sx = 1 + Math.random() * objectSize;
 								var sy = 1 + Math.random() * objectSize;
 								var sz = 1 + Math.random() * objectSize;
-								threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), createObjectMaterial() );
+								threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), createObjectMaterial() );
 								shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 								shape.setMargin( margin );
 								break;
@@ -338,7 +338,7 @@
 								// Cylinder
 								var radius = 1 + Math.random() * objectSize;
 								var height = 1 + Math.random() * objectSize;
-								threeObject = new THREE.Mesh( new THREE.CylinderGeometry( radius, radius, height, 20, 1 ), createObjectMaterial() );
+								threeObject = new THREE.Mesh( new THREE.CylinderBufferGeometry( radius, radius, height, 20, 1 ), createObjectMaterial() );
 								shape = new Ammo.btCylinderShape( new Ammo.btVector3( radius, height * 0.5, radius ) );
 								shape.setMargin(margin);
 								break;
@@ -346,7 +346,7 @@
 								// Cone
 								var radius = 1 + Math.random() * objectSize;
 								var height = 2 + Math.random() * objectSize;
-								threeObject = new THREE.Mesh( new THREE.CylinderGeometry( 0, radius, height, 20, 2 ), createObjectMaterial() );
+								threeObject = new THREE.Mesh( new THREE.ConeBufferGeometry( radius, height, 20, 2 ), createObjectMaterial() );
 								shape = new Ammo.btConeShape( radius, height );
 								break;
 						}