Browse Source

Updated builds.

Mr.doob 9 years ago
parent
commit
4c34bd107d
2 changed files with 12 additions and 17 deletions
  1. 0 4
      build/three.js
  2. 12 13
      build/three.min.js

+ 0 - 4
build/three.js

@@ -29073,8 +29073,6 @@ THREE.WebGLProgram = ( function () {
 
 				parameters.supportsVertexTextures ? '#define VERTEX_TEXTURES' : '',
 
-				renderer.gammaInput ? '#define GAMMA_INPUT' : '',
-				renderer.gammaOutput ? '#define GAMMA_OUTPUT' : '',
 				'#define GAMMA_FACTOR ' + gammaFactorDefine,
 
 				'#define MAX_BONES ' + parameters.maxBones,
@@ -29180,8 +29178,6 @@ THREE.WebGLProgram = ( function () {
 
 				parameters.alphaTest ? '#define ALPHATEST ' + parameters.alphaTest : '',
 
-				renderer.gammaInput ? '#define GAMMA_INPUT' : '',
-				renderer.gammaOutput ? '#define GAMMA_OUTPUT' : '',
 				'#define GAMMA_FACTOR ' + gammaFactorDefine,
 
 				( parameters.useFog && parameters.fog ) ? '#define USE_FOG' : '',

+ 12 - 13
build/three.min.js

@@ -686,19 +686,18 @@ a);}}function b(b,c){var d=a(c);return"vec4 "+b+"( vec4 value ) { return "+d[0]+
 function h(a){return a.replace(/#include +<([\w\d.]+)>/g,function(a,b){var c=THREE.ShaderChunk[b];if(void 0===c)throw Error("Can not resolve #include <"+b+">");return h(c)})}function k(a){return a.replace(/for \( int i \= (\d+)\; i < (\d+)\; i \+\+ \) \{([\s\S]+?)(?=\})\}/g,function(a,b,c,d){a="";for(b=parseInt(b);b<parseInt(c);b++)a+=d.replace(/\[ i \]/g,"[ "+b+" ]");return a})}var l=0,n=/^([\w\d_]+)\.([\w\d_]+)$/,p=/^([\w\d_]+)\[(\d+)\]\.([\w\d_]+)$/,m=/^([\w\d_]+)\[0\]$/;return function(a,t,u,
 r){var v=a.context,x=u.extensions,D=u.defines,w=u.__webglShader.vertexShader,C=u.__webglShader.fragmentShader,A="SHADOWMAP_TYPE_BASIC";r.shadowMapType===THREE.PCFShadowMap?A="SHADOWMAP_TYPE_PCF":r.shadowMapType===THREE.PCFSoftShadowMap&&(A="SHADOWMAP_TYPE_PCF_SOFT");var y="ENVMAP_TYPE_CUBE",B="ENVMAP_MODE_REFLECTION",G="ENVMAP_BLENDING_MULTIPLY";if(r.envMap){switch(u.envMap.mapping){case THREE.CubeReflectionMapping:case THREE.CubeRefractionMapping:y="ENVMAP_TYPE_CUBE";break;case THREE.CubeUVReflectionMapping:case THREE.CubeUVRefractionMapping:y=
 "ENVMAP_TYPE_CUBE_UV";break;case THREE.EquirectangularReflectionMapping:case THREE.EquirectangularRefractionMapping:y="ENVMAP_TYPE_EQUIREC";break;case THREE.SphericalReflectionMapping:y="ENVMAP_TYPE_SPHERE"}switch(u.envMap.mapping){case THREE.CubeRefractionMapping:case THREE.EquirectangularRefractionMapping:B="ENVMAP_MODE_REFRACTION"}switch(u.combine){case THREE.MultiplyOperation:G="ENVMAP_BLENDING_MULTIPLY";break;case THREE.MixOperation:G="ENVMAP_BLENDING_MIX";break;case THREE.AddOperation:G="ENVMAP_BLENDING_ADD"}}var F=
-0<a.gammaFactor?a.gammaFactor:1,x=d(x,r,a.extensions),z=e(D),H=v.createProgram();u instanceof THREE.RawShaderMaterial?a=D="":(D=["precision "+r.precision+" float;","precision "+r.precision+" int;","#define SHADER_NAME "+u.__webglShader.name,z,r.supportsVertexTextures?"#define VERTEX_TEXTURES":"",a.gammaInput?"#define GAMMA_INPUT":"",a.gammaOutput?"#define GAMMA_OUTPUT":"","#define GAMMA_FACTOR "+F,"#define MAX_BONES "+r.maxBones,r.map?"#define USE_MAP":"",r.envMap?"#define USE_ENVMAP":"",r.envMap?
-"#define "+B:"",r.lightMap?"#define USE_LIGHTMAP":"",r.aoMap?"#define USE_AOMAP":"",r.emissiveMap?"#define USE_EMISSIVEMAP":"",r.bumpMap?"#define USE_BUMPMAP":"",r.normalMap?"#define USE_NORMALMAP":"",r.displacementMap&&r.supportsVertexTextures?"#define USE_DISPLACEMENTMAP":"",r.specularMap?"#define USE_SPECULARMAP":"",r.roughnessMap?"#define USE_ROUGHNESSMAP":"",r.metalnessMap?"#define USE_METALNESSMAP":"",r.alphaMap?"#define USE_ALPHAMAP":"",r.vertexColors?"#define USE_COLOR":"",r.flatShading?"#define FLAT_SHADED":
-"",r.skinning?"#define USE_SKINNING":"",r.useVertexTexture?"#define BONE_TEXTURE":"",r.morphTargets?"#define USE_MORPHTARGETS":"",r.morphNormals&&!1===r.flatShading?"#define USE_MORPHNORMALS":"",r.doubleSided?"#define DOUBLE_SIDED":"",r.flipSided?"#define FLIP_SIDED":"",r.shadowMapEnabled?"#define USE_SHADOWMAP":"",r.shadowMapEnabled?"#define "+A:"",0<r.pointLightShadows?"#define POINT_LIGHT_SHADOWS":"",r.sizeAttenuation?"#define USE_SIZEATTENUATION":"",r.logarithmicDepthBuffer?"#define USE_LOGDEPTHBUF":
-"",r.logarithmicDepthBuffer&&a.extensions.get("EXT_frag_depth")?"#define USE_LOGDEPTHBUF_EXT":"","uniform mat4 modelMatrix;","uniform mat4 modelViewMatrix;","uniform mat4 projectionMatrix;","uniform mat4 viewMatrix;","uniform mat3 normalMatrix;","uniform vec3 cameraPosition;","attribute vec3 position;","attribute vec3 normal;","attribute vec2 uv;","#ifdef USE_COLOR","\tattribute vec3 color;","#endif","#ifdef USE_MORPHTARGETS","\tattribute vec3 morphTarget0;","\tattribute vec3 morphTarget1;","\tattribute vec3 morphTarget2;",
-"\tattribute vec3 morphTarget3;","\t#ifdef USE_MORPHNORMALS","\t\tattribute vec3 morphNormal0;","\t\tattribute vec3 morphNormal1;","\t\tattribute vec3 morphNormal2;","\t\tattribute vec3 morphNormal3;","\t#else","\t\tattribute vec3 morphTarget4;","\t\tattribute vec3 morphTarget5;","\t\tattribute vec3 morphTarget6;","\t\tattribute vec3 morphTarget7;","\t#endif","#endif","#ifdef USE_SKINNING","\tattribute vec4 skinIndex;","\tattribute vec4 skinWeight;","#endif","\n"].filter(f).join("\n"),a=[x,"precision "+
-r.precision+" float;","precision "+r.precision+" int;","#define SHADER_NAME "+u.__webglShader.name,z,r.alphaTest?"#define ALPHATEST "+r.alphaTest:"",a.gammaInput?"#define GAMMA_INPUT":"",a.gammaOutput?"#define GAMMA_OUTPUT":"","#define GAMMA_FACTOR "+F,r.useFog&&r.fog?"#define USE_FOG":"",r.useFog&&r.fogExp?"#define FOG_EXP2":"",r.map?"#define USE_MAP":"",r.envMap?"#define USE_ENVMAP":"",r.envMap?"#define "+y:"",r.envMap?"#define "+B:"",r.envMap?"#define "+G:"",r.lightMap?"#define USE_LIGHTMAP":"",
-r.aoMap?"#define USE_AOMAP":"",r.emissiveMap?"#define USE_EMISSIVEMAP":"",r.bumpMap?"#define USE_BUMPMAP":"",r.normalMap?"#define USE_NORMALMAP":"",r.specularMap?"#define USE_SPECULARMAP":"",r.roughnessMap?"#define USE_ROUGHNESSMAP":"",r.metalnessMap?"#define USE_METALNESSMAP":"",r.alphaMap?"#define USE_ALPHAMAP":"",r.vertexColors?"#define USE_COLOR":"",r.flatShading?"#define FLAT_SHADED":"",r.doubleSided?"#define DOUBLE_SIDED":"",r.flipSided?"#define FLIP_SIDED":"",r.shadowMapEnabled?"#define USE_SHADOWMAP":
-"",r.shadowMapEnabled?"#define "+A:"",0<r.pointLightShadows?"#define POINT_LIGHT_SHADOWS":"",r.logarithmicDepthBuffer?"#define USE_LOGDEPTHBUF":"",r.logarithmicDepthBuffer&&a.extensions.get("EXT_frag_depth")?"#define USE_LOGDEPTHBUF_EXT":"",r.envMap&&a.extensions.get("EXT_shader_texture_lod")?"#define TEXTURE_LOD_EXT":"","uniform mat4 viewMatrix;","uniform vec3 cameraPosition;",r.outputEncoding||r.mapEncoding||r.envMapEncoding||r.emissiveMapEncoding?THREE.ShaderChunk.encodings:"",r.mapEncoding?b("mapTexelToLinear",
-r.mapEncoding):"",r.envMapEncoding?b("envMapTexelToLinear",r.envMapEncoding):"",r.emissiveMapEncoding?b("emissiveMapTexelToLinear",r.emissiveMapEncoding):"",r.outputEncoding?c("linearToOutputTexel",r.outputEncoding):"","\n"].filter(f).join("\n"));w=h(w,r);w=g(w,r);C=h(C,r);C=g(C,r);!1===u instanceof THREE.ShaderMaterial&&(w=k(w),C=k(C));C=a+C;w=THREE.WebGLShader(v,v.VERTEX_SHADER,D+w);C=THREE.WebGLShader(v,v.FRAGMENT_SHADER,C);v.attachShader(H,w);v.attachShader(H,C);void 0!==u.index0AttributeName?
-v.bindAttribLocation(H,0,u.index0AttributeName):!0===r.morphTargets&&v.bindAttribLocation(H,0,"position");v.linkProgram(H);r=v.getProgramInfoLog(H);A=v.getShaderInfoLog(w);y=v.getShaderInfoLog(C);G=B=!0;if(!1===v.getProgramParameter(H,v.LINK_STATUS))B=!1,console.error("THREE.WebGLProgram: shader error: ",v.getError(),"gl.VALIDATE_STATUS",v.getProgramParameter(H,v.VALIDATE_STATUS),"gl.getProgramInfoLog",r,A,y);else if(""!==r)console.warn("THREE.WebGLProgram: gl.getProgramInfoLog()",r);else if(""===
-A||""===y)G=!1;G&&(this.diagnostics={runnable:B,material:u,programLog:r,vertexShader:{log:A,prefix:D},fragmentShader:{log:y,prefix:a}});v.deleteShader(w);v.deleteShader(C);var O;this.getUniforms=function(){if(void 0===O){for(var a={},b=v.getProgramParameter(H,v.ACTIVE_UNIFORMS),c=0;c<b;c++){var d=v.getActiveUniform(H,c).name,e=v.getUniformLocation(H,d),f=n.exec(d);if(f){var d=f[1],f=f[2],g=a[d];g||(g=a[d]={});g[f]=e}else if(f=p.exec(d)){var g=f[1],d=f[2],f=f[3],h=a[g];h||(h=a[g]=[]);(g=h[d])||(g=
-h[d]={});g[f]=e}else(f=m.exec(d))?(g=f[1],a[g]=e):a[d]=e}O=a}return O};var L;this.getAttributes=function(){if(void 0===L){for(var a={},b=v.getProgramParameter(H,v.ACTIVE_ATTRIBUTES),c=0;c<b;c++){var d=v.getActiveAttrib(H,c).name;a[d]=v.getAttribLocation(H,d)}L=a}return L};this.destroy=function(){v.deleteProgram(H);this.program=void 0};Object.defineProperties(this,{uniforms:{get:function(){console.warn("THREE.WebGLProgram: .uniforms is now .getUniforms().");return this.getUniforms()}},attributes:{get:function(){console.warn("THREE.WebGLProgram: .attributes is now .getAttributes().");
-return this.getAttributes()}}});this.id=l++;this.code=t;this.usedTimes=1;this.program=H;this.vertexShader=w;this.fragmentShader=C;return this}}();
+0<a.gammaFactor?a.gammaFactor:1,x=d(x,r,a.extensions),z=e(D),H=v.createProgram();u instanceof THREE.RawShaderMaterial?a=D="":(D=["precision "+r.precision+" float;","precision "+r.precision+" int;","#define SHADER_NAME "+u.__webglShader.name,z,r.supportsVertexTextures?"#define VERTEX_TEXTURES":"","#define GAMMA_FACTOR "+F,"#define MAX_BONES "+r.maxBones,r.map?"#define USE_MAP":"",r.envMap?"#define USE_ENVMAP":"",r.envMap?"#define "+B:"",r.lightMap?"#define USE_LIGHTMAP":"",r.aoMap?"#define USE_AOMAP":
+"",r.emissiveMap?"#define USE_EMISSIVEMAP":"",r.bumpMap?"#define USE_BUMPMAP":"",r.normalMap?"#define USE_NORMALMAP":"",r.displacementMap&&r.supportsVertexTextures?"#define USE_DISPLACEMENTMAP":"",r.specularMap?"#define USE_SPECULARMAP":"",r.roughnessMap?"#define USE_ROUGHNESSMAP":"",r.metalnessMap?"#define USE_METALNESSMAP":"",r.alphaMap?"#define USE_ALPHAMAP":"",r.vertexColors?"#define USE_COLOR":"",r.flatShading?"#define FLAT_SHADED":"",r.skinning?"#define USE_SKINNING":"",r.useVertexTexture?"#define BONE_TEXTURE":
+"",r.morphTargets?"#define USE_MORPHTARGETS":"",r.morphNormals&&!1===r.flatShading?"#define USE_MORPHNORMALS":"",r.doubleSided?"#define DOUBLE_SIDED":"",r.flipSided?"#define FLIP_SIDED":"",r.shadowMapEnabled?"#define USE_SHADOWMAP":"",r.shadowMapEnabled?"#define "+A:"",0<r.pointLightShadows?"#define POINT_LIGHT_SHADOWS":"",r.sizeAttenuation?"#define USE_SIZEATTENUATION":"",r.logarithmicDepthBuffer?"#define USE_LOGDEPTHBUF":"",r.logarithmicDepthBuffer&&a.extensions.get("EXT_frag_depth")?"#define USE_LOGDEPTHBUF_EXT":
+"","uniform mat4 modelMatrix;","uniform mat4 modelViewMatrix;","uniform mat4 projectionMatrix;","uniform mat4 viewMatrix;","uniform mat3 normalMatrix;","uniform vec3 cameraPosition;","attribute vec3 position;","attribute vec3 normal;","attribute vec2 uv;","#ifdef USE_COLOR","\tattribute vec3 color;","#endif","#ifdef USE_MORPHTARGETS","\tattribute vec3 morphTarget0;","\tattribute vec3 morphTarget1;","\tattribute vec3 morphTarget2;","\tattribute vec3 morphTarget3;","\t#ifdef USE_MORPHNORMALS","\t\tattribute vec3 morphNormal0;",
+"\t\tattribute vec3 morphNormal1;","\t\tattribute vec3 morphNormal2;","\t\tattribute vec3 morphNormal3;","\t#else","\t\tattribute vec3 morphTarget4;","\t\tattribute vec3 morphTarget5;","\t\tattribute vec3 morphTarget6;","\t\tattribute vec3 morphTarget7;","\t#endif","#endif","#ifdef USE_SKINNING","\tattribute vec4 skinIndex;","\tattribute vec4 skinWeight;","#endif","\n"].filter(f).join("\n"),a=[x,"precision "+r.precision+" float;","precision "+r.precision+" int;","#define SHADER_NAME "+u.__webglShader.name,
+z,r.alphaTest?"#define ALPHATEST "+r.alphaTest:"","#define GAMMA_FACTOR "+F,r.useFog&&r.fog?"#define USE_FOG":"",r.useFog&&r.fogExp?"#define FOG_EXP2":"",r.map?"#define USE_MAP":"",r.envMap?"#define USE_ENVMAP":"",r.envMap?"#define "+y:"",r.envMap?"#define "+B:"",r.envMap?"#define "+G:"",r.lightMap?"#define USE_LIGHTMAP":"",r.aoMap?"#define USE_AOMAP":"",r.emissiveMap?"#define USE_EMISSIVEMAP":"",r.bumpMap?"#define USE_BUMPMAP":"",r.normalMap?"#define USE_NORMALMAP":"",r.specularMap?"#define USE_SPECULARMAP":
+"",r.roughnessMap?"#define USE_ROUGHNESSMAP":"",r.metalnessMap?"#define USE_METALNESSMAP":"",r.alphaMap?"#define USE_ALPHAMAP":"",r.vertexColors?"#define USE_COLOR":"",r.flatShading?"#define FLAT_SHADED":"",r.doubleSided?"#define DOUBLE_SIDED":"",r.flipSided?"#define FLIP_SIDED":"",r.shadowMapEnabled?"#define USE_SHADOWMAP":"",r.shadowMapEnabled?"#define "+A:"",0<r.pointLightShadows?"#define POINT_LIGHT_SHADOWS":"",r.logarithmicDepthBuffer?"#define USE_LOGDEPTHBUF":"",r.logarithmicDepthBuffer&&a.extensions.get("EXT_frag_depth")?
+"#define USE_LOGDEPTHBUF_EXT":"",r.envMap&&a.extensions.get("EXT_shader_texture_lod")?"#define TEXTURE_LOD_EXT":"","uniform mat4 viewMatrix;","uniform vec3 cameraPosition;",r.outputEncoding||r.mapEncoding||r.envMapEncoding||r.emissiveMapEncoding?THREE.ShaderChunk.encodings:"",r.mapEncoding?b("mapTexelToLinear",r.mapEncoding):"",r.envMapEncoding?b("envMapTexelToLinear",r.envMapEncoding):"",r.emissiveMapEncoding?b("emissiveMapTexelToLinear",r.emissiveMapEncoding):"",r.outputEncoding?c("linearToOutputTexel",
+r.outputEncoding):"","\n"].filter(f).join("\n"));w=h(w,r);w=g(w,r);C=h(C,r);C=g(C,r);!1===u instanceof THREE.ShaderMaterial&&(w=k(w),C=k(C));C=a+C;w=THREE.WebGLShader(v,v.VERTEX_SHADER,D+w);C=THREE.WebGLShader(v,v.FRAGMENT_SHADER,C);v.attachShader(H,w);v.attachShader(H,C);void 0!==u.index0AttributeName?v.bindAttribLocation(H,0,u.index0AttributeName):!0===r.morphTargets&&v.bindAttribLocation(H,0,"position");v.linkProgram(H);r=v.getProgramInfoLog(H);A=v.getShaderInfoLog(w);y=v.getShaderInfoLog(C);G=
+B=!0;if(!1===v.getProgramParameter(H,v.LINK_STATUS))B=!1,console.error("THREE.WebGLProgram: shader error: ",v.getError(),"gl.VALIDATE_STATUS",v.getProgramParameter(H,v.VALIDATE_STATUS),"gl.getProgramInfoLog",r,A,y);else if(""!==r)console.warn("THREE.WebGLProgram: gl.getProgramInfoLog()",r);else if(""===A||""===y)G=!1;G&&(this.diagnostics={runnable:B,material:u,programLog:r,vertexShader:{log:A,prefix:D},fragmentShader:{log:y,prefix:a}});v.deleteShader(w);v.deleteShader(C);var O;this.getUniforms=function(){if(void 0===
+O){for(var a={},b=v.getProgramParameter(H,v.ACTIVE_UNIFORMS),c=0;c<b;c++){var d=v.getActiveUniform(H,c).name,e=v.getUniformLocation(H,d),f=n.exec(d);if(f){var d=f[1],f=f[2],g=a[d];g||(g=a[d]={});g[f]=e}else if(f=p.exec(d)){var g=f[1],d=f[2],f=f[3],h=a[g];h||(h=a[g]=[]);(g=h[d])||(g=h[d]={});g[f]=e}else(f=m.exec(d))?(g=f[1],a[g]=e):a[d]=e}O=a}return O};var L;this.getAttributes=function(){if(void 0===L){for(var a={},b=v.getProgramParameter(H,v.ACTIVE_ATTRIBUTES),c=0;c<b;c++){var d=v.getActiveAttrib(H,
+c).name;a[d]=v.getAttribLocation(H,d)}L=a}return L};this.destroy=function(){v.deleteProgram(H);this.program=void 0};Object.defineProperties(this,{uniforms:{get:function(){console.warn("THREE.WebGLProgram: .uniforms is now .getUniforms().");return this.getUniforms()}},attributes:{get:function(){console.warn("THREE.WebGLProgram: .attributes is now .getAttributes().");return this.getAttributes()}}});this.id=l++;this.code=t;this.usedTimes=1;this.program=H;this.vertexShader=w;this.fragmentShader=C;return this}}();
 THREE.WebGLPrograms=function(a,b){function c(a,b){var c;a?a instanceof THREE.Texture?c=a.encoding:a instanceof THREE.WebGLRenderTarget&&(c=a.texture.encoding):c=THREE.LinearEncoding;c===THREE.LinearEncoding&&b&&(c=THREE.GammaEncoding);return c}var d=[],e={MeshDepthMaterial:"depth",MeshNormalMaterial:"normal",MeshBasicMaterial:"basic",MeshLambertMaterial:"lambert",MeshPhongMaterial:"phong",MeshStandardMaterial:"standard",LineBasicMaterial:"basic",LineDashedMaterial:"dashed",PointsMaterial:"points"},
 f="precision supportsVertexTextures map mapEncoding envMap envMapMode envMapEncoding lightMap aoMap emissiveMap emissiveMapEncoding bumpMap normalMap displacementMap specularMap roughnessMap metalnessMap alphaMap combine vertexColors fog useFog fogExp flatShading sizeAttenuation logarithmicDepthBuffer skinning maxBones useVertexTexture morphTargets morphNormals maxMorphTargets maxMorphNormals numDirLights numPointLights numSpotLights numHemiLights shadowMapEnabled pointLightShadows shadowMapType alphaTest doubleSided flipSided".split(" ");
 this.getParameters=function(d,f,k,l){var n=e[d.type],p;b.floatVertexTextures&&l&&l.skeleton&&l.skeleton.useVertexTexture?p=1024:(p=Math.floor((b.maxVertexUniforms-20)/4),void 0!==l&&l instanceof THREE.SkinnedMesh&&(p=Math.min(l.skeleton.bones.length,p),p<l.skeleton.bones.length&&console.warn("WebGLRenderer: too many bones - "+l.skeleton.bones.length+", this GPU supports just "+p+" (try OpenGL instead of ANGLE)")));var m=a.getPrecision();null!==d.precision&&(m=b.getMaxPrecision(d.precision),m!==d.precision&&