From 5eb26ca1ba4b10cb51425f037344fc930eadd45a Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 29 Mar 2016 16:36:04 +0100 Subject: [PATCH] Replaced degToRad/radToDeg uses in src. See #8471. --- src/cameras/PerspectiveCamera.js | 6 +++--- src/cameras/StereoCamera.js | 2 +- src/extras/geometries/EdgesGeometry.js | 2 +- src/math/Matrix4.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cameras/PerspectiveCamera.js b/src/cameras/PerspectiveCamera.js index a591442bdf..9041bfadd1 100644 --- a/src/cameras/PerspectiveCamera.js +++ b/src/cameras/PerspectiveCamera.js @@ -36,7 +36,7 @@ THREE.PerspectiveCamera.prototype.setLens = function ( focalLength, frameHeight if ( frameHeight === undefined ) frameHeight = 24; - this.fov = 2 * THREE.Math.radToDeg( Math.atan( frameHeight / ( focalLength * 2 ) ) ); + this.fov = 2 * THREE.Math.RAD2DEG * Math.atan( frameHeight / ( focalLength * 2 ) ); this.updateProjectionMatrix(); }; @@ -94,12 +94,12 @@ THREE.PerspectiveCamera.prototype.setViewOffset = function ( fullWidth, fullHeig THREE.PerspectiveCamera.prototype.updateProjectionMatrix = function () { - var fov = THREE.Math.radToDeg( 2 * Math.atan( Math.tan( THREE.Math.degToRad( this.fov ) * 0.5 ) / this.zoom ) ); + var fov = THREE.Math.RAD2DEG * ( 2 * Math.atan( Math.tan( THREE.Math.DEG2RAD * this.fov * 0.5 ) / this.zoom ) ); if ( this.fullWidth ) { var aspect = this.fullWidth / this.fullHeight; - var top = Math.tan( THREE.Math.degToRad( fov * 0.5 ) ) * this.near; + var top = Math.tan( THREE.Math.DEG2RAD * fov * 0.5 ) * this.near; var bottom = - top; var left = aspect * bottom; var right = aspect * top; diff --git a/src/cameras/StereoCamera.js b/src/cameras/StereoCamera.js index 156ecbc658..8df58ff928 100644 --- a/src/cameras/StereoCamera.js +++ b/src/cameras/StereoCamera.js @@ -49,7 +49,7 @@ THREE.StereoCamera.prototype = { var projectionMatrix = camera.projectionMatrix.clone(); var eyeSep = 0.064 / 2; var eyeSepOnProjection = eyeSep * near / focalLength; - var ymax = near * Math.tan( THREE.Math.degToRad( fov * 0.5 ) ); + var ymax = near * Math.tan( THREE.Math.DEG2RAD * fov * 0.5 ); var xmin, xmax; // translate xOffset diff --git a/src/extras/geometries/EdgesGeometry.js b/src/extras/geometries/EdgesGeometry.js index 71b2755afc..7515bce841 100644 --- a/src/extras/geometries/EdgesGeometry.js +++ b/src/extras/geometries/EdgesGeometry.js @@ -8,7 +8,7 @@ THREE.EdgesGeometry = function ( geometry, thresholdAngle ) { thresholdAngle = ( thresholdAngle !== undefined ) ? thresholdAngle : 1; - var thresholdDot = Math.cos( THREE.Math.degToRad( thresholdAngle ) ); + var thresholdDot = Math.cos( THREE.Math.DEG2RAD * thresholdAngle ); var edge = [ 0, 0 ], hash = {}; diff --git a/src/math/Matrix4.js b/src/math/Matrix4.js index accae72f72..38610b511b 100644 --- a/src/math/Matrix4.js +++ b/src/math/Matrix4.js @@ -888,7 +888,7 @@ THREE.Matrix4.prototype = { makePerspective: function ( fov, aspect, near, far ) { - var ymax = near * Math.tan( THREE.Math.degToRad( fov * 0.5 ) ); + var ymax = near * Math.tan( THREE.Math.DEG2RAD * fov * 0.5 ); var ymin = - ymax; var xmin = ymin * aspect; var xmax = ymax * aspect; -- GitLab