浏览代码

Updated builds.

Mr.doob 7 年之前
父节点
当前提交
393fc60c82
共有 3 个文件被更改,包括 339 次插入317 次删除
  1. 17 6
      build/three.js
  2. 305 305
      build/three.min.js
  3. 17 6
      build/three.module.js

+ 17 - 6
build/three.js

@@ -21480,8 +21480,9 @@
 	 * @author mrdoob / http://mrdoob.com/
 	 */
 
-	function WebXRManager( gl ) {
+	function WebXRManager( renderer ) {
 
+		var gl = renderer.context;
 		var device = null;
 		var session = null;
 
@@ -21538,7 +21539,7 @@
 
 				session.addEventListener( 'end', function () {
 
-					gl.bindFramebuffer( gl.FRAMEBUFFER, null );
+					renderer.setFramebuffer( null );
 					animation.stop();
 
 				} );
@@ -21549,6 +21550,8 @@
 					frameOfRef = value;
 					isExclusive = session.exclusive;
 
+					renderer.setFramebuffer( session.baseLayer.framebuffer );
+
 					animation.setContext( session );
 					animation.start();
 
@@ -21603,8 +21606,6 @@
 
 			}
 
-			gl.bindFramebuffer( gl.FRAMEBUFFER, session.baseLayer.framebuffer );
-
 			if ( onAnimationFrameCallback ) onAnimationFrameCallback();
 
 		}
@@ -21711,6 +21712,8 @@
 
 			// internal state cache
 
+			_framebuffer = null,
+
 			_currentRenderTarget = null,
 			_currentFramebuffer = null,
 			_currentMaterialId = - 1,
@@ -21878,7 +21881,7 @@
 
 		// vr
 
-		var vr = ( 'xr' in navigator ) ? new WebXRManager( _gl ) : new WebVRManager( _this );
+		var vr = ( 'xr' in navigator ) ? new WebXRManager( _this ) : new WebVRManager( _this );
 
 		this.vr = vr;
 
@@ -23984,6 +23987,14 @@
 
 		}() );
 
+		//
+
+		this.setFramebuffer = function ( value ) {
+
+			_framebuffer = value;
+
+		};
+
 		this.getRenderTarget = function () {
 
 			return _currentRenderTarget;
@@ -24000,7 +24011,7 @@
 
 			}
 
-			var framebuffer = null;
+			var framebuffer = _framebuffer;
 			var isCube = false;
 
 			if ( renderTarget ) {

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


+ 17 - 6
build/three.module.js

@@ -21474,8 +21474,9 @@ function WebVRManager( renderer ) {
  * @author mrdoob / http://mrdoob.com/
  */
 
-function WebXRManager( gl ) {
+function WebXRManager( renderer ) {
 
+	var gl = renderer.context;
 	var device = null;
 	var session = null;
 
@@ -21532,7 +21533,7 @@ function WebXRManager( gl ) {
 
 			session.addEventListener( 'end', function () {
 
-				gl.bindFramebuffer( gl.FRAMEBUFFER, null );
+				renderer.setFramebuffer( null );
 				animation.stop();
 
 			} );
@@ -21543,6 +21544,8 @@ function WebXRManager( gl ) {
 				frameOfRef = value;
 				isExclusive = session.exclusive;
 
+				renderer.setFramebuffer( session.baseLayer.framebuffer );
+
 				animation.setContext( session );
 				animation.start();
 
@@ -21597,8 +21600,6 @@ function WebXRManager( gl ) {
 
 		}
 
-		gl.bindFramebuffer( gl.FRAMEBUFFER, session.baseLayer.framebuffer );
-
 		if ( onAnimationFrameCallback ) onAnimationFrameCallback();
 
 	}
@@ -21705,6 +21706,8 @@ function WebGLRenderer( parameters ) {
 
 		// internal state cache
 
+		_framebuffer = null,
+
 		_currentRenderTarget = null,
 		_currentFramebuffer = null,
 		_currentMaterialId = - 1,
@@ -21872,7 +21875,7 @@ function WebGLRenderer( parameters ) {
 
 	// vr
 
-	var vr = ( 'xr' in navigator ) ? new WebXRManager( _gl ) : new WebVRManager( _this );
+	var vr = ( 'xr' in navigator ) ? new WebXRManager( _this ) : new WebVRManager( _this );
 
 	this.vr = vr;
 
@@ -23978,6 +23981,14 @@ function WebGLRenderer( parameters ) {
 
 	}() );
 
+	//
+
+	this.setFramebuffer = function ( value ) {
+
+		_framebuffer = value;
+
+	};
+
 	this.getRenderTarget = function () {
 
 		return _currentRenderTarget;
@@ -23994,7 +24005,7 @@ function WebGLRenderer( parameters ) {
 
 		}
 
-		var framebuffer = null;
+		var framebuffer = _framebuffer;
 		var isCube = false;
 
 		if ( renderTarget ) {

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