|
@@ -13878,12 +13878,21 @@ PerspectiveCamera.prototype = Object.assign( Object.create( Camera.prototype ),
|
|
|
|
|
|
var fov = 90, aspect = 1;
|
|
|
|
|
|
-function CubeCamera( near, far, cubeResolution, options ) {
|
|
|
+function CubeCamera( near, far, renderTarget ) {
|
|
|
|
|
|
Object3D.call( this );
|
|
|
|
|
|
this.type = 'CubeCamera';
|
|
|
|
|
|
+ if ( renderTarget.isWebGLCubeRenderTarget !== true ) {
|
|
|
+
|
|
|
+ console.error( 'THREE.CubeCamera: The constructor now expects an instance of WebGLCubeRenderTarget as third parameter.' );
|
|
|
+ return;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ this.renderTarget = renderTarget;
|
|
|
+
|
|
|
var cameraPX = new PerspectiveCamera( fov, aspect, near, far );
|
|
|
cameraPX.up.set( 0, - 1, 0 );
|
|
|
cameraPX.lookAt( new Vector3( 1, 0, 0 ) );
|
|
@@ -13914,18 +13923,12 @@ function CubeCamera( near, far, cubeResolution, options ) {
|
|
|
cameraNZ.lookAt( new Vector3( 0, 0, - 1 ) );
|
|
|
this.add( cameraNZ );
|
|
|
|
|
|
- options = options || { format: RGBFormat, magFilter: LinearFilter, minFilter: LinearFilter };
|
|
|
-
|
|
|
- this.renderTarget = new WebGLCubeRenderTarget( cubeResolution, options );
|
|
|
- this.renderTarget.texture.name = "CubeCamera";
|
|
|
-
|
|
|
this.update = function ( renderer, scene ) {
|
|
|
|
|
|
if ( this.parent === null ) this.updateMatrixWorld();
|
|
|
|
|
|
var currentRenderTarget = renderer.getRenderTarget();
|
|
|
|
|
|
- var renderTarget = this.renderTarget;
|
|
|
var generateMipmaps = renderTarget.texture.generateMipmaps;
|
|
|
|
|
|
renderTarget.texture.generateMipmaps = false;
|
|
@@ -13958,8 +13961,6 @@ function CubeCamera( near, far, cubeResolution, options ) {
|
|
|
|
|
|
var currentRenderTarget = renderer.getRenderTarget();
|
|
|
|
|
|
- var renderTarget = this.renderTarget;
|
|
|
-
|
|
|
for ( var i = 0; i < 6; i ++ ) {
|
|
|
|
|
|
renderer.setRenderTarget( renderTarget, i );
|
|
@@ -14080,11 +14081,7 @@ WebGLCubeRenderTarget.prototype.fromEquirectangularTexture = function ( renderer
|
|
|
|
|
|
scene.add( mesh );
|
|
|
|
|
|
- var camera = new CubeCamera( 1, 10, 1 );
|
|
|
-
|
|
|
- camera.renderTarget = this;
|
|
|
- camera.renderTarget.texture.name = 'CubeCameraTexture';
|
|
|
-
|
|
|
+ var camera = new CubeCamera( 1, 10, this );
|
|
|
camera.update( renderer, scene );
|
|
|
|
|
|
mesh.geometry.dispose();
|