浏览代码

Merge pull request #13324 from looeee/move_suzanne_model

EXAMPLES: moved suzanne.js geometry model to correct folder
Mr.doob 7 年之前
父节点
当前提交
cfe50e4413

+ 0 - 0
examples/models/json/suzanne.json → examples/models/json/suzanne_buffergeometry.json


+ 0 - 0
examples/obj/Suzanne.js → examples/models/json/suzanne_geometry.json


+ 1 - 1
examples/webgl_interactive_instances_gpu.html

@@ -500,7 +500,7 @@
 			clean();
 			clean();
 
 
 			// make instances
 			// make instances
-			loader.load( 'obj/Suzanne.js', function ( geo ) {
+			loader.load( 'models/json/suzanne_geometry.json', function ( geo ) {
 
 
 				geo.computeBoundingBox();
 				geo.computeBoundingBox();
 				geometrySize = geo.boundingBox.getSize();
 				geometrySize = geo.boundingBox.getSize();

+ 1 - 1
examples/webgl_modifier_subdivision.html

@@ -105,7 +105,7 @@
 			});
 			});
 
 
 			var loader2 = new THREE.JSONLoader();
 			var loader2 = new THREE.JSONLoader();
-			loader2.load( 'obj/Suzanne.js', function ( geometry ) {
+			loader2.load( 'models/json/suzanne_geometry.json', function ( geometry ) {
 
 
 				geometriesParams.push({type: 'Suzanne', args: [ ], scale: 100, meshScale:2 });
 				geometriesParams.push({type: 'Suzanne', args: [ ], scale: 100, meshScale:2 });
 
 

+ 1 - 1
examples/webgl_performance.html

@@ -54,7 +54,7 @@
 				var material = new THREE.MeshNormalMaterial();
 				var material = new THREE.MeshNormalMaterial();
 
 
 				var loader = new THREE.BufferGeometryLoader();
 				var loader = new THREE.BufferGeometryLoader();
-				loader.load( 'models/json/suzanne.json', function ( geometry ) {
+				loader.load( 'models/json/suzanne_buffergeometry.json', function ( geometry ) {
 
 
 					geometry.computeVertexNormals();
 					geometry.computeVertexNormals();
 
 

+ 1 - 1
examples/webgl_performance_static.html

@@ -52,7 +52,7 @@
 				var material = new THREE.MeshNormalMaterial();
 				var material = new THREE.MeshNormalMaterial();
 
 
 				var loader = new THREE.BufferGeometryLoader();
 				var loader = new THREE.BufferGeometryLoader();
-				loader.load( 'models/json/suzanne.json', function ( geometry ) {
+				loader.load( 'models/json/suzanne_buffergeometry.json', function ( geometry ) {
 
 
 					geometry.computeVertexNormals();
 					geometry.computeVertexNormals();
 
 

+ 5 - 4
examples/webgl_postprocessing_dof2.html

@@ -172,8 +172,10 @@ Use WEBGL Depth buffer support?
 
 
 				// Adding Monkeys
 				// Adding Monkeys
 
 
-				var loader2 = new THREE.JSONLoader();
-				loader2.load( 'obj/Suzanne.js', function ( geometry ) {
+				var loader2 = new THREE.BufferGeometryLoader();
+				loader2.load( 'models/json/suzanne_buffergeometry.json', function ( geometry ) {
+
+					geometry.computeVertexNormals();
 
 
 					var material = new THREE.MeshPhongMaterial( {
 					var material = new THREE.MeshPhongMaterial( {
 						color: 0xffffff,
 						color: 0xffffff,
@@ -191,12 +193,11 @@ Use WEBGL Depth buffer support?
 						var mesh = new THREE.Mesh( geometry, material );
 						var mesh = new THREE.Mesh( geometry, material );
 						mesh.scale.multiplyScalar(30);
 						mesh.scale.multiplyScalar(30);
 
 
-
 						mesh.position.z = Math.cos(i / monkeys * Math.PI * 2) * 200;
 						mesh.position.z = Math.cos(i / monkeys * Math.PI * 2) * 200;
 						mesh.position.y = Math.sin(i / monkeys * Math.PI * 3) * 20;
 						mesh.position.y = Math.sin(i / monkeys * Math.PI * 3) * 20;
 						mesh.position.x = Math.sin(i / monkeys * Math.PI * 2) * 200;
 						mesh.position.x = Math.sin(i / monkeys * Math.PI * 2) * 200;
 
 
-						mesh.rotation.x = Math.PI / 2;
+						mesh.rotation.y = -Math.PI / 2;
 						mesh.rotation.z = -i / monkeys * Math.PI * 2;
 						mesh.rotation.z = -i / monkeys * Math.PI * 2;
 
 
 						scene.add( mesh );
 						scene.add( mesh );