浏览代码

Updated builds.

Mr.doob 7 年之前
父节点
当前提交
319f466af5
共有 3 个文件被更改,包括 86 次插入245 次删除
  1. 26 6
      build/three.js
  2. 34 233
      build/three.min.js
  3. 26 6
      build/three.module.js

+ 26 - 6
build/three.js

@@ -21372,10 +21372,22 @@
 
 
 			render: _infoRender,
 			render: _infoRender,
 			memory: _infoMemory,
 			memory: _infoMemory,
-			programs: null
+			programs: null,
+			autoReset: true,
+			reset: resetInfo
 
 
 		};
 		};
 
 
+		function resetInfo () {
+
+			_infoRender.frame ++;
+			_infoRender.calls = 0;
+			_infoRender.vertices = 0;
+			_infoRender.faces = 0;
+			_infoRender.points = 0;
+
+		}
+
 		function getTargetPixelRatio() {
 		function getTargetPixelRatio() {
 
 
 			return _currentRenderTarget === null ? _pixelRatio : 1;
 			return _currentRenderTarget === null ? _pixelRatio : 1;
@@ -22338,11 +22350,7 @@
 
 
 			//
 			//
 
 
-			_infoRender.frame ++;
-			_infoRender.calls = 0;
-			_infoRender.vertices = 0;
-			_infoRender.faces = 0;
-			_infoRender.points = 0;
+			if ( this.info.autoReset ) this.info.reset();
 
 
 			if ( renderTarget === undefined ) {
 			if ( renderTarget === undefined ) {
 
 
@@ -23755,6 +23763,18 @@
 
 
 		};
 		};
 
 
+		this.copyFramebufferToTexture = function ( x, y, texture, level ) {
+
+			var width = texture.image.width;
+			var height = texture.image.height;
+			var internalFormat = utils.convert( texture.format );
+
+			this.setTexture2D( texture, 0 );
+
+			_gl.copyTexImage2D( _gl.TEXTURE_2D, level || 0, internalFormat, x, y, width, height, 0 );
+
+		};
+
 	}
 	}
 
 
 	/**
 	/**

文件差异内容过多而无法显示
+ 34 - 233
build/three.min.js


+ 26 - 6
build/three.module.js

@@ -21366,10 +21366,22 @@ function WebGLRenderer( parameters ) {
 
 
 		render: _infoRender,
 		render: _infoRender,
 		memory: _infoMemory,
 		memory: _infoMemory,
-		programs: null
+		programs: null,
+		autoReset: true,
+		reset: resetInfo
 
 
 	};
 	};
 
 
+	function resetInfo () {
+
+		_infoRender.frame ++;
+		_infoRender.calls = 0;
+		_infoRender.vertices = 0;
+		_infoRender.faces = 0;
+		_infoRender.points = 0;
+
+	}
+
 	function getTargetPixelRatio() {
 	function getTargetPixelRatio() {
 
 
 		return _currentRenderTarget === null ? _pixelRatio : 1;
 		return _currentRenderTarget === null ? _pixelRatio : 1;
@@ -22332,11 +22344,7 @@ function WebGLRenderer( parameters ) {
 
 
 		//
 		//
 
 
-		_infoRender.frame ++;
-		_infoRender.calls = 0;
-		_infoRender.vertices = 0;
-		_infoRender.faces = 0;
-		_infoRender.points = 0;
+		if ( this.info.autoReset ) this.info.reset();
 
 
 		if ( renderTarget === undefined ) {
 		if ( renderTarget === undefined ) {
 
 
@@ -23749,6 +23757,18 @@ function WebGLRenderer( parameters ) {
 
 
 	};
 	};
 
 
+	this.copyFramebufferToTexture = function ( x, y, texture, level ) {
+
+		var width = texture.image.width;
+		var height = texture.image.height;
+		var internalFormat = utils.convert( texture.format );
+
+		this.setTexture2D( texture, 0 );
+
+		_gl.copyTexImage2D( _gl.TEXTURE_2D, level || 0, internalFormat, x, y, width, height, 0 );
+
+	};
+
 }
 }
 
 
 /**
 /**

部分文件因为文件数量过多而无法显示