From 3bc0080fa702a830654d6e0e3e8bc14fb710caaa Mon Sep 17 00:00:00 2001 From: Yaski Date: Thu, 19 Jul 2012 01:18:08 +0600 Subject: [PATCH] Minor code formatting --- src/alternativa/engine3d/core/Camera3D.as | 15 +++++++------- .../engine3d/utils/Object3DUtils.as | 20 +++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/alternativa/engine3d/core/Camera3D.as b/src/alternativa/engine3d/core/Camera3D.as index 5a3593d..e7a2d82 100644 --- a/src/alternativa/engine3d/core/Camera3D.as +++ b/src/alternativa/engine3d/core/Camera3D.as @@ -411,7 +411,6 @@ public class Camera3D extends Object3D { /** * Setup Camera3D position using x, y, z coordinates */ - public function setPosition(x:Number, y:Number, z:Number):void{ this.x = x; this.y = y; @@ -422,13 +421,13 @@ public class Camera3D extends Object3D { * Camera3D lookAt method */ public function lookAt(x:Number, y:Number, z:Number):void{ - var deltaX:Number = x - this.x; - var deltaY:Number = y - this.y; - var deltaZ:Number = z - this.z; - var rotX = Math.atan2(deltaZ, Math.sqrt(deltaX * deltaX + deltaY * deltaY)); - rotationX = rotX - 0.5 * Math.PI; - rotationY = 0; - rotationZ = - Math.atan2(deltaX,deltaY); + var deltaX:Number = x - this.x; + var deltaY:Number = y - this.y; + var deltaZ:Number = z - this.z; + var rotX = Math.atan2(deltaZ, Math.sqrt(deltaX * deltaX + deltaY * deltaY)); + rotationX = rotX - 0.5 * Math.PI; + rotationY = 0; + rotationZ = - Math.atan2(deltaX,deltaY); } /** diff --git a/src/alternativa/engine3d/utils/Object3DUtils.as b/src/alternativa/engine3d/utils/Object3DUtils.as index 417c905..3808a6a 100644 --- a/src/alternativa/engine3d/utils/Object3DUtils.as +++ b/src/alternativa/engine3d/utils/Object3DUtils.as @@ -22,20 +22,24 @@ package alternativa.engine3d.utils { private static const toRootTransform:Transform3D = new Transform3D(); private static const fromRootTransform:Transform3D = new Transform3D(); - + + private static const RAD2DEG:Number = 180/Math.PI; + private static const DEG2RAD:Number = Math.PI/180; + + /** - * @public * Convert Degress to Radians and Radians to Degrees */ - public static function toRadians(degrees:Number):Number{ - return degrees * Math.PI / 180; - } - - public static function toDegrees(radians:Number):Number{ - return radians * 180 / Math.PI; + return degrees * DEG2RAD; } + /** + * Convert Radians to Degrees + */ + public static function toDegrees(radians:Number):Number{ + return radians * RAD2DEG; + } /** * @private