gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showCollision/commandShowCollision.ts

@@ -1,404 +0,0 @@
-import { ReferenceLightModel } from "gs-bim-air-core/gsDevFx/objects/referenceLightModel";
-import { CommandComponent } from "../../../viewerWrapper/commands/commandComponent";
-
-import * as Longan from "gs-longan";
-import { CollisionObjects } from "gs-bim-air-core/gsDevFx/objects/collisionObjects";
-import { ComponentSelector } from "gs-bim-air-core/gsDevFx/operators/componentSelector";
-import { Material } from "gs-bim-air-core/gsDevFx/objects/material";
-import { TreeNodeObject } from "gs-bim-air-core/gsDevFx/objects/treeNodeObject";
-import renderObjectsService from "../../../api/renderObjectService";
-import { CollisionObject } from "gs-bim-air-core/gsDevFx/objects/collisionObject";
-import { CollisionType, LonganCore } from "gs-longan";
-import { Collision } from "../../../viewerWrapper/panels/collision/collisionPanel";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import * as Commands from "gs-bim-air-core/commands";
-
-export default class CommandShowCollision extends Commands.CommandShowCollision {
-  typeName = "CommandShowCollision";
-
-  collusionCount = -1;
-  option = { name: "", isCompute: false, data: "" };
-  k = 0;
-  depthRange;
-  // key0;
-  // key1;
-
-  lastSegObjRed: TreeNodeObject;
-  lastSegObjBlue: TreeNodeObject;
-  materialRed: Material;
-  materialBlue: Material;
-
-  currentCount = 0;
-  allCount = 0;
-
-  component: CommandComponent;
-
-  constructor() {
-    super();
-    this.commandData = {
-      name: "",
-      isCompute: false,
-      data: "",
-      collisionTableDataLoadingText: "碰撞进度：0/0",
-    };
-  }
-
-  begin() {
-    this.component = new CommandComponent(this, () => import("./showCollision.vue"));
-
-    this.viewer.isBusy = true;
-    this.component.show();
-    this.collusionCount = -1;
-    this.viewer.operatorManager.add(new CameraMouse());
-    this.viewer.operatorManager.add(new ComponentSelector());
-    super.begin();
-  }
-
-  end() {
-    this.viewer.isBusy = false;
-    if (this.lastSegObjRed && this.lastSegObjBlue) {
-      // this.lastSegObjRed.segment.renderingOptions.unsetDepthRange();
-      // this.lastSegObjBlue.segment.renderingOptions.unsetDepthRange();
-      // this.viewer.materialManager.clearOverride([this.lastSegObjRed, this.lastSegObjBlue]);
-    }
-
-    this.viewer.updateDisplay();
-
-    this.component.hide();
-
-    super.end();
-  }
-
-  switchCollisionListData(option: { name: string; isCompute: boolean; data }) {
-    this.option = { ...option };
-    this.commandData = { ...option };
-  }
-
-  findNoObjTreeNodeObject(treeNodeObject: TreeNodeObject, nodes: Longan.List<TreeNodeObject>) {
-    // if (treeNodeObject.obj) {
-    //   if (treeNodeObject.childNodes) {
-    //     for (let i = 0; i < treeNodeObject.childNodes.length; i++) {
-    //       const item = treeNodeObject.childNodes[i];
-    //       this.findNoObjTreeNodeObject(item, nodes);
-    //     }
-    //     // return
-    //   } else {
-    //     // return null;
-    //   }
-    // } else {
-    //   nodes.add(treeNodeObject);
-    //   // return treeNodeObject;
-    // }
-  }
-
-  // computeCollision(
-  //   option: { name: string; isCompute: boolean; data },
-  //   checkedNodes: TreeNodeObject[],
-  //   collisionType: CollisionType,
-  //   softCollisionDistance?: number
-  // ) {
-  //   this.option = { ...option };
-  //   this.commandData = { ...option };
-
-  //   this.currentCount = 0;
-  //   this.allCount = 0;
-  //   let collisionDatas: Collision[] = [];
-  //   let len = checkedNodes.length;
-
-  //   let geoPromises = [];
-  //   checkedNodes.forEach((treeNodeObject) => {
-  //     let nodes: Longan.List<TreeNodeObject> = new Longan.List();
-  //     this.findNoObjTreeNodeObject(treeNodeObject, nodes);
-
-  //     nodes.items.forEach((node) => {
-  //       console.log("node---------", node);
-  //       if (node) {
-  //         // let p = this.viewer.ensureSegmentAsynGeometry(
-  //         //   node.segment.key,
-  //         //   (total, current) => {
-  //         //     this.commandData = {
-  //         //       isCompute: this.option.isCompute,
-  //         //       collisionTableDataLoadingText: `检查${node.name}：${current}/${total}`,
-  //         //     };
-  //         //   }
-  //         // );
-  //         // geoPromises.push(p);
-  //       }
-  //     });
-  //   });
-  //   // return;
-
-  //   Promise.all(geoPromises).then(() => {
-  //     if (len <= 0) {
-  //       return;
-  //     } else if (len === 1) {
-  //       // 单节点碰撞
-  //       let segs: TreeNodeObject[] = [];
-  //       // this.viewer.structureTreeManager.getComponents(checkedNodes[0], segs);
-  //       if (segs.length === 0) {
-  //         console.warn("节点不存在构件");
-  //       } else {
-  //         console.log("节点构件:", segs);
-  //       }
-  //       this.allCount += segs.length * (segs.length - 1);
-  //       this.viewer.panelManager.getPanelByName<collisionPanel>("collisionPanel")
-  //         .computeObjectCollisions(
-  //           segs,
-  //           segs,
-  //           collisionType,
-  //           (total, current) => {
-  //             this.currentCount += 1;
-  //             let collisionTableDataLoadingText = "碰撞进度：" + this.currentCount + "/" + this.allCount;
-
-  //             this.commandData = {
-  //               isCompute: this.option.isCompute,
-  //               collisionTableDataLoadingText,
-  //             };
-  //           },
-  //           softCollisionDistance
-  //         )
-  //         .then((data) => {
-  //           collisionDatas = collisionDatas.concat(data);
-  //           this.commandData = {
-  //             isCompute: this.option.isCompute,
-  //             collisionTableDataLoadingText: "碰撞进度：0/0",
-  //           };
-  //           // console.log("collisionDatas---------------", data, collisionDatas);
-  //         });
-  //       // collisionCount += segs.length * segs.length;
-  //     } else {
-  //       // 多个节点互相碰撞
-  //       for (let i = 0; i < len - 1; i++) {
-  //         for (let j = i + 1; j < len; j++) {
-  //           let node1 = checkedNodes[i];
-  //           let node2 = checkedNodes[j];
-
-  //           let segs1: TreeNodeObject[] = [];
-  //           let segs2: TreeNodeObject[] = [];
-  //           // this.viewer.structureTreeManager.getComponents(node1, segs1);
-  //           // this.viewer.structureTreeManager.getComponents(node2, segs2);
-
-  //           if (segs1.length === 0 || segs2.length === 0) {
-  //             console.warn("节点不存在构件");
-  //           } else {
-  //             // console.log("互相碰撞的节点构件:", segs1, segs2);
-  //           }
-  //           this.allCount += segs1.length * segs2.length;
-
-  //           this.viewer.panelManager.getPanelByName<collisionPanel>("collisionPanel")
-  //             .computeObjectCollisions(
-  //               segs1,
-  //               segs2,
-  //               collisionType,
-  //               (total, current) => {
-  //                 if (total && current === 0) {
-  //                   this.allCount += total;
-  //                 }
-  //                 this.currentCount += 1;
-  //                 let collisionTableDataLoadingText = this.currentCount + "/" + this.allCount;
-
-  //                 this.commandData = {
-  //                   isCompute: this.option.isCompute,
-  //                   collisionTableDataLoadingText,
-  //                 };
-  //               },
-  //               softCollisionDistance
-  //             )
-  //             .then((data) => {
-  //               collisionDatas = collisionDatas.concat(data);
-  //             });
-  //         }
-  //       }
-  //     }
-  //     console.log("碰撞的总次数:", this.allCount, collisionDatas);
-
-  //     let timer = setInterval(() => {
-  //       if (this.currentCount === this.allCount) {
-  //         this.commandData.isCompute = false;
-  //         // id去重
-  //         let ids = getTreeNodeObjectsRelatedIds(checkedNodes);
-  //         // checkedNodes.forEach((treeNodeObject) => {
-  //         //   let ro = treeNodeObject.model.renderObject;
-  //         //   let id;
-  //         //   if (ro.typeName === "ReferenceLightModel") {
-  //         //     id = (ro as ReferenceLightModel).reference.id;
-  //         //   } else if (ro.typeName === "LightModel") {
-  //         //     id = ro.id;
-  //         //   }
-  //         //   // console.log("treeNodeObject", treeNodeObject);
-  //         //   if (!ids.includes(id)) {
-  //         //     ids.push(id);
-  //         //   }
-  //         // });
-
-  //         let list: Collision[] = [];
-  //         // 去掉null数据
-  //         collisionDatas.forEach((item) => {
-  //           if (item) {
-  //             list.push(item);
-  //           }
-  //         });
-
-  //         let obj = {};
-  //         let collisionAllList = [];
-
-  //         list.forEach((item, index) => {
-  //           if (item) {
-  //             // 防止key重复
-  //             let newItem1 =
-  //               item.segObj1.componentId + item.segObj2.componentId + item.segObj1.modelId + item.segObj2.modelId;
-  //             let newItem2 =
-  //               item.segObj2.componentId + item.segObj1.componentId + item.segObj2.modelId + item.segObj1.modelId;
-  //             let isExist1 = obj[newItem1];
-  //             let isExist2 = obj[newItem2];
-  //             if (!isExist1 && !isExist2) {
-  //               collisionAllList.push(item);
-  //               obj[newItem1] = true;
-  //               obj[newItem2] = true;
-  //             }
-  //           }
-  //         });
-
-  //         let collisionNodeNames = [];
-  //         checkedNodes.forEach((item) => {
-  //           collisionNodeNames.push(item.name);
-  //         });
-  //         this.getCollisionData(collisionAllList, ids, collisionType, collisionNodeNames);
-  //         clearInterval(timer);
-  //         return collisionDatas;
-  //       }
-  //     }, 500);
-  //   });
-  // }
-
-  getCollisionData(collisionList: Collision[], ids, collisionType: CollisionType, collisionNodeNames: string[]) {
-    // let tableData = [];
-    // for (let i = 0; i < collisionList.length; i++) {
-    //   let collsionPos = collisionList[i].collsionPos;
-    //   let segmentObject0 = collisionList[i].segObj1;
-    //   let segmentObject1 = collisionList[i].segObj2;
-    //   let key0 = segmentObject0.segment.key;
-    //   let key1 = segmentObject1.segment.key;
-    //   //用这种方式算出来的bb不一定准确(当涉及到多重引用时)
-    //   let box0 =LonganCore.JS_Compute_View_Boundingbox_By_Key(this.viewer.viewKey, key0);
-    //   let box1 =LonganCore.JS_Compute_View_Boundingbox_By_Key(this.viewer.viewKey, key1);
-    //   let min: number[] = new Array<number>();
-    //   min[0] = box0[0] < box1[0] ? box0[0] : box1[0];
-    //   min[1] = box0[1] < box1[1] ? box0[1] : box1[1];
-    //   min[2] = box0[2] < box1[2] ? box0[2] : box1[2];
-    //   let max: number[] = new Array<number>();
-    //   max[0] = box0[3] > box1[3] ? box0[3] : box1[3];
-    //   max[1] = box0[4] > box1[4] ? box0[4] : box1[4];
-    //   max[2] = box0[5] > box1[5] ? box0[5] : box1[5];
-    //   let compaire =
-    //     collisionList[i].segObj1.componentId +
-    //     "," +
-    //     collisionList[i].segObj2.componentId +
-    //     "," +
-    //     collisionList[i].segObj1.modelId +
-    //     "," +
-    //     collisionList[i].segObj2.modelId;
-    //   let object = {
-    //     compaire,
-    //     type: collisionList[i].collisionType,
-    //     collsionPos,
-    //     min,
-    //     max,
-    //   };
-    //   tableData.push(object);
-    // }
-    // // 保存碰撞数据
-    // let lightModel = this.viewer.process.renderObject;
-    // let collisionObjects = this.viewer.process.findRenderObject("CollisionObjects");
-    // if (!collisionObjects) {
-    //   collisionObjects = new CollisionObjects();
-    //   this.viewer.process.addRenderObject(lightModel, collisionObjects);
-    // }
-    // let collisionObject = new CollisionObject();
-    // collisionObject.name = this.option.name;
-    // collisionObject.data = tableData;
-    // collisionObject.related = ids;
-    // collisionObject.collisionType = collisionType;
-    // collisionObject.collisionNodeNames = collisionNodeNames;
-    // if ((collisionType & 8) === 8) {
-    //   collisionObject.softCollisionDistance = this.viewer.softCollisionDistance;
-    // }
-    // let obj = collisionObject.serialize();
-    // renderObjectsService.createRenderObject("", obj, this.viewer.options.tag).then((data: any) => {
-    //   this.viewer.process.addRenderObject(collisionObjects, collisionObject);
-    //   // 生成在ui界面
-    //   this.viewer.panelManager.getPanelByName<collisionPanel>("collisionPanel").collisionObjectJsonList.unshift(data);
-    //   this.viewer.panelManager.getPanelByName<collisionPanel>("collisionPanel").generateCollision();
-    //   this.commandData = {
-    //     isCompute: false,
-    //     data: tableData,
-    //   };
-    // });
-  }
-
-  selectCollision(row: { index: number; compaire: string; collsionPos: Float32Array; type: string; min; max }) {
-    let compaireArr = row.compaire.split(",");
-    if (this.lastSegObjRed && this.lastSegObjBlue) {
-      // this.viewer.materialManager.clearOverride([this.lastSegObjRed, this.lastSegObjBlue]);
-    }
-
-    this.lastSegObjRed = this.viewer.getComponent(compaireArr[2], compaireArr[0]);
-    this.lastSegObjBlue = this.viewer.getComponent(compaireArr[3], compaireArr[1]);
-
-    this.materialRed = new Material(this.viewer, "red");
-    this.materialRed.setColor(255, 0, 0, 0.5);
-    this.materialRed.setFloat();
-    this.materialRed.styleSegment.renderingOptions.logarithmicDepthBuffer = false;
-
-    this.materialBlue = new Material(this.viewer, "blue");
-    this.materialBlue.setColor(0, 0, 255, 0.5);
-    this.materialBlue.setFloat();
-    this.materialBlue.styleSegment.renderingOptions.logarithmicDepthBuffer = false;
-
-    // this.viewer.materialManager.override([this.lastSegObjRed], this.materialRed);
-    // this.viewer.materialManager.override([this.lastSegObjBlue], this.materialBlue);
-
-    // this.viewer.locateWorldByData(row.min, row.max, row.collsionPos);
-    const bb = new Longan.BoundingBox(Longan.Vector3.FromArray(row.min), Longan.Vector3.FromArray(row.max));
-    const translate = Longan.Matrix.Translation(-row.collsionPos[0], -row.collsionPos[1], -row.collsionPos[2]);
-    this.viewer.locateWorldByBoundingBox(Longan.BoundingBox.TransformCoordinates(bb, translate));
-    // console.log(row.min, row.max);
-    this.viewer.updateDisplay();
-  }
-
-  getComponentIdByPathKey(keyList: Int32Array) {
-    let id = null;
-    //引用的前n-1个
-    for (let i = 0; i < keyList.length - 1; i++) {
-      let includeKey = keyList[i];
-      let segment = new Longan.Segment(includeKey);
-      id = segment.property.showString("id");
-      if (id !== null) {
-        return { id, includeKey };
-      }
-    }
-    if (id === null) {
-      //第n个
-      let includeKey = keyList[keyList.length - 1];
-      let segment = new Longan.Segment(includeKey);
-      id = segment.property.showString("id");
-      if (id) {
-        return { id, includeKey };
-      }
-
-      //第n个的parent
-      let owner_key = LonganCore.JS_Show_Owner_By_Key(includeKey);
-      while (owner_key !== -1) {
-        let segment = new Longan.Segment(owner_key);
-        id = segment.property.showString("id");
-        if (id) {
-          return { id, includeKey };
-        }
-
-        owner_key = LonganCore.JS_Show_Owner_By_Key(owner_key);
-      }
-    }
-    let includeKey = -1;
-    return { id, includeKey };
-  }
-}

package/src/viewerWrapper/commands/showCollision/showCollision.vue

@@ -1,222 +0,0 @@
-<template>
-  <div
-    class="showCollision"
-    v-loading="collisionTableDataLoading"
-    :element-loading-text="collisionTableDataLoadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-    <el-table
-      :data="collisionTableData"
-      :row-class-name="tableRowClassName"
-      @row-click="tableRowClick"
-      :row-style="{ cursor: 'pointer' }"
-      height="70vh"
-      style="width: 100%">
-      <el-table-column type="index" label="碰撞ID" width="80"></el-table-column>
-      <el-table-column label="碰撞对比" min-width="200" prop="compaire">
-        <template slot-scope="scope">
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(255,0,0,0.5)' : '',
-            }">
-            {{ scope.row.compaire.split(",")[0] }}
-            <!-- {{ scope.row.segObj1.componentId }}  -->
-          </span>
-          ,
-          <br v-if="scope.row.compaire.length > 14" />
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(0,0,255,0.5)' : '',
-            }">
-            {{ scope.row.compaire.split(",")[1] }}
-            <!-- {{ scope.row.segObj2.componentId }} -->
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" width="80" prop="type"></el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Inject, Prop, Vue, Watch } from "vue-property-decorator";
-import CommandShowCollision from "./commandShowCollision";
-import { uniqueByProperty } from "../../../utils/dataUtility";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-
-@Component({
-  components: {},
-})
-export default class ShowCollision extends Vue {
-  @Prop() componentData;
-  @Inject() getViewer;
-
-  calcSoftCollisionChecked = false;
-  calcTouchCollisionChecked = false;
-  collisionTableDataLoading = false;
-  collisionTableDataLoadingText = "0/0";
-  collisionTableData = [];
-  activeRowIndex = null;
-
-  get viewer(): Viewer {
-    return this.getViewer();
-  }
-
-  get commandData() {
-    let commandData = this.componentData || {
-      name: "",
-      isCompute: false,
-      data: "",
-      collisionTableDataLoadingText: "0/0",
-    };
-    if (commandData.data) {
-      this.getCollisionListJson(commandData.data);
-    }
-    if (commandData.name) {
-      this.$emit("setSubTitle", commandData.name);
-    }
-    if (commandData.collisionTableDataLoadingText) {
-      this.collisionTableDataLoadingText = commandData.collisionTableDataLoadingText;
-    }
-    return commandData;
-  }
-
-  @Watch("componentData", { deep: true })
-  onIsComputeChange(val, oldVal) {
-    if (this.componentData.isCompute) {
-      this.collisionCheck();
-    }
-    if (this.componentData.name) {
-      this.$emit("setSubTitle", this.componentData.name);
-    }
-    if (this.componentData.data) {
-      this.getCollisionListJson(this.componentData.data);
-    }
-    if (this.componentData.collisionTableDataLoadingText) {
-      this.collisionTableDataLoadingText = this.componentData.collisionTableDataLoadingText;
-    }
-  }
-
-  getCollisionListJson(data) {
-    this.collisionTableDataLoading = true;
-    // axios.get(`/file-service/files/${data}`).then((data: any) => {
-    // console.log("data", data);
-    // 碰撞对比列表去重
-    this.collisionTableData = uniqueByProperty(data, "compaire");
-    this.collisionTableDataLoading = false;
-    // });
-  }
-
-  collisionCheck() {
-    if (this.commandData.isCompute) {
-      this.collisionTableDataLoading = true;
-    } else {
-      this.collisionTableDataLoading = false;
-    }
-  }
-
-  touchCollisionValueChange() {}
-
-  softCollisionValueChange() {}
-
-  tableRowClassName({ row, rowIndex }) {
-    // 把每一行的索引放进row
-    row.index = rowIndex;
-  }
-
-  tableRowClick(row) {
-    let commandShowCollision = this.viewer.process.commandManager.currentCommand as CommandShowCollision;
-    commandShowCollision.selectCollision(row);
-    console.log("tableRowClick", row);
-    this.activeRowIndex = row.index;
-  }
-
-  setData() {
-    this.$emit("setData", {
-      title: "模型碰撞",
-      // left: "calc(50% - 400px)",
-      right: "80px",
-      top: "20px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-    this.collisionCheck();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle";
-
-.showCollision {
-  padding: 0 10px;
-}
-
-:deep(.el-table) {
-  background: transparent;
-  // width: 600px;
-
-  .el-table__header-wrapper {
-    th {
-      // background: $gs-primary-background3;
-      background: transparent;
-      color: $gs-primary-fontColor;
-      border-bottom: 1px solid $model-theme-light;
-    }
-  }
-  tr,
-  th {
-    background: transparent;
-  }
-
-  .el-table__body-wrapper {
-    tr {
-      // background: $model-theme-light;
-      background: transparent;
-      color: $gs-primary-fontColor;
-
-      td {
-        padding: 6px 0;
-        border-bottom: 1px solid $model-theme-light;
-      }
-    }
-  }
-
-  .el-table__body tr:hover > td {
-    background-color: $gs-primary-background;
-  }
-}
-
-.el-table:before {
-  height: 0;
-}
-::v-deep .el-loading-mask {
-  background-color: rgba(231, 121, 121, 0.9);
-}
-.setting-wrapper {
-  text-align: left;
-  display: flex;
-  justify-content: space-between;
-
-  .el-button {
-    // margin: 0 20px;
-  }
-
-  .el-checkbox {
-    color: white;
-    margin: 0 20px;
-  }
-
-  .el-slider {
-    width: 150px;
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 20px;
-    height: 32px;
-    margin-top: -3px;
-  }
-}
-</style>

package/src/viewerWrapper/commands/showComponentCut/commandShowComponentCut.ts

@@ -1,31 +0,0 @@
-import { CommandComponent as CommandStore } from "../commandComponent";
-import { CommandComponent } from "gs-bim-air-core/commands/commandComponent";
-import * as Longan from "gs-longan";
-import { CuttingBoxOperator } from "gs-bim-air-core/gsDevFx/operators/cuttingBoxOperator";
-import { CuttingBoxObject } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingBoxObject";
-import { BoundingBox } from "gs-longan";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-
-export default class CommandShowComponentCut extends CommandComponent {
-  typeName = "CommandShowComponentCut";
-  component: CommandStore;
-  constructor() {
-    super();
-  }
-
-  begin() {
-    // this.panelComponent = new PanelStore(this, () => import("./showComponentCut.vue"));
-    this.component = new CommandStore(this, () => import("./showComponentCut.vue"));
-
-    this.commandData = { xValue: [0, 100], yValue: [0, 100], zValue: [0, 100] };
-    this.component.show();
-  }
-
-  end() {
-    this.viewer.operatorManager.clear();
-
-    this.viewer.updateDisplay();
-
-    this.component.hide();
-  }
-}