From 5dd59385f74c5908b3020cf66e667ce476a464fa Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 12 Apr 2018 16:33:29 -0700 Subject: [PATCH] Updated builds. --- build/three.js | 2 ++ build/three.min.js | 8 ++++---- build/three.module.js | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/three.js b/build/three.js index e57b05f6d4..0be0a5f0b2 100644 --- a/build/three.js +++ b/build/three.js @@ -10384,6 +10384,7 @@ copy: function ( source ) { + this.name = source.name; this.array = new source.array.constructor( source.array ); this.itemSize = source.itemSize; this.count = source.count; @@ -16756,6 +16757,7 @@ // + this.name = shader.name; this.id = programIdCount ++; this.code = code; this.usedTimes = 1; diff --git a/build/three.min.js b/build/three.min.js index cf1e29260a..d4f9150f3b 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -62,9 +62,9 @@ break;case 303:case 304:n="ENVMAP_TYPE_EQUIREC";break;case 305:n="ENVMAP_TYPE_SP "#define USE_ALPHAMAP":"",f.vertexColors?"#define USE_COLOR":"",f.gradientMap?"#define USE_GRADIENTMAP":"",f.flatShading?"#define FLAT_SHADED":"",f.doubleSided?"#define DOUBLE_SIDED":"",f.flipSided?"#define FLIP_SIDED":"",f.shadowMapEnabled?"#define USE_SHADOWMAP":"",f.shadowMapEnabled?"#define "+w:"",f.premultipliedAlpha?"#define PREMULTIPLIED_ALPHA":"",f.physicallyCorrectLights?"#define PHYSICALLY_CORRECT_LIGHTS":"",f.logarithmicDepthBuffer?"#define USE_LOGDEPTHBUF":"",f.logarithmicDepthBuffer&& b.get("EXT_frag_depth")?"#define USE_LOGDEPTHBUF_EXT":"",f.envMap&&b.get("EXT_shader_texture_lod")?"#define TEXTURE_LOD_EXT":"","uniform mat4 viewMatrix;","uniform vec3 cameraPosition;",0!==f.toneMapping?"#define TONE_MAPPING":"",0!==f.toneMapping?W.tonemapping_pars_fragment:"",0!==f.toneMapping?ng("toneMapping",f.toneMapping):"",f.dithering?"#define DITHERING":"",f.outputEncoding||f.mapEncoding||f.envMapEncoding||f.emissiveMapEncoding?W.encodings_pars_fragment:"",f.mapEncoding?Ud("mapTexelToLinear", f.mapEncoding):"",f.envMapEncoding?Ud("envMapTexelToLinear",f.envMapEncoding):"",f.emissiveMapEncoding?Ud("emissiveMapTexelToLinear",f.emissiveMapEncoding):"",f.outputEncoding?mg("linearToOutputTexel",f.outputEncoding):"",f.depthPacking?"#define DEPTH_PACKING "+d.depthPacking:"","\n"].filter(Bc).join("\n"));l=Vd(l);l=Re(l,f);l=Se(l,f);m=Vd(m);m=Re(m,f);m=Se(m,f);l=Te(l);m=Te(m);m=b+m;l=Pe(g,g.VERTEX_SHADER,h+l);m=Pe(g,g.FRAGMENT_SHADER,m);g.attachShader(p,l);g.attachShader(p,m);void 0!==d.index0AttributeName? -g.bindAttribLocation(p,0,d.index0AttributeName):!0===f.morphTargets&&g.bindAttribLocation(p,0,"position");g.linkProgram(p);f=g.getProgramInfoLog(p).trim();e=g.getShaderInfoLog(l).trim();w=g.getShaderInfoLog(m).trim();t=n=!0;if(!1===g.getProgramParameter(p,g.LINK_STATUS))n=!1,console.error("THREE.WebGLProgram: shader error: ",g.getError(),"gl.VALIDATE_STATUS",g.getProgramParameter(p,g.VALIDATE_STATUS),"gl.getProgramInfoLog",f,e,w);else if(""!==f)console.warn("THREE.WebGLProgram: gl.getProgramInfoLog()", -f);else if(""===e||""===w)t=!1;t&&(this.diagnostics={runnable:n,material:d,programLog:f,vertexShader:{log:e,prefix:h},fragmentShader:{log:w,prefix:b}});g.deleteShader(l);g.deleteShader(m);var v;this.getUniforms=function(){void 0===v&&(v=new cb(g,p,a));return v};var C;this.getAttributes=function(){if(void 0===C){for(var a={},b=g.getProgramParameter(p,g.ACTIVE_ATTRIBUTES),c=0;c