Fixed loading of models which were using normalmap materials inside MeshFaceMaterials.

build/three.js

@@ -6846,13 +6846,11 @@ THREE.Loader.prototype = {
 
 	},
 
-	hasNormals: function ( scope ) {
+	needsTangents: function ( materials ) {
 
-		var m, i, il = scope.materials.length;
+		for( var i = 0, il = materials.length; i < il; i ++ ) {
 
-		for( i = 0; i < il; i ++ ) {
-
-			m = scope.materials[ i ];
+			var m = materials[ i ];
 
 			if ( m instanceof THREE.ShaderMaterial ) return true;
 
@@ -7318,7 +7316,7 @@ THREE.BinaryLoader.prototype.loadAjaxBuffers = function ( json, callback, binary
 
 // Binary AJAX parser
 
-THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texturePath, materials ) {
+THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texturePath, jsonMaterials ) {
 
 	var Model = function ( texturePath ) {
 
@@ -7399,8 +7397,6 @@ THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texture
 		this.computeCentroids();
 		this.computeFaceNormals();
 
-		if ( THREE.Loader.prototype.hasNormals( this ) ) this.computeTangents();
-
 		function handlePadding( n ) {
 
 			return ( n % 4 ) ? ( 4 - n % 4 ) : 0;
@@ -7961,7 +7957,12 @@ THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texture
 
 	Model.prototype = Object.create( THREE.Geometry.prototype );
 
-	callback( new Model( texturePath ), this.initMaterials( materials, texturePath ) );
+	var geometry = new Model( texturePath );
+	var materials = this.initMaterials( jsonMaterials, texturePath );
+
+	if ( this.needsTangents( materials ) ) geometry.computeTangents();
+
+	callback( geometry, materials );
 
 };
 /**
@@ -8111,9 +8112,6 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texturePath
 	geometry.computeCentroids();
 	geometry.computeFaceNormals();
 
-	if ( this.hasNormals( geometry ) ) geometry.computeTangents();
-
-
 	function parseModel( scale ) {
 
 		function isBitSet( value, position ) {
@@ -8431,6 +8429,8 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texturePath
 
 	var materials = this.initMaterials( json.materials, texturePath );
 
+	if ( this.needsTangents( materials ) ) geometry.computeTangents();
+
 	callback( geometry, materials );
 
 };
@@ -8706,16 +8706,10 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 					if ( geometry ) {
 
-						var hasNormals = false;
+						var needsTangents = false;
 
 						material = result.materials[ o.material ];
-						hasNormals = material instanceof THREE.ShaderMaterial;
-
-						if ( hasNormals ) {
-
-							geometry.computeTangents();
-
-						}
+						needsTangents = material instanceof THREE.ShaderMaterial;
 
 						p = o.position;
 						r = o.rotation;
@@ -8746,6 +8740,22 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 						}
 
+						if ( material instanceof THREE.MeshFaceMaterial ) {
+
+							for ( var i = 0; i < material.materials.length; i ++ ) {
+
+								needsTangents = needsTangents || ( material.materials[ i ] instanceof THREE.ShaderMaterial );
+
+							}
+
+						}
+
+						if ( needsTangents ) {
+
+							geometry.computeTangents();
+
+						}
+
 						if ( o.skin ) {
 
 							object = new THREE.SkinnedMesh( geometry, material );

build/three.min.js

@@ -145,14 +145,14 @@ THREE.HemisphereLight=function(a,b,c){THREE.Light.call(this,a);this.groundColor=
 THREE.SpotLight=function(a,b,c,d,e){THREE.Light.call(this,a);this.position=new THREE.Vector3(0,1,0);this.target=new THREE.Object3D;this.intensity=void 0!==b?b:1;this.distance=void 0!==c?c:0;this.angle=void 0!==d?d:Math.PI/2;this.exponent=void 0!==e?e:10;this.onlyShadow=this.castShadow=!1;this.shadowCameraNear=50;this.shadowCameraFar=5E3;this.shadowCameraFov=50;this.shadowCameraVisible=!1;this.shadowBias=0;this.shadowDarkness=0.5;this.shadowMapHeight=this.shadowMapWidth=512;this.shadowMatrix=this.shadowCamera=
 this.shadowMapSize=this.shadowMap=null};THREE.SpotLight.prototype=Object.create(THREE.Light.prototype);THREE.Loader=function(a){this.statusDomElement=(this.showStatus=a)?THREE.Loader.prototype.addStatusElement():null;this.onLoadStart=function(){};this.onLoadProgress=function(){};this.onLoadComplete=function(){}};
 THREE.Loader.prototype={constructor:THREE.Loader,crossOrigin:"anonymous",addStatusElement:function(){var a=document.createElement("div");a.style.position="absolute";a.style.right="0px";a.style.top="0px";a.style.fontSize="0.8em";a.style.textAlign="left";a.style.background="rgba(0,0,0,0.25)";a.style.color="#fff";a.style.width="120px";a.style.padding="0.5em 0.5em 0.5em 0.5em";a.style.zIndex=1E3;a.innerHTML="Loading ...";return a},updateProgress:function(a){var b="Loaded ",b=a.total?b+((100*a.loaded/
-a.total).toFixed(0)+"%"):b+((a.loaded/1E3).toFixed(2)+" KB");this.statusDomElement.innerHTML=b},extractUrlBase:function(a){a=a.split("/");a.pop();return(1>a.length?".":a.join("/"))+"/"},initMaterials:function(a,b){for(var c=[],d=0;d<a.length;++d)c[d]=THREE.Loader.prototype.createMaterial(a[d],b);return c},hasNormals:function(a){var b,c,d=a.materials.length;for(c=0;c<d;c++)if(b=a.materials[c],b instanceof THREE.ShaderMaterial)return!0;return!1},createMaterial:function(a,b){function c(a){a=Math.log(a)/
-Math.LN2;return Math.floor(a)==a}function d(a){a=Math.log(a)/Math.LN2;return Math.pow(2,Math.round(a))}function e(a,e,f,h,i,j,t){var q=f.toLowerCase().endsWith(".dds"),A=b+"/"+f;if(q){var w=THREE.ImageUtils.loadCompressedTexture(A);a[e]=w}else w=document.createElement("canvas"),a[e]=new THREE.Texture(w);a[e].sourceFile=f;if(h&&(a[e].repeat.set(h[0],h[1]),1!==h[0]&&(a[e].wrapS=THREE.RepeatWrapping),1!==h[1]))a[e].wrapT=THREE.RepeatWrapping;i&&a[e].offset.set(i[0],i[1]);if(j&&(f={repeat:THREE.RepeatWrapping,
-mirror:THREE.MirroredRepeatWrapping},void 0!==f[j[0]]&&(a[e].wrapS=f[j[0]]),void 0!==f[j[1]]))a[e].wrapT=f[j[1]];t&&(a[e].anisotropy=t);if(!q){var r=a[e],a=new Image;a.onload=function(){if(!c(this.width)||!c(this.height)){var a=d(this.width),b=d(this.height);r.image.width=a;r.image.height=b;r.image.getContext("2d").drawImage(this,0,0,a,b)}else r.image=this;r.needsUpdate=true};a.crossOrigin=g.crossOrigin;a.src=A}}function f(a){return(255*a[0]<<16)+(255*a[1]<<8)+255*a[2]}var g=this,h="MeshLambertMaterial",
-i={color:15658734,opacity:1,map:null,lightMap:null,normalMap:null,bumpMap:null,wireframe:!1};if(a.shading){var j=a.shading.toLowerCase();"phong"===j?h="MeshPhongMaterial":"basic"===j&&(h="MeshBasicMaterial")}void 0!==a.blending&&void 0!==THREE[a.blending]&&(i.blending=THREE[a.blending]);if(void 0!==a.transparent||1>a.opacity)i.transparent=a.transparent;void 0!==a.depthTest&&(i.depthTest=a.depthTest);void 0!==a.depthWrite&&(i.depthWrite=a.depthWrite);void 0!==a.visible&&(i.visible=a.visible);void 0!==
-a.flipSided&&(i.side=THREE.BackSide);void 0!==a.doubleSided&&(i.side=THREE.DoubleSide);void 0!==a.wireframe&&(i.wireframe=a.wireframe);void 0!==a.vertexColors&&("face"===a.vertexColors?i.vertexColors=THREE.FaceColors:a.vertexColors&&(i.vertexColors=THREE.VertexColors));a.colorDiffuse?i.color=f(a.colorDiffuse):a.DbgColor&&(i.color=a.DbgColor);a.colorSpecular&&(i.specular=f(a.colorSpecular));a.colorAmbient&&(i.ambient=f(a.colorAmbient));a.transparency&&(i.opacity=a.transparency);a.specularCoef&&(i.shininess=
-a.specularCoef);a.mapDiffuse&&b&&e(i,"map",a.mapDiffuse,a.mapDiffuseRepeat,a.mapDiffuseOffset,a.mapDiffuseWrap,a.mapDiffuseAnisotropy);a.mapLight&&b&&e(i,"lightMap",a.mapLight,a.mapLightRepeat,a.mapLightOffset,a.mapLightWrap,a.mapLightAnisotropy);a.mapBump&&b&&e(i,"bumpMap",a.mapBump,a.mapBumpRepeat,a.mapBumpOffset,a.mapBumpWrap,a.mapBumpAnisotropy);a.mapNormal&&b&&e(i,"normalMap",a.mapNormal,a.mapNormalRepeat,a.mapNormalOffset,a.mapNormalWrap,a.mapNormalAnisotropy);a.mapSpecular&&b&&e(i,"specularMap",
-a.mapSpecular,a.mapSpecularRepeat,a.mapSpecularOffset,a.mapSpecularWrap,a.mapSpecularAnisotropy);a.mapBumpScale&&(i.bumpScale=a.mapBumpScale);a.mapNormal?(h=THREE.ShaderUtils.lib.normal,j=THREE.UniformsUtils.clone(h.uniforms),j.tNormal.value=i.normalMap,a.mapNormalFactor&&j.uNormalScale.value.set(a.mapNormalFactor,a.mapNormalFactor),i.map&&(j.tDiffuse.value=i.map,j.enableDiffuse.value=!0),i.specularMap&&(j.tSpecular.value=i.specularMap,j.enableSpecular.value=!0),i.lightMap&&(j.tAO.value=i.lightMap,
-j.enableAO.value=!0),j.uDiffuseColor.value.setHex(i.color),j.uSpecularColor.value.setHex(i.specular),j.uAmbientColor.value.setHex(i.ambient),j.uShininess.value=i.shininess,void 0!==i.opacity&&(j.uOpacity.value=i.opacity),i=new THREE.ShaderMaterial({fragmentShader:h.fragmentShader,vertexShader:h.vertexShader,uniforms:j,lights:!0,fog:!0})):i=new THREE[h](i);void 0!==a.DbgName&&(i.name=a.DbgName);return i}};THREE.BinaryLoader=function(a){THREE.Loader.call(this,a)};THREE.BinaryLoader.prototype=Object.create(THREE.Loader.prototype);
+a.total).toFixed(0)+"%"):b+((a.loaded/1E3).toFixed(2)+" KB");this.statusDomElement.innerHTML=b},extractUrlBase:function(a){a=a.split("/");a.pop();return(1>a.length?".":a.join("/"))+"/"},initMaterials:function(a,b){for(var c=[],d=0;d<a.length;++d)c[d]=THREE.Loader.prototype.createMaterial(a[d],b);return c},needsTangents:function(a){for(var b=0,c=a.length;b<c;b++)if(a[b]instanceof THREE.ShaderMaterial)return!0;return!1},createMaterial:function(a,b){function c(a){a=Math.log(a)/Math.LN2;return Math.floor(a)==
+a}function d(a){a=Math.log(a)/Math.LN2;return Math.pow(2,Math.round(a))}function e(a,e,f,h,i,j,t){var q=f.toLowerCase().endsWith(".dds"),A=b+"/"+f;if(q){var w=THREE.ImageUtils.loadCompressedTexture(A);a[e]=w}else w=document.createElement("canvas"),a[e]=new THREE.Texture(w);a[e].sourceFile=f;if(h&&(a[e].repeat.set(h[0],h[1]),1!==h[0]&&(a[e].wrapS=THREE.RepeatWrapping),1!==h[1]))a[e].wrapT=THREE.RepeatWrapping;i&&a[e].offset.set(i[0],i[1]);if(j&&(f={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping},
+void 0!==f[j[0]]&&(a[e].wrapS=f[j[0]]),void 0!==f[j[1]]))a[e].wrapT=f[j[1]];t&&(a[e].anisotropy=t);if(!q){var r=a[e],a=new Image;a.onload=function(){if(!c(this.width)||!c(this.height)){var a=d(this.width),b=d(this.height);r.image.width=a;r.image.height=b;r.image.getContext("2d").drawImage(this,0,0,a,b)}else r.image=this;r.needsUpdate=true};a.crossOrigin=g.crossOrigin;a.src=A}}function f(a){return(255*a[0]<<16)+(255*a[1]<<8)+255*a[2]}var g=this,h="MeshLambertMaterial",i={color:15658734,opacity:1,map:null,
+lightMap:null,normalMap:null,bumpMap:null,wireframe:!1};if(a.shading){var j=a.shading.toLowerCase();"phong"===j?h="MeshPhongMaterial":"basic"===j&&(h="MeshBasicMaterial")}void 0!==a.blending&&void 0!==THREE[a.blending]&&(i.blending=THREE[a.blending]);if(void 0!==a.transparent||1>a.opacity)i.transparent=a.transparent;void 0!==a.depthTest&&(i.depthTest=a.depthTest);void 0!==a.depthWrite&&(i.depthWrite=a.depthWrite);void 0!==a.visible&&(i.visible=a.visible);void 0!==a.flipSided&&(i.side=THREE.BackSide);
+void 0!==a.doubleSided&&(i.side=THREE.DoubleSide);void 0!==a.wireframe&&(i.wireframe=a.wireframe);void 0!==a.vertexColors&&("face"===a.vertexColors?i.vertexColors=THREE.FaceColors:a.vertexColors&&(i.vertexColors=THREE.VertexColors));a.colorDiffuse?i.color=f(a.colorDiffuse):a.DbgColor&&(i.color=a.DbgColor);a.colorSpecular&&(i.specular=f(a.colorSpecular));a.colorAmbient&&(i.ambient=f(a.colorAmbient));a.transparency&&(i.opacity=a.transparency);a.specularCoef&&(i.shininess=a.specularCoef);a.mapDiffuse&&
+b&&e(i,"map",a.mapDiffuse,a.mapDiffuseRepeat,a.mapDiffuseOffset,a.mapDiffuseWrap,a.mapDiffuseAnisotropy);a.mapLight&&b&&e(i,"lightMap",a.mapLight,a.mapLightRepeat,a.mapLightOffset,a.mapLightWrap,a.mapLightAnisotropy);a.mapBump&&b&&e(i,"bumpMap",a.mapBump,a.mapBumpRepeat,a.mapBumpOffset,a.mapBumpWrap,a.mapBumpAnisotropy);a.mapNormal&&b&&e(i,"normalMap",a.mapNormal,a.mapNormalRepeat,a.mapNormalOffset,a.mapNormalWrap,a.mapNormalAnisotropy);a.mapSpecular&&b&&e(i,"specularMap",a.mapSpecular,a.mapSpecularRepeat,
+a.mapSpecularOffset,a.mapSpecularWrap,a.mapSpecularAnisotropy);a.mapBumpScale&&(i.bumpScale=a.mapBumpScale);a.mapNormal?(h=THREE.ShaderUtils.lib.normal,j=THREE.UniformsUtils.clone(h.uniforms),j.tNormal.value=i.normalMap,a.mapNormalFactor&&j.uNormalScale.value.set(a.mapNormalFactor,a.mapNormalFactor),i.map&&(j.tDiffuse.value=i.map,j.enableDiffuse.value=!0),i.specularMap&&(j.tSpecular.value=i.specularMap,j.enableSpecular.value=!0),i.lightMap&&(j.tAO.value=i.lightMap,j.enableAO.value=!0),j.uDiffuseColor.value.setHex(i.color),
+j.uSpecularColor.value.setHex(i.specular),j.uAmbientColor.value.setHex(i.ambient),j.uShininess.value=i.shininess,void 0!==i.opacity&&(j.uOpacity.value=i.opacity),i=new THREE.ShaderMaterial({fragmentShader:h.fragmentShader,vertexShader:h.vertexShader,uniforms:j,lights:!0,fog:!0})):i=new THREE[h](i);void 0!==a.DbgName&&(i.name=a.DbgName);return i}};THREE.BinaryLoader=function(a){THREE.Loader.call(this,a)};THREE.BinaryLoader.prototype=Object.create(THREE.Loader.prototype);
 THREE.BinaryLoader.prototype.load=function(a,b,c,d){var c=c&&"string"===typeof c?c:this.extractUrlBase(a),d=d&&"string"===typeof d?d:this.extractUrlBase(a),e=this.showProgress?THREE.Loader.prototype.updateProgress:null;this.onLoadStart();this.loadAjaxJSON(this,a,b,c,d,e)};
 THREE.BinaryLoader.prototype.loadAjaxJSON=function(a,b,c,d,e,f){var g=new XMLHttpRequest;g.onreadystatechange=function(){if(4==g.readyState)if(200==g.status||0==g.status){var h=JSON.parse(g.responseText);a.loadAjaxBuffers(h,c,e,d,f)}else console.error("THREE.BinaryLoader: Couldn't load ["+b+"] ["+g.status+"]")};g.open("GET",b,!0);g.send(null)};
 THREE.BinaryLoader.prototype.loadAjaxBuffers=function(a,b,c,d,e){var f=new XMLHttpRequest,g=c+"/"+a.buffers,h=0;f.onreadystatechange=function(){if(4==f.readyState)if(200==f.status||0==f.status){var c=f.response;void 0===c&&(c=(new Uint8Array(f.responseBody)).buffer);THREE.BinaryLoader.prototype.createBinModel(c,b,d,a.materials)}else console.error("THREE.BinaryLoader: Couldn't load ["+g+"] ["+f.status+"]");else 3==f.readyState?e&&(0==h&&(h=f.getResponseHeader("Content-Length")),e({total:h,loaded:f.responseText.length})):
@@ -164,8 +164,8 @@ j],I[3*j+1],I[3*j+2]),new THREE.Vector3(o,p,l),new THREE.Vector3(s,q,n)],null,i)
 q,n),new THREE.Vector3(r,t,m),new THREE.Vector3(u,v,o)],null,j))}}var J=this,H=0,I=[],L=[],P,S,U;THREE.Geometry.call(this);r=a;S=H;A=new Uint8Array(r,S,12);o="";for(q=0;12>q;q++)o+=String.fromCharCode(A[S+q]);b=z(r,S+12);z(r,S+13);z(r,S+14);z(r,S+15);c=z(r,S+16);d=z(r,S+17);e=z(r,S+18);j=z(r,S+19);l=v(r,S+20);m=v(r,S+20+4);n=v(r,S+20+8);p=v(r,S+20+12);o=v(r,S+20+16);s=v(r,S+20+20);t=v(r,S+20+24);q=v(r,S+20+28);A=v(r,S+20+32);w=v(r,S+20+36);r=v(r,S+20+40);H+=b;S=3*c+j;U=4*c+j;P=p*S;b=o*(S+3*d);c=s*
 (S+3*e);j=t*(S+3*d+3*e);S=q*U;d=A*(U+4*d);e=w*(U+4*e);U=H;var H=new Float32Array(a,H,3*l),M,O,Q,Z;for(M=0;M<l;M++)O=H[3*M],Q=H[3*M+1],Z=H[3*M+2],J.vertices.push(new THREE.Vector3(O,Q,Z));l=H=U+3*l*Float32Array.BYTES_PER_ELEMENT;if(m){H=new Int8Array(a,H,3*m);for(U=0;U<m;U++)M=H[3*U],O=H[3*U+1],Q=H[3*U+2],I.push(M/127,O/127,Q/127)}H=l+3*m*Int8Array.BYTES_PER_ELEMENT;m=H+=E(3*m);if(n){l=new Float32Array(a,H,2*n);for(H=0;H<n;H++)U=l[2*H],M=l[2*H+1],L.push(U,M)}n=H=m+2*n*Float32Array.BYTES_PER_ELEMENT;
 P=n+P+E(2*p);m=P+b+E(2*o);b=m+c+E(2*s);c=b+j+E(2*t);S=c+S+E(2*q);j=S+d+E(2*A);d=j+e+E(2*w);s&&(e=m+3*s*Uint32Array.BYTES_PER_ELEMENT,C(s,m,e+3*s*Uint32Array.BYTES_PER_ELEMENT),u(s,e));t&&(s=b+3*t*Uint32Array.BYTES_PER_ELEMENT,e=s+3*t*Uint32Array.BYTES_PER_ELEMENT,N(t,b,s,e+3*t*Uint32Array.BYTES_PER_ELEMENT),u(t,e));w&&(t=j+4*w*Uint32Array.BYTES_PER_ELEMENT,G(w,j,t+4*w*Uint32Array.BYTES_PER_ELEMENT),D(w,t));r&&(w=d+4*r*Uint32Array.BYTES_PER_ELEMENT,t=w+4*r*Uint32Array.BYTES_PER_ELEMENT,B(r,d,w,t+4*
-r*Uint32Array.BYTES_PER_ELEMENT),D(r,t));p&&C(p,n,n+3*p*Uint32Array.BYTES_PER_ELEMENT);o&&(p=P+3*o*Uint32Array.BYTES_PER_ELEMENT,N(o,P,p,p+3*o*Uint32Array.BYTES_PER_ELEMENT));q&&G(q,c,c+4*q*Uint32Array.BYTES_PER_ELEMENT);A&&(o=S+4*A*Uint32Array.BYTES_PER_ELEMENT,B(A,S,o,o+4*A*Uint32Array.BYTES_PER_ELEMENT));this.computeCentroids();this.computeFaceNormals();THREE.Loader.prototype.hasNormals(this)&&this.computeTangents()};e.prototype=Object.create(THREE.Geometry.prototype);b(new e(c),this.initMaterials(d,
-c))};THREE.ImageLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};THREE.ImageLoader.prototype={constructor:THREE.ImageLoader,load:function(a,b){var c=this;void 0===b&&(b=new Image);b.addEventListener("load",function(){c.dispatchEvent({type:"load",content:b})},!1);b.addEventListener("error",function(){c.dispatchEvent({type:"error",message:"Couldn't load URL ["+a+"]"})},!1);c.crossOrigin&&(b.crossOrigin=c.crossOrigin);b.src=a}};
+r*Uint32Array.BYTES_PER_ELEMENT),D(r,t));p&&C(p,n,n+3*p*Uint32Array.BYTES_PER_ELEMENT);o&&(p=P+3*o*Uint32Array.BYTES_PER_ELEMENT,N(o,P,p,p+3*o*Uint32Array.BYTES_PER_ELEMENT));q&&G(q,c,c+4*q*Uint32Array.BYTES_PER_ELEMENT);A&&(o=S+4*A*Uint32Array.BYTES_PER_ELEMENT,B(A,S,o,o+4*A*Uint32Array.BYTES_PER_ELEMENT));this.computeCentroids();this.computeFaceNormals()};e.prototype=Object.create(THREE.Geometry.prototype);e=new e(c);c=this.initMaterials(d,c);this.needsTangents(c)&&e.computeTangents();b(e,c)};
+THREE.ImageLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};THREE.ImageLoader.prototype={constructor:THREE.ImageLoader,load:function(a,b){var c=this;void 0===b&&(b=new Image);b.addEventListener("load",function(){c.dispatchEvent({type:"load",content:b})},!1);b.addEventListener("error",function(){c.dispatchEvent({type:"error",message:"Couldn't load URL ["+a+"]"})},!1);c.crossOrigin&&(b.crossOrigin=c.crossOrigin);b.src=a}};
 THREE.JSONLoader=function(a){THREE.Loader.call(this,a);this.withCredentials=!1};THREE.JSONLoader.prototype=Object.create(THREE.Loader.prototype);THREE.JSONLoader.prototype.load=function(a,b,c){c=c&&"string"===typeof c?c:this.extractUrlBase(a);this.onLoadStart();this.loadAjaxJSON(this,a,b,c)};
 THREE.JSONLoader.prototype.loadAjaxJSON=function(a,b,c,d,e){var f=new XMLHttpRequest,g=0;f.withCredentials=this.withCredentials;f.onreadystatechange=function(){if(f.readyState===f.DONE)if(200===f.status||0===f.status){if(f.responseText){var h=JSON.parse(f.responseText);a.createModel(h,c,d)}else console.warn("THREE.JSONLoader: ["+b+"] seems to be unreachable or file there is empty");a.onLoadComplete()}else console.error("THREE.JSONLoader: Couldn't load ["+b+"] ["+f.status+"]");else f.readyState===
 f.LOADING?e&&(0===g&&(g=f.getResponseHeader("Content-Length")),e({total:g,loaded:f.responseText.length})):f.readyState===f.HEADERS_RECEIVED&&(g=f.getResponseHeader("Content-Length"))};f.open("GET",b,!0);f.send(null)};
@@ -173,31 +173,31 @@ THREE.JSONLoader.prototype.createModel=function(a,b,c){var d=new THREE.Geometry,
 t.a=r[i++],t.b=r[i++],t.c=r[i++],t.d=r[i++],l=4):(t=new THREE.Face3,t.a=r[i++],t.b=r[i++],t.c=r[i++],l=3);h&&(h=r[i++],t.materialIndex=h);h=d.faces.length;if(f)for(f=0;f<v;f++)q=a.uvs[f],p=r[i++],w=q[2*p],p=q[2*p+1],d.faceUvs[f][h]=new THREE.UV(w,p);if(g)for(f=0;f<v;f++){q=a.uvs[f];A=[];for(g=0;g<l;g++)p=r[i++],w=q[2*p],p=q[2*p+1],A[g]=new THREE.UV(w,p);d.faceVertexUvs[f][h]=A}n&&(n=3*r[i++],g=new THREE.Vector3,g.x=E[n++],g.y=E[n++],g.z=E[n],t.normal=g);if(m)for(f=0;f<l;f++)n=3*r[i++],g=new THREE.Vector3,
 g.x=E[n++],g.y=E[n++],g.z=E[n],t.vertexNormals.push(g);s&&(m=r[i++],m=new THREE.Color(z[m]),t.color=m);if(o)for(f=0;f<l;f++)m=r[i++],m=new THREE.Color(z[m]),t.vertexColors.push(m);d.faces.push(t)}if(a.skinWeights){i=0;for(j=a.skinWeights.length;i<j;i+=2)r=a.skinWeights[i],E=a.skinWeights[i+1],d.skinWeights.push(new THREE.Vector4(r,E,0,0))}if(a.skinIndices){i=0;for(j=a.skinIndices.length;i<j;i+=2)r=a.skinIndices[i],E=a.skinIndices[i+1],d.skinIndices.push(new THREE.Vector4(r,E,0,0))}d.bones=a.bones;
 d.animation=a.animation;if(void 0!==a.morphTargets){i=0;for(j=a.morphTargets.length;i<j;i++){d.morphTargets[i]={};d.morphTargets[i].name=a.morphTargets[i].name;d.morphTargets[i].vertices=[];z=d.morphTargets[i].vertices;v=a.morphTargets[i].vertices;r=0;for(E=v.length;r<E;r+=3)o=new THREE.Vector3,o.x=v[r]*e,o.y=v[r+1]*e,o.z=v[r+2]*e,z.push(o)}}if(void 0!==a.morphColors){i=0;for(j=a.morphColors.length;i<j;i++){d.morphColors[i]={};d.morphColors[i].name=a.morphColors[i].name;d.morphColors[i].colors=[];
-E=d.morphColors[i].colors;z=a.morphColors[i].colors;e=0;for(r=z.length;e<r;e+=3)v=new THREE.Color(16755200),v.setRGB(z[e],z[e+1],z[e+2]),E.push(v)}}d.computeCentroids();d.computeFaceNormals();this.hasNormals(d)&&d.computeTangents();a=this.initMaterials(a.materials,c);b(d,a)};
+E=d.morphColors[i].colors;z=a.morphColors[i].colors;e=0;for(r=z.length;e<r;e+=3)v=new THREE.Color(16755200),v.setRGB(z[e],z[e+1],z[e+2]),E.push(v)}}d.computeCentroids();d.computeFaceNormals();a=this.initMaterials(a.materials,c);this.needsTangents(a)&&d.computeTangents();b(d,a)};
 THREE.LoadingMonitor=function(){THREE.EventTarget.call(this);var a=this,b=0,c=0,d=function(){b++;a.dispatchEvent({type:"progress",loaded:b,total:c});b===c&&a.dispatchEvent({type:"load"})};this.add=function(a){c++;a.addEventListener("load",d,!1)}};
 THREE.SceneLoader=function(){this.onLoadStart=function(){};this.onLoadProgress=function(){};this.onLoadComplete=function(){};this.callbackSync=function(){};this.callbackProgress=function(){};this.geometryHandlerMap={};this.hierarchyHandlerMap={};this.addGeometryHandler("ascii",THREE.JSONLoader);this.addGeometryHandler("binary",THREE.BinaryLoader)};THREE.SceneLoader.prototype.constructor=THREE.SceneLoader;
 THREE.SceneLoader.prototype.load=function(a,b){var c=this,d=new XMLHttpRequest;d.onreadystatechange=function(){if(4===d.readyState)if(200===d.status||0===d.status){var e=JSON.parse(d.responseText);c.parse(e,b,a)}else console.error("THREE.SceneLoader: Couldn't load ["+a+"] ["+d.status+"]")};d.open("GET",a,!0);d.send(null)};THREE.SceneLoader.prototype.addGeometryHandler=function(a,b){this.geometryHandlerMap[a]={loaderClass:b}};
 THREE.SceneLoader.prototype.addHierarchyHandler=function(a,b){this.hierarchyHandlerMap[a]={loaderClass:b}};
 THREE.SceneLoader.prototype.parse=function(a,b,c){function d(a,b){return"relativeToHTML"==b?a:m+"/"+a}function e(){f(M.scene,Q.objects)}function f(a,b){for(var c in b)if(void 0===M.objects[c]){var e=b[c],g=null;if(e.type&&e.type in l.hierarchyHandlerMap&&void 0===e.loading){var i={},j;for(j in t)"type"!==j&&"url"!==j&&(i[j]=t[j]);C=M.materials[e.material];e.loading=!0;var n=l.hierarchyHandlerMap[e.type].loaderObject;n.addEventListener?(n.addEventListener("load",h(c,a,C,e)),n.load(d(e.url,Q.urlBaseType))):
-n.options?n.load(d(e.url,Q.urlBaseType),h(c,a,C,e)):n.load(d(e.url,Q.urlBaseType),h(c,a,C,e),i)}else if(void 0!==e.geometry){if(D=M.geometries[e.geometry])g=!1,C=M.materials[e.material],(g=C instanceof THREE.ShaderMaterial)&&D.computeTangents(),w=e.position,r=e.rotation,E=e.quaternion,z=e.scale,q=e.matrix,E=0,e.material||(C=new THREE.MeshFaceMaterial(M.face_materials[e.geometry])),C instanceof THREE.MeshFaceMaterial&&0===C.materials.length&&(C=new THREE.MeshFaceMaterial(M.face_materials[e.geometry])),
-e.skin?g=new THREE.SkinnedMesh(D,C):e.morph?(g=new THREE.MorphAnimMesh(D,C),void 0!==e.duration&&(g.duration=e.duration),void 0!==e.time&&(g.time=e.time),void 0!==e.mirroredLoop&&(g.mirroredLoop=e.mirroredLoop),C.morphNormals&&D.computeMorphNormals()):g=new THREE.Mesh(D,C),g.name=c,q?(g.matrixAutoUpdate=!1,g.matrix.set(q[0],q[1],q[2],q[3],q[4],q[5],q[6],q[7],q[8],q[9],q[10],q[11],q[12],q[13],q[14],q[15])):(g.position.set(w[0],w[1],w[2]),E?(g.quaternion.set(E[0],E[1],E[2],E[3]),g.useQuaternion=!0):
-g.rotation.set(r[0],r[1],r[2]),g.scale.set(z[0],z[1],z[2])),g.visible=e.visible,g.castShadow=e.castShadow,g.receiveShadow=e.receiveShadow,a.add(g),M.objects[c]=g}else"DirectionalLight"===e.type||"PointLight"===e.type||"AmbientLight"===e.type?(H=void 0!==e.color?e.color:16777215,I=void 0!==e.intensity?e.intensity:1,"DirectionalLight"===e.type?(w=e.direction,J=new THREE.DirectionalLight(H,I),J.position.set(w[0],w[1],w[2]),e.target&&(O.push({object:J,targetName:e.target}),J.target=null)):"PointLight"===
-e.type?(w=e.position,A=e.distance,J=new THREE.PointLight(H,I,A),J.position.set(w[0],w[1],w[2])):"AmbientLight"===e.type&&(J=new THREE.AmbientLight(H)),a.add(J),J.name=c,M.lights[c]=J,M.objects[c]=J):"PerspectiveCamera"===e.type||"OrthographicCamera"===e.type?("PerspectiveCamera"===e.type?G=new THREE.PerspectiveCamera(e.fov,e.aspect,e.near,e.far):"OrthographicCamera"===e.type&&(G=new THREE.OrthographicCamera(v.left,v.right,v.top,v.bottom,v.near,v.far)),w=e.position,G.position.set(w[0],w[1],w[2]),a.add(G),
-G.name=c,M.cameras[c]=G,M.objects[c]=G):(w=e.position,r=e.rotation,E=e.quaternion,z=e.scale,E=0,g=new THREE.Object3D,g.name=c,g.position.set(w[0],w[1],w[2]),E?(g.quaternion.set(E[0],E[1],E[2],E[3]),g.useQuaternion=!0):g.rotation.set(r[0],r[1],r[2]),g.scale.set(z[0],z[1],z[2]),g.visible=void 0!==e.visible?e.visible:!1,a.add(g),M.objects[c]=g,M.empties[c]=g);if(g){if(void 0!==e.properties)for(var m in e.properties)g.properties[m]=e.properties[m];void 0!==e.children&&f(g,e.children)}}}function g(a){return function(b,
-c){M.geometries[a]=b;M.face_materials[a]=c;e();L-=1;l.onLoadComplete();j()}}function h(a,b,c,d){return function(f){var f=f.content?f.content:f.dae?f.scene:f,g=d.position,h=d.rotation,i=d.quaternion,n=d.scale;f.position.set(g[0],g[1],g[2]);i?(f.quaternion.set(i[0],i[1],i[2],i[3]),f.useQuaternion=!0):f.rotation.set(h[0],h[1],h[2]);f.scale.set(n[0],n[1],n[2]);c&&f.traverse(function(a){a.material=c});b.add(f);M.objects[a]=f;e();L-=1;l.onLoadComplete();j()}}function i(a){return function(b,c){M.geometries[a]=
-b;M.face_materials[a]=c}}function j(){l.callbackProgress({totalModels:S,totalTextures:U,loadedModels:S-L,loadedTextures:U-P},M);l.onLoadProgress();if(0===L&&0===P){for(var a=0;a<O.length;a++){var c=O[a],d=M.objects[c.targetName];d?c.object.target=d:(c.object.target=new THREE.Object3D,M.scene.add(c.object.target));c.object.target.properties.targetInverse=c.object}b(M)}}var l=this,m=THREE.Loader.prototype.extractUrlBase(c),n,p,o,s,t,q,A,w,r,E,z,v,u,D,C,G,N,B,J,H,I,L,P,S,U,M,O=[],Q=a,Z;for(Z in this.geometryHandlerMap)a=
-this.geometryHandlerMap[Z].loaderClass,this.geometryHandlerMap[Z].loaderObject=new a;for(Z in this.hierarchyHandlerMap)a=this.hierarchyHandlerMap[Z].loaderClass,this.hierarchyHandlerMap[Z].loaderObject=new a;P=L=0;M={scene:new THREE.Scene,geometries:{},face_materials:{},materials:{},textures:{},objects:{},cameras:{},lights:{},fogs:{},empties:{}};if(Q.transform&&(Z=Q.transform.position,a=Q.transform.rotation,c=Q.transform.scale,Z&&M.scene.position.set(Z[0],Z[1],Z[2]),a&&M.scene.rotation.set(a[0],a[1],
-a[2]),c&&M.scene.scale.set(c[0],c[1],c[2]),Z||a||c))M.scene.updateMatrix(),M.scene.updateMatrixWorld();Z=function(a){return function(){P-=a;j();l.onLoadComplete()}};for(o in Q.fogs)a=Q.fogs[o],"linear"===a.type?N=new THREE.Fog(0,a.near,a.far):"exp2"===a.type&&(N=new THREE.FogExp2(0,a.density)),v=a.color,N.color.setRGB(v[0],v[1],v[2]),M.fogs[o]=N;for(n in Q.geometries)t=Q.geometries[n],t.type in this.geometryHandlerMap&&(L+=1,l.onLoadStart());for(var K in Q.objects)o=Q.objects[K],o.type&&o.type in
-this.hierarchyHandlerMap&&(L+=1,l.onLoadStart());S=L;for(n in Q.geometries)if(t=Q.geometries[n],"cube"===t.type)D=new THREE.CubeGeometry(t.width,t.height,t.depth,t.widthSegments,t.heightSegments,t.depthSegments),M.geometries[n]=D;else if("plane"===t.type)D=new THREE.PlaneGeometry(t.width,t.height,t.widthSegments,t.heightSegments),M.geometries[n]=D;else if("sphere"===t.type)D=new THREE.SphereGeometry(t.radius,t.widthSegments,t.heightSegments),M.geometries[n]=D;else if("cylinder"===t.type)D=new THREE.CylinderGeometry(t.topRad,
-t.botRad,t.height,t.radSegs,t.heightSegs),M.geometries[n]=D;else if("torus"===t.type)D=new THREE.TorusGeometry(t.radius,t.tube,t.segmentsR,t.segmentsT),M.geometries[n]=D;else if("icosahedron"===t.type)D=new THREE.IcosahedronGeometry(t.radius,t.subdivisions),M.geometries[n]=D;else if(t.type in this.geometryHandlerMap){K={};for(B in t)"type"!==B&&"url"!==B&&(K[B]=t[B]);this.geometryHandlerMap[t.type].loaderObject.load(d(t.url,Q.urlBaseType),g(n),K)}else"embedded"===t.type&&(K=Q.embeds[t.id],K.metadata=
-Q.metadata,K&&this.geometryHandlerMap.ascii.loaderObject.createModel(K,i(n),""));for(s in Q.textures)if(n=Q.textures[s],n.url instanceof Array){P+=n.url.length;for(B=0;B<n.url.length;B++)l.onLoadStart()}else P+=1,l.onLoadStart();U=P;for(s in Q.textures){n=Q.textures[s];void 0!==n.mapping&&void 0!==THREE[n.mapping]&&(n.mapping=new THREE[n.mapping]);if(n.url instanceof Array){K=n.url.length;o=[];for(B=0;B<K;B++)o[B]=d(n.url[B],Q.urlBaseType);B=(B=o[0].endsWith(".dds"))?THREE.ImageUtils.loadCompressedTextureCube(o,
-n.mapping,Z(K)):THREE.ImageUtils.loadTextureCube(o,n.mapping,Z(K))}else{B=n.url.toLowerCase().endsWith(".dds");K=d(n.url,Q.urlBaseType);o=Z(1);B=B?THREE.ImageUtils.loadCompressedTexture(K,n.mapping,o):THREE.ImageUtils.loadTexture(K,n.mapping,o);void 0!==THREE[n.minFilter]&&(B.minFilter=THREE[n.minFilter]);void 0!==THREE[n.magFilter]&&(B.magFilter=THREE[n.magFilter]);n.anisotropy&&(B.anisotropy=n.anisotropy);if(n.repeat&&(B.repeat.set(n.repeat[0],n.repeat[1]),1!==n.repeat[0]&&(B.wrapS=THREE.RepeatWrapping),
-1!==n.repeat[1]))B.wrapT=THREE.RepeatWrapping;n.offset&&B.offset.set(n.offset[0],n.offset[1]);if(n.wrap&&(K={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping},void 0!==K[n.wrap[0]]&&(B.wrapS=K[n.wrap[0]]),void 0!==K[n.wrap[1]]))B.wrapT=K[n.wrap[1]]}M.textures[s]=B}for(p in Q.materials){q=Q.materials[p];for(u in q.parameters)"envMap"===u||"map"===u||"lightMap"===u||"bumpMap"===u?q.parameters[u]=M.textures[q.parameters[u]]:"shading"===u?q.parameters[u]="flat"===q.parameters[u]?THREE.FlatShading:
-THREE.SmoothShading:"side"===u?q.parameters[u]="double"==q.parameters[u]?THREE.DoubleSide:"back"==q.parameters[u]?THREE.BackSide:THREE.FrontSide:"blending"===u?q.parameters[u]=q.parameters[u]in THREE?THREE[q.parameters[u]]:THREE.NormalBlending:"combine"===u?q.parameters[u]="MixOperation"==q.parameters[u]?THREE.MixOperation:THREE.MultiplyOperation:"vertexColors"===u?"face"==q.parameters[u]?q.parameters[u]=THREE.FaceColors:q.parameters[u]&&(q.parameters[u]=THREE.VertexColors):"wrapRGB"===u&&(s=q.parameters[u],
-q.parameters[u]=new THREE.Vector3(s[0],s[1],s[2]));void 0!==q.parameters.opacity&&1>q.parameters.opacity&&(q.parameters.transparent=!0);q.parameters.normalMap?(s=THREE.ShaderUtils.lib.normal,Z=THREE.UniformsUtils.clone(s.uniforms),n=q.parameters.color,B=q.parameters.specular,K=q.parameters.ambient,o=q.parameters.shininess,Z.tNormal.value=M.textures[q.parameters.normalMap],q.parameters.normalScale&&Z.uNormalScale.value.set(q.parameters.normalScale[0],q.parameters.normalScale[1]),q.parameters.map&&
-(Z.tDiffuse.value=q.parameters.map,Z.enableDiffuse.value=!0),q.parameters.envMap&&(Z.tCube.value=q.parameters.envMap,Z.enableReflection.value=!0,Z.uReflectivity.value=q.parameters.reflectivity),q.parameters.lightMap&&(Z.tAO.value=q.parameters.lightMap,Z.enableAO.value=!0),q.parameters.specularMap&&(Z.tSpecular.value=M.textures[q.parameters.specularMap],Z.enableSpecular.value=!0),q.parameters.displacementMap&&(Z.tDisplacement.value=M.textures[q.parameters.displacementMap],Z.enableDisplacement.value=
-!0,Z.uDisplacementBias.value=q.parameters.displacementBias,Z.uDisplacementScale.value=q.parameters.displacementScale),Z.uDiffuseColor.value.setHex(n),Z.uSpecularColor.value.setHex(B),Z.uAmbientColor.value.setHex(K),Z.uShininess.value=o,q.parameters.opacity&&(Z.uOpacity.value=q.parameters.opacity),C=new THREE.ShaderMaterial({fragmentShader:s.fragmentShader,vertexShader:s.vertexShader,uniforms:Z,lights:!0,fog:!0})):C=new THREE[q.type](q.parameters);M.materials[p]=C}for(p in Q.materials)if(q=Q.materials[p],
-q.parameters.materials){u=[];for(B=0;B<q.parameters.materials.length;B++)u.push(M.materials[q.parameters.materials[B]]);M.materials[p].materials=u}e();M.cameras&&Q.defaults.camera&&(M.currentCamera=M.cameras[Q.defaults.camera]);M.fogs&&Q.defaults.fog&&(M.scene.fog=M.fogs[Q.defaults.fog]);v=Q.defaults.bgcolor;M.bgColor=new THREE.Color;M.bgColor.setRGB(v[0],v[1],v[2]);M.bgColorAlpha=Q.defaults.bgalpha;l.callbackSync(M);j()};
+n.options?n.load(d(e.url,Q.urlBaseType),h(c,a,C,e)):n.load(d(e.url,Q.urlBaseType),h(c,a,C,e),i)}else if(void 0!==e.geometry){if(D=M.geometries[e.geometry]){g=!1;C=M.materials[e.material];g=C instanceof THREE.ShaderMaterial;w=e.position;r=e.rotation;E=e.quaternion;z=e.scale;q=e.matrix;E=0;e.material||(C=new THREE.MeshFaceMaterial(M.face_materials[e.geometry]));C instanceof THREE.MeshFaceMaterial&&0===C.materials.length&&(C=new THREE.MeshFaceMaterial(M.face_materials[e.geometry]));if(C instanceof THREE.MeshFaceMaterial)for(i=
+0;i<C.materials.length;i++)g=g||C.materials[i]instanceof THREE.ShaderMaterial;g&&D.computeTangents();e.skin?g=new THREE.SkinnedMesh(D,C):e.morph?(g=new THREE.MorphAnimMesh(D,C),void 0!==e.duration&&(g.duration=e.duration),void 0!==e.time&&(g.time=e.time),void 0!==e.mirroredLoop&&(g.mirroredLoop=e.mirroredLoop),C.morphNormals&&D.computeMorphNormals()):g=new THREE.Mesh(D,C);g.name=c;q?(g.matrixAutoUpdate=!1,g.matrix.set(q[0],q[1],q[2],q[3],q[4],q[5],q[6],q[7],q[8],q[9],q[10],q[11],q[12],q[13],q[14],
+q[15])):(g.position.set(w[0],w[1],w[2]),E?(g.quaternion.set(E[0],E[1],E[2],E[3]),g.useQuaternion=!0):g.rotation.set(r[0],r[1],r[2]),g.scale.set(z[0],z[1],z[2]));g.visible=e.visible;g.castShadow=e.castShadow;g.receiveShadow=e.receiveShadow;a.add(g);M.objects[c]=g}}else"DirectionalLight"===e.type||"PointLight"===e.type||"AmbientLight"===e.type?(H=void 0!==e.color?e.color:16777215,I=void 0!==e.intensity?e.intensity:1,"DirectionalLight"===e.type?(w=e.direction,J=new THREE.DirectionalLight(H,I),J.position.set(w[0],
+w[1],w[2]),e.target&&(O.push({object:J,targetName:e.target}),J.target=null)):"PointLight"===e.type?(w=e.position,A=e.distance,J=new THREE.PointLight(H,I,A),J.position.set(w[0],w[1],w[2])):"AmbientLight"===e.type&&(J=new THREE.AmbientLight(H)),a.add(J),J.name=c,M.lights[c]=J,M.objects[c]=J):"PerspectiveCamera"===e.type||"OrthographicCamera"===e.type?("PerspectiveCamera"===e.type?G=new THREE.PerspectiveCamera(e.fov,e.aspect,e.near,e.far):"OrthographicCamera"===e.type&&(G=new THREE.OrthographicCamera(v.left,
+v.right,v.top,v.bottom,v.near,v.far)),w=e.position,G.position.set(w[0],w[1],w[2]),a.add(G),G.name=c,M.cameras[c]=G,M.objects[c]=G):(w=e.position,r=e.rotation,E=e.quaternion,z=e.scale,E=0,g=new THREE.Object3D,g.name=c,g.position.set(w[0],w[1],w[2]),E?(g.quaternion.set(E[0],E[1],E[2],E[3]),g.useQuaternion=!0):g.rotation.set(r[0],r[1],r[2]),g.scale.set(z[0],z[1],z[2]),g.visible=void 0!==e.visible?e.visible:!1,a.add(g),M.objects[c]=g,M.empties[c]=g);if(g){if(void 0!==e.properties)for(var m in e.properties)g.properties[m]=
+e.properties[m];void 0!==e.children&&f(g,e.children)}}}function g(a){return function(b,c){M.geometries[a]=b;M.face_materials[a]=c;e();L-=1;l.onLoadComplete();j()}}function h(a,b,c,d){return function(f){var f=f.content?f.content:f.dae?f.scene:f,g=d.position,h=d.rotation,i=d.quaternion,n=d.scale;f.position.set(g[0],g[1],g[2]);i?(f.quaternion.set(i[0],i[1],i[2],i[3]),f.useQuaternion=!0):f.rotation.set(h[0],h[1],h[2]);f.scale.set(n[0],n[1],n[2]);c&&f.traverse(function(a){a.material=c});b.add(f);M.objects[a]=
+f;e();L-=1;l.onLoadComplete();j()}}function i(a){return function(b,c){M.geometries[a]=b;M.face_materials[a]=c}}function j(){l.callbackProgress({totalModels:S,totalTextures:U,loadedModels:S-L,loadedTextures:U-P},M);l.onLoadProgress();if(0===L&&0===P){for(var a=0;a<O.length;a++){var c=O[a],d=M.objects[c.targetName];d?c.object.target=d:(c.object.target=new THREE.Object3D,M.scene.add(c.object.target));c.object.target.properties.targetInverse=c.object}b(M)}}var l=this,m=THREE.Loader.prototype.extractUrlBase(c),
+n,p,o,s,t,q,A,w,r,E,z,v,u,D,C,G,N,B,J,H,I,L,P,S,U,M,O=[],Q=a,Z;for(Z in this.geometryHandlerMap)a=this.geometryHandlerMap[Z].loaderClass,this.geometryHandlerMap[Z].loaderObject=new a;for(Z in this.hierarchyHandlerMap)a=this.hierarchyHandlerMap[Z].loaderClass,this.hierarchyHandlerMap[Z].loaderObject=new a;P=L=0;M={scene:new THREE.Scene,geometries:{},face_materials:{},materials:{},textures:{},objects:{},cameras:{},lights:{},fogs:{},empties:{}};if(Q.transform&&(Z=Q.transform.position,a=Q.transform.rotation,
+c=Q.transform.scale,Z&&M.scene.position.set(Z[0],Z[1],Z[2]),a&&M.scene.rotation.set(a[0],a[1],a[2]),c&&M.scene.scale.set(c[0],c[1],c[2]),Z||a||c))M.scene.updateMatrix(),M.scene.updateMatrixWorld();Z=function(a){return function(){P-=a;j();l.onLoadComplete()}};for(o in Q.fogs)a=Q.fogs[o],"linear"===a.type?N=new THREE.Fog(0,a.near,a.far):"exp2"===a.type&&(N=new THREE.FogExp2(0,a.density)),v=a.color,N.color.setRGB(v[0],v[1],v[2]),M.fogs[o]=N;for(n in Q.geometries)t=Q.geometries[n],t.type in this.geometryHandlerMap&&
+(L+=1,l.onLoadStart());for(var K in Q.objects)o=Q.objects[K],o.type&&o.type in this.hierarchyHandlerMap&&(L+=1,l.onLoadStart());S=L;for(n in Q.geometries)if(t=Q.geometries[n],"cube"===t.type)D=new THREE.CubeGeometry(t.width,t.height,t.depth,t.widthSegments,t.heightSegments,t.depthSegments),M.geometries[n]=D;else if("plane"===t.type)D=new THREE.PlaneGeometry(t.width,t.height,t.widthSegments,t.heightSegments),M.geometries[n]=D;else if("sphere"===t.type)D=new THREE.SphereGeometry(t.radius,t.widthSegments,
+t.heightSegments),M.geometries[n]=D;else if("cylinder"===t.type)D=new THREE.CylinderGeometry(t.topRad,t.botRad,t.height,t.radSegs,t.heightSegs),M.geometries[n]=D;else if("torus"===t.type)D=new THREE.TorusGeometry(t.radius,t.tube,t.segmentsR,t.segmentsT),M.geometries[n]=D;else if("icosahedron"===t.type)D=new THREE.IcosahedronGeometry(t.radius,t.subdivisions),M.geometries[n]=D;else if(t.type in this.geometryHandlerMap){K={};for(B in t)"type"!==B&&"url"!==B&&(K[B]=t[B]);this.geometryHandlerMap[t.type].loaderObject.load(d(t.url,
+Q.urlBaseType),g(n),K)}else"embedded"===t.type&&(K=Q.embeds[t.id],K.metadata=Q.metadata,K&&this.geometryHandlerMap.ascii.loaderObject.createModel(K,i(n),""));for(s in Q.textures)if(n=Q.textures[s],n.url instanceof Array){P+=n.url.length;for(B=0;B<n.url.length;B++)l.onLoadStart()}else P+=1,l.onLoadStart();U=P;for(s in Q.textures){n=Q.textures[s];void 0!==n.mapping&&void 0!==THREE[n.mapping]&&(n.mapping=new THREE[n.mapping]);if(n.url instanceof Array){K=n.url.length;o=[];for(B=0;B<K;B++)o[B]=d(n.url[B],
+Q.urlBaseType);B=(B=o[0].endsWith(".dds"))?THREE.ImageUtils.loadCompressedTextureCube(o,n.mapping,Z(K)):THREE.ImageUtils.loadTextureCube(o,n.mapping,Z(K))}else{B=n.url.toLowerCase().endsWith(".dds");K=d(n.url,Q.urlBaseType);o=Z(1);B=B?THREE.ImageUtils.loadCompressedTexture(K,n.mapping,o):THREE.ImageUtils.loadTexture(K,n.mapping,o);void 0!==THREE[n.minFilter]&&(B.minFilter=THREE[n.minFilter]);void 0!==THREE[n.magFilter]&&(B.magFilter=THREE[n.magFilter]);n.anisotropy&&(B.anisotropy=n.anisotropy);if(n.repeat&&
+(B.repeat.set(n.repeat[0],n.repeat[1]),1!==n.repeat[0]&&(B.wrapS=THREE.RepeatWrapping),1!==n.repeat[1]))B.wrapT=THREE.RepeatWrapping;n.offset&&B.offset.set(n.offset[0],n.offset[1]);if(n.wrap&&(K={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping},void 0!==K[n.wrap[0]]&&(B.wrapS=K[n.wrap[0]]),void 0!==K[n.wrap[1]]))B.wrapT=K[n.wrap[1]]}M.textures[s]=B}for(p in Q.materials){q=Q.materials[p];for(u in q.parameters)"envMap"===u||"map"===u||"lightMap"===u||"bumpMap"===u?q.parameters[u]=M.textures[q.parameters[u]]:
+"shading"===u?q.parameters[u]="flat"===q.parameters[u]?THREE.FlatShading:THREE.SmoothShading:"side"===u?q.parameters[u]="double"==q.parameters[u]?THREE.DoubleSide:"back"==q.parameters[u]?THREE.BackSide:THREE.FrontSide:"blending"===u?q.parameters[u]=q.parameters[u]in THREE?THREE[q.parameters[u]]:THREE.NormalBlending:"combine"===u?q.parameters[u]="MixOperation"==q.parameters[u]?THREE.MixOperation:THREE.MultiplyOperation:"vertexColors"===u?"face"==q.parameters[u]?q.parameters[u]=THREE.FaceColors:q.parameters[u]&&
+(q.parameters[u]=THREE.VertexColors):"wrapRGB"===u&&(s=q.parameters[u],q.parameters[u]=new THREE.Vector3(s[0],s[1],s[2]));void 0!==q.parameters.opacity&&1>q.parameters.opacity&&(q.parameters.transparent=!0);q.parameters.normalMap?(s=THREE.ShaderUtils.lib.normal,Z=THREE.UniformsUtils.clone(s.uniforms),n=q.parameters.color,B=q.parameters.specular,K=q.parameters.ambient,o=q.parameters.shininess,Z.tNormal.value=M.textures[q.parameters.normalMap],q.parameters.normalScale&&Z.uNormalScale.value.set(q.parameters.normalScale[0],
+q.parameters.normalScale[1]),q.parameters.map&&(Z.tDiffuse.value=q.parameters.map,Z.enableDiffuse.value=!0),q.parameters.envMap&&(Z.tCube.value=q.parameters.envMap,Z.enableReflection.value=!0,Z.uReflectivity.value=q.parameters.reflectivity),q.parameters.lightMap&&(Z.tAO.value=q.parameters.lightMap,Z.enableAO.value=!0),q.parameters.specularMap&&(Z.tSpecular.value=M.textures[q.parameters.specularMap],Z.enableSpecular.value=!0),q.parameters.displacementMap&&(Z.tDisplacement.value=M.textures[q.parameters.displacementMap],
+Z.enableDisplacement.value=!0,Z.uDisplacementBias.value=q.parameters.displacementBias,Z.uDisplacementScale.value=q.parameters.displacementScale),Z.uDiffuseColor.value.setHex(n),Z.uSpecularColor.value.setHex(B),Z.uAmbientColor.value.setHex(K),Z.uShininess.value=o,q.parameters.opacity&&(Z.uOpacity.value=q.parameters.opacity),C=new THREE.ShaderMaterial({fragmentShader:s.fragmentShader,vertexShader:s.vertexShader,uniforms:Z,lights:!0,fog:!0})):C=new THREE[q.type](q.parameters);M.materials[p]=C}for(p in Q.materials)if(q=
+Q.materials[p],q.parameters.materials){u=[];for(B=0;B<q.parameters.materials.length;B++)u.push(M.materials[q.parameters.materials[B]]);M.materials[p].materials=u}e();M.cameras&&Q.defaults.camera&&(M.currentCamera=M.cameras[Q.defaults.camera]);M.fogs&&Q.defaults.fog&&(M.scene.fog=M.fogs[Q.defaults.fog]);v=Q.defaults.bgcolor;M.bgColor=new THREE.Color;M.bgColor.setRGB(v[0],v[1],v[2]);M.bgColorAlpha=Q.defaults.bgalpha;l.callbackSync(M);j()};
 THREE.TextureLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};THREE.TextureLoader.prototype={constructor:THREE.TextureLoader,load:function(a){var b=this,c=new Image;c.addEventListener("load",function(){var a=new THREE.Texture(c);a.needsUpdate=!0;b.dispatchEvent({type:"load",content:a})},!1);c.addEventListener("error",function(){b.dispatchEvent({type:"error",message:"Couldn't load URL ["+a+"]"})},!1);b.crossOrigin&&(c.crossOrigin=b.crossOrigin);c.src=a}};
 THREE.Material=function(){THREE.MaterialLibrary.push(this);this.id=THREE.MaterialIdCount++;this.name="";this.side=THREE.FrontSide;this.opacity=1;this.transparent=!1;this.blending=THREE.NormalBlending;this.blendSrc=THREE.SrcAlphaFactor;this.blendDst=THREE.OneMinusSrcAlphaFactor;this.blendEquation=THREE.AddEquation;this.depthWrite=this.depthTest=!0;this.polygonOffset=!1;this.alphaTest=this.polygonOffsetUnits=this.polygonOffsetFactor=0;this.overdraw=!1;this.needsUpdate=this.visible=!0};
 THREE.Material.prototype.setValues=function(a){if(void 0!==a)for(var b in a){var c=a[b];if(void 0===c)console.warn("THREE.Material: '"+b+"' parameter is undefined.");else if(b in this){var d=this[b];d instanceof THREE.Color&&c instanceof THREE.Color?d.copy(c):d instanceof THREE.Color&&"number"===typeof c?d.setHex(c):d instanceof THREE.Vector3&&c instanceof THREE.Vector3?d.copy(c):this[b]=c}}};

src/loaders/BinaryLoader.js

@@ -116,7 +116,7 @@ THREE.BinaryLoader.prototype.loadAjaxBuffers = function ( json, callback, binary
 
 // Binary AJAX parser
 
-THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texturePath, materials ) {
+THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texturePath, jsonMaterials ) {
 
 	var Model = function ( texturePath ) {
 
@@ -197,8 +197,6 @@ THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texture
 		this.computeCentroids();
 		this.computeFaceNormals();
 
-		if ( THREE.Loader.prototype.hasNormals( this ) ) this.computeTangents();
-
 		function handlePadding( n ) {
 
 			return ( n % 4 ) ? ( 4 - n % 4 ) : 0;
@@ -759,6 +757,11 @@ THREE.BinaryLoader.prototype.createBinModel = function ( data, callback, texture
 
 	Model.prototype = Object.create( THREE.Geometry.prototype );
 
-	callback( new Model( texturePath ), this.initMaterials( materials, texturePath ) );
+	var geometry = new Model( texturePath );
+	var materials = this.initMaterials( jsonMaterials, texturePath );
+
+	if ( this.needsTangents( materials ) ) geometry.computeTangents();
+
+	callback( geometry, materials );
 
 };

src/loaders/JSONLoader.js

@@ -104,9 +104,6 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texturePath
 	geometry.computeCentroids();
 	geometry.computeFaceNormals();
 
-	if ( this.hasNormals( geometry ) ) geometry.computeTangents();
-
-
 	function parseModel( scale ) {
 
 		function isBitSet( value, position ) {
@@ -424,6 +421,8 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texturePath
 
 	var materials = this.initMaterials( json.materials, texturePath );
 
+	if ( this.needsTangents( materials ) ) geometry.computeTangents();
+
 	callback( geometry, materials );
 
 };

src/loaders/Loader.js

@@ -81,13 +81,11 @@ THREE.Loader.prototype = {
 
 	},
 
-	hasNormals: function ( scope ) {
+	needsTangents: function ( materials ) {
 
-		var m, i, il = scope.materials.length;
+		for( var i = 0, il = materials.length; i < il; i ++ ) {
 
-		for( i = 0; i < il; i ++ ) {
-
-			m = scope.materials[ i ];
+			var m = materials[ i ];
 
 			if ( m instanceof THREE.ShaderMaterial ) return true;
 

src/loaders/SceneLoader.js

@@ -234,16 +234,10 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 					if ( geometry ) {
 
-						var hasNormals = false;
+						var needsTangents = false;
 
 						material = result.materials[ o.material ];
-						hasNormals = material instanceof THREE.ShaderMaterial;
-
-						if ( hasNormals ) {
-
-							geometry.computeTangents();
-
-						}
+						needsTangents = material instanceof THREE.ShaderMaterial;
 
 						p = o.position;
 						r = o.rotation;
@@ -274,6 +268,22 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 						}
 
+						if ( material instanceof THREE.MeshFaceMaterial ) {
+
+							for ( var i = 0; i < material.materials.length; i ++ ) {
+
+								needsTangents = needsTangents || ( material.materials[ i ] instanceof THREE.ShaderMaterial );
+
+							}
+
+						}
+
+						if ( needsTangents ) {
+
+							geometry.computeTangents();
+
+						}
+
 						if ( o.skin ) {
 
 							object = new THREE.SkinnedMesh( geometry, material );