Browse Source

Updated builds.

Mr.doob 4 years ago
parent
commit
5299a7d5a1
3 changed files with 28 additions and 18 deletions
  1. 12 9
      build/three.js
  2. 0 0
      build/three.min.js
  3. 16 9
      build/three.module.js

+ 12 - 9
build/three.js

@@ -16241,8 +16241,9 @@
 		}
 
 		function deallocateRenderTarget(renderTarget) {
+			var texture = renderTarget.texture;
 			var renderTargetProperties = properties.get(renderTarget);
-			var textureProperties = properties.get(renderTarget.texture);
+			var textureProperties = properties.get(texture);
 			if (!renderTarget) return;
 
 			if (textureProperties.__webglTexture !== undefined) {
@@ -16268,7 +16269,7 @@
 				if (renderTargetProperties.__webglDepthRenderbuffer) _gl.deleteRenderbuffer(renderTargetProperties.__webglDepthRenderbuffer);
 			}
 
-			properties.remove(renderTarget.texture);
+			properties.remove(texture);
 			properties.remove(renderTarget);
 		} //
 
@@ -16635,9 +16636,10 @@
 
 
 		function setupFrameBufferTexture(framebuffer, renderTarget, attachment, textureTarget) {
-			var glFormat = utils.convert(renderTarget.texture.format);
-			var glType = utils.convert(renderTarget.texture.type);
-			var glInternalFormat = getInternalFormat(renderTarget.texture.internalFormat, glFormat, glType);
+			var texture = renderTarget.texture;
+			var glFormat = utils.convert(texture.format);
+			var glType = utils.convert(texture.type);
+			var glInternalFormat = getInternalFormat(texture.internalFormat, glFormat, glType);
 
 			if (textureTarget === 32879 || textureTarget === 35866) {
 				state.texImage3D(textureTarget, 0, glInternalFormat, renderTarget.width, renderTarget.height, renderTarget.depth, 0, glFormat, glType, null);
@@ -16647,7 +16649,7 @@
 
 			_gl.bindFramebuffer(36160, framebuffer);
 
-			_gl.framebufferTexture2D(36160, attachment, textureTarget, properties.get(renderTarget.texture).__webglTexture, 0);
+			_gl.framebufferTexture2D(36160, attachment, textureTarget, properties.get(texture).__webglTexture, 0);
 
 			_gl.bindFramebuffer(36160, null);
 		} // Setup storage for internal depth/stencil buffers and bind to correct framebuffer
@@ -16689,10 +16691,11 @@
 
 				_gl.framebufferRenderbuffer(36160, 33306, 36161, renderbuffer);
 			} else {
-				var glFormat = utils.convert(renderTarget.texture.format);
-				var glType = utils.convert(renderTarget.texture.type);
+				var texture = renderTarget.texture;
+				var glFormat = utils.convert(texture.format);
+				var glType = utils.convert(texture.type);
 
-				var _glInternalFormat = getInternalFormat(renderTarget.texture.internalFormat, glFormat, glType);
+				var _glInternalFormat = getInternalFormat(texture.internalFormat, glFormat, glType);
 
 				if (isMultisample) {
 					var _samples2 = getRenderTargetSamples(renderTarget);

File diff suppressed because it is too large
+ 0 - 0
build/three.min.js


+ 16 - 9
build/three.module.js

@@ -20261,8 +20261,10 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 	function deallocateRenderTarget( renderTarget ) {
 
+		const texture = renderTarget.texture;
+
 		const renderTargetProperties = properties.get( renderTarget );
-		const textureProperties = properties.get( renderTarget.texture );
+		const textureProperties = properties.get( texture );
 
 		if ( ! renderTarget ) return;
 
@@ -20297,7 +20299,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		}
 
-		properties.remove( renderTarget.texture );
+		properties.remove( texture );
 		properties.remove( renderTarget );
 
 	}
@@ -20849,9 +20851,11 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 	// Setup storage for target texture and bind it to correct framebuffer
 	function setupFrameBufferTexture( framebuffer, renderTarget, attachment, textureTarget ) {
 
-		const glFormat = utils.convert( renderTarget.texture.format );
-		const glType = utils.convert( renderTarget.texture.type );
-		const glInternalFormat = getInternalFormat( renderTarget.texture.internalFormat, glFormat, glType );
+		const texture = renderTarget.texture;
+
+		const glFormat = utils.convert( texture.format );
+		const glType = utils.convert( texture.type );
+		const glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType );
 
 		if ( textureTarget === 32879 || textureTarget === 35866 ) {
 
@@ -20864,7 +20868,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 		}
 
 		_gl.bindFramebuffer( 36160, framebuffer );
-		_gl.framebufferTexture2D( 36160, attachment, textureTarget, properties.get( renderTarget.texture ).__webglTexture, 0 );
+		_gl.framebufferTexture2D( 36160, attachment, textureTarget, properties.get( texture ).__webglTexture, 0 );
 		_gl.bindFramebuffer( 36160, null );
 
 	}
@@ -20927,9 +20931,11 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		} else {
 
-			const glFormat = utils.convert( renderTarget.texture.format );
-			const glType = utils.convert( renderTarget.texture.type );
-			const glInternalFormat = getInternalFormat( renderTarget.texture.internalFormat, glFormat, glType );
+			const texture = renderTarget.texture;
+
+			const glFormat = utils.convert( texture.format );
+			const glType = utils.convert( texture.type );
+			const glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType );
 
 			if ( isMultisample ) {
 
@@ -21188,6 +21194,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 	function updateRenderTargetMipmap( renderTarget ) {
 
 		const texture = renderTarget.texture;
+
 		const supportsMips = isPowerOfTwo( renderTarget ) || isWebGL2;
 
 		if ( textureNeedsGenerateMipmaps( texture, supportsMips ) ) {

Some files were not shown because too many files changed in this diff