From c572f96b9c67fea2b15459ee1eb496cc3f1629ad Mon Sep 17 00:00:00 2001 From: WestLangley Date: Tue, 14 May 2019 15:28:00 -0400 Subject: [PATCH] Clean up --- src/core/Raycaster.js | 4 ++-- src/objects/Sprite.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/Raycaster.js b/src/core/Raycaster.js index 53ef70d1c4..4c98e6df1e 100644 --- a/src/core/Raycaster.js +++ b/src/core/Raycaster.js @@ -79,13 +79,13 @@ Object.assign( Raycaster.prototype, { this.ray.origin.setFromMatrixPosition( camera.matrixWorld ); this.ray.direction.set( coords.x, coords.y, 0.5 ).unproject( camera ).sub( this.ray.origin ).normalize(); - this.camera = camera; + this._camera = camera; } else if ( ( camera && camera.isOrthographicCamera ) ) { this.ray.origin.set( coords.x, coords.y, ( camera.near + camera.far ) / ( camera.near - camera.far ) ).unproject( camera ); // set origin in plane of camera this.ray.direction.set( 0, 0, - 1 ).transformDirection( camera.matrixWorld ); - this.camera = camera; + this._camera = camera; } else { diff --git a/src/objects/Sprite.js b/src/objects/Sprite.js index e32720b7fe..166e33ab0b 100644 --- a/src/objects/Sprite.js +++ b/src/objects/Sprite.js @@ -102,12 +102,12 @@ Sprite.prototype = Object.assign( Object.create( Object3D.prototype ), { worldScale.setFromMatrixScale( this.matrixWorld ); - viewWorldMatrix.copy( raycaster.camera.matrixWorld ); - this.modelViewMatrix.multiplyMatrices( raycaster.camera.matrixWorldInverse, this.matrixWorld ); + viewWorldMatrix.copy( raycaster._camera.matrixWorld ); + this.modelViewMatrix.multiplyMatrices( raycaster._camera.matrixWorldInverse, this.matrixWorld ); mvPosition.setFromMatrixPosition( this.modelViewMatrix ); - if ( raycaster.camera.isPerspectiveCamera && this.material.sizeAttenuation === false ) { + if ( raycaster._camera.isPerspectiveCamera && this.material.sizeAttenuation === false ) { worldScale.multiplyScalar( - mvPosition.z ); -- GitLab