bill 5 mēneši atpakaļ
vecāks
revīzija
0e584e0e96
2 mainītis faili ar 6 papildinājumiem un 4 dzēšanām
  1. 4 3
      src/sdk/association/animation.ts
  2. 2 1
      src/sdk/sdk.ts

+ 4 - 3
src/sdk/association/animation.ts

@@ -60,9 +60,10 @@ export const addAM = (data: AnimationModel): Promise<AnimationModel3D> => {
           paths: {},
           subtitles: {},
         };
-        animationGroup
-          .addAnimationModel(data)
-          .then((am) => (amMap[key].am = am));
+        const am = animationGroup.addAnimationModel(data)
+        am.bus.on('loadDone', () => {
+          amMap[key].am = am
+        })
       }
     },
     { immediate: true }

+ 2 - 1
src/sdk/sdk.ts

@@ -368,7 +368,7 @@ export type AnimationGroup = {
   // 暂停
   pause: () => void;
   // 添加动画模型
-  addAnimationModel: (data: AnimationModel) => Promise<AnimationModel3D>;
+  addAnimationModel: (data: AnimationModel) => AnimationModel3D;
 
   // 设置当前时间, 单位为秒
   setCurrentTime: (s: number) => void;
@@ -422,6 +422,7 @@ export type AnimationModel3D = {
 
   // 动画帧姿态修改数据
   bus: Emitter<{
+    loadDone: void
     transformChanged: {
       position?: SceneLocalPos;
       scale?: number;