Updated builds.

build/Three.js

@@ -178,7 +178,7 @@ B.geometries[l];if(n.type=="cube"){I=new THREE.CubeGeometry(n.width,n.height,n.d
 n.heightSegs);M.geometries[l]=I}else if(n.type=="torus"){I=new THREE.TorusGeometry(n.radius,n.tube,n.segmentsR,n.segmentsT);M.geometries[l]=I}else if(n.type=="icosahedron"){I=new THREE.IcosahedronGeometry(n.radius,n.subdivisions);M.geometries[l]=I}else if(n.type=="bin_mesh")c.load(d(n.url,B.urlBaseType),f(l));else if(n.type=="ascii_mesh")G.load(d(n.url,B.urlBaseType),f(l));else if(n.type=="embedded_mesh"){n=B.embeds[n.id];n.metadata=B.metadata;n&&G.createModel(n,g(l),"")}}for(q in B.textures){l=B.textures[q];
 if(l.url instanceof Array){D=D+l.url.length;for(n=0;n<l.url.length;n++)i.onLoadStart()}else{D=D+1;i.onLoadStart()}}P=D;for(q in B.textures){l=B.textures[q];if(l.mapping!=void 0&&THREE[l.mapping]!=void 0)l.mapping=new THREE[l.mapping];if(l.url instanceof Array){n=[];for(X=0;X<l.url.length;X++)n[X]=d(l.url[X],B.urlBaseType);n=THREE.ImageUtils.loadTextureCube(n,l.mapping,a)}else{n=THREE.ImageUtils.loadTexture(d(l.url,B.urlBaseType),l.mapping,a);if(THREE[l.minFilter]!=void 0)n.minFilter=THREE[l.minFilter];
 if(THREE[l.magFilter]!=void 0)n.magFilter=THREE[l.magFilter];if(l.repeat){n.repeat.set(l.repeat[0],l.repeat[1]);if(l.repeat[0]!=1)n.wrapS=THREE.RepeatWrapping;if(l.repeat[1]!=1)n.wrapT=THREE.RepeatWrapping}l.offset&&n.offset.set(l.offset[0],l.offset[1]);if(l.wrap){X={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping};if(X[l.wrap[0]]!==void 0)n.wrapS=X[l.wrap[0]];if(X[l.wrap[1]]!==void 0)n.wrapT=X[l.wrap[1]]}}M.textures[q]=n}for(o in B.materials){u=B.materials[o];for(H in u.parameters)if(H==
-"envMap"||H=="map"||H=="lightMap")u.parameters[H]=M.textures[u.parameters[H]];else if(H=="shading")u.parameters[H]=u.parameters[H]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(H=="blending")u.parameters[H]=THREE[u.parameters[H]]?THREE[u.parameters[H]]:THREE.NormalBlending;else if(H=="combine")u.parameters[H]=u.parameters[H]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(H=="vertexColors")if(u.parameters[H]=="face")u.parameters[H]=THREE.FaceColors;else if(u.parameters[H])u.parameters[H]=
+"envMap"||H=="map"||H=="lightMap")u.parameters[H]=M.textures[u.parameters[H]];else if(H=="shading")u.parameters[H]=u.parameters[H]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(H=="blending")u.parameters[H]=u.parameters[H]in THREE?THREE[u.parameters[H]]:THREE.NormalBlending;else if(H=="combine")u.parameters[H]=u.parameters[H]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(H=="vertexColors")if(u.parameters[H]=="face")u.parameters[H]=THREE.FaceColors;else if(u.parameters[H])u.parameters[H]=
 THREE.VertexColors;if(u.parameters.opacity!==void 0&&u.parameters.opacity<1)u.parameters.transparent=true;if(u.parameters.normalMap){q=THREE.ShaderUtils.lib.normal;a=THREE.UniformsUtils.clone(q.uniforms);l=u.parameters.color;n=u.parameters.specular;X=u.parameters.ambient;c=u.parameters.shininess;a.tNormal.texture=M.textures[u.parameters.normalMap];if(u.parameters.normalMapFactor)a.uNormalScale.value=u.parameters.normalMapFactor;if(u.parameters.map){a.tDiffuse.texture=u.parameters.map;a.enableDiffuse.value=
 true}if(u.parameters.lightMap){a.tAO.texture=u.parameters.lightMap;a.enableAO.value=true}if(u.parameters.specularMap){a.tSpecular.texture=M.textures[u.parameters.specularMap];a.enableSpecular.value=true}a.uDiffuseColor.value.setHex(l);a.uSpecularColor.value.setHex(n);a.uAmbientColor.value.setHex(X);a.uShininess.value=c;if(u.parameters.opacity)a.uOpacity.value=u.parameters.opacity;N=new THREE.ShaderMaterial({fragmentShader:q.fragmentShader,vertexShader:q.vertexShader,uniforms:a,lights:true,fog:true})}else N=
 new THREE[u.type](u.parameters);M.materials[o]=N}e();i.callbackSync(M);h()};THREE.TextureLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};

build/custom/ThreeCanvas.js

@@ -171,7 +171,7 @@ t.geometries[h];if(i.type=="cube"){D=new THREE.CubeGeometry(i.width,i.height,i.d
 i.heightSegs);y.geometries[h]=D}else if(i.type=="torus"){D=new THREE.TorusGeometry(i.radius,i.tube,i.segmentsR,i.segmentsT);y.geometries[h]=D}else if(i.type=="icosahedron"){D=new THREE.IcosahedronGeometry(i.radius,i.subdivisions);y.geometries[h]=D}else if(i.type=="bin_mesh")c.load(d(i.url,t.urlBaseType),e(h));else if(i.type=="ascii_mesh")E.load(d(i.url,t.urlBaseType),e(h));else if(i.type=="embedded_mesh"){i=t.embeds[i.id];i.metadata=t.metadata;i&&E.createModel(i,g(h),"")}}for(p in t.textures){h=t.textures[p];
 if(h.url instanceof Array){N=N+h.url.length;for(i=0;i<h.url.length;i++)k.onLoadStart()}else{N=N+1;k.onLoadStart()}}O=N;for(p in t.textures){h=t.textures[p];if(h.mapping!=void 0&&THREE[h.mapping]!=void 0)h.mapping=new THREE[h.mapping];if(h.url instanceof Array){i=[];for(L=0;L<h.url.length;L++)i[L]=d(h.url[L],t.urlBaseType);i=THREE.ImageUtils.loadTextureCube(i,h.mapping,a)}else{i=THREE.ImageUtils.loadTexture(d(h.url,t.urlBaseType),h.mapping,a);if(THREE[h.minFilter]!=void 0)i.minFilter=THREE[h.minFilter];
 if(THREE[h.magFilter]!=void 0)i.magFilter=THREE[h.magFilter];if(h.repeat){i.repeat.set(h.repeat[0],h.repeat[1]);if(h.repeat[0]!=1)i.wrapS=THREE.RepeatWrapping;if(h.repeat[1]!=1)i.wrapT=THREE.RepeatWrapping}h.offset&&i.offset.set(h.offset[0],h.offset[1]);if(h.wrap){L={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping};if(L[h.wrap[0]]!==void 0)i.wrapS=L[h.wrap[0]];if(L[h.wrap[1]]!==void 0)i.wrapT=L[h.wrap[1]]}}y.textures[p]=i}for(n in t.materials){s=t.materials[n];for(z in s.parameters)if(z==
-"envMap"||z=="map"||z=="lightMap")s.parameters[z]=y.textures[s.parameters[z]];else if(z=="shading")s.parameters[z]=s.parameters[z]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(z=="blending")s.parameters[z]=THREE[s.parameters[z]]?THREE[s.parameters[z]]:THREE.NormalBlending;else if(z=="combine")s.parameters[z]=s.parameters[z]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(z=="vertexColors")if(s.parameters[z]=="face")s.parameters[z]=THREE.FaceColors;else if(s.parameters[z])s.parameters[z]=
+"envMap"||z=="map"||z=="lightMap")s.parameters[z]=y.textures[s.parameters[z]];else if(z=="shading")s.parameters[z]=s.parameters[z]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(z=="blending")s.parameters[z]=s.parameters[z]in THREE?THREE[s.parameters[z]]:THREE.NormalBlending;else if(z=="combine")s.parameters[z]=s.parameters[z]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(z=="vertexColors")if(s.parameters[z]=="face")s.parameters[z]=THREE.FaceColors;else if(s.parameters[z])s.parameters[z]=
 THREE.VertexColors;if(s.parameters.opacity!==void 0&&s.parameters.opacity<1)s.parameters.transparent=true;if(s.parameters.normalMap){p=THREE.ShaderUtils.lib.normal;a=THREE.UniformsUtils.clone(p.uniforms);h=s.parameters.color;i=s.parameters.specular;L=s.parameters.ambient;c=s.parameters.shininess;a.tNormal.texture=y.textures[s.parameters.normalMap];if(s.parameters.normalMapFactor)a.uNormalScale.value=s.parameters.normalMapFactor;if(s.parameters.map){a.tDiffuse.texture=s.parameters.map;a.enableDiffuse.value=
 true}if(s.parameters.lightMap){a.tAO.texture=s.parameters.lightMap;a.enableAO.value=true}if(s.parameters.specularMap){a.tSpecular.texture=y.textures[s.parameters.specularMap];a.enableSpecular.value=true}a.uDiffuseColor.value.setHex(h);a.uSpecularColor.value.setHex(i);a.uAmbientColor.value.setHex(L);a.uShininess.value=c;if(s.parameters.opacity)a.uOpacity.value=s.parameters.opacity;H=new THREE.ShaderMaterial({fragmentShader:p.fragmentShader,vertexShader:p.vertexShader,uniforms:a,lights:true,fog:true})}else H=
 new THREE[s.type](s.parameters);y.materials[n]=H}f();k.callbackSync(y);m()};THREE.TextureLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};

build/custom/ThreeWebGL.js

@@ -177,7 +177,7 @@ y.geometries[i];if(n.type=="cube"){G=new THREE.CubeGeometry(n.width,n.height,n.d
 n.heightSegs);I.geometries[i]=G}else if(n.type=="torus"){G=new THREE.TorusGeometry(n.radius,n.tube,n.segmentsR,n.segmentsT);I.geometries[i]=G}else if(n.type=="icosahedron"){G=new THREE.IcosahedronGeometry(n.radius,n.subdivisions);I.geometries[i]=G}else if(n.type=="bin_mesh")c.load(d(n.url,y.urlBaseType),e(i));else if(n.type=="ascii_mesh")L.load(d(n.url,y.urlBaseType),e(i));else if(n.type=="embedded_mesh"){n=y.embeds[n.id];n.metadata=y.metadata;n&&L.createModel(n,h(i),"")}}for(q in y.textures){i=y.textures[q];
 if(i.url instanceof Array){F=F+i.url.length;for(n=0;n<i.url.length;n++)m.onLoadStart()}else{F=F+1;m.onLoadStart()}}W=F;for(q in y.textures){i=y.textures[q];if(i.mapping!=void 0&&THREE[i.mapping]!=void 0)i.mapping=new THREE[i.mapping];if(i.url instanceof Array){n=[];for(S=0;S<i.url.length;S++)n[S]=d(i.url[S],y.urlBaseType);n=THREE.ImageUtils.loadTextureCube(n,i.mapping,a)}else{n=THREE.ImageUtils.loadTexture(d(i.url,y.urlBaseType),i.mapping,a);if(THREE[i.minFilter]!=void 0)n.minFilter=THREE[i.minFilter];
 if(THREE[i.magFilter]!=void 0)n.magFilter=THREE[i.magFilter];if(i.repeat){n.repeat.set(i.repeat[0],i.repeat[1]);if(i.repeat[0]!=1)n.wrapS=THREE.RepeatWrapping;if(i.repeat[1]!=1)n.wrapT=THREE.RepeatWrapping}i.offset&&n.offset.set(i.offset[0],i.offset[1]);if(i.wrap){S={repeat:THREE.RepeatWrapping,mirror:THREE.MirroredRepeatWrapping};if(S[i.wrap[0]]!==void 0)n.wrapS=S[i.wrap[0]];if(S[i.wrap[1]]!==void 0)n.wrapT=S[i.wrap[1]]}}I.textures[q]=n}for(o in y.materials){s=y.materials[o];for(Q in s.parameters)if(Q==
-"envMap"||Q=="map"||Q=="lightMap")s.parameters[Q]=I.textures[s.parameters[Q]];else if(Q=="shading")s.parameters[Q]=s.parameters[Q]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(Q=="blending")s.parameters[Q]=THREE[s.parameters[Q]]?THREE[s.parameters[Q]]:THREE.NormalBlending;else if(Q=="combine")s.parameters[Q]=s.parameters[Q]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(Q=="vertexColors")if(s.parameters[Q]=="face")s.parameters[Q]=THREE.FaceColors;else if(s.parameters[Q])s.parameters[Q]=
+"envMap"||Q=="map"||Q=="lightMap")s.parameters[Q]=I.textures[s.parameters[Q]];else if(Q=="shading")s.parameters[Q]=s.parameters[Q]=="flat"?THREE.FlatShading:THREE.SmoothShading;else if(Q=="blending")s.parameters[Q]=s.parameters[Q]in THREE?THREE[s.parameters[Q]]:THREE.NormalBlending;else if(Q=="combine")s.parameters[Q]=s.parameters[Q]=="MixOperation"?THREE.MixOperation:THREE.MultiplyOperation;else if(Q=="vertexColors")if(s.parameters[Q]=="face")s.parameters[Q]=THREE.FaceColors;else if(s.parameters[Q])s.parameters[Q]=
 THREE.VertexColors;if(s.parameters.opacity!==void 0&&s.parameters.opacity<1)s.parameters.transparent=true;if(s.parameters.normalMap){q=THREE.ShaderUtils.lib.normal;a=THREE.UniformsUtils.clone(q.uniforms);i=s.parameters.color;n=s.parameters.specular;S=s.parameters.ambient;c=s.parameters.shininess;a.tNormal.texture=I.textures[s.parameters.normalMap];if(s.parameters.normalMapFactor)a.uNormalScale.value=s.parameters.normalMapFactor;if(s.parameters.map){a.tDiffuse.texture=s.parameters.map;a.enableDiffuse.value=
 true}if(s.parameters.lightMap){a.tAO.texture=s.parameters.lightMap;a.enableAO.value=true}if(s.parameters.specularMap){a.tSpecular.texture=I.textures[s.parameters.specularMap];a.enableSpecular.value=true}a.uDiffuseColor.value.setHex(i);a.uSpecularColor.value.setHex(n);a.uAmbientColor.value.setHex(S);a.uShininess.value=c;if(s.parameters.opacity)a.uOpacity.value=s.parameters.opacity;R=new THREE.ShaderMaterial({fragmentShader:q.fragmentShader,vertexShader:q.vertexShader,uniforms:a,lights:true,fog:true})}else R=
 new THREE[s.type](s.parameters);I.materials[o]=R}f();m.callbackSync(I);l()};THREE.TextureLoader=function(){THREE.EventTarget.call(this);this.crossOrigin=null};