Merge pull request #13320 from looeee/move_leeperrysmith_model

EXAMPLES: moved leePerrySmith json model to correct folder

examples/obj/leeperrysmith/.htaccess

-<Files *.js>
-SetOutputFilter DEFLATE
-</Files>
-
-<Files *.bin>
-SetOutputFilter DEFLATE
-</Files>

examples/webgl_decals.html

@@ -240,13 +240,13 @@
 
 			var loader = new THREE.JSONLoader();
 
-			loader.load( 'obj/leeperrysmith/LeePerrySmith.js', function( geometry ) {
+			loader.load( 'models/json/leeperrysmith/LeePerrySmith.json', function( geometry ) {
 
 				var material = new THREE.MeshPhongMaterial( {
 					specular: 0x111111,
-					map: textureLoader.load( 'obj/leeperrysmith/Map-COL.jpg' ),
-					specularMap: textureLoader.load( 'obj/leeperrysmith/Map-SPEC.jpg' ),
-					normalMap: textureLoader.load( 'obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg' ),
+					map: textureLoader.load( 'models/json/leeperrysmith/Map-COL.jpg' ),
+					specularMap: textureLoader.load( 'models/json/leeperrysmith/Map-SPEC.jpg' ),
+					normalMap: textureLoader.load( 'models/json/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg' ),
 					shininess: 25
 				} );
 

examples/webgl_helpers.html

@@ -56,7 +56,7 @@
 				scene.add( polarGridHelper );
 
 				var loader = new THREE.JSONLoader();
-				loader.load( 'obj/leeperrysmith/LeePerrySmith.js', function ( geometry, materials ) {
+				loader.load( 'models/json/leeperrysmith/LeePerrySmith.json', function ( geometry, materials ) {
 
 					var material = new THREE.MeshLambertMaterial();
 

examples/webgl_loader_ctm.html

@@ -180,9 +180,9 @@
 
 						specular: 0x303030,
 						shininess: 50,
-						map: textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" ),
-						specularMap: textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" ),
-						normalMap: textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
+						map: textureLoader.load( "models/json/leeperrysmith/Map-COL.jpg" ),
+						specularMap: textureLoader.load( "models/json/leeperrysmith/Map-SPEC.jpg" ),
+						normalMap: textureLoader.load( "models/json/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
 						normalScale: new THREE.Vector2( 0.8, 0.8 )
 
 					} );

examples/webgl_materials_bumpmap.html

@@ -110,7 +110,7 @@
 
 				//
 
-				var mapHeight = new THREE.TextureLoader().load( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
+				var mapHeight = new THREE.TextureLoader().load( "models/json/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
 
 				var material = new THREE.MeshPhongMaterial( {
 					color: 0x552811,
@@ -121,7 +121,7 @@
 				} );
 
 				loader = new THREE.JSONLoader();
-				loader.load( "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) { createScene( geometry, 100, material ) } );
+				loader.load( "models/json/leeperrysmith/LeePerrySmith.json", function( geometry ) { createScene( geometry, 100, material ) } );
 
 				renderer = new THREE.WebGLRenderer( { antialias: false } );
 				renderer.setPixelRatio( window.devicePixelRatio );

examples/webgl_materials_bumpmap_skin.html

@@ -126,7 +126,7 @@
 				//
 
 				loader = new THREE.JSONLoader();
-				loader.load( "obj/leeperrysmith/LeePerrySmith.js", function ( geometry ) {
+				loader.load( "models/json/leeperrysmith/LeePerrySmith.json", function ( geometry ) {
 
 					createScene( geometry, 100 )
 
@@ -187,19 +187,19 @@
 
 				var textureLoader = new THREE.TextureLoader();
 
-				var mapHeight = textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
+				var mapHeight = textureLoader.load( "models/json/leeperrysmith/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg" );
 
 				mapHeight.anisotropy = 4;
 				mapHeight.wrapS = mapHeight.wrapT = THREE.RepeatWrapping;
 				mapHeight.format = THREE.RGBFormat;
 
-				var mapSpecular = textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" );
+				var mapSpecular = textureLoader.load( "models/json/leeperrysmith/Map-SPEC.jpg" );
 
 				mapSpecular.anisotropy = 4;
 				mapSpecular.wrapS = mapSpecular.wrapT = THREE.RepeatWrapping;
 				mapSpecular.format = THREE.RGBFormat;
 
-				var mapColor = textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" );
+				var mapColor = textureLoader.load( "models/json/leeperrysmith/Map-COL.jpg" );
 
 				mapColor.anisotropy = 4;
 				mapColor.wrapS = mapColor.wrapT = THREE.RepeatWrapping;

examples/webgl_materials_modified.html

@@ -115,7 +115,7 @@
 				};
 
 				loader = new THREE.JSONLoader();
-				loader.load( "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) {
+				loader.load( "models/json/leeperrysmith/LeePerrySmith.json", function( geometry ) {
 
 					mesh = new THREE.Mesh( geometry, material );
 					mesh.position.y = - 50;

examples/webgl_materials_normalmap.html

@@ -124,14 +124,14 @@
 					color: 0xdddddd,
 					specular: 0x222222,
 					shininess: 35,
-					map: textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" ),
-					specularMap: textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" ),
-					normalMap: textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
+					map: textureLoader.load( "models/json/leeperrysmith/Map-COL.jpg" ),
+					specularMap: textureLoader.load( "models/json/leeperrysmith/Map-SPEC.jpg" ),
+					normalMap: textureLoader.load( "models/json/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
 					normalScale: new THREE.Vector2( 0.8, 0.8 )
 				} );
 
 				loader = new THREE.JSONLoader();
-				loader.load( "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) { createScene( geometry, 100, material ) } );
+				loader.load( "models/json/leeperrysmith/LeePerrySmith.json", function( geometry ) { createScene( geometry, 100, material ) } );
 
 				renderer = new THREE.WebGLRenderer( { antialias: false } );
 				renderer.setSize( window.innerWidth, window.innerHeight );

examples/webgl_materials_skin.html

@@ -118,10 +118,10 @@
 
 				var textureLoader = new THREE.TextureLoader();
 
-				uniformsUV[ "tNormal" ].value = textureLoader.load( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
+				uniformsUV[ "tNormal" ].value = textureLoader.load( "models/json/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" );
 				uniformsUV[ "uNormalScale" ].value = -1.5;
 
-				uniformsUV[ "tDiffuse" ].value = textureLoader.load( "obj/leeperrysmith/Map-COL.jpg" );
+				uniformsUV[ "tDiffuse" ].value = textureLoader.load( "models/json/leeperrysmith/Map-COL.jpg" );
 
 				uniformsUV[ "passID" ].value = 0;
 
@@ -150,7 +150,7 @@
 				// LOADER
 
 				loader = new THREE.JSONLoader();
-				loader.load(  "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) {
+				loader.load(  "models/json/leeperrysmith/LeePerrySmith.json", function( geometry ) {
 
 					createScene( geometry, 100, material );
 

examples/webgl_postprocessing_advanced.html

@@ -112,7 +112,7 @@
 				sceneModel.add( directionalLight );
 
 				var loader = new THREE.JSONLoader();
-				loader.load( "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) {
+				loader.load( "models/json/leeperrysmith/LeePerrySmith.json", function( geometry ) {
 
 					createMesh( geometry, sceneModel, 100 );
 
@@ -340,8 +340,8 @@
 					color: 0x999999,
 					specular: 0x080808,
 					shininess: 20,
-					map: new THREE.TextureLoader().load( "obj/leeperrysmith/Map-COL.jpg" ),
-					normalMap: new THREE.TextureLoader().load("obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
+					map: new THREE.TextureLoader().load( "models/json/leeperrysmith/Map-COL.jpg" ),
+					normalMap: new THREE.TextureLoader().load("models/json/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ),
 					normalScale: new THREE.Vector2( 0.75, 0.75 )
 
 				} );