Browse Source

Refactored, removed redundant vars

gbath 7 years ago
parent
commit
e38e51a391
1 changed files with 6 additions and 35 deletions
  1. 6 35
      examples/js/utils/MathUtils.js

+ 6 - 35
examples/js/utils/MathUtils.js

@@ -9,13 +9,9 @@ THREE.MathUtils = {
         var cos = Math.cos;
         var sin = Math.sin;
 
-        var c1 = cos(a / 2);
         var c2 = cos(b / 2);
-        var c3 = cos(c / 2);
 
-        var s1 = sin(a / 2);
         var s2 = sin(b / 2);
-        var s3 = sin(c / 2);
 
         var c13 = cos((a + c) / 2);
         var s13 = sin((a + c) / 2);
@@ -26,52 +22,29 @@ THREE.MathUtils = {
         var c3_1 = cos((c - a) / 2);
         var s3_1 = sin((c - a) / 2);
 
-        var qx = 0;
-        var qy = 0;
-        var qz = 0;
-        var qw = 0;
-
         if (order === 'XYX') {
 
-            qx = c2 * s13;
-            qy = s2 * c1_3;
-            qz = s2 * s1_3;
-            qw = c2 * c13;
+            q.set(c2 * s13, s2 * c1_3, s2 * s1_3, c2 * c13);
 
         } else if (order === 'YZY') {
 
-            qx = s2 * s1_3;
-            qy = c2 * s13;
-            qz = s2 * c1_3;
-            qw = c2 * c13;
+            q.set(s2 * s1_3, c2 * s13, s2 * c1_3, c2 * c13);
 
         } else if (order === 'ZXZ') {
 
-            qx = s2 * c1_3;
-            qy = s2 * s1_3;
-            qz = c2 * s13;
-            qw = c2 * c13;
+            q.set(s2 * c1_3, s2 * s1_3, c2 * s13, c2 * c13);
 
         } else if (order === 'XZX') {
 
-            qx = c2 * s13;
-            qy = s2 * s3_1;
-            qz = s2 * c3_1;
-            qw = c2 * c13;
+            q.set(c2 * s13, s2 * s3_1, s2 * c3_1, c2 * c13);
 
         } else if (order === 'YXY') {
 
-            qx = s2 * c3_1;
-            qy = c2 * s13;
-            qz = s2 * s3_1;
-            qw = c2 * c13;
+            q.set(s2 * c3_1, c2 * s13, s2 * s3_1, c2 * c13);
 
         } else if (order === 'ZYZ') {
 
-            qx = s2 * s3_1;
-            qy = s2 * c3_1;
-            qz = c2 * s13;
-            qw = c2 * c13;
+            q.set(s2 * s3_1, s2 * c3_1, c2 * s13, c2 * c13);
 
         }
 
@@ -81,7 +54,5 @@ THREE.MathUtils = {
 
         }
 
-        q.set( qx, qy, qz, qw);
-
     }
 }