From b66ab7df0633c4bd00e004e2bd077e0cf35c07d5 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 5 Nov 2013 19:25:19 +0900 Subject: [PATCH] Updated builds. --- build/three.js | 9 ++++++++- build/three.min.js | 37 +++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/build/three.js b/build/three.js index cdc8e6baaa..0aca87199b 100644 --- a/build/three.js +++ b/build/three.js @@ -12221,7 +12221,9 @@ THREE.SceneLoader.prototype = { // lights - } else if (objJSON.type === "PointLight" || objJSON.type === "AmbientLight" || objJSON.type === "SpotLight" || objJSON.type === "HemisphereLight" || objJSON.type === "AreaLight") { + } else if ( objJSON.type === "AmbientLight" || objJSON.type === "PointLight" || + objJSON.type === "DirectionalLight" || objJSON.type === "SpotLight" || + objJSON.type === "HemisphereLight" || objJSON.type === "AreaLight" ) { var color = objJSON.color; var intensity = objJSON.intensity; @@ -12240,6 +12242,11 @@ THREE.SceneLoader.prototype = { light.position.fromArray( position ); break; + case 'DirectionalLight': + light = new THREE.DirectionalLight( color, intensity ); + light.position.fromArray( objJSON.direction ); + break; + case 'SpotLight': light = new THREE.SpotLight( color, intensity, distance, 1 ); light.angle = objJSON.angle; diff --git a/build/three.min.js b/build/three.min.js index 9aa021fb3c..4c60144bcc 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -237,24 +237,25 @@ THREE.SceneLoader.prototype={constructor:THREE.SceneLoader,load:function(a,b){va E.objects)}function f(a,b){var c,e,h,i,k,m;for(m in b){var n=y.objects[m],p=b[m];if(void 0===n){if(p.type&&p.type in l.hierarchyHandlers){if(void 0===p.loading){c={type:1,url:1,material:1,position:1,rotation:1,scale:1,visible:1,children:1,userData:1,skin:1,morph:1,mirroredLoop:1,duration:1};var u={},v;for(v in p)v in c||(u[v]=p[v]);r=y.materials[p.material];p.loading=!0;c=l.hierarchyHandlers[p.type].loaderObject;c.options?c.load(d(p.url,E.urlBaseType),g(m,a,r,p)):c.load(d(p.url,E.urlBaseType),g(m, a,r,p),u)}}else if(void 0!==p.geometry){if(s=y.geometries[p.geometry]){n=!1;r=y.materials[p.material];n=r instanceof THREE.ShaderMaterial;e=p.position;h=p.rotation;i=p.scale;c=p.matrix;k=p.quaternion;p.material||(r=new THREE.MeshFaceMaterial(y.face_materials[p.geometry]));r instanceof THREE.MeshFaceMaterial&&0===r.materials.length&&(r=new THREE.MeshFaceMaterial(y.face_materials[p.geometry]));if(r instanceof THREE.MeshFaceMaterial)for(u=0;uz.parameters.opacity&&(z.parameters.transparent=!0);z.parameters.normalMap?(J=THREE.ShaderLib.normalmap,B=THREE.UniformsUtils.clone(J.uniforms),u=z.parameters.color,M=z.parameters.specular,p=z.parameters.ambient,G=z.parameters.shininess,B.tNormal.value=y.textures[z.parameters.normalMap],z.parameters.normalScale&&B.uNormalScale.value.set(z.parameters.normalScale[0],z.parameters.normalScale[1]), -z.parameters.map&&(B.tDiffuse.value=z.parameters.map,B.enableDiffuse.value=!0),z.parameters.envMap&&(B.tCube.value=z.parameters.envMap,B.enableReflection.value=!0,B.uReflectivity.value=z.parameters.reflectivity),z.parameters.lightMap&&(B.tAO.value=z.parameters.lightMap,B.enableAO.value=!0),z.parameters.specularMap&&(B.tSpecular.value=y.textures[z.parameters.specularMap],B.enableSpecular.value=!0),z.parameters.displacementMap&&(B.tDisplacement.value=y.textures[z.parameters.displacementMap],B.enableDisplacement.value= -!0,B.uDisplacementBias.value=z.parameters.displacementBias,B.uDisplacementScale.value=z.parameters.displacementScale),B.uDiffuseColor.value.setHex(u),B.uSpecularColor.value.setHex(M),B.uAmbientColor.value.setHex(p),B.uShininess.value=G,z.parameters.opacity&&(B.uOpacity.value=z.parameters.opacity),r=new THREE.ShaderMaterial({fragmentShader:J.fragmentShader,vertexShader:J.vertexShader,uniforms:B,lights:!0,fog:!0})):r=new THREE[z.type](z.parameters);r.name=I;y.materials[I]=r}for(I in E.materials)if(z= -E.materials[I],z.parameters.materials){A=[];for(u=0;uz.parameters.opacity&&(z.parameters.transparent=!0);z.parameters.normalMap?(J=THREE.ShaderLib.normalmap,B=THREE.UniformsUtils.clone(J.uniforms),u=z.parameters.color,M=z.parameters.specular,p=z.parameters.ambient, +G=z.parameters.shininess,B.tNormal.value=y.textures[z.parameters.normalMap],z.parameters.normalScale&&B.uNormalScale.value.set(z.parameters.normalScale[0],z.parameters.normalScale[1]),z.parameters.map&&(B.tDiffuse.value=z.parameters.map,B.enableDiffuse.value=!0),z.parameters.envMap&&(B.tCube.value=z.parameters.envMap,B.enableReflection.value=!0,B.uReflectivity.value=z.parameters.reflectivity),z.parameters.lightMap&&(B.tAO.value=z.parameters.lightMap,B.enableAO.value=!0),z.parameters.specularMap&& +(B.tSpecular.value=y.textures[z.parameters.specularMap],B.enableSpecular.value=!0),z.parameters.displacementMap&&(B.tDisplacement.value=y.textures[z.parameters.displacementMap],B.enableDisplacement.value=!0,B.uDisplacementBias.value=z.parameters.displacementBias,B.uDisplacementScale.value=z.parameters.displacementScale),B.uDiffuseColor.value.setHex(u),B.uSpecularColor.value.setHex(M),B.uAmbientColor.value.setHex(p),B.uShininess.value=G,z.parameters.opacity&&(B.uOpacity.value=z.parameters.opacity), +r=new THREE.ShaderMaterial({fragmentShader:J.fragmentShader,vertexShader:J.vertexShader,uniforms:B,lights:!0,fog:!0})):r=new THREE[z.type](z.parameters);r.name=I;y.materials[I]=r}for(I in E.materials)if(z=E.materials[I],z.parameters.materials){A=[];for(u=0;u