From 9280a53a7ed60a1337c6a200b630e6461d22a9a6 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 12 Jan 2018 17:59:03 -0800 Subject: [PATCH] Updated builds. --- build/three.js | 4 ++-- build/three.min.js | 2 +- build/three.module.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/three.js b/build/three.js index 10ecda59be..8ac9b62285 100644 --- a/build/three.js +++ b/build/three.js @@ -23163,7 +23163,7 @@ }; - this.copyFramebufferToTexture = function ( x, y, texture, level ) { + this.copyFramebufferToTexture = function ( position, texture, level ) { var width = texture.image.width; var height = texture.image.height; @@ -23171,7 +23171,7 @@ this.setTexture2D( texture, 0 ); - _gl.copyTexImage2D( _gl.TEXTURE_2D, level || 0, internalFormat, x, y, width, height, 0 ); + _gl.copyTexImage2D( _gl.TEXTURE_2D, level || 0, internalFormat, position.x, position.y, width, height, 0 ); }; diff --git a/build/three.min.js b/build/three.min.js index 1785dafd6e..f349faac9b 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -185,7 +185,7 @@ c)}}();this.setTextureCube=function(){var a=!1;return function(b,c){b&&b.isWebGL var b=null,c=!1;a?(b=Y.get(a).__webglFramebuffer,a.isWebGLRenderTargetCube&&(b=b[a.activeCubeFace],c=!0),T.copy(a.viewport),Sa.copy(a.scissor),U=a.scissorTest):(T.copy(ea).multiplyScalar(S),Sa.copy(ca).multiplyScalar(S),U=ga);R!==b&&(F.bindFramebuffer(F.FRAMEBUFFER,b),R=b);Z.viewport(T);Z.scissor(Sa);Z.setScissorTest(U);c&&(c=Y.get(a.texture),F.framebufferTexture2D(F.FRAMEBUFFER,F.COLOR_ATTACHMENT0,F.TEXTURE_CUBE_MAP_POSITIVE_X+a.activeCubeFace,c.__webglTexture,a.activeMipMapLevel))};this.readRenderTargetPixels= function(a,b,c,d,e,f){if(a&&a.isWebGLRenderTarget){var g=Y.get(a).__webglFramebuffer;if(g){var h=!1;g!==R&&(F.bindFramebuffer(F.FRAMEBUFFER,g),h=!0);try{var k=a.texture,m=k.format,t=k.type;1023!==m&&la.convert(m)!==F.getParameter(F.IMPLEMENTATION_COLOR_READ_FORMAT)?console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format."):1009===t||la.convert(t)===F.getParameter(F.IMPLEMENTATION_COLOR_READ_TYPE)||1015===t&&(ia.get("OES_texture_float")|| ia.get("WEBGL_color_buffer_float"))||1016===t&&ia.get("EXT_color_buffer_half_float")?F.checkFramebufferStatus(F.FRAMEBUFFER)===F.FRAMEBUFFER_COMPLETE?0<=b&&b<=a.width-d&&0<=c&&c<=a.height-e&&F.readPixels(b,c,d,e,la.convert(m),la.convert(t),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&& -F.bindFramebuffer(F.FRAMEBUFFER,R)}}}else console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not THREE.WebGLRenderTarget.")};this.copyFramebufferToTexture=function(a,b,c,d){var e=c.image.width,f=c.image.height,g=la.convert(c.format);this.setTexture2D(c,0);F.copyTexImage2D(F.TEXTURE_2D,d||0,g,a,b,e,f,0)}}function Mb(a,b){this.name="";this.color=new H(a);this.density=void 0!==b?b:2.5E-4}function Nb(a,b,c){this.name="";this.color=new H(a);this.near=void 0!==b?b:1;this.far=void 0!== +F.bindFramebuffer(F.FRAMEBUFFER,R)}}}else console.error("THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not THREE.WebGLRenderTarget.")};this.copyFramebufferToTexture=function(a,b,c){var d=b.image.width,e=b.image.height,f=la.convert(b.format);this.setTexture2D(b,0);F.copyTexImage2D(F.TEXTURE_2D,c||0,f,a.x,a.y,d,e,0)}}function Mb(a,b){this.name="";this.color=new H(a);this.density=void 0!==b?b:2.5E-4}function Nb(a,b,c){this.name="";this.color=new H(a);this.near=void 0!==b?b:1;this.far=void 0!== c?c:1E3}function rd(){A.call(this);this.type="Scene";this.overrideMaterial=this.fog=this.background=null;this.autoUpdate=!0}function eb(a){L.call(this);this.type="SpriteMaterial";this.color=new H(16777215);this.map=null;this.rotation=0;this.lights=this.fog=!1;this.setValues(a)}function Ac(a){A.call(this);this.type="Sprite";this.material=void 0!==a?a:new eb}function Bc(){A.call(this);this.type="LOD";Object.defineProperties(this,{levels:{enumerable:!0,value:[]}})}function Cc(a,b){a=a||[];this.bones= a.slice(0);this.boneMatrices=new Float32Array(16*this.bones.length);if(void 0===b)this.calculateInverses();else if(this.bones.length===b.length)this.boneInverses=b.slice(0);else for(console.warn("THREE.Skeleton boneInverses is the wrong length."),this.boneInverses=[],a=0,b=this.bones.length;a