Update type def and build.

pofulu · May 22, 2022 · 7ad563d · 7ad563d
1 parent 0028b14
commit 7ad563d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/PFTween.d.ts b/PFTween.d.ts
@@ -190,8 +190,8 @@ declare class PFTween<T extends Number | Number[] | ScalarSignal | Vec2Signal |
     get durationMilliseconds(): number;
 }
 declare class PFTweenValue {
-    readonly rawValue: any;
-    constructor(animate: any);
+    readonly rawValue: ScalarSignal | ArrayOfScalarSignals;
+    constructor(animate: ScalarSignal | ArrayOfScalarSignals);
     /**
      * Take input numbers and output them in a different order.
      * Input values correspond to the swizzle value (xyzw) in the order theyre inputted. For example, an input of (1,2,3) and a swizzle value of (yxz) would output (2,1,3). You can also use 0 and 1. For example, a swizzle value of (x01) would output (1,0,1).

diff --git a/PFTween.js b/PFTween.js
@@ -557,15 +557,16 @@ class PFTweener extends PFTweenValue {
             loopCount: config.loopCount,
             mirror: config.isMirror
         });
-        let tween;
-        if (config.useCustomCurve) {
-            const progress = Animation_1.default.animate(driver, Animation_1.default.samplers.linear(0, 1));
-            const y = config.curve.evaluate(progress);
-            tween = super(Animation_1.default.animate(Animation_1.default.valueDriver(y, 0, 1), Animation_1.default.samplers.linear(config.begin, config.end)));
-        }
-        else {
-            tween = super(Animation_1.default.animate(driver, config.sampler));
-        }
+        const tween = super((() => {
+            if (config.useCustomCurve) {
+                const progress = Animation_1.default.animate(driver, Animation_1.default.samplers.linear(0, 1));
+                const y = config.curve.evaluate(progress);
+                return Animation_1.default.animate(Animation_1.default.valueDriver(y, 0, 1), Animation_1.default.samplers.linear(config.begin, config.end));
+            }
+            else {
+                return Animation_1.default.animate(driver, config.sampler);
+            }
+        })());
         // prevent unnecessary subscription 
         if (config.loopCount != Infinity) {
             config.events.onComplete.invokeOnEvent(driver.onCompleted());

diff --git a/PFTweenDemo/scripts/PFTween.ts b/PFTweenDemo/scripts/PFTween.ts
@@ -598,9 +598,9 @@ class PFTween<T extends Number | Number[] | ScalarSignal | Vec2Signal | PointSig
 }
 
 class PFTweenValue {
-    readonly rawValue;
+    readonly rawValue: ScalarSignal | ArrayOfScalarSignals;
 
-    constructor(animate) {
+    constructor(animate: ScalarSignal | ArrayOfScalarSignals) {
         this.rawValue = animate;
     }