three-cad-viewer 3.4.1 → 3.4.2

package/dist/three-cad-viewer.css

@@ -47,6 +47,11 @@ canvas {
   outline: none !important;
 }
 
+/* Disables text selection of UI elements */
+body {
+  user-select: none;
+}
+
 .tcv_cad_viewer {
   margin: 0;
   display: flex;
@@ -114,6 +119,7 @@ canvas {
   border-style: solid;
   border-width: 1px;
   overflow: hidden;
+  user-select:text;
 }
 
 .tcv_cad_info_wrapper {

package/dist/three-cad-viewer.esm.js

@@ -57660,25 +57660,35 @@ class Measurement {
       this.panelDragData.y = e.clientY;
       e.stopPropagation();
     });
-    document.addEventListener("mouseup", this._mouseup);
-    document.addEventListener("mousemove", this._dragPanel);
   }
 
   enableContext() {
     this.contextEnabled = true;
     this.panelCenter = new Vector3(1, 0, 0);
+
+    document.addEventListener("mouseup", this._mouseup);
+    document.addEventListener("mousemove", this._dragPanel);
   }
 
   disableContext() {
+    this._hideMeasurement();
     this.contextEnabled = false;
+    this.responseData = null;
+
+    for (var group of this.selectedShapes) {
+      group.obj.clearHighlights();
+    }
     this.selectedShapes = [];
-    this._hideMeasurement();
+
+    document.removeEventListener("mouseup", this._mouseup);
+    document.removeEventListener("mousemove", this._dragPanel);
+
     this.viewer.checkChanges({ selectedShapeIDs: [] });
   }
 
   _hideMeasurement() {
-    this.responseData = null;
     this.panel.show(false);
+    this.disposeArrows();
     this.scene.clear();
   }
 
@@ -57698,6 +57708,10 @@ class Measurement {
     throw new Error("Subclass needs to override this method");
   }
 
+  _updateConnectionLine() {
+    throw new Error("Subclass needs to override this method");
+  }
+
   /**
    * Get the maximum number of selected obj this measurement can handle
    * @returns {int} The numbers of obj handled by the measurement
@@ -57767,7 +57781,6 @@ class Measurement {
    * @param {object} selectedObj The selected obj.
    */
   handleSelection = (selectedObj) => {
-    this._hideMeasurement();
     if (
       this.selectedShapes.find((o) => o.obj.name === selectedObj.obj.name) !==
       undefined
@@ -57827,8 +57840,9 @@ class Measurement {
     camera.updateMatrixWorld();
     this.panelCenter = panelCenter.unproject(camera);
 
-    this.scene.clear();
-    this._makeLines();
+    if (this.scene.children.length > 0) {
+      this._updateConnectionLine();
+    }
   };
 
   /**
@@ -57863,7 +57877,6 @@ class Measurement {
       this.panelY += dy;
     }
 
-    this.scene.clear();
     this._updateMeasurement();
 
     // Update the drag start position
@@ -57903,19 +57916,23 @@ class Measurement {
       (Math.max(this.viewer.cadWidth, this.viewer.height) / 60);
     this._adjustArrowsScaleFactor(zoom);
     this.viewer.renderer.clearDepth();
-    this.viewer.renderer.render(this.scene, camera);
     this._movePanel();
+    this.viewer.renderer.render(this.scene, camera);
   }
 
-  dispose() {
-    document.removeEventListener("mouseup", this._mouseup);
-    document.removeEventListener("mousemove", this._dragPanel);
-
+  disposeArrows() {
     for (var i in this.scene.children) {
       this.scene.children[i].dispose();
-      this.scene.children[i] = null;
     }
-    this.panel.dispose();
+    this.scene.children = [];
+  }
+
+  dispose() {
+    if (this.panel) {
+      this.panel.show(false);
+      this.panel.dispose();
+    }
+    this.disposeArrows();
     this.panel = null;
     this.viewer = null;
     this.scene = null;
@@ -57955,29 +57972,38 @@ class DistanceMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 1.5;
-    const distanceLine = new DistanceLineArrow(
-      this.coneLength,
-      this.point1,
-      this.point2,
-      2 * lineWidth,
-      this.measurementLineColor,
-    );
-    this.scene.add(distanceLine);
-
-    this.middlePoint = new Vector3()
-      .addVectors(this.point1, this.point2)
-      .multiplyScalar(0.5);
-    const connectingLine = new DistanceLineArrow(
-      this.coneLength,
-      this.panelCenter,
-      this.middlePoint,
-      lineWidth,
-      this.connectingLineColor,
-      false,
-      false,
-    );
-    this.scene.add(connectingLine);
+    if (this.scene.children.length === 0) {
+      const lineWidth = 1.5;
+      const distanceLine = new DistanceLineArrow(
+        this.coneLength,
+        this.point1,
+        this.point2,
+        2 * lineWidth,
+        this.measurementLineColor,
+      );
+      this.scene.add(distanceLine);
+
+      this.middlePoint = new Vector3()
+        .addVectors(this.point1, this.point2)
+        .multiplyScalar(0.5);
+      const connectingLine = new DistanceLineArrow(
+        this.coneLength,
+        this.panelCenter,
+        this.middlePoint,
+        lineWidth,
+        this.connectingLineColor,
+        false,
+        false,
+      );
+      this.scene.add(connectingLine);
+    }
+  }
+
+  _updateConnectionLine() {
+    this.scene.children[1].children[0].geometry.setPositions([
+      ...this.middlePoint,
+      ...this.panelCenter,
+    ]);
   }
 
   /**
@@ -58027,18 +58053,27 @@ class PropertiesMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 1.5;
-    this.middlePoint = this.responseData.center;
-    const connectingLine = new DistanceLineArrow(
-      this.coneLength,
-      this.panelCenter,
-      this.middlePoint,
-      lineWidth,
-      this.connectingLineColor,
-      false,
-      false,
-    );
-    this.scene.add(connectingLine);
+    if (this.scene.children.length === 0) {
+      const lineWidth = 1.5;
+      this.middlePoint = this.responseData.center;
+      const connectingLine = new DistanceLineArrow(
+        this.coneLength,
+        this.panelCenter,
+        this.middlePoint,
+        lineWidth,
+        this.connectingLineColor,
+        false,
+        false,
+      );
+      this.scene.add(connectingLine);
+    }
+  }
+
+  _updateConnectionLine() {
+    this.scene.children[0].children[0].geometry.setPositions([
+      ...this.middlePoint,
+      ...this.panelCenter,
+    ]);
   }
 
   /**
@@ -58094,31 +58129,43 @@ class AngleMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 1.5;
-    this._getPoints();
-    const item1Line = new DistanceLineArrow(
-      this.coneLength,
-      this.point1,
-      this.panelCenter,
-      lineWidth,
-      this.connectingLineColor,
-      false,
-      false,
-    );
-    const item2Line = new DistanceLineArrow(
-      this.coneLength,
-      this.point2,
-      this.panelCenter,
-      lineWidth,
-      this.connectingLineColor,
-      false,
-      false,
-    );
-    this.scene.add(item1Line);
-    this.scene.add(item2Line);
-    this.middlePoint = new Vector3()
-      .addVectors(this.point1, this.point2)
-      .multiplyScalar(0.5);
+    if (this.scene.children.length === 0) {
+      const lineWidth = 1.5;
+      this._getPoints();
+      const item1Line = new DistanceLineArrow(
+        this.coneLength,
+        this.point1,
+        this.panelCenter,
+        lineWidth,
+        this.connectingLineColor,
+        false,
+        false,
+      );
+      const item2Line = new DistanceLineArrow(
+        this.coneLength,
+        this.point2,
+        this.panelCenter,
+        lineWidth,
+        this.connectingLineColor,
+        false,
+        false,
+      );
+      this.scene.add(item1Line);
+      this.scene.add(item2Line);
+      this.middlePoint = new Vector3()
+        .addVectors(this.point1, this.point2)
+        .multiplyScalar(0.5);
+    }
+  }
+
+  _updateConnectionLine() {
+    for (var i = 0; i < 2; i++) {
+      const p = i == 0 ? this.point1 : this.point2;
+      this.scene.children[i].children[0].geometry.setPositions([
+        ...p,
+        ...this.panelCenter,
+      ]);
+    }
   }
 
   handleResponse(response) {
@@ -58149,6 +58196,9 @@ class SelectObject {
       this.viewer.raycaster.filters.geomFilter = [GeomFilter.none];
     }
     this.contextEnabled = false;
+    for (var group of this.selectedShapes) {
+      group.obj.clearHighlights();
+    }
     this.selectedShapes = [];
   }
 
@@ -58218,7 +58268,6 @@ class SelectObject {
 
   dispose() {
     this.disableContext();
-    this.selectedShapes = [];
   }
 }
 
@@ -58257,7 +58306,9 @@ class Tools {
    */
   enable(toolType) {
     // Disable the currently enabled tool (if any)
-    this.disable();
+    if (this.enabledTool) {
+      this.disable();
+    }
 
     switch (toolType) {
       case ToolTypes.DISTANCE:
@@ -59163,6 +59214,15 @@ class Display {
         this.viewer.toggleTab(false);
         this.currentButton = null;
       }
+      if (name == "distance") {
+        this.viewer.cadTools.disable(ToolTypes.DISTANCE);
+      } else if (name == "properties") {
+        this.viewer.cadTools.disable(ToolTypes.PROPERTIES);
+      } else if (name == "angle") {
+        this.viewer.cadTools.disable(ToolTypes.ANGLE);
+      } else if (name == "select") {
+        this.viewer.cadTools.disable(ToolTypes.SELECT);
+      }
       this.viewer.checkChanges({ activeTool: ToolTypes.NONE });
       this.viewer.clearSelection();
       if (this.viewer.hasAnimation()) {
@@ -61850,19 +61910,11 @@ class TreeView {
    * Handles the scroll event.
    */
   handleScroll = () => {
-    if (!this.ticking) {
-      window.requestAnimationFrame(() => {
-        const scrollTop = this.scrollContainer.scrollTop;
-        this.lastScrollTop = scrollTop;
-        if (this.debug) {
-          console.log("update => scroll");
-        }
-        this.update();
-
-        this.ticking = false;
-      });
-      this.ticking = true;
+    this.lastScrollTop = this.scrollContainer.scrollTop;
+    if (this.debug) {
+      console.log("update => scroll");
     }
+    this.update();
   };
 
   /**
@@ -65197,7 +65249,7 @@ class Camera {
   }
 }
 
-const version = "3.4.1";
+const version = "3.4.2";
 
 Mesh.prototype.dispose = function () {
   if (this.geometry) {