@gamelearn/arcade-components 2.29.2 → 2.29.3

package/dist/components/animation-component/components/AnimationComponent.js

@@ -64,13 +64,18 @@ var AnimationComponent = function AnimationComponent(_ref) {
           loader.load(animation.url, function (gltf) {
             var mixer = object.userData.mixer;
             var defaultAnim = object.userData.defaultAnim;
+            if (!object.userData.actionList) object.userData.actionList = {};
+            var actionList = object.userData.actionList;
+            if (!actionList.idle) {
+              var action = mixer.existingAction(defaultAnim, object);
+              actionList.idle = action;
+            }
             var currentAction = mixer.clipAction(gltf.animations[0], object);
-            var oldAction = mixer.clipAction(defaultAnim, object);
             currentAction.setLoop(_three.LoopRepeat, loopTimes);
-            mixer.stopAllAction();
-            (0, _helpers.executeCrossFade)(oldAction, currentAction, 0.5);
+            (0, _helpers.activateAction)(currentAction, 0);
+            (0, _helpers.executeCrossFade)(actionList.idle, currentAction);
             var finishCallback = function finishCallback() {
-              (0, _helpers.executeCrossFade)(currentAction, oldAction, 0.5);
+              (0, _helpers.executeCrossFade)(currentAction, actionList.idle);
               if (canInteract) emitEvent({
                 type: 'success'
               });

package/dist/helpers/index.js

@@ -159,11 +159,9 @@ function prepareCrossfade(root, startAction, endAction) {
 }
 function syncCrossfade(mixer, startAction, endAction) {
   mixer.addEventListener('loop', onLoopFinished);
-  function onLoopFinished(event) {
-    if (event.action === startAction) {
-      mixer.removeEventListener('loop', onLoopFinished);
-      executeCrossFade(startAction, endAction);
-    }
+  function onLoopFinished() {
+    mixer.removeEventListener('loop', onLoopFinished);
+    executeCrossFade(startAction, endAction);
   }
 }
 function resetActions(mixer, active) {

package/dist/helpers/useStateMachine.js

@@ -98,7 +98,6 @@ function useStateMachine(lines) {
   var resetActives = function resetActives() {
     Object.keys(active).forEach(function (uid) {
       startAnimation(uid, 'idle');
-      setActive(uid, 'idle');
     });
   };
   (0, _react.useEffect)(function () {
@@ -125,11 +124,12 @@ function useStateMachine(lines) {
         mixer = _root$userData.mixer,
         actionList = _root$userData.actionList;
       var currentActive = active[uid];
+      if (emotion === currentActive) return;
       var startAction = actionList[currentActive];
       var endAction = actionList[emotion];
+      setActive(uid, emotion);
       (0, _.resetActions)(mixer, startAction);
       (0, _.executeCrossFade)(startAction, endAction);
-      setActive(uid, emotion);
     }
   }, [scene, loaded, active, setActive]);
   var processAnimations = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
@@ -157,7 +157,6 @@ function useStateMachine(lines) {
                     if (!actionList.idle) {
                       defaultAction = mixer.existingAction(defaultAnim, root);
                       actionList.idle = defaultAction;
-                      (0, _.activateAction)(defaultAction, 1);
                       setActive(uid, 'idle');
                     }
                     loadEmotion = /*#__PURE__*/function () {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.29.2",
+  "version": "2.29.3",
   "main": "dist/index.js",
   "files": [
     "dist",