From 32c299318cff898ccf280158741d3781803b4814 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 14 Jun 2016 18:30:27 -0700 Subject: [PATCH] Updated builds. --- build/three.js | 49 +++++++++++++++++++++---------------------- build/three.min.js | 52 +++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/build/three.js b/build/three.js index 3c7594b687..0b44540fe5 100644 --- a/build/three.js +++ b/build/three.js @@ -18401,18 +18401,21 @@ Object.assign( THREE.XHRLoader.prototype, { setPath: function ( value ) { this.path = value; + return this; }, setResponseType: function ( value ) { this.responseType = value; + return this; }, setWithCredentials: function ( value ) { this.withCredentials = value; + return this; } @@ -18516,12 +18519,14 @@ Object.assign( THREE.ImageLoader.prototype, { setCrossOrigin: function ( value ) { this.crossOrigin = value; + return this; }, setPath: function ( value ) { this.path = value; + return this; } @@ -20055,12 +20060,14 @@ Object.assign( THREE.TextureLoader.prototype, { setCrossOrigin: function ( value ) { this.crossOrigin = value; + return this; }, setPath: function ( value ) { this.path = value; + return this; } @@ -20123,12 +20130,14 @@ Object.assign( THREE.CubeTextureLoader.prototype, { setCrossOrigin: function ( value ) { this.crossOrigin = value; + return this; }, setPath: function ( value ) { this.path = value; + return this; } @@ -20354,6 +20363,7 @@ Object.assign( THREE.CompressedTextureLoader.prototype, { setPath: function ( value ) { this.path = value; + return this; } @@ -25683,12 +25693,6 @@ THREE.WebGLRenderer = function ( parameters ) { var size = geometryAttribute.itemSize; var buffer = objects.getAttributeBuffer( geometryAttribute ); - if ( buffer === undefined ) { - - console.error( objects, geometryAttribute ); - - } - if ( geometryAttribute instanceof THREE.InterleavedBufferAttribute ) { var data = geometryAttribute.data; @@ -25906,16 +25910,27 @@ THREE.WebGLRenderer = function ( parameters ) { // - var needsClear = this.autoClear || forceClear; var background = scene.background; if ( background === null ) { glClearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha ); - } else if ( background instanceof THREE.CubeTexture ) { + } else if ( background instanceof THREE.Color ) { + + glClearColor( background.r, background.g, background.b, 1 ); + + } - backgroundCamera2.projectionMatrix = camera.projectionMatrix; + if ( this.autoClear || forceClear ) { + + this.clear( this.autoClearColor, this.autoClearDepth, this.autoClearStencil ); + + } + + if ( background instanceof THREE.CubeTexture ) { + + backgroundCamera2.projectionMatrix.copy( camera.projectionMatrix ); backgroundCamera2.matrixWorld.extractRotation( camera.matrixWorld ); backgroundCamera2.matrixWorldInverse.getInverse( backgroundCamera2.matrixWorld ); @@ -25925,28 +25940,12 @@ THREE.WebGLRenderer = function ( parameters ) { _this.renderBufferDirect( backgroundCamera2, null, backgroundBoxMesh.geometry, backgroundBoxMesh.material, backgroundBoxMesh, null ); - needsClear = false; - } else if ( background instanceof THREE.Texture ) { backgroundPlaneMesh.material.map = background; _this.renderBufferDirect( backgroundCamera, null, backgroundPlaneMesh.geometry, backgroundPlaneMesh.material, backgroundPlaneMesh, null ); - needsClear = false; - - } else if ( background instanceof THREE.Color ) { - - glClearColor( background.r, background.g, background.b, 1 ); - - needsClear = true; - - } - - if ( needsClear ) { - - this.clear( this.autoClearColor, this.autoClearDepth, this.autoClearStencil ); - } // diff --git a/build/three.min.js b/build/three.min.js index f9eec0a646..465610eb7b 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -383,10 +383,10 @@ d.mapRoughnessOffset,d.mapRoughnessWrap,d.mapRoughnessAnisotropy);break;case "ma k.opacity=n;break;case "depthTest":case "depthWrite":case "colorWrite":case "opacity":case "reflectivity":case "transparent":case "visible":case "wireframe":k[l]=n;break;case "vertexColors":!0===n&&(k.vertexColors=THREE.VertexColors);"face"===n&&(k.vertexColors=THREE.FaceColors);break;default:console.error("THREE.Loader.createMaterial: Unsupported",l,n)}}"MeshBasicMaterial"===k.type&&delete k.emissive;"MeshPhongMaterial"!==k.type&&delete k.specular;1>k.opacity&&(k.transparent=!0);c.setTextures(h); return c.parse(k)}}()};THREE.Loader.Handlers={handlers:[],add:function(a,b){this.handlers.push(a,b)},get:function(a){for(var b=this.handlers,c=0,d=b.length;c=da.maxTextures&&console.warn("WebGLRenderer: trying to use "+a+" texture units while this GPU supports only "+da.maxTextures);ia+=1;return a};this.setTexture2D=function(){var a=!1;return function(b,c){b instanceof THREE.WebGLRenderTarget&&(a||(console.warn("THREE.WebGLRenderer.setTexture2D: don't use render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);ka.setTexture2D(b,c)}}();this.setTexture=function(){var a=!1;return function(b, -c){a||(console.warn("THREE.WebGLRenderer: .setTexture is deprecated, use setTexture2D instead."),a=!0);ka.setTexture2D(b,c)}}();this.setTextureCube=function(){var a=!1;return function(b,c){b instanceof THREE.WebGLRenderTargetCube&&(a||(console.warn("THREE.WebGLRenderer.setTextureCube: don't use cube render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);b instanceof THREE.CubeTexture||Array.isArray(b.image)&&6===b.image.length?ka.setTextureCube(b,c):ka.setTextureCubeDynamic(b, -c)}}();this.getCurrentRenderTarget=function(){return J};this.setRenderTarget=function(a){(J=a)&&void 0===Z.get(a).__webglFramebuffer&&ka.setupRenderTarget(a);var b=a instanceof THREE.WebGLRenderTargetCube,c;a?(c=Z.get(a),c=b?c.__webglFramebuffer[a.activeCubeFace]:c.__webglFramebuffer,X.copy(a.scissor),ja=a.scissorTest,ba.copy(a.viewport)):(c=null,X.copy(ua).multiplyScalar($),ja=xa,ba.copy(ma).multiplyScalar($));D!==c&&(x.bindFramebuffer(x.FRAMEBUFFER,c),D=c);R.scissor(X);R.setScissorTest(ja);R.viewport(ba); -b&&(b=Z.get(a.texture),x.framebufferTexture2D(x.FRAMEBUFFER,x.COLOR_ATTACHMENT0,x.TEXTURE_CUBE_MAP_POSITIVE_X+a.activeCubeFace,b.__webglTexture,a.activeMipMapLevel))};this.readRenderTargetPixels=function(a,b,c,d,e,f){if(!1===a instanceof THREE.WebGLRenderTarget)console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not THREE.WebGLRenderTarget.");else{var g=Z.get(a).__webglFramebuffer;if(g){var h=!1;g!==D&&(x.bindFramebuffer(x.FRAMEBUFFER,g),h=!0);try{var k=a.texture;k.format!== -THREE.RGBAFormat&&u(k.format)!==x.getParameter(x.IMPLEMENTATION_COLOR_READ_FORMAT)?console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format."):k.type===THREE.UnsignedByteType||u(k.type)===x.getParameter(x.IMPLEMENTATION_COLOR_READ_TYPE)||k.type===THREE.FloatType&&U.get("WEBGL_color_buffer_float")||k.type===THREE.HalfFloatType&&U.get("EXT_color_buffer_half_float")?x.checkFramebufferStatus(x.FRAMEBUFFER)===x.FRAMEBUFFER_COMPLETE?0<=b&&b<= -a.width-d&&0<=c&&c<=a.height-e&&x.readPixels(b,c,d,e,u(k.format),u(k.type),f):console.error("THREE.WebGLRenderer.readRenderTargetPixels: readPixels from renderTarget failed. Framebuffer not complete."):console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.")}finally{h&&x.bindFramebuffer(x.FRAMEBUFFER,D)}}}}}; +w=x.BYTE:C instanceof Uint8Array&&(w=x.UNSIGNED_BYTE);var C=u.itemSize,y=ea.getAttributeBuffer(u);if(u instanceof THREE.InterleavedBufferAttribute){var z=u.data,A=z.stride,u=u.offset;z instanceof THREE.InstancedInterleavedBuffer?(R.enableAttributeAndDivisor(v,z.meshPerAttribute,p),void 0===c.maxInstancedCount&&(c.maxInstancedCount=z.meshPerAttribute*z.count)):R.enableAttribute(v);x.bindBuffer(x.ARRAY_BUFFER,y);x.vertexAttribPointer(v,C,w,t,A*z.array.BYTES_PER_ELEMENT,(k*A+u)*z.array.BYTES_PER_ELEMENT)}else u instanceof +THREE.InstancedBufferAttribute?(R.enableAttributeAndDivisor(v,u.meshPerAttribute,p),void 0===c.maxInstancedCount&&(c.maxInstancedCount=u.meshPerAttribute*u.count)):R.enableAttribute(v),x.bindBuffer(x.ARRAY_BUFFER,y),x.vertexAttribPointer(v,C,w,t,0,k*C*u.array.BYTES_PER_ELEMENT)}else if(void 0!==n&&(w=n[q],void 0!==w))switch(w.length){case 2:x.vertexAttrib2fv(v,w);break;case 3:x.vertexAttrib3fv(v,w);break;case 4:x.vertexAttrib4fv(v,w);break;default:x.vertexAttrib1fv(v,w)}}}R.disableUnusedAttributes()}null!== +b&&x.bindBuffer(x.ELEMENT_ARRAY_BUFFER,ea.getAttributeBuffer(b))}p=Infinity;null!==b?p=b.count:void 0!==m&&(p=m.count);q=c.drawRange.start;b=c.drawRange.count;m=null!==g?g.start:0;k=null!==g?g.count:Infinity;g=Math.max(0,q,m);p=Math.min(0+p,q+b,m+k)-1;p=Math.max(0,p-g+1);if(e instanceof THREE.Mesh)if(!0===d.wireframe)R.setLineWidth(d.wireframeLinewidth*(null===J?$:1)),a.setMode(x.LINES);else switch(e.drawMode){case THREE.TrianglesDrawMode:a.setMode(x.TRIANGLES);break;case THREE.TriangleStripDrawMode:a.setMode(x.TRIANGLE_STRIP); +break;case THREE.TriangleFanDrawMode:a.setMode(x.TRIANGLE_FAN)}else e instanceof THREE.Line?(d=d.linewidth,void 0===d&&(d=1),R.setLineWidth(d*(null===J?$:1)),e instanceof THREE.LineSegments?a.setMode(x.LINES):a.setMode(x.LINE_STRIP)):e instanceof THREE.Points&&a.setMode(x.POINTS);c instanceof THREE.InstancedBufferGeometry?0=da.maxTextures&&console.warn("WebGLRenderer: trying to use "+a+" texture units while this GPU supports only "+ +da.maxTextures);ia+=1;return a};this.setTexture2D=function(){var a=!1;return function(b,c){b instanceof THREE.WebGLRenderTarget&&(a||(console.warn("THREE.WebGLRenderer.setTexture2D: don't use render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);ka.setTexture2D(b,c)}}();this.setTexture=function(){var a=!1;return function(b,c){a||(console.warn("THREE.WebGLRenderer: .setTexture is deprecated, use setTexture2D instead."),a=!0);ka.setTexture2D(b,c)}}();this.setTextureCube= +function(){var a=!1;return function(b,c){b instanceof THREE.WebGLRenderTargetCube&&(a||(console.warn("THREE.WebGLRenderer.setTextureCube: don't use cube render targets as textures. Use their .texture property instead."),a=!0),b=b.texture);b instanceof THREE.CubeTexture||Array.isArray(b.image)&&6===b.image.length?ka.setTextureCube(b,c):ka.setTextureCubeDynamic(b,c)}}();this.getCurrentRenderTarget=function(){return J};this.setRenderTarget=function(a){(J=a)&&void 0===Z.get(a).__webglFramebuffer&&ka.setupRenderTarget(a); +var b=a instanceof THREE.WebGLRenderTargetCube,c;a?(c=Z.get(a),c=b?c.__webglFramebuffer[a.activeCubeFace]:c.__webglFramebuffer,X.copy(a.scissor),ja=a.scissorTest,ba.copy(a.viewport)):(c=null,X.copy(ua).multiplyScalar($),ja=xa,ba.copy(ma).multiplyScalar($));D!==c&&(x.bindFramebuffer(x.FRAMEBUFFER,c),D=c);R.scissor(X);R.setScissorTest(ja);R.viewport(ba);b&&(b=Z.get(a.texture),x.framebufferTexture2D(x.FRAMEBUFFER,x.COLOR_ATTACHMENT0,x.TEXTURE_CUBE_MAP_POSITIVE_X+a.activeCubeFace,b.__webglTexture,a.activeMipMapLevel))}; +this.readRenderTargetPixels=function(a,b,c,d,e,f){if(!1===a instanceof THREE.WebGLRenderTarget)console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not THREE.WebGLRenderTarget.");else{var g=Z.get(a).__webglFramebuffer;if(g){var h=!1;g!==D&&(x.bindFramebuffer(x.FRAMEBUFFER,g),h=!0);try{var k=a.texture;k.format!==THREE.RGBAFormat&&u(k.format)!==x.getParameter(x.IMPLEMENTATION_COLOR_READ_FORMAT)?console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format."): +k.type===THREE.UnsignedByteType||u(k.type)===x.getParameter(x.IMPLEMENTATION_COLOR_READ_TYPE)||k.type===THREE.FloatType&&U.get("WEBGL_color_buffer_float")||k.type===THREE.HalfFloatType&&U.get("EXT_color_buffer_half_float")?x.checkFramebufferStatus(x.FRAMEBUFFER)===x.FRAMEBUFFER_COMPLETE?0<=b&&b<=a.width-d&&0<=c&&c<=a.height-e&&x.readPixels(b,c,d,e,u(k.format),u(k.type),f):console.error("THREE.WebGLRenderer.readRenderTargetPixels: readPixels from renderTarget failed. Framebuffer not complete."):console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.")}finally{h&& +x.bindFramebuffer(x.FRAMEBUFFER,D)}}}}}; THREE.WebGLRenderTarget=function(a,b,c){this.uuid=THREE.Math.generateUUID();this.width=a;this.height=b;this.scissor=new THREE.Vector4(0,0,a,b);this.scissorTest=!1;this.viewport=new THREE.Vector4(0,0,a,b);c=c||{};void 0===c.minFilter&&(c.minFilter=THREE.LinearFilter);this.texture=new THREE.Texture(void 0,void 0,c.wrapS,c.wrapT,c.magFilter,c.minFilter,c.format,c.type,c.anisotropy,c.encoding);this.depthBuffer=void 0!==c.depthBuffer?c.depthBuffer:!0;this.stencilBuffer=void 0!==c.stencilBuffer?c.stencilBuffer: !0;this.depthTexture=null}; Object.assign(THREE.WebGLRenderTarget.prototype,THREE.EventDispatcher.prototype,{setSize:function(a,b){if(this.width!==a||this.height!==b)this.width=a,this.height=b,this.dispose();this.viewport.set(0,0,a,b);this.scissor.set(0,0,a,b)},clone:function(){return(new this.constructor).copy(this)},copy:function(a){this.width=a.width;this.height=a.height;this.viewport.copy(a.viewport);this.texture=a.texture.clone();this.depthBuffer=a.depthBuffer;this.stencilBuffer=a.stencilBuffer;this.depthTexture=a.depthTexture; -- GitLab