Browse Source

Address MrDoob's review comments #2

Rik Cabanier 3 years ago
parent
commit
5a2e3e613b

+ 2 - 2
src/renderers/WebGLMultisampleRenderTarget.js

@@ -9,7 +9,7 @@ class WebGLMultisampleRenderTarget extends WebGLRenderTarget {
 		this.samples = 4;
 
 		this.ignoreDepthForMultisampleCopy = options.ignoreDepth !== undefined ? options.ignoreDepth : true;
-		this.useRenderToTexture = ( options.useMultisampledRenderToTexture !== undefined ) ? options.useMultisampledRenderToTexture : false;
+		this.useRenderToTexture = ( options.useRenderToTexture !== undefined ) ? options.useRenderToTexture : false;
 		this.useRenderbuffer = this.useRenderToTexture === false;
 
 	}
@@ -19,7 +19,7 @@ class WebGLMultisampleRenderTarget extends WebGLRenderTarget {
 		super.copy.call( this, source );
 
 		this.samples = source.samples;
-		this.useRenderToTexture = source.useMultisampledRenderToTexture;
+		this.useRenderToTexture = source.useRenderToTexture;
 		this.useRenderbuffer = source.useRenderbuffer;
 
 		return this;

+ 3 - 3
src/renderers/WebGLRenderer.js

@@ -1855,12 +1855,12 @@ function WebGLRenderer( parameters = {} ) {
 
 	};
 
-	this.setRenderTarget = function ( renderTarget, activeCubeFace = 0, activeMipmapLevel = 0, options = {} ) {
+	this.setRenderTarget = function ( renderTarget, activeCubeFace = 0, activeMipmapLevel = 0, defaultFramebuffer = undefined, options = {} ) {
 
 		_currentRenderTarget = renderTarget;
 		_currentActiveCubeFace = activeCubeFace;
 		_currentActiveMipmapLevel = activeMipmapLevel;
-		const useDefaultFramebuffer = options.framebuffer === undefined;
+		const useDefaultFramebuffer = defaultFramebuffer === undefined;
 
 		if ( renderTarget ) {
 
@@ -1898,7 +1898,7 @@ function WebGLRenderer( parameters = {} ) {
 
 				// We need to make sure to rebind the framebuffer.
 				state.bindFramebuffer( _gl.FRAMEBUFFER, null );
-				renderTargetProperties.__webglFramebuffer = options.framebuffer;
+				renderTargetProperties.__webglFramebuffer = defaultFramebuffer;
 
 			} else if ( renderTargetProperties.__webglFramebuffer === undefined ) {
 

+ 2 - 3
src/renderers/webxr/WebXRManager.js

@@ -583,9 +583,7 @@ class WebXRManager extends EventDispatcher {
 						newRenderTarget,
 						0,
 						0,
-						{
-							framebuffer: glBaseLayer.framebuffer
-						} );
+						glBaseLayer.framebuffer );
 
 				}
 
@@ -622,6 +620,7 @@ class WebXRManager extends EventDispatcher {
 								newRenderTarget,
 								0,
 								0,
+								undefined,
 								{
 									colorTexture: glSubImage.colorTexture,
 									depthTexture: glProjLayer.ignoreDepthValues ? undefined : glSubImage.depthStencilTexture