diff --git a/docs/api/cameras/CubeCamera.html b/docs/api/cameras/CubeCamera.html index d76d82561ac6cb5ee8d6b69f8cc4d9b1876df695..5da5dc28a68c96a25d3d44dcdb44974b9e25c95c 100644 --- a/docs/api/cameras/CubeCamera.html +++ b/docs/api/cameras/CubeCamera.html @@ -32,7 +32,7 @@ //Update the render target cube car.setVisible( false ); cubeCamera.position.copy( car.position ); - cubeCamera.updateCubeMap( renderer, scene ); + cubeCamera.update( renderer, scene ); //Render the scene car.setVisible( true ); @@ -67,7 +67,7 @@
See the base [page:Object3D] class for common methods.
-

[method:null updateCubeMap]( [page:WebGLRenderer renderer], [page:Scene scene] )

+

[method:null update]( [page:WebGLRenderer renderer], [page:Scene scene] )

renderer -- The current WebGL renderer
scene -- The current scene @@ -76,7 +76,7 @@ Call this to update the [page:CubeCamera.renderTarget renderTarget].
-

[method:null clearCubeMap]( [page:Boolean color], [page:Boolean depth], [page:Boolean stencil] )

+

[method:null clear]( [page:Boolean color], [page:Boolean depth], [page:Boolean stencil] )

Call this to clear the [page:CubeCamera.renderTarget renderTarget] color, depth, and/or stencil buffers. The color buffer is set to the renderer's current clear color. Arguments default to *true*. diff --git a/examples/webgl_materials_cubemap_dynamic.html b/examples/webgl_materials_cubemap_dynamic.html index 9591657c0a7935f429e09e40b70fedb652be4d1d..dd97ed59ab2fcf90df0ac4a7d5577f901c6fb84e 100644 --- a/examples/webgl_materials_cubemap_dynamic.html +++ b/examples/webgl_materials_cubemap_dynamic.html @@ -961,7 +961,7 @@ cubeCamera.position.copy( currentCar.root.position ); renderer.autoClear = true; - cubeCamera.updateCubeMap( renderer, scene ); + cubeCamera.update( renderer, scene ); veyron.setVisible( true ); gallardo.setVisible( true ); diff --git a/examples/webgl_materials_cubemap_dynamic2.html b/examples/webgl_materials_cubemap_dynamic2.html index a504bddb9b5f6b423f256c586a31ca6ae70de261..15a774083dcaaa228d5241ebb9e828fc3bb1e6f5 100644 --- a/examples/webgl_materials_cubemap_dynamic2.html +++ b/examples/webgl_materials_cubemap_dynamic2.html @@ -191,12 +191,12 @@ if ( count % 2 === 0 ) { material.envMap = cubeCamera1.renderTarget.texture; - cubeCamera2.updateCubeMap( renderer, scene ); + cubeCamera2.update( renderer, scene ); } else { material.envMap = cubeCamera2.renderTarget.texture; - cubeCamera1.updateCubeMap( renderer, scene ); + cubeCamera1.update( renderer, scene ); } diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index 4266874ab8e1c409c82053e7868b58b5a3f48350..43bfeb4afc2ae9cc6aad39f0b5d26cfc9f92302c 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -392,7 +392,7 @@ // render cube map mesh.visible = false; - cubeCamera.updateCubeMap( renderer, scene ); + cubeCamera.update( renderer, scene ); mesh.visible = true; // render scene diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index 7a4bb5523083a580f7aed93289ccd666d59c049a..e2838c26681cccd62772287b8084829f5f92b088 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -66,6 +66,7 @@ import { WebGLRenderer } from './renderers/WebGLRenderer.js'; import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js'; import { WebGLShadowMap } from './renderers/webgl/WebGLShadowMap.js'; import { Shape } from './extras/core/Shape.js'; +import { CubeCamera } from './cameras/CubeCamera.js'; export { BoxGeometry as CubeGeometry }; @@ -1426,6 +1427,15 @@ AudioAnalyser.prototype.getData = function () { // +CubeCamera.prototype.updateCubeMap = function ( renderer, scene ) { + + console.warn( 'THREE.CubeCamera: .updateCubeMap() is now .update().' ); + return this.update( renderer, scene ); + +}; + +// + export var GeometryUtils = { merge: function ( geometry1, geometry2, materialIndexOffset ) { diff --git a/src/cameras/CubeCamera.js b/src/cameras/CubeCamera.js index 65ff98925f8f6240fd6c7503ff465bb420bc9db6..b791ce8370cca91b7a2f5fd246b761e84e6fca42 100644 --- a/src/cameras/CubeCamera.js +++ b/src/cameras/CubeCamera.js @@ -54,7 +54,7 @@ function CubeCamera( near, far, cubeResolution ) { this.renderTarget = new WebGLRenderTargetCube( cubeResolution, cubeResolution, options ); this.renderTarget.texture.name = "CubeCamera"; - this.updateCubeMap = function ( renderer, scene ) { + this.update = function ( renderer, scene ) { if ( this.parent === null ) this.updateMatrixWorld(); @@ -87,7 +87,7 @@ function CubeCamera( near, far, cubeResolution ) { }; - this.clearCubeMap = function ( color, depth, stencil ) { + this.clear = function ( color, depth, stencil ) { var renderTarget = this.renderTarget;