From 5721ece51fafeb0dab73a3248b0388900393eb1e Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 27 Oct 2020 11:43:46 +0000 Subject: [PATCH] CubeCamera: Moved clear() to WebGLCubeRenderTarget. --- src/Three.Legacy.js | 7 +++++++ src/cameras/CubeCamera.d.ts | 2 -- src/cameras/CubeCamera.js | 16 ---------------- src/renderers/WebGLCubeRenderTarget.js | 16 ++++++++++++++++ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index f7a9174e7c..04ec795a61 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -2106,6 +2106,13 @@ CubeCamera.prototype.updateCubeMap = function ( renderer, scene ) { }; +CubeCamera.prototype.clear = function ( renderer, color, depth, stencil ) { + + console.warn( 'THREE.CubeCamera: .clear() is now .renderTarget.clear().' ); + return this.renderTarget.clear( renderer, color, depth, stencil ); + +}; + // export const GeometryUtils = { diff --git a/src/cameras/CubeCamera.d.ts b/src/cameras/CubeCamera.d.ts index b95f6fbb67..f30370c8d9 100644 --- a/src/cameras/CubeCamera.d.ts +++ b/src/cameras/CubeCamera.d.ts @@ -13,6 +13,4 @@ export class CubeCamera extends Object3D { update( renderer: WebGLRenderer, scene: Scene ): void; - clear( renderer: WebGLRenderer, color: boolean, depth: boolean, stencil: boolean ): void; - } diff --git a/src/cameras/CubeCamera.js b/src/cameras/CubeCamera.js index 388d24f583..58965d4e2c 100644 --- a/src/cameras/CubeCamera.js +++ b/src/cameras/CubeCamera.js @@ -94,22 +94,6 @@ function CubeCamera( near, far, renderTarget ) { }; - this.clear = function ( renderer, color, depth, stencil ) { - - const currentRenderTarget = renderer.getRenderTarget(); - - for ( let i = 0; i < 6; i ++ ) { - - renderer.setRenderTarget( renderTarget, i ); - - renderer.clear( color, depth, stencil ); - - } - - renderer.setRenderTarget( currentRenderTarget ); - - }; - } CubeCamera.prototype = Object.create( Object3D.prototype ); diff --git a/src/renderers/WebGLCubeRenderTarget.js b/src/renderers/WebGLCubeRenderTarget.js index 792b9b2d85..bc104ef6e1 100644 --- a/src/renderers/WebGLCubeRenderTarget.js +++ b/src/renderers/WebGLCubeRenderTarget.js @@ -123,4 +123,20 @@ WebGLCubeRenderTarget.prototype.fromEquirectangularTexture = function ( renderer }; +WebGLCubeRenderTarget.prototype.clear = function ( renderer, color, depth, stencil ) { + + const currentRenderTarget = renderer.getRenderTarget(); + + for ( let i = 0; i < 6; i ++ ) { + + renderer.setRenderTarget( this, i ); + + renderer.clear( color, depth, stencil ); + + } + + renderer.setRenderTarget( currentRenderTarget ); + +}; + export { WebGLCubeRenderTarget }; -- GitLab