optimize tween computations

foo123 · Dec 8, 2022 · f20893a · f20893a
1 parent 1f19041
commit f20893a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/build/Geometrize.js b/build/Geometrize.js
@@ -2,14 +2,14 @@
 *   Geometrize
 *   computational geometry and rendering library for JavaScript
 *
-*   @version 0.6.0 (2022-12-08 19:02:30)
+*   @version 0.6.0 (2022-12-08 22:04:06)
 *   https://github.com/foo123/Geometrize
 *
 **//**
 *   Geometrize
 *   computational geometry and rendering library for JavaScript
 *
-*   @version 0.6.0 (2022-12-08 19:02:30)
+*   @version 0.6.0 (2022-12-08 22:04:06)
 *   https://github.com/foo123/Geometrize
 *
 **/
@@ -4084,6 +4084,8 @@ function first_frame(tween)
         cos = stdMath.cos(angle);
         sin = stdMath.sin(angle);
     }
+    tx += orx - cos*orx + sin*ory;
+    ty += ory - cos*ory - sin*orx;
     for (i=0; i<n; ++i)
     {
         ai = as[i];
@@ -4094,8 +4096,8 @@ function first_frame(tween)
             x = sx*(aij.x - osx) + osx;
             y = sy*(aij.y - osy) + osy;
             s[j] = {
-            x: cos*x - sin*y + orx - cos*orx + sin*ory + tx,
-            y: sin*x + cos*y + ory - cos*ory - sin*orx + ty
+            x: cos*x - sin*y + tx,
+            y: sin*x + cos*y + ty
            };
         }
         cs[i] = s;
@@ -4165,6 +4167,8 @@ function next_frame(tween)
         cos = stdMath.cos(angle);
         sin = stdMath.sin(angle);
     }
+    tx += orx - cos*orx + sin*ory;
+    ty += ory - cos*ory - sin*orx;
     for (i=0; i<n; ++i)
     {
         ai = as[i];
@@ -4177,8 +4181,8 @@ function next_frame(tween)
             x = sx*(aij.x + t*(bij.x - aij.x) - osx) + osx;
             y = sy*(aij.y + t*(bij.y - aij.y) - osy) + osy;
             s[j] = {
-            x: cos*x - sin*y + orx - cos*orx + sin*ory + tx,
-            y: sin*x + cos*y + ory - cos*ory - sin*orx + ty
+            x: cos*x - sin*y + tx,
+            y: sin*x + cos*y + ty
            };
         }
         cs[i] = s;

diff --git a/build/Geometrize.min.js b/build/Geometrize.min.js
diff --git a/src/Tween.js b/src/Tween.js
@@ -253,6 +253,8 @@ function first_frame(tween)
         cos = stdMath.cos(angle);
         sin = stdMath.sin(angle);
     }
+    tx += orx - cos*orx + sin*ory;
+    ty += ory - cos*ory - sin*orx;
     for (i=0; i<n; ++i)
     {
         ai = as[i];
@@ -263,8 +265,8 @@ function first_frame(tween)
             x = sx*(aij.x - osx) + osx;
             y = sy*(aij.y - osy) + osy;
             s[j] = {
-            x: cos*x - sin*y + orx - cos*orx + sin*ory + tx,
-            y: sin*x + cos*y + ory - cos*ory - sin*orx + ty
+            x: cos*x - sin*y + tx,
+            y: sin*x + cos*y + ty
            };
         }
         cs[i] = s;
@@ -334,6 +336,8 @@ function next_frame(tween)
         cos = stdMath.cos(angle);
         sin = stdMath.sin(angle);
     }
+    tx += orx - cos*orx + sin*ory;
+    ty += ory - cos*ory - sin*orx;
     for (i=0; i<n; ++i)
     {
         ai = as[i];
@@ -346,8 +350,8 @@ function next_frame(tween)
             x = sx*(aij.x + t*(bij.x - aij.x) - osx) + osx;
             y = sy*(aij.y + t*(bij.y - aij.y) - osy) + osy;
             s[j] = {
-            x: cos*x - sin*y + orx - cos*orx + sin*ory + tx,
-            y: sin*x + cos*y + ory - cos*ory - sin*orx + ty
+            x: cos*x - sin*y + tx,
+            y: sin*x + cos*y + ty
            };
         }
         cs[i] = s;