bill 4 月之前
父节点
当前提交
8e0c2f59b0
共有 3 个文件被更改,包括 8 次插入7 次删除
  1. 2 2
      src/sdk/association/fuseMode.ts
  2. 4 4
      src/sdk/association/index.ts
  3. 2 1
      src/sdk/sdk.ts

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

@@ -123,13 +123,13 @@ const setModels = (sdk: SDK, models: FuseModels, oldModels: FuseModels) => {
 
     sceneModel.bus.on("changeSelect", (select) => {
       unSet(() => {
-        if (custom.showMode === "fuse") {
+        // if (custom.showMode === "fuse") {
           if (custom.currentModel === item && !select) {
             custom.currentModel = null;
           } else if (custom.currentModel !== item && select) {
             custom.currentModel = item;
           }
-        }
+        // }
       });
     });
     showLoad();

+ 4 - 4
src/sdk/association/index.ts

@@ -6,7 +6,7 @@ import {
   getFuseModel,
   sceneModelMap,
 } from "./fuseMode";
-import { FuseModel, fuseModelsLoaded, GuidePath, setting } from "@/store";
+import { FuseModel, fuseModels, fuseModelsLoaded, GuidePath, setting } from "@/store";
 import { associationTaggings } from "./tagging";
 import { associationSetting } from "./setting";
 import { associationMessaures } from "./measure";
@@ -51,9 +51,9 @@ export const getSupperPanoModel = () => {
 };
 
 export const analysisPose = (pose: Pose) => {
-  if ("model" in pose && pose.model) {
+  if ("modelId" in pose && pose.modelId) {
     let info: GuidePath["panoInfo"] | undefined = undefined;
-    let fuseMode = getFuseModel(pose.model);
+    let fuseMode = fuseModels.value.find(item => item.id === pose.modelId);
     if (fuseMode!) {
       info = {
         panoId: pose.panoId,
@@ -84,7 +84,7 @@ export const analysisPoseInfo = (info: ReturnType<typeof analysisPose>) => {
     if (sceneModel!) {
       pose = {
         ...pose,
-        model: sceneModel,
+        modelId: getFuseModel(sceneModel)!.id,
         panoId: info.panoInfo.panoId,
         posInModel: info.panoInfo.posInModel,
         rotInModel: info.panoInfo.rotInModel,

+ 2 - 1
src/sdk/sdk.ts

@@ -150,7 +150,8 @@ export type Pose =
     }
   | {
       panoId: any;
-      model: SceneModel;
+      // model: SceneModel;
+      modelId: string;
       posInModel: SceneLocalPos;
       rotInModel: SceneLocalPos;
       position: SceneLocalPos;