Updated builds.

mrdoob · Jan 6, 2018 · 7fedf92 · 7fedf92
1 parent 6b7ee3e
commit 7fedf92
Show file tree

Hide file tree

Showing 3 changed files with 740 additions and 769 deletions.
diff --git a/build/three.js b/build/three.js
@@ -17452,7 +17452,7 @@
 
 		}
 
-		function clear() {
+		function dispose() {
 
 			updateList = {};
 
@@ -17461,7 +17461,7 @@
 		return {
 
 			update: update,
-			clear: clear
+			dispose: dispose
 
 		};
 
@@ -18489,7 +18489,7 @@
 	 * @author mrdoob / http://mrdoob.com/
 	 */
 
-	function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, infoMemory ) {
+	function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, infoMemory, infoRender ) {
 
 		var _isWebGL2 = ( typeof WebGL2RenderingContext !== 'undefined' && _gl instanceof WebGL2RenderingContext );
 		var _videoTextures = {};
@@ -18684,6 +18684,8 @@
 
 			var textureProperties = properties.get( texture );
 
+			if ( texture.isVideoTexture ) updateVideoTexture( texture );
+
 			if ( texture.version > 0 && textureProperties.__version !== texture.version ) {
 
 				var image = texture.image;
@@ -18895,12 +18897,6 @@
 
 				textureProperties.__webglTexture = _gl.createTexture();
 
-				if ( texture.isVideoTexture ) {
-
-					_videoTextures[ texture.id ] = texture;
-
-				}
-
 				infoMemory.textures ++;
 
 			}
@@ -19282,11 +19278,17 @@
 
 		}
 
-		function updateVideoTextures() {
+		function updateVideoTexture( texture ) {
+
+			var id = texture.id;
+			var frame = infoRender.frame;
+
+			// Check the last frame we updated the VideoTexture
 
-			for ( var id in _videoTextures ) {
+			if ( _videoTextures[ id ] !== frame ) {
 
-				_videoTextures[ id ].update();
+				_videoTextures[ id ] = frame;
+				texture.update();
 
 			}
 
@@ -19297,7 +19299,6 @@
 		this.setTextureCubeDynamic = setTextureCubeDynamic;
 		this.setupRenderTarget = setupRenderTarget;
 		this.updateRenderTargetMipmap = updateRenderTargetMipmap;
-		this.updateVideoTextures = updateVideoTextures;
 
 	}
 
@@ -19331,7 +19332,7 @@
 
 		}
 
-		function clear() {
+		function dispose() {
 
 			properties = {};
 
@@ -19340,7 +19341,7 @@
 		return {
 			get: get,
 			remove: remove,
-			clear: clear
+			dispose: dispose
 		};
 
 	}
@@ -21478,7 +21479,7 @@
 			state.viewport( _currentViewport.copy( _viewport ).multiplyScalar( _pixelRatio ) );
 
 			properties = new WebGLProperties();
-			textures = new WebGLTextures( _gl, extensions, state, properties, capabilities, utils, _infoMemory );
+			textures = new WebGLTextures( _gl, extensions, state, properties, capabilities, utils, _infoMemory, _infoRender );
 			attributes = new WebGLAttributes( _gl );
 			geometries = new WebGLGeometries( _gl, attributes, _infoMemory );
 			objects = new WebGLObjects( geometries, _infoRender );
@@ -21715,6 +21716,8 @@
 			_canvas.removeEventListener( 'webglcontextrestored', onContextRestore, false );
 
 			renderLists.dispose();
+			properties.dispose();
+			objects.dispose();
 
 			vr.dispose();
 
@@ -22335,10 +22338,6 @@
 
 			//
 
-			textures.updateVideoTextures();
-
-			//
-
 			if ( _clippingEnabled ) _clipping.beginShadows();
 
 			shadowMap.render( shadowsArray, scene, camera );
@@ -25154,19 +25153,6 @@
 
 		this.generateMipmaps = false;
 
-		// Set needsUpdate when first frame is ready
-
-		var scope = this;
-
-		function onLoaded() {
-
-			video.removeEventListener( 'loadeddata', onLoaded, false );
-			scope.needsUpdate = true;
-
-		}
-
-		video.addEventListener( 'loadeddata', onLoaded, false );
-
 	}
 
 	VideoTexture.prototype = Object.assign( Object.create( Texture.prototype ), {