gs-bim-air 3.0.3 → 3.0.5

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

@@ -1,314 +0,0 @@
-import { MeasureDistanceSelector } from "gs-bim-air-core/gsDevFx/operators/measureDistanceSelector";
-import Measure from "./measure";
-import { Container, Line } from "@svgdotjs/svg.js";
-
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-import { DistanceMeasure, DistanceObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/distanceObject";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { Vector3, ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { projectService } from "../../../../api/projectService";
-import { measureService } from "../../../../api/measureService";
-export default class Distance extends Measure {
-  measureObjects;
-  lineGroup = [];
-
-  lineX;
-  lineY;
-  lineZ;
-
-  rectGroup = [];
-  textGroup = [];
-  line: Line;
-  startCircle;
-  endCircle;
-
-  activeIndex = null;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addMeasureObject(startPoint: Vector3, endPoint: Vector3) {
-    // let measureObjects = this.viewer.measureManager.measureObjects;
-    // if (!measureObjects) {
-    //   measureObjects = new MeasureObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, measureObjects);
-    // }
-    let measureObjects = this.viewer.measureManager.measureObjects;
-    let distanceObject = new DistanceObject(this.viewer);
-    distanceObject.startPoint = startPoint;
-    distanceObject.endPoint = endPoint;
-    // distanceObject.data = [...(startPoint as [number, number, number]), ...(endPoint as [number, number, number])];
-
-    distanceObject.clickFun = (obj: DistanceObject) => {
-      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.distance = obj.distance;
-      instance.commandData.startPos = obj.startPoint.asArray();
-      instance.commandData.endPos = obj.endPoint.asArray();
-      instance.activeMeasureTypeChange(MeasureType.Distance);
-    };
-
-    measureObjects.addChildObject(distanceObject);
-
-    // 画出最新的
-    measureObjects.clearActive();
-    distanceObject.active = true;
-    measureObjects.render();
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    instance.commandData.distance = distanceObject.distance;
-    instance.commandData.startPos = startPoint.asArray();
-    instance.commandData.endPos = endPoint.asArray();
-    instance.activeMeasureTypeChange(MeasureType.Distance);
-
-    measureService
-      .createMeasure(this.viewer.projectSceneManager.currentScene.id, distanceObject.toJson())
-      .then((data) => {
-        distanceObject.fromJson(data as DistanceMeasure);
-      });
-  }
-
-  deleteActiveDistance() {
-    super.deleteActiveMeasure();
-
-    // this.clearActive();
-  }
-
-  // this.clearActive();
-
-  clearActive() {
-    if (this.startCircle) {
-      if (this.rectGroup[this.activeIndex]) {
-        this.rectGroup[this.activeIndex].stroke({ color: "#E09C0D", width: 0 });
-      }
-
-      this.startCircle.remove();
-      this.endCircle.remove();
-
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-
-      this.startCircle = null;
-      this.endCircle = null;
-
-      this.lineX = null;
-      this.lineY = null;
-      this.lineZ = null;
-    }
-
-    super.clearActive();
-  }
-
-  operatorChange() {
-    super.operatorChange();
-
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-
-    // let 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;
-
-    this.viewer.operatorManager.add(this.measureDistanceSelector());
-
-    //切换测量类型时，若激活的对象不是该类型，面板测量数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    let commandShowMeasure = instance;
-    if (commandShowMeasure.activeMeasureType !== MeasureType.Distance) {
-      commandShowMeasure.commandData.distance = 0;
-      commandShowMeasure.commandData.startPos = [0, 0, 0];
-      commandShowMeasure.commandData.endPos = [0, 0, 0];
-    }
-  }
-
-  measureDistanceSelector() {
-    let measureDistanceSelector = new MeasureDistanceSelector();
-    measureDistanceSelector.addMeasure.add((startPoint, endPoint) => {
-      this.addMeasureObject(startPoint, endPoint);
-    });
-
-    let draw = this.svgDraw.draw as Container;
-
-    // let this.startCircle;
-    // let this.line;
-
-    measureDistanceSelector.lButtonDown.add(() => {
-      console.log("lbuttondown", measureDistanceSelector.startPoint, measureDistanceSelector.endPoint);
-      if (measureDistanceSelector.startPoint && !measureDistanceSelector.endPoint) {
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   measureDistanceSelector.startPoint,
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([measureDistanceSelector.startPoint.asArray()])[0];
-
-        let startX = startPixelPos[0];
-        let startY = startPixelPos[1];
-        this.startCircle = draw
-          .circle(10)
-          .fill("#E09C0D")
-          .stroke({
-            color: "#fff",
-            width: 3,
-          })
-          .move(startX - 5, startY - 5);
-      } else {
-        if (this.startCircle) {
-          this.startCircle.remove();
-          this.line.remove();
-        }
-      }
-    });
-
-    let mouseOffsetX;
-    let mouseOffsetY;
-
-    measureDistanceSelector.mouseMove.add((e: ViewerEvent) => {
-      if (measureDistanceSelector.startPoint) {
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   measureDistanceSelector.startPoint,
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([measureDistanceSelector.startPoint.asArray()])[0];
-        let startX = startPixelPos[0];
-        let startY = startPixelPos[1];
-
-        mouseOffsetX = e.mouseEvent().offsetX;
-        mouseOffsetY = e.mouseEvent().offsetY;
-
-        if (this.startCircle) {
-          let startPixelPos = this.viewer.worldPointToPixelPoint([measureDistanceSelector.startPoint.asArray()])[0];
-
-          let startX = startPixelPos[0];
-          let startY = startPixelPos[1];
-          this.startCircle.move(startX - 5, startY - 5);
-        }
-
-        if (this.line) {
-          this.line.remove();
-        }
-        this.line = draw.line(startX, startY, mouseOffsetX, mouseOffsetY).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-      }
-    });
-
-    this.updateTemporarySvg = () => {
-      if (measureDistanceSelector.startPoint && this.startCircle) {
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   measureDistanceSelector.startPoint,
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([measureDistanceSelector.startPoint.asArray()])[0];
-
-        let startX = startPixelPos[0];
-        let startY = startPixelPos[1];
-        this.startCircle.move(startX - 5, startY - 5);
-        if (this.line) {
-          this.line.remove();
-        }
-        this.line = draw.line(startX, startY, mouseOffsetX, mouseOffsetY).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-      }
-    };
-
-    // this.viewer.sceneCameraChanged.add(this.updateTemporarySvg);
-
-    measureDistanceSelector.windowKeyDown.add((e: ViewerEvent) => {
-      let commandShowMeasure = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-      if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Distance) {
-        this.deleteActiveDistance();
-        // saveModel()
-        this.activeIndex = null;
-      }
-      if ((e.uiEvent as any).key === "Escape" && commandShowMeasure.activeMeasureType === MeasureType.Distance) {
-        if (this.line) {
-          this.line.remove();
-          this.line = null;
-        }
-        if (this.startCircle) {
-          this.startCircle.remove();
-          this.startCircle = null;
-        }
-      }
-    });
-    return measureDistanceSelector;
-  }
-
-  end(): void {
-    // this.viewer.sceneCameraChanged.remove(this.updateTemporarySvg);
-    if (this.line) {
-      this.line.remove();
-    }
-    if (this.startCircle) {
-      this.startCircle.remove();
-    }
-  }
-
-  clearAll() {
-    super.clearAll();
-    this.lineGroup.forEach((item) => {
-      item.remove();
-    });
-
-    if (this.startCircle) {
-      this.startCircle.remove();
-      this.endCircle.remove();
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-    }
-
-    this.rectGroup.forEach((item) => {
-      item.remove();
-    });
-    this.textGroup.forEach((item) => {
-      item.remove();
-    });
-
-    this.lineGroup = [];
-
-    this.startCircle = null;
-    this.endCircle = null;
-
-    this.lineX = null;
-    this.lineY = null;
-    this.lineZ = null;
-
-    this.rectGroup = [];
-    this.textGroup = [];
-  }
-}

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

@@ -1,164 +0,0 @@
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-import { MeasureElevationSelector } from "gs-bim-air-core/gsDevFx/operators/measureElevationSelector";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-import Measure from "./measure";
-
-import { ElevationMeasure, ElevationObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/elevationObject";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-import { Vector3, ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { measureService } from "../../../../api/measureService";
-
-export default class Elevation extends Measure {
-  svgDraw: SvgDraw;
-  measureObjects: MeasureObjects;
-
-  lineGroup = [];
-  lineGroup1 = [];
-  lineGroup2 = [];
-
-  rectGroup = [];
-  textGroup = [];
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-    this.svgDraw = svgDraw;
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addMeasureObject(selectPoint: Vector3) {
-    // let measureObjects = this.viewer.measureManager.measureObjects;
-    // if (!measureObjects) {
-    //   measureObjects = new MeasureObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, measureObjects);
-    // }
-
-    let measureObjects = this.viewer.measureManager.measureObjects;
-
-    let elevationObject = new ElevationObject(this.viewer);
-    elevationObject.point = selectPoint;
-    // this.viewer.process.addRenderObject(measureObjects, elevationObject);
-    elevationObject.clickFun = (obj: ElevationObject) => {
-      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.elevationValue = obj.elevation;
-      instance.activeMeasureTypeChange(MeasureType.Elevation);
-    };
-    measureObjects.addChildObject(elevationObject);
-
-    // 画出最新的
-    measureObjects.clearActive();
-    elevationObject.active = true;
-    measureObjects.render();
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    instance.commandData.elevationValue = elevationObject.elevation;
-    instance.activeMeasureTypeChange(MeasureType.Elevation);
-
-    measureService
-      .createMeasure(this.viewer.projectSceneManager.currentScene.id, elevationObject.toJson())
-      .then((data) => {
-        elevationObject.fromJson(data as ElevationMeasure);
-      });
-  }
-
-  deleteActiveElevation() {
-    super.deleteActiveMeasure();
-
-    //删除高程数据时面板数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    let commandShowMeasure = instance;
-    commandShowMeasure.commandData.elevationValue = 0;
-
-    // this.clearActive();
-  }
-
-  clearActive() {
-    if (this.rectGroup[this.activeIndex]) {
-      this.rectGroup[this.activeIndex].stroke({ color: "#E09C0D", width: 0 });
-    }
-    super.clearActive();
-  }
-
-  operatorChange() {
-    super.operatorChange();
-
-    // let 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.measureElevationSelector());
-
-    //切换测量类型时，若激活的对象不是该类型，面板测量数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    let commandShowMeasure = instance;
-    if (commandShowMeasure.activeMeasureType !== MeasureType.Elevation) {
-      commandShowMeasure.commandData.elevationValue = 0;
-    }
-  }
-
-  measureElevationSelector() {
-    let measureElevationSelector = new MeasureElevationSelector();
-    measureElevationSelector.addMeasure.add((selectPoint) => {
-      this.addMeasureObject(selectPoint);
-    });
-
-    measureElevationSelector.lButtonDown.add(() => {
-      console.log("lbuttondown", measureElevationSelector.selectPoint);
-    });
-    measureElevationSelector.mouseMove.add((e: ViewerEvent) => {});
-    measureElevationSelector.rButtonDown.add((e: ViewerEvent) => {});
-    measureElevationSelector.windowKeyDown.add((e: ViewerEvent) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveElevation();
-        // saveModel()
-        this.activeIndex = null;
-      }
-    });
-    return measureElevationSelector;
-  }
-
-  clearAll() {
-    super.clearAll();
-    this.lineGroup.forEach((item) => {
-      item.remove();
-    });
-    this.lineGroup1.forEach((item) => {
-      item.remove();
-    });
-    this.lineGroup2.forEach((item) => {
-      item.remove();
-    });
-
-    this.rectGroup.forEach((item) => {
-      item.remove();
-    });
-    this.textGroup.forEach((item) => {
-      item.remove();
-    });
-  }
-}

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

@@ -1,48 +0,0 @@
-import * as Longan from "gs-longan";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { measureService } from "../../../../api/measureService";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-
-export default class Measure {
-  viewer: Viewer;
-  svgDraw: SvgDraw;
-  // currentSelector: Longan.ViewerOperator
-  activeIndex = null;
-  updateTemporarySvg: () => void;
-
-  // group: G = null;
-
-  constructor(svgDraw, viewer) {
-    this.svgDraw = svgDraw;
-    this.viewer = viewer;
-  }
-
-  begin() {}
-
-  end() {}
-
-  operatorChange() {
-    this.viewer.operatorManager.clear();
-    this.viewer.operatorManager.add(new CameraMouse());
-  }
-
-  clearActive() {
-    this.activeIndex = null;
-  }
-
-  clearAll() {}
-
-  deleteActiveMeasure() {
-    let measureObjects = this.viewer.measureManager.measureObjects;
-
-    if (measureObjects) {
-      measureObjects.childObjects.forEach((item: MeasureObject) => {
-        if (item.active) {
-          item.remove();
-        }
-      });
-    }
-  }
-}