bill 4 月之前
父節點
當前提交
98b7bd2386
共有 5 個文件被更改,包括 16 次插入8 次删除
  1. 8 1
      src/hook/use-fly.ts
  2. 2 1
      src/sdk/association/index.ts
  3. 1 1
      src/style.scss
  4. 4 4
      src/views/animation/bottom.vue
  5. 1 1
      src/views/tagging-position/index.vue

+ 8 - 1
src/hook/use-fly.ts

@@ -54,7 +54,14 @@ export const flyTagging = (tagging: Tagging, callback?: () => void) => {
 
 export const flyTaggingPosition = (position: TaggingPosition) => {
   if (position.pose) {
-    setPose(position.pose);
+    setPose({
+      modelId: position.modelId,
+      dur: 300,
+      // distance: 3,
+      maxDis: 15,
+      isFlyToTag: true,
+      ...position.pose
+    } as any);
   } else {
     sdk.comeTo({
       position: getTaggingPosNode(position)!.getImageCenter(),

+ 2 - 1
src/sdk/association/index.ts

@@ -71,7 +71,7 @@ export const analysisPose = (pose: Pose) => {
 };
 
 export const analysisPoseInfo = (info: ReturnType<typeof analysisPose>) => {
-  let pose: Pose = { target: info.target, position: info.position };
+  let pose: Pose = { ...info, target: info.target, position: info.position };
   if ("panoInfo" in info && info.panoInfo) {
     let sceneModel: SceneModel;
     for (const [k, v] of Array.from(sceneModelMap.entries())) {
@@ -107,6 +107,7 @@ export const setPose = (info: ReturnType<typeof analysisPose>, _sdk = sdk) => {
   } else {
     activeModel({ showMode: "fuse" });
   }
+  console.error('pose', pose)
   setTimeout(() => {
     sdk.comeTo({ ...pose, dur: 300 });
   });

+ 1 - 1
src/style.scss

@@ -176,6 +176,6 @@ input::-ms-clear,input::-ms-reveal {
   font-size: 14px;
   padding: 10px 20px;
   color: #ffffff;
-  line-height: 16px;
+  line-height: 22px;
   word-break: break-all;
 }

+ 4 - 4
src/views/animation/bottom.vue

@@ -140,7 +140,7 @@ const tlProps = [
   {
     attr: "frames",
     component: TimeLineFrame,
-    height: 30,
+    height: 31,
     top: 24,
     background: "#000",
     opacity: 0.5,
@@ -148,7 +148,7 @@ const tlProps = [
   {
     attr: "actions",
     component: TimeLineAction,
-    height: 30,
+    height: 29,
     top: 65,
     background: "#000",
     opacity: 0.5,
@@ -156,7 +156,7 @@ const tlProps = [
   {
     attr: "subtitles",
     component: TimeLineAction,
-    height: 30,
+    height: 29,
     top: 105,
     background: "#000",
     opacity: 0.5,
@@ -164,7 +164,7 @@ const tlProps = [
   {
     attr: "paths",
     component: TimeLineAction,
-    height: 30,
+    height: 29,
     top: 145,
     background: "#000",
     opacity: 0.5,

+ 1 - 1
src/views/tagging-position/index.vue

@@ -95,7 +95,7 @@ watch(
     const position = positions.value?.find((item) => item.id === showId.value);
     if (position) {
       position.pose = sdk.getPose({ modelId: position.modelId, isFlyToTag: true });
-      console.log("set Pose");
+      console.log("set Pose", position.pose);
     }
   }, 300)
 );