add warning when using the legacy api

g-harel · g-harel · commit e85ee24bb132 · 2020-03-23T22:20:44.000-05:00
diff --git a/internal/animate/interpolate.ts b/internal/animate/interpolate.ts
@@ -47,10 +47,15 @@ export const interpolateBetween = (percentage: number, a: Shape, b: Shape): Shap
 // Interpolates between shapes a and b while applying a smoothing effect. Smoothing effect's
 // strength is relative to how far away the percentage is from either 0 or 1. It is strongest in the
 // middle of the animation (percentage = 0.5) or when bounds are exceeded (percentage = 1.8).
-export const interpolateBetweenSmooth = (strength: number, percentage: number, a: Shape, b: Shape): Shape => {
+export const interpolateBetweenSmooth = (
+    strength: number,
+    percentage: number,
+    a: Shape,
+    b: Shape,
+): Shape => {
     strength *= Math.min(1, Math.min(Math.abs(0 - percentage), Math.abs(1 - percentage)));
     const interpolated = interpolateBetween(percentage, a, b);
-    const smoothed = smooth(interpolated, Math.sqrt(strength + 0.25)/3);
+    const smoothed = smooth(interpolated, Math.sqrt(strength + 0.25) / 3);
     return mapShape(interpolated, ({index, curr}) => {
         const sp = smoothed[index];
         curr.handleIn.angle = interpolateAngle(strength, curr.handleIn.angle, sp.handleIn.angle);
diff --git a/internal/animate/prepare.ts b/internal/animate/prepare.ts
@@ -24,7 +24,7 @@ const optimizeOrder = (a: Shape, b: Shape): Shape => {
         for (let i = 0; i < count; i++) {
             let sum = 0;
             for (let j = 0; j < count; j++) {
-                sum += distance(a[j], shape[mod(j + i, count)]);
+                sum += (100 * distance(a[j], shape[mod(j + i, count)])) ** 1 / 2;
                 if (sum > minSum) break;
             }
             if (sum <= minSum) {
diff --git a/internal/animate/testing/index.html b/internal/animate/testing/index.html
@@ -20,6 +20,7 @@
 <body>
     <button id="toggle">TOGGLE<br>DEBUG</button>
     <script src="./script.ts"></script>
+    <script src="../../../legacy/blobs.ts"></script>
 </body>
 
 </html>
diff --git a/legacy/blobs.ts b/legacy/blobs.ts
@@ -6,6 +6,12 @@ import {XmlElement} from "../editable";
 import {genBlob} from "../internal/blobs";
 import {mapShape} from "../internal/util";
 
+const isBrowser = new Function("try {return this===window;}catch(e){ return false;}");
+const isLocalhost = () => location.hostname === "localhost" || location.hostname === "127.0.0.1";
+if (!isBrowser() || (isBrowser() && isLocalhost())) {
+    console.warn("You are using the legacy blobs API!\nPlease use TODO instead.");
+}
+
 export interface PathOptions {
     // Bounding box dimensions.
     size: number;
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -2,7 +2,7 @@ import typescript from "rollup-plugin-typescript2";
 import {uglify} from "rollup-plugin-uglify";
 
 export default {
-    input: "./index.ts",
+    input: "./legacy/blobs.ts",
     output: {
         file: "index.js",
         format: "umd",

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ const optimizeOrder = (a: Shape, b: Shape): Shape => {`
`24`	`24`	`for (let i = 0; i < count; i++) {`
`25`	`25`	`let sum = 0;`
`26`	`26`	`for (let j = 0; j < count; j++) {`
`27`		`- sum += distance(a[j], shape[mod(j + i, count)]);`
	`27`	`+ sum += (100 * distance(a[j], shape[mod(j + i, count)])) ** 1 / 2;`
`28`	`28`	`if (sum > minSum) break;`
`29`	`29`	`}`
`30`	`30`	`if (sum <= minSum) {`