bill hai 4 meses
pai
achega
d52150712d
Modificáronse 4 ficheiros con 7 adicións e 7 borrados
  1. 2 2
      src/hook/ids.ts
  2. 2 2
      src/hook/use-fly.ts
  3. 2 2
      src/sdk/association/animation.ts
  4. 1 1
      src/views/animation/left.vue

+ 2 - 2
src/hook/ids.ts

@@ -37,8 +37,8 @@ export const useSelects = <T extends { id: any }>(items: Ref<T[]>, test = false)
         items.map((item) => item.id),
         oldItems.map((item) => item.id)
       );
-      test && console.error('added', added)
-      test && console.error('deleted', deleted)
+      // test && console.error('added', added)
+      // test && console.error('deleted', deleted)
       
       added.forEach((id) => updateSelectId(id, true));
       deleted.forEach((id) => updateSelectId(id, false));

+ 2 - 2
src/hook/use-fly.ts

@@ -67,13 +67,13 @@ export const flyTaggingPosition = (position: TaggingPosition) => {
     } as any, sdk, false);
   } else {
     sdk.comeTo({
-      position: getTaggingPosNode(position)!.getImageCenter(),
+      focusPos: getTaggingPosNode(position)!.getImageCenter(),
       modelId: position.modelId,
       dur: 300,
       // distance: 3,
       maxDis: 15,
       isFlyToTag: true,
-    });
+    } as any);
   }
 };
 

+ 2 - 2
src/sdk/association/animation.ts

@@ -550,7 +550,7 @@ export const associationAnimation = (sdk: SDK, el: HTMLDivElement) => {
         const am3d = amMap[getAMKey(am)];
         if (!am3d || !am3d.am) continue;
 
-        am3d.am.setDefaultPose(am.mat || am3d.am.getModelPose())
+        am3d.am.setDefaultPose && am3d.am.setDefaultPose(am.mat || am3d.am.getModelPose())
         // const frame = am3d.am!.addFrame({
         //   id: uuid(),
         //   mat: am.mat || am3d.am.getModelPose(),
@@ -567,7 +567,7 @@ export const associationAnimation = (sdk: SDK, el: HTMLDivElement) => {
           watchEffect(() => {
             // am.mat && frame.setMat(am.mat);
             if (am.mat && am3d.am) {
-              am3d.am.setDefaultPose(am.mat)
+              am3d.am.setDefaultPose && am3d.am.setDefaultPose(am.mat)
               // console.log(am.mat)
               // am3d.am.changePosition(mat.position!)
               // am3d.am.changeRotation(mat.rotation!)

+ 1 - 1
src/views/animation/left.vue

@@ -82,7 +82,7 @@ const updateSelectAm = (item: AnimationModel, select: boolean) => {
 // if (import.meta.env.DEV) {
 activeKey.value = "animation";
 const stop = watchEffect(() => {
-  if (ams.value.length > 0 && amMap[getAMKey(ams.value[0])].am) {
+  if (ams.value.length > 0 && amMap[getAMKey(ams.value[0])]?.am) {
     setTimeout(() => {
       emit("update:focus", ams.value[0]);
       stop();