move animation code into internal dir

g-harel · g-harel · commit 0d4c035d4a23 · 2020-01-24T20:32:17.000-06:00
diff --git a/animate/util.ts b/animate/util.ts
diff --git a/internal/animate/types.ts b/internal/animate/types.ts
@@ -1,4 +1,4 @@
-import {Shape} from "../bezier/types";
+import {Shape} from "../shape/types";
 
 export interface EasingFunc {
     (progress: number): number;
diff --git a/internal/canvas/draw.ts b/internal/canvas/draw.ts
@@ -1,5 +1,5 @@
-import {Coord, Point, Shape} from "../bezier/types";
-import {expandHandle} from "../bezier/util";
+import {Coord, Shape} from "../shape/types";
+import {expandHandle} from "../shape/util";
 
 const pointSize = 2;
 const infoSpacing = 20;
diff --git a/internal/math/geometry.ts b/internal/math/geometry.ts
@@ -1,16 +1,28 @@
 import {deg} from "./unit";
+import {Coord} from "../shape/types";
 
 export interface Point {
     x: number;
     y: number;
 }
 
 // Calculates distance between two points.
-export const distance = (p1: Point, p2: Point): number => {
-    return Math.sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2);
+export const distance = (a: Point, b: Point): number => {
+    return Math.sqrt((a.x - b.x) ** 2 + (a.y - b.y) ** 2);
 };
 
-// Calculates the angle of the line from p1 to p2 in degrees.
-export const angle = (p1: Point, p2: Point): number => {
-    return deg(Math.atan2(p2.y - p1.y, p2.x - p1.x));
+// Calculates the angle of the line from a to b in degrees.
+export const angle = (a: Point, b: Point): number => {
+    return deg(Math.atan2(b.y - a.y, b.x - a.x));
+};
+
+export const split = (percentage: number, a: number, b: number): number => {
+    return a + percentage * (b - a);
+};
+
+export const splitLine = (percentage: number, a: Coord, b: Coord): Coord => {
+    return {
+        x: split(percentage, a.x, b.x),
+        y: split(percentage, a.y, b.y),
+    };
 };
diff --git a/internal/shape/interpolate.ts b/internal/shape/interpolate.ts
@@ -1,5 +1,5 @@
 import {Shape} from "./types";
-import {split, splitLine} from "../util";
+import {split, splitLine} from "../math/geometry";
 
 const interpolateAngle = (percentage: number, a: number, b: number): number => {
     const tau = Math.PI * 2;
diff --git a/internal/shape/prepare.ts b/internal/shape/prepare.ts
@@ -1,6 +1,6 @@
 import {copyPoint, length, reverse, shift, split} from "./util";
 import {Point, Shape} from "./types";
-import {distance} from "../util";
+import {distance} from "../math/geometry";
 
 const optimizeOrder = (a: Shape, b: Shape): Shape => {
     const count = a.length;
diff --git a/internal/shape/types.ts b/internal/shape/types.ts
diff --git a/internal/shape/util.ts b/internal/shape/util.ts
@@ -1,5 +1,5 @@
 import {Coord, Handle, Point, Shape} from "./types";
-import {distance, splitLine} from "../util";
+import {distance, splitLine} from "../math/geometry";
 
 export const copyPoint = (p: Point): Point => ({
     x: p.x,
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "build": "npm run clean && rollup -c rollup.config.ts",
     "clean": "trash '**/*.js' '**/*.js.map' '**/*.d.ts' '!**/node_modules/**/*'",
     "fmt": "prettier --list-different --write --ignore-path .gitignore '**/*.{js,ts}'",
-    "dev:animate": "parcel animate/index.html --open",
+    "anim": "parcel testing/animate.html --open",
     "test": "jest"
   },
   "devDependencies": {
diff --git a/testing/animate.html b/testing/animate.html
@@ -18,7 +18,7 @@
 </head>
 
 <body>
-    <script src="./test.ts"></script>
+    <script src="./animate.ts"></script>
 </body>
 
 </html>
diff --git a/testing/animate.ts b/testing/animate.ts
@@ -1,10 +1,10 @@
 import blobs from "..";
 
-import {interpolateBetweenLoop} from "./bezier/interpolate";
-import {divideShape, prepShapes, splitCurveBy} from "./bezier/prepare";
-import {Coord, Point, Shape} from "./bezier/types";
-import {length, split} from "./bezier/util";
-import {clear, drawInfo, drawShape} from "./canvas/draw";
+import {interpolateBetweenLoop} from "../internal/shape/interpolate";
+import {divideShape, prepShapes, splitCurveBy} from "../internal/shape/prepare";
+import {Coord, Point, Shape} from "../internal/shape/types";
+import {length, split} from "../internal/shape/util";
+import {clear, drawInfo, drawShape} from "../internal/canvas/draw";
 
 const animationSpeed = 2;
 const animationStart = 0.3;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {Shape} from "../bezier/types";`
	`1`	`+import {Shape} from "../shape/types";`
`2`	`2`
`3`	`3`	`export interface EasingFunc {`
`4`	`4`	`(progress: number): number;`