From f16d4ea253938d359344f516777c27afbab12d78 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Wed, 8 Apr 2020 11:10:21 +0200 Subject: [PATCH] Reflector: Remove recursion parameter. --- examples/js/objects/Reflector.js | 13 +------------ examples/jsm/objects/Reflector.d.ts | 1 - examples/jsm/objects/Reflector.js | 13 +------------ examples/webgl_mirror.html | 6 ++---- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/examples/js/objects/Reflector.js b/examples/js/objects/Reflector.js index 14ab4865da..45f5b135dd 100644 --- a/examples/js/objects/Reflector.js +++ b/examples/js/objects/Reflector.js @@ -17,7 +17,6 @@ THREE.Reflector = function ( geometry, options ) { var textureHeight = options.textureHeight || 512; var clipBias = options.clipBias || 0; var shader = options.shader || THREE.Reflector.ReflectorShader; - var recursion = options.recursion !== undefined ? options.recursion : 0; var encoding = options.encoding !== undefined ? options.encoding : THREE.LinearEncoding; // @@ -67,14 +66,6 @@ THREE.Reflector = function ( geometry, options ) { this.onBeforeRender = function ( renderer, scene, camera ) { - if ( 'recursion' in camera.userData ) { - - if ( camera.userData.recursion === recursion ) return; - - camera.userData.recursion ++; - - } - reflectorWorldPosition.setFromMatrixPosition( scope.matrixWorld ); cameraWorldPosition.setFromMatrixPosition( camera.matrixWorld ); @@ -113,8 +104,6 @@ THREE.Reflector = function ( geometry, options ) { virtualCamera.updateMatrixWorld(); virtualCamera.projectionMatrix.copy( camera.projectionMatrix ); - virtualCamera.userData.recursion = 0; - // Update the texture matrix textureMatrix.set( 0.5, 0.0, 0.0, 0.5, @@ -158,7 +147,7 @@ THREE.Reflector = function ( geometry, options ) { var currentXrEnabled = renderer.xr.enabled; var currentShadowAutoUpdate = renderer.shadowMap.autoUpdate; - renderer.xr.enabled = false; // Avoid camera modification and recursion + renderer.xr.enabled = false; // Avoid camera modification renderer.shadowMap.autoUpdate = false; // Avoid re-computing shadows renderer.setRenderTarget( renderTarget ); diff --git a/examples/jsm/objects/Reflector.d.ts b/examples/jsm/objects/Reflector.d.ts index 0a175c4bb1..abd1878776 100644 --- a/examples/jsm/objects/Reflector.d.ts +++ b/examples/jsm/objects/Reflector.d.ts @@ -12,7 +12,6 @@ export interface ReflectorOptions { textureHeight?: number; clipBias?: number; shader?: object; - recursion?: number; encoding?: TextureEncoding; } diff --git a/examples/jsm/objects/Reflector.js b/examples/jsm/objects/Reflector.js index 6e8379970d..35aa0c816c 100644 --- a/examples/jsm/objects/Reflector.js +++ b/examples/jsm/objects/Reflector.js @@ -34,7 +34,6 @@ var Reflector = function ( geometry, options ) { var textureHeight = options.textureHeight || 512; var clipBias = options.clipBias || 0; var shader = options.shader || Reflector.ReflectorShader; - var recursion = options.recursion !== undefined ? options.recursion : 0; var encoding = options.encoding !== undefined ? options.encoding : LinearEncoding; // @@ -84,14 +83,6 @@ var Reflector = function ( geometry, options ) { this.onBeforeRender = function ( renderer, scene, camera ) { - if ( 'recursion' in camera.userData ) { - - if ( camera.userData.recursion === recursion ) return; - - camera.userData.recursion ++; - - } - reflectorWorldPosition.setFromMatrixPosition( scope.matrixWorld ); cameraWorldPosition.setFromMatrixPosition( camera.matrixWorld ); @@ -130,8 +121,6 @@ var Reflector = function ( geometry, options ) { virtualCamera.updateMatrixWorld(); virtualCamera.projectionMatrix.copy( camera.projectionMatrix ); - virtualCamera.userData.recursion = 0; - // Update the texture matrix textureMatrix.set( 0.5, 0.0, 0.0, 0.5, @@ -175,7 +164,7 @@ var Reflector = function ( geometry, options ) { var currentXrEnabled = renderer.xr.enabled; var currentShadowAutoUpdate = renderer.shadowMap.autoUpdate; - renderer.xr.enabled = false; // Avoid camera modification and recursion + renderer.xr.enabled = false; // Avoid camera modification renderer.shadowMap.autoUpdate = false; // Avoid re-computing shadows renderer.setRenderTarget( renderTarget ); diff --git a/examples/webgl_mirror.html b/examples/webgl_mirror.html index 2be20ce9d9..39840d5670 100644 --- a/examples/webgl_mirror.html +++ b/examples/webgl_mirror.html @@ -80,8 +80,7 @@ clipBias: 0.003, textureWidth: WIDTH * window.devicePixelRatio, textureHeight: HEIGHT * window.devicePixelRatio, - color: 0x777777, - recursion: 1 + color: 0x777777 } ); groundMirror.position.y = 0.5; groundMirror.rotateX( - Math.PI / 2 ); @@ -92,8 +91,7 @@ clipBias: 0.003, textureWidth: WIDTH * window.devicePixelRatio, textureHeight: HEIGHT * window.devicePixelRatio, - color: 0x889999, - recursion: 1 + color: 0x889999 } ); verticalMirror.position.y = 50; verticalMirror.position.z = - 50; -- GitLab