gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showMeasure/lib/minDistance.ts

@@ -1,398 +0,0 @@
-import { TreeNodeObject } from "gs-bim-air-core/gsDevFx/objects/treeNodeObject";
-import * as Longan from "gs-longan";
-import { GeometryObject } from "gs-bim-air-core/gsDevFx/objects/geometryObject";
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { MinDistanceMeasure, MinDistanceObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/minDistanceObject";
-import { ComponentPreSelector } from "gs-bim-air-core/gsDevFx/operators/componentPreSelector";
-import { ComponentSelector } from "gs-bim-air-core/gsDevFx/operators/componentSelector";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-import Measure from "./measure";
-import { LonganMath, MeshRendererComponent, VertexBuffer, WebGL2RenderContext } from "gs-longan";
-import { MeshComponent, isPC } from "gs-longan";
-import { LonganCore } from "gs-longan";
-import { KeepBufferDataOperator } from "gs-bim-air-core/gsDevFx/operators/keepBufferDataOperator";
-import { measureService } from "../../../../api/measureService";
-
-export default class MinDistance extends Measure {
-  cameraMouse;
-  geometries0 = [];
-  geometries1 = [];
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-  }
-
-  addMeasureObject(data: Float32Array, selectedObjects: TreeNodeObject[]) {
-    // let measureObjects = this.viewer.measureManager.measureObjects;
-    // if (!measureObjects) {
-    //   measureObjects = new MeasureObjects(this.viewer);
-    //   const viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, measureObjects);
-    // }
-
-    let measureObjects = this.viewer.measureManager.measureObjects;
-
-    const minDistanceObject = new MinDistanceObject(this.viewer);
-    minDistanceObject._treeNodeObjects = selectedObjects;
-
-    let localPoints: number[] = Object.values(data);
-    let worldPoint1 = this.viewer.coordinateManager.localToWorld(new Float64Array(localPoints.slice(1, 4)));
-    let worldPoint2 = this.viewer.coordinateManager.localToWorld(new Float64Array(localPoints.slice(4, 7)));
-    // let distance = GeometryOperators.distance(worldPoint1,worldPoint2)
-    // minDistanceObject.data = [localPoints[0]].concat(Array.from(worldPoint1)).concat(Array.from(worldPoint2));
-    minDistanceObject.distance = localPoints[0];
-    minDistanceObject.startPoint = new Longan.Vector3(...worldPoint1);
-    minDistanceObject.endPoint = new Longan.Vector3(...worldPoint2);
-    minDistanceObject.clickFun = (obj: MinDistanceObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-      if (instance.typeName !== "CommandShowMeasure" && isPC()) {
-        instance = new CommandShowMeasure();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-      instance.commandData.minDistance = obj.minDistance;
-      instance.activeMeasureTypeChange(MeasureType.Mindistance);
-    };
-
-    measureObjects.clearActive();
-    minDistanceObject.active = true;
-    minDistanceObject.render();
-    // this.viewer.process.addRenderObject(measureObjects, minDistanceObject);
-    measureObjects.addChildObject(minDistanceObject);
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    instance.commandData.minDistance = data[0];
-    instance.activeMeasureTypeChange(MeasureType.Mindistance);
-
-    measureService
-      .createMeasure(this.viewer.projectSceneManager.currentScene.id, minDistanceObject.toJson())
-      .then((data) => {
-        minDistanceObject.fromJson(data as MinDistanceMeasure);
-      });
-  }
-
-  operatorChange() {
-    super.operatorChange();
-    let componentSelector = this.viewer.operatorManager.find("ComponentSelector") as ComponentSelector;
-    if (!componentSelector) {
-      componentSelector = new ComponentSelector();
-    }
-    componentSelector.isMultiSelect = true;
-
-    let componentPreSelector = this.viewer.operatorManager.find("ComponentPreSelector") as ComponentPreSelector;
-    if (!componentPreSelector) {
-      componentPreSelector = new ComponentPreSelector();
-    }
-
-    let keepBufferDataOperator = this.viewer.operatorManager.find("KeepBufferDataOperator") as KeepBufferDataOperator;
-    if (!keepBufferDataOperator) {
-      keepBufferDataOperator = new KeepBufferDataOperator();
-    }
-
-    this.viewer.operatorManager.add(componentSelector);
-    this.viewer.operatorManager.add(componentPreSelector);
-    this.viewer.operatorManager.add(keepBufferDataOperator);
-    this.measureMindistanceSelector();
-
-    const instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-    if (instance.activeMeasureType !== MeasureType.Mindistance) {
-      instance.commandData.minDistance = 0;
-    }
-  }
-
-  measureMindistanceSelector() {
-    const componentSelector = this.viewer.operatorManager.find("ComponentSelector") as ComponentSelector;
-    const geomList = new Longan.List<GeometryObject>();
-    // let selectedObjects: TreeNodeObject[] = [];
-    let paths = [];
-
-    componentSelector.lButtonUp.add((sender, event) => {
-      const selectedObjects = this.viewer.selectionManager.selectedObjects;
-
-      const selectionManager = this.viewer.selectionManager;
-      if (selectedObjects.length > 2) {
-        const clearObjs = selectedObjects.slice(0, 2);
-        selectionManager.clearSelectionAndHighlight(...clearObjs);
-      } else if (selectedObjects.length === 2) {
-        let minData;
-        const rc = Viewer.currentRenderContext as WebGL2RenderContext;
-
-        let roIdMapSubMeshs0 = selectedObjects[0].subMeshs;
-        let roIdMapSubMeshs1 = selectedObjects[1].subMeshs;
-
-        let vertexsArray0: {
-          vertexes: Float32Array;
-          indexes: Int32Array;
-          stride: number;
-        }[] = [];
-        let vertexsArray1: {
-          vertexes: Float32Array;
-          indexes: Int32Array;
-          stride: number;
-        }[] = [];
-
-        for (let roId0 in roIdMapSubMeshs0) {
-          let ro0 = this.viewer.renderObjectManager.targetRenderObjects.get(roId0);
-          if (ro0) {
-            let meshRenderer0 = ro0.components.find<MeshRendererComponent>("MeshRendererComponent");
-            let meshComponent0 = ro0.components.find<MeshComponent>("MeshComponent");
-
-            // if (meshRenderer0.geometry && meshComponent0.mesh) {
-            //   rc.getGeometry(meshRenderer0.geometry, meshComponent0.mesh, ["a_position"]);
-            // }
-            let mesh = meshComponent0.mesh;
-            const stride0 = 3;
-            // const vertexes0 = Array.isArray(mesh.vertexes) ? mesh.vertexes[0] : mesh.vertexes;
-            const vertexes0 = mesh.getVertexBuffer(VertexBuffer.PositionKind)._buffer._data as Float32Array;
-            const meshIndexes0 = mesh.getIndices() as Int32Array;
-            // console.log("meshIndexes0", meshIndexes0);
-            let subMeshs0 = roIdMapSubMeshs0[roId0];
-            subMeshs0.forEach((subMesh0) => {
-              let indexes0 = meshIndexes0.slice(subMesh0.indexStart, subMesh0.indexStart + subMesh0.indexCount);
-              vertexsArray0.push({
-                vertexes: vertexes0 as Float32Array,
-                indexes: indexes0,
-                stride: stride0,
-              });
-            });
-          }
-        }
-
-        for (let roId1 in roIdMapSubMeshs1) {
-          let ro1 = this.viewer.renderObjectManager.targetRenderObjects.get(roId1);
-
-          if (ro1) {
-            let meshRenderer1 = ro1.components.find<MeshRendererComponent>("MeshRendererComponent");
-            let meshComponent1 = ro1.components.find<MeshComponent>("MeshComponent");
-
-            // if (meshRenderer1.geometry && meshComponent1.mesh) {
-            //   rc.getGeometry(meshRenderer1.geometry, meshComponent1.mesh, ["a_position"]);
-            // }
-
-            let mesh = meshComponent1.mesh;
-            const stride1 = 3;
-            // const vertexes1 = Array.isArray(mesh.vertexes) ? mesh.vertexes[0] : mesh.vertexes;
-            const vertexes1 = mesh.getVertexBuffer(VertexBuffer.PositionKind)._buffer._data as Float32Array;
-            const meshIndexes1 = mesh.getIndices() as Int32Array;
-            // console.log("meshIndexes1", meshIndexes1);
-
-            let subMeshs1 = roIdMapSubMeshs1[roId1];
-            subMeshs1.forEach((subMesh1) => {
-              let indexes1 = meshIndexes1.slice(subMesh1.indexStart, subMesh1.indexStart + subMesh1.indexCount);
-              vertexsArray1.push({
-                vertexes: vertexes1 as Float32Array,
-                indexes: indexes1,
-                stride: stride1,
-              });
-            });
-          }
-        }
-
-        // console.log("vertexsArray: ", vertexsArray0, vertexsArray1);
-
-        vertexsArray0.forEach((item0) => {
-          vertexsArray1.forEach((item1) => {
-            let data = LonganCore.JS_FLT_Compute_Distance_Triangles(
-              item0.vertexes,
-              item0.indexes,
-              item1.vertexes,
-              item1.indexes,
-              item0.stride
-            );
-            // console.log("minData", data);
-
-            if (minData) {
-              minData = minData[0] < data[0] ? minData : data;
-            } else {
-              minData = data;
-            }
-          });
-        });
-        //LonganCore.JS_FLT_Compute_Distance_Triangles();
-
-        if (minData) {
-          this.addMeasureObject(minData, selectedObjects);
-        }
-        selectionManager.clearSelectionAndHighlight(...selectedObjects);
-      }
-    });
-
-    componentSelector.windowKeyDown.add((e) => {
-      const commandShowMeasure = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-      if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Mindistance) {
-        this.deleteActiveMeasure();
-        this.activeIndex = null;
-      }
-      if ((e.uiEvent as any).key === "Escape" && commandShowMeasure.activeMeasureType === MeasureType.Mindistance) {
-        geomList.clear();
-      }
-    });
-  }
-
-  // TODO:最小距离遍历待优化
-  traverseSegment(segment: Longan.Segment, geometries: Longan.List<Longan.Geometry>) {
-    if (segment) {
-      geometries.items = geometries.items.concat(segment.geometries.items);
-
-      if (segment.includes) {
-        for (let i = 0; i < segment.includes.items.length; i++) {
-          const item = segment.includes.items[i].segment;
-          this.traverseSegment(item, geometries);
-        }
-      }
-
-      if (segment.subsegments) {
-        for (let i = 0; i < segment.subsegments.items.length; i++) {
-          const item = segment.subsegments.items[i];
-          this.traverseSegment(item, geometries);
-        }
-      }
-    }
-    return geometries;
-  }
-
-  getMinGeometry(geometries0: Longan.Geometry[], geometries1: Longan.Geometry[], paths) {
-    let minData: Float32Array = null;
-    let minBbDist: number = null;
-    let minPGeo0: Longan.Geometry = null;
-    let minPGeo1: Longan.Geometry = null;
-
-    for (let i = 0; i < geometries0.length; i++) {
-      const geo0 = geometries0[i];
-      let bb0 = this.viewer.computeViewBoundingBoxByKey(geo0.key);
-      //   console.log("bb0", bb0);
-      let pArr0 = [
-        bb0[0],
-        bb0[1],
-        bb0[2],
-
-        bb0[0],
-        bb0[1],
-        bb0[5],
-
-        bb0[0],
-        bb0[4],
-        bb0[2],
-
-        bb0[0],
-        bb0[4],
-        bb0[5],
-
-        bb0[3],
-        bb0[4],
-        bb0[5],
-
-        bb0[3],
-        bb0[4],
-        bb0[2],
-
-        bb0[3],
-        bb0[1],
-        bb0[2],
-
-        bb0[3],
-        bb0[1],
-        bb0[5],
-      ];
-
-      for (let j = 0; j < geometries1.length; j++) {
-        const geo1 = geometries1[j];
-        // const geo1 = new Longan.Segment(-115).geometries.items[0];
-
-        let bb1 = this.viewer.computeViewBoundingBoxByKey(geo1.key);
-
-        let pArr1 = [
-          bb1[0],
-          bb1[1],
-          bb1[2],
-
-          bb1[0],
-          bb1[1],
-          bb1[5],
-
-          bb1[0],
-          bb1[4],
-          bb1[2],
-
-          bb1[0],
-          bb1[4],
-          bb1[5],
-
-          bb1[3],
-          bb1[4],
-          bb1[5],
-
-          bb1[3],
-          bb1[4],
-          bb1[2],
-
-          bb1[3],
-          bb1[1],
-          bb1[2],
-
-          bb1[3],
-          bb1[1],
-          bb1[5],
-        ];
-
-        let isIntersecting = LonganMath.BoundingBox.isIntersecting(bb0, bb1);
-        // 判断是否互相嵌入
-        if (isIntersecting) {
-          let distData = geo0.distanceTo(geo1, new Int32Array(paths[0]), new Int32Array(paths[1]));
-          // console.log("isIntersecting", distData);
-
-          if (!minData) {
-            minData = distData;
-          } else if (distData[0] < minData[0]) {
-            minData = distData;
-            // console.log(distData);
-          } else if (distData[0] === 0) {
-            minPGeo0 = geo0;
-            minPGeo1 = geo1;
-
-            return {
-              minPGeo0,
-              minPGeo1,
-              minData,
-            };
-          }
-        } else {
-          for (let k = 0; k < 8; k++) {
-            const p0 = pArr0.slice(k * 3, k * 3 + 3);
-
-            for (let l = 0; l < 8; l++) {
-              const p1 = pArr1.slice(l * 3, l * 3 + 3);
-              let dist = Longan.DGeometryOperators.distance(new Float64Array(p0), new Float64Array(p1));
-
-              if (!minBbDist) {
-                minBbDist = dist;
-                minPGeo0 = geo0;
-                minPGeo1 = geo1;
-              } else if (dist < minBbDist) {
-                minBbDist = dist;
-                minPGeo0 = geo0;
-                minPGeo1 = geo1;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return {
-      minPGeo0,
-      minPGeo1,
-      minData,
-    };
-  }
-
-  deleteActiveMeasure() {
-    super.deleteActiveMeasure();
-
-    // 面板数据清零
-    (this.viewer.process.commandManager.currentCommand as CommandShowMeasure).commandData.minDistance = 0;
-    this.activeIndex = null;
-  }
-}

package/src/viewerWrapper/commands/showMeasure/lib/point.ts

@@ -1,211 +0,0 @@
-import * as LonganCore from "gs-longan";
-import * as Longan from "gs-longan";
-import { Container } from "@svgdotjs/svg.js";
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import Measure from "./measure";
-import { PointMeasure, PointObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/pointObject";
-import { MeasurePointSelector } from "gs-bim-air-core/gsDevFx/operators/measurePointSelector";
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-// import { JS_Compute_Coordinates_By_Key } from "gs-longan/longan/gs.viewer";
-import { ViewerEvent } from "gs-longan/viewer";
-import { isPC, Vector3 } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { measureService } from "gs-bim-air-core/api/measureService";
-
-export default class Point extends Measure {
-  private _tack = null;
-  private _auxiliaryLine = null;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-  }
-
-  operatorChange() {
-    super.operatorChange();
-    // const objectPreSelector = new ObjectPreSelector();
-
-    // this.viewer.operatorManager.add(objectPreSelector);
-    // objectPreSelector.vertexSelection = true;
-    // objectPreSelector.edgeSelection = true;
-    // objectPreSelector.faceSelection = true;
-    // objectPreSelector.highlightVertex = true;
-    // objectPreSelector.highlightEdge = true;
-    // objectPreSelector.highlightFace = true;
-
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-
-    this.viewer.operatorManager.add(this.measurePointSelector());
-
-    const instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-    if (instance.activeMeasureType !== MeasureType.Point) {
-      instance.commandData.pointPos = [0, 0, 0];
-    }
-  }
-
-  measurePointSelector() {
-    const measurePointSelector = new MeasurePointSelector();
-    measurePointSelector.addMeasure.add((pointPosition) => {
-      // let pointPosition = CoordinateManager.CoordinateTranslate(lightModel, new Float32Array(p));
-      // const x = pointPosition[0];
-      // const y = pointPosition[1];
-      // const z = pointPosition[2];
-      this.addMeasureObject(pointPosition);
-    });
-
-    // measurePointSelector.lButtonDown.add((sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //   if (measurePointSelector.pointPosition && !measurePointSelector.labelPixelPosition) {
-    //     const draw = this.svgDraw.draw as Container;
-    //     const startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-    //       this.viewer.sceneKey,
-    //       "world",
-    //       measurePointSelector.pointPosition,
-    //       "pixels"
-    //     );
-
-    //     const startX = startPixelPos[0];
-    //     const startY = startPixelPos[1];
-    //     this._tack = draw
-    //       .circle(10)
-    //       .fill("#E09C0D")
-    //       .stroke({
-    //         color: "#fff",
-    //         width: 3,
-    //       })
-    //       .move(startX - 5, startY - 5);
-    //   }
-    // });
-    // measurePointSelector.mouseMove.add((sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //   if (this._auxiliaryLine) {
-    //     this._auxiliaryLine.remove();
-    //   }
-    //   if (measurePointSelector.pointPosition) {
-    //     let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-    //       this.viewer.sceneKey,
-    //       "world",
-    //       measurePointSelector.pointPosition,
-    //       "pixels"
-    //     );
-    //     const draw = this.svgDraw.draw as Container;
-    //     const startX = startPixelPos[0];
-    //     const startY = startPixelPos[1];
-    //     this._auxiliaryLine = draw.line(startX, startY, e.mouseEvent().offsetX, e.mouseEvent().offsetY).stroke({
-    //       color: "#E09C0D",
-    //       width: 3,
-    //       linecap: "round",
-    //       dasharray: "10 10",
-    //     });
-    //   }
-    // });
-    // measurePointSelector.rButtonDown.add((sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //   if (this._tack) {
-    //     this._tack.remove();
-    //     this._tack = null;
-    //   }
-    //   if (this._auxiliaryLine) {
-    //     this._auxiliaryLine.remove();
-    //     this._auxiliaryLine = null;
-    //   }
-    // });
-    this.updateTemporarySvg = () => {};
-    // this.viewer.sceneCameraChanged.add(this.updateTemporarySvg);
-
-    measurePointSelector.windowKeyDown.add((e: ViewerEvent) => {
-      const commandShowMeasure = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveMeasurePoint();
-        this.activeIndex = null;
-      }
-      if ((e.uiEvent as any).key === "Escape" && commandShowMeasure.activeMeasureType === MeasureType.Distance) {
-        if (this._tack) {
-          this._tack.remove();
-          this._tack = null;
-        }
-        if (this._auxiliaryLine) {
-          this._auxiliaryLine.remove();
-          this._auxiliaryLine = null;
-        }
-      }
-    });
-    return measurePointSelector;
-  }
-
-  end(): void {
-    // this.viewer.sceneCameraChanged.remove(this.updateTemporarySvg);
-
-    if (this._tack) {
-      this._tack.remove();
-      this._tack = null;
-    }
-    if (this._auxiliaryLine) {
-      this._auxiliaryLine.remove();
-      this._auxiliaryLine = null;
-    }
-  }
-
-  addMeasureObject(selectPoint: Vector3) {
-    // let measureObjects = this.viewer.measureManager.measureObjects;
-    // if (!measureObjects) {
-    //   measureObjects = new MeasureObjects(this.viewer);
-    //   const viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, measureObjects);
-    // }
-
-    let measureObjects = this.viewer.measureManager.measureObjects;
-
-    const pointObject = new PointObject(this.viewer);
-    pointObject.point = selectPoint;
-
-    // pointObject.data = Array.from(CoordinateManager.LightModelLocalToWorld(selectPoint));
-    pointObject.clickFun = (obj: PointObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-      if (instance.typeName !== "CommandShowMeasure" && isPC()) {
-        instance = new CommandShowMeasure();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-
-      instance.commandData.pointPos = obj.pointPostion;
-      instance.activeMeasureTypeChange(MeasureType.Point);
-    };
-    // this.viewer.process.addRenderObject(measureObjects, pointObject);
-    measureObjects.addChildObject(pointObject);
-
-    measureObjects.clearActive();
-    pointObject.active = true;
-    measureObjects.render();
-    if (this._tack) {
-      this._tack.remove();
-      this._tack = null;
-    }
-    if (this._auxiliaryLine) {
-      this._auxiliaryLine.remove();
-      this._auxiliaryLine = null;
-    }
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    instance.activeMeasureTypeChange(MeasureType.Point);
-
-    measureService.createMeasure(this.viewer.projectSceneManager.currentScene.id, pointObject.toJson()).then((data) => {
-      pointObject.fromJson(data as PointMeasure);
-    });
-  }
-
-  deleteActiveMeasurePoint() {
-    super.deleteActiveMeasure();
-    // const measureObjects: MeasureObjects = this.viewer.measureManager.measureObjects;
-    // if (measureObjects) {
-    //   measureObjects.childObjects.forEach((item: MeasureObject) => {
-    //     if (item.active) {
-    //       item.remove();
-    //     }
-    //   });
-    // }
-    //面板数据清零
-    (this.viewer.process.commandManager.currentCommand as CommandShowMeasure).commandData.pointPos = [0, 0, 0];
-    this.activeIndex = null;
-  }
-}