feat: gotoAnd同步运行wasm #262

karasjs · Feb 3, 2023 · 4184332 · 4184332
1 parent 380c82d
commit 4184332
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/index.js b/index.js
@@ -15635,6 +15635,7 @@
         wasm.__wbg_set_animation_percent(this.ptr, arg0);
       }
       /**
+       * @param {number} node
        * @param {number} direction
        * @param {number} duration
        * @param {number} fps
@@ -15742,8 +15743,8 @@
       }
     }, {
       key: "new",
-      value: function _new(direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing) {
-        var ret = wasm.animation_new(direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing);
+      value: function _new(node, direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing) {
+        var ret = wasm.animation_new(node, direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing);
         return Animation.__wrap(ret);
       }
     }]);
@@ -18263,7 +18264,7 @@
               }
             }
 
-            var wa = this.__wasmAnimation = wasm$1.Animation["new"](DIRECTION[this.__direction] || 0, this.__duration, this.__fps, this.__delay, this.__endDelay, FILLS[this.__fill] || 0, this.__playbackRate, iter, this.__areaStart, this.__areaDuration, easeType);
+            var wa = this.__wasmAnimation = wasm$1.Animation["new"](target.__wasmNode.ptr, DIRECTION[this.__direction] || 0, this.__duration, this.__fps, this.__delay, this.__endDelay, FILLS[this.__fill] || 0, this.__playbackRate, iter, this.__areaStart, this.__areaDuration, easeType);
 
             if (easeType === EASING.EASE_CUSTOM) {
               var v = ea.match(/[\d.]+/g);
@@ -18743,7 +18744,7 @@
         var wasmChange = false;
 
         if (wa) {
-          wasmChange = wa.goto_stop(v, dur);
+          wasmChange = wa.goto_stop(this.__currentTime, dur);
         }
 
         this.__calCurrent(this.__currentFrames, this.__currentFrame, v, dur, duration, {
@@ -18798,16 +18799,11 @@
 
         this.__startTime = frame.__now = frame.__now || inject.now();
         this.__playState = 'paused';
-        var wa = this.__wasmAnimation; // wasm的特殊标识，在root的before中统一遍历节点计算中需要知道
-
-        if (wa) {
-          wa.play_state = PLAY_STATE.PAUSED;
-        }
-
+        var wa = this.__wasmAnimation;
         var wasmChange = false;
 
         if (wa) {
-          wasmChange = wa.goto_stop(v, dur);
+          wasmChange = wa.goto_stop(this.__currentTime, dur);
         }
 
         this.__calCurrent(this.__currentFrames, this.__currentFrame, v, dur, duration, {
@@ -18823,7 +18819,6 @@
         var duration = this.__duration;
         var areaDuration = this.__areaDuration;
         var dur = areaDuration ? Math.min(duration, areaDuration) : duration;
-        var wa = this.__wasmAnimation;
 
         if (isNaN(v) || v < 0) {
           throw new Error('Param of gotoAnd(Play/Stop) is illegal: ' + v);
@@ -18839,11 +18834,6 @@
 
 
         this.__currentTime = v;
-
-        if (wa) {
-          wa.current_time = v;
-        }
-
         v -= this.__delay - this.__areaStart;
 
         if (v < 0) {
@@ -18855,10 +18845,6 @@
         v -= dur * playCount;
         this.__playCount = playCount;
 
-        if (wa) {
-          wa.play_count = playCount;
-        }
-
         this.__initCurrentFrames(playCount);
 
         return v;

diff --git a/index.js.map b/index.js.map
diff --git a/src/animate/Animation.js b/src/animate/Animation.js
@@ -1644,7 +1644,7 @@ class Animation extends Event {
             easeType = EASING.EASE_CUSTOM;
           }
         }
-        let wa = this.__wasmAnimation = wasm.Animation.new(DIRECTION[this.__direction] || 0, this.__duration, this.__fps,
+        let wa = this.__wasmAnimation = wasm.Animation.new(target.__wasmNode.ptr, DIRECTION[this.__direction] || 0, this.__duration, this.__fps,
           this.__delay, this.__endDelay, FILLS[this.__fill] || 0, this.__playbackRate, iter,
           this.__areaStart, this.__areaDuration, easeType);
         if(easeType === EASING.EASE_CUSTOM) {
@@ -2030,7 +2030,7 @@ class Animation extends Event {
     let wa = this.__wasmAnimation;
     let wasmChange = false;
     if(wa) {
-      wasmChange = wa.goto_stop(v, dur);
+      wasmChange = wa.goto_stop(this.__currentTime, dur);
     }
     this.__calCurrent(this.__currentFrames, this.__currentFrame, v, dur, duration, {
       wasmChange,
@@ -2077,13 +2077,9 @@ class Animation extends Event {
     this.__startTime = frame.__now = frame.__now || inject.now();
     this.__playState = 'paused';
     let wa = this.__wasmAnimation;
-    // wasm的特殊标识，在root的before中统一遍历节点计算中需要知道
-    if(wa) {
-      wa.play_state = PLAY_STATE.PAUSED;
-    }
     let wasmChange = false;
     if(wa) {
-      wasmChange = wa.goto_stop(v, dur);
+      wasmChange = wa.goto_stop(this.__currentTime, dur);
     }
     this.__calCurrent(this.__currentFrames, this.__currentFrame, v, dur, duration, {
       wasmChange,
@@ -2097,7 +2093,6 @@ class Animation extends Event {
     let duration = this.__duration;
     let areaDuration = this.__areaDuration;
     let dur = areaDuration ? Math.min(duration, areaDuration) : duration;
-    let wa = this.__wasmAnimation;
     if(isNaN(v) || v < 0) {
       throw new Error('Param of gotoAnd(Play/Stop) is illegal: ' + v);
     }
@@ -2109,9 +2104,6 @@ class Animation extends Event {
     }
     // 在时间范围内设置好时间，复用play直接跳到播放点
     this.__currentTime = v;
-    if(wa) {
-      wa.current_time = v;
-    }
     v -= this.__delay - this.__areaStart;
     if(v < 0) {
       v = 0;
@@ -2120,9 +2112,6 @@ class Animation extends Event {
     let playCount = Math.min(iterations - 1, Math.floor(v / dur));
     v -= dur * playCount;
     this.__playCount = playCount;
-    if(wa) {
-      wa.play_count = playCount;
-    }
     this.__initCurrentFrames(playCount);
     return v;
   }

diff --git a/src/wasm/index.js b/src/wasm/index.js
@@ -247,6 +247,7 @@ export class Animation {
     wasm.__wbg_set_animation_percent(this.ptr, arg0);
   }
   /**
+   * @param {number} node
    * @param {number} direction
    * @param {number} duration
    * @param {number} fps
@@ -260,8 +261,8 @@ export class Animation {
    * @param {number} easing
    * @returns {Animation}
    */
-  static new(direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing) {
-    const ret = wasm.animation_new(direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing);
+  static new(node, direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing) {
+    const ret = wasm.animation_new(node, direction, duration, fps, delay, end_delay, fill, playback_rate, iterations, area_start, area_duration, easing);
     return Animation.__wrap(ret);
   }
   /**