Переглянути джерело

More folder structure clean up.

Mr.doob 13 роки тому
батько
коміт
4d7a030b7e

+ 0 - 0
examples/models/monster.dae → examples/models/collada/monster/monster.dae


+ 0 - 0
examples/models/monster.jpg → examples/models/collada/monster/monster.jpg


+ 0 - 0
examples/models/monster.txt → examples/models/collada/monster/monster.txt


+ 0 - 0
examples/ctm/LeePerry.ctm → examples/models/ctm/LeePerry.ctm


+ 0 - 0
examples/ctm/WaltHead.ctm → examples/models/ctm/WaltHead.ctm


+ 0 - 0
examples/ctm/ben.ctm → examples/models/ctm/ben.ctm


+ 0 - 0
examples/ctm/camaro/camaro.ctm → examples/models/ctm/camaro/camaro.ctm


+ 0 - 0
examples/ctm/camaro/camaro.js → examples/models/ctm/camaro/camaro.js


+ 0 - 0
examples/ctm/camaro/car-ao.png → examples/models/ctm/camaro/car-ao.png


+ 0 - 0
examples/ctm/camaro/plane-ao-256.png → examples/models/ctm/camaro/plane-ao-256.png


+ 0 - 0
examples/ctm/hand.ctm → examples/models/ctm/hand.ctm


+ 0 - 0
examples/utf8/ben.utf8 → examples/models/utf8/ben.utf8


+ 0 - 0
examples/utf8/hand.utf8 → examples/models/utf8/hand.utf8


+ 1 - 1
examples/webgl_loader_collada.html

@@ -49,7 +49,7 @@
 
 			var loader = new THREE.ColladaLoader();
 			loader.options.convertUpAxis = true;
-			loader.load( './models/monster.dae', function colladaReady( collada ) {
+			loader.load( './models/collada/monster/monster.dae', function colladaReady( collada ) {
 
 				dae = collada.scene;
 				skin = collada.skins[ 0 ];

+ 3 - 3
examples/webgl_loader_ctm.html

@@ -146,7 +146,7 @@
 
 				var loader = new THREE.CTMLoader( renderer.context );
 
-				loader.load( "ctm/ben.ctm",   function( geometry ) {
+				loader.load( "models/ctm/ben.ctm",   function( geometry ) {
 
 					var material = new THREE.MeshLambertMaterial( { color: 0xffaa00, map: THREE.ImageUtils.loadTexture( "textures/ash_uvgrid01.jpg" ), envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3 } );
 					callbackModel( geometry, 450, material, 0, -200, 0, 0, 0 );
@@ -154,7 +154,7 @@
 
 				}, useWorker, useBuffers );
 
-				loader.load( "ctm/WaltHead.ctm",  function( geometry ) {
+				loader.load( "models/ctm/WaltHead.ctm",  function( geometry ) {
 
 					//geometry.computeVertexNormals();
 
@@ -164,7 +164,7 @@
 
 				}, useWorker, useBuffers );
 
-				loader.load( "ctm/LeePerry.ctm",  function( geometry ) {
+				loader.load( "models/ctm/LeePerry.ctm",  function( geometry ) {
 
 					var material = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0x444444, shininess: 30, map: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-COL.jpg" ), envMaps: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3 } );
 					callbackModel( geometry, 1300, material, 200, 50, 0, 0, 0 );

+ 1 - 1
examples/webgl_loader_ctm_materials.html

@@ -207,7 +207,7 @@
 				var position = new THREE.Vector3( -105, -78, -40 );
 				var scale = new THREE.Vector3( 30, 30, 30 );
 
-				loaderCTM.loadParts( "ctm/camaro/camaro.js", function( geometries, materials ) {
+				loaderCTM.loadParts( "models/ctm/camaro/camaro.js", function( geometries, materials ) {
 
 					hackMaterials( materials );
 

+ 17 - 5
examples/webgl_loader_utf8.html

@@ -112,17 +112,29 @@
 
 				var loader = new THREE.UTF8Loader();
 
-				loader.load( "utf8/hand.utf8", function( geometry ) { callbackModel( geometry, 400, 0xffffff, 125, FLOOR, 0 ); },
-							 { scale: 0.815141, offsetX: -0.371823, offsetY: -0.011920, offsetZ: -0.416061 } );
+				loader.load( "models/utf8/hand.utf8", function ( geometry ) {
 
-				loader.load( "utf8/ben.utf8", function( geometry ) { callbackModel( geometry, 400, 0xffaa00, -125, FLOOR, 0 ); },
-							  { scale: 0.707192, offsetX: -0.109362, offsetY: -0.006435, offsetZ: -0.268751 } );
+					callbackModel( geometry, 400, 0xffffff, 125, FLOOR, 0 );
+
+				}, { scale: 0.815141, offsetX: -0.371823, offsetY: -0.011920, offsetZ: -0.416061 } );
+
+				loader.load( "models/utf8/ben.utf8", function ( geometry ) {
+
+					callbackModel( geometry, 400, 0xffaa00, -125, FLOOR, 0 );
+
+				}, { scale: 0.707192, offsetX: -0.109362, offsetY: -0.006435, offsetZ: -0.268751 } );
 
 			}
 
 			function callbackModel( geometry, s, color, x, y, z ) {
 
-				var material = new THREE.MeshLambertMaterial( { color: color, map: THREE.ImageUtils.loadTexture( "textures/ash_uvgrid01.jpg" ), envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3 } );
+				var material = new THREE.MeshLambertMaterial( {
+					color: color,
+					map: THREE.ImageUtils.loadTexture( "textures/ash_uvgrid01.jpg" ),
+					envMap: reflectionCube,
+					combine: THREE.MixOperation,
+					reflectivity: 0.3
+				} );
 				//material.shading =  THREE.FlatShading;
 
 				var mesh = new THREE.Mesh( geometry, material );