Sfoglia il codice sorgente

Updated examples that rely on GeometryUtils.merge.

Mr.doob 11 anni fa
parent
commit
a01e7c0bed

+ 7 - 6
examples/js/crossfade/scenes.js

@@ -34,7 +34,7 @@ function generateGeometry(objectType, numObjects) {
 
 		var scale = new THREE.Vector3();
 
-		var geom, color=new THREE.Color();
+		var geom, color = new THREE.Color();
 
 		scale.x = Math.random() * 200 + 100;
 
@@ -55,12 +55,13 @@ function generateGeometry(objectType, numObjects) {
 		// give the geom's vertices a random color, to be displayed
 		applyVertexColors( geom, color );
 
-		var cube = new THREE.Mesh( geom );
-		cube.position.copy( position );
-		cube.rotation.copy( rotation );
-		cube.scale.copy( scale );
+		var mesh = new THREE.Mesh( geom );
+		mesh.position.copy( position );
+		mesh.rotation.copy( rotation );
+		mesh.scale.copy( scale );
+		mesh.updateMatrix();
 
-		THREE.GeometryUtils.merge( geometry, cube );
+		geometry.merge( mesh.geometry, mesh.matrix );
 
 	}
 

+ 6 - 2
examples/webgl_camera_logarithmicdepthbuffer.html

@@ -207,16 +207,20 @@
 					materialargs.color = THREE.ColorKeywords[ colorkeys[ i + coloroffset ] ];
 
 					var material = new THREE.MeshPhongMaterial( materialargs );
+
 					var textmesh = new THREE.Mesh( labelgeo, material );
 					textmesh.scale.set(scale, scale, scale);
 					textmesh.position.z = -labeldata[i].size * scale;
 					textmesh.position.y = labeldata[i].size / 4 * scale;
+					textmesh.updateMatrix();
+
 					var dotmesh = new THREE.Mesh(new THREE.SphereGeometry(labeldata[i].size * scale / 2, 24, 12), material);
 					dotmesh.position.y = -labeldata[i].size / 4 * scale;
+					dotmesh.updateMatrix();
 
 					var merged = new THREE.Geometry();
-					THREE.GeometryUtils.merge(merged, textmesh);
-					THREE.GeometryUtils.merge(merged, dotmesh);
+					merged.merge( textmesh.geometry, textmesh.matrix );
+					merged.merge( dotmesh.geometry, dotmesh.matrix );
 
 					var mesh = new THREE.Mesh(merged, material);
 					mesh.position.z = -labeldata[i].size * 1 * scale;

+ 1 - 2
examples/webgl_custom_attributes_particles2.html

@@ -132,8 +132,7 @@
 			vc1 = geometry.vertices.length;
 
 			var geometry2 = new THREE.BoxGeometry( 0.8 * radius, 0.8 * radius, 0.8 * radius, 10, 10, 10 );
-
-			THREE.GeometryUtils.merge( geometry, geometry2 );
+			geometry.merge( geometry2 );
 
 			sphere = new THREE.ParticleSystem( geometry, shaderMaterial );
 

+ 5 - 6
examples/webgl_custom_attributes_particles3.html

@@ -154,18 +154,17 @@
 
 			vc1 = geometry.vertices.length;
 
-			var m, dummyMaterial = new THREE.MeshFaceMaterial();
-
 			radius = 200;
 			var geometry2 = new THREE.BoxGeometry( radius, 0.1 * radius, 0.1 * radius, 50, 5, 5 );
 
 			function addGeo( geo, x, y, z, ry ) {
 
-				m = new THREE.Mesh( geo, dummyMaterial );
-				m.position.set( x, y, z );
-				m.rotation.y = ry;
+				var mesh = new THREE.Mesh( geo );
+				mesh.position.set( x, y, z );
+				mesh.rotation.y = ry;
+				mesh.updateMatrix();
 
-				THREE.GeometryUtils.merge( geometry, m );
+				geometry.merge( mesh.geometry, mesh.matrix );
 
 			}