three-cad-viewer 2.2.4 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-cad-viewer",
-  "version": "2.2.4",
+  "version": "3.0.2",
   "description": "",
   "repository": {
     "type": "git",
@@ -24,24 +24,24 @@
   "author": "Bernhard Walter",
   "license": "MIT",
   "dependencies": {
-    "three": "0.162.0"
+    "three": "0.166.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/eslint-parser": "^7.23.3",
-    "@rollup/plugin-image": "^3.0.2",
-    "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "eslint": "^8.1.0",
-    "eslint-config-prettier": "^8.3.0",
-    "prettier": "^2.3.2",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.25.3",
+    "@babel/core": "^7.24.7",
+    "@babel/eslint-parser": "^7.24.7",
+    "@rollup/plugin-image": "^3.0.3",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "eslint": "^9.6.0",
+    "eslint-config-prettier": "^9.1.0",
+    "prettier": "^3.3.2",
+    "rimraf": "^6.0.0",
+    "rollup": "^4.18.1",
     "rollup-plugin-html": "^0.2.1",
-    "rollup-plugin-import-css": "^3.3.1",
+    "rollup-plugin-import-css": "^3.5.0",
     "rollup-plugin-livereload": "^2.0.5",
-    "rollup-plugin-serve": "^2.0.2",
+    "rollup-plugin-serve": "^1.1.1",
     "rollup-plugin-string": "^3.0.0"
   },
   "babel": {}
-}
+}

package/src/_version.js

@@ -1 +1 @@
-export const version = "2.2.4";
+export const version = "3.0.2";

package/src/bbox.js

@@ -1,9 +1,6 @@
 import * as THREE from "three";
 
 class BoundingBox extends THREE.Box3 {
-  constructor() {
-    super();
-  }
 
   expandByObject(object, precise = false) {
     object.updateWorldMatrix(false, false);

package/src/cad_tools/measure.js

@@ -440,7 +440,7 @@ class DistanceMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 0.0025;
+    const lineWidth = 1.5;
     const distanceLine = new DistanceLineArrow(
       this.coneLength,
       this.point1,
@@ -494,12 +494,12 @@ class PropertiesMeasurement extends Measurement {
     const subheader = isSolid
       ? "Solid"
       : isVertex
-      ? "Vertex"
-      : isLine
-      ? "Edge"
-      : isFace
-      ? "Face"
-      : "Unknown";
+        ? "Vertex"
+        : isLine
+          ? "Edge"
+          : isFace
+            ? "Face"
+            : "Unknown";
     this.panel.subheader = subheader;
     const debugProps = {
       volume: 0.44,
@@ -526,7 +526,7 @@ class PropertiesMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 0.0025;
+    const lineWidth = 1.5;
 
     const middlePoint = DEBUG
       ? this.selectedShapes[0].obj.children[0].geometry.boundingSphere.center
@@ -600,7 +600,7 @@ class AngleMeasurement extends Measurement {
   }
 
   _makeLines() {
-    const lineWidth = 0.0025;
+    const lineWidth = 1.5;
     this._getPoints();
     const item1Line = new DistanceLineArrow(
       this.coneLength,

package/src/display.js

@@ -89,6 +89,8 @@ class Display {
     this.clipSliders = null;
     this.explodeFlag = false;
 
+    this.currentButton = null;
+
     this.lastPlaneState = false;
 
     var theme;
@@ -676,14 +678,18 @@ class Display {
    */
   setTool = (name, flag) => {
     this.viewer.toggleAnimationLoop(flag);
-    this.viewer.setPickHandler(!flag);
-    this.viewer.setRaycastMode(flag);
 
     if (flag) {
       if (this.viewer.hasAnimation()) {
         this.viewer.backupAnimation();
       }
-
+      if (
+        ["distance", "properties", "angle"].includes(name) &&
+        !["distance", "properties", "angle"].includes(this.currentButton)
+      ) {
+        this.viewer.toggleGroup(true);
+      }
+      this.viewer.setRaycastMode(flag);
       this.shapeFilterDropDownMenu.setRaycaster(this.viewer.raycaster);
 
       if (name == "distance") {
@@ -696,7 +702,12 @@ class Display {
         this.viewer.cadTools.enable(ToolTypes.ANGLE);
         this.viewer.checkChanges({ activeTool: ToolTypes.ANGLE });
       }
+      this.currentButton = name;
     } else {
+      if (this.currentButton == name) {
+        this.viewer.toggleGroup(false);
+        this.currentButton = null;
+      }
       this.viewer.checkChanges({ activeTool: ToolTypes.NONE });
       this.viewer.clearSelection();
       if (this.viewer.hasAnimation()) {
@@ -704,7 +715,9 @@ class Display {
         this.viewer.clearAnimation();
         this.viewer.restoreAnimation();
       }
+      this.viewer.setRaycastMode(flag);
     }
+    this.viewer.setPickHandler(!flag);
     this.shapeFilterDropDownMenu.show(flag);
   };
 
@@ -1019,6 +1032,19 @@ class Display {
     }
   }
 
+  /**
+   * Toggle visibility of the clipping tab
+   * @function
+   */
+  toggleClippingTab = (flag) => {
+    if (flag) {
+      this.tabClip.removeAttribute("disabled");
+    } else {
+      this.tabClip.setAttribute("disabled", "true");
+    }
+    this.tabClip.classList.toggle("tcv_tab-disabled", !flag);
+  };
+
   /**
    * Collapse nodes handler
    * @function

package/src/nestedgroup.js

@@ -5,6 +5,7 @@ import { LineMaterial } from "three/examples/jsm/lines/LineMaterial.js";
 import { VertexNormalsHelper } from "three/examples/jsm/helpers/VertexNormalsHelper.js";
 import { BoundingBox } from "./bbox.js";
 import { ObjectGroup } from "./objectgroup.js";
+import { flatten } from "./utils.js";
 
 class NestedGroup {
   constructor(
@@ -55,7 +56,7 @@ class NestedGroup {
     var positions =
       edgeList instanceof Float32Array
         ? edgeList
-        : new Float32Array(edgeList.flat(2));
+        : new Float32Array(flatten(edgeList, 3));
 
     const lineGeometry = new LineSegmentsGeometry();
     lineGeometry.setPositions(positions);
@@ -103,7 +104,7 @@ class NestedGroup {
     var edges = this._renderEdges(
       edgeList.edges
         ? edgeList.edges // protocol version 2
-        : edgeList, // protocol version 1
+        : flatten(edgeList), // protocol version 1
       lineWidth,
       color,
       state,
@@ -142,8 +143,8 @@ class NestedGroup {
       // protocol version 1
       positions =
         vertexList instanceof Float32Array
-          ? vertexList.flat()
-          : new Float32Array(vertexList.flat());
+          ? vertexList
+          : new Float32Array(flatten(vertexList));
     }
     const geometry = new THREE.BufferGeometry();
     geometry.setAttribute(
@@ -190,15 +191,15 @@ class NestedGroup {
     const positions =
       shape.vertices instanceof Float32Array
         ? shape.vertices
-        : new Float32Array(shape.vertices.flat());
+        : new Float32Array(flatten(shape.vertices));
     const normals =
       shape.normals instanceof Float32Array
         ? shape.normals
-        : new Float32Array(shape.normals.flat());
+        : new Float32Array(flatten(shape.normals));
     const triangles =
       shape.triangles instanceof Uint32Array
         ? shape.triangles
-        : new Uint32Array(shape.triangles.flat());
+        : new Uint32Array(flatten(shape.triangles));
 
     var group = new ObjectGroup(
       this.defaultOpacity,
@@ -273,7 +274,7 @@ class NestedGroup {
         side: THREE.FrontSide,
         visible: states[0] == 1,
         map: texture,
-        name:"frontMaterial"
+        name: "frontMaterial",
       });
     }
 
@@ -296,7 +297,7 @@ class NestedGroup {
       depthTest: true,
       clipIntersection: false,
       visible: states[0] == 1 && (renderback || this.backVisible),
-      name: "backMaterial"
+      name: "backMaterial",
     });
 
     const back = new THREE.Mesh(shapeGeometry, backMaterial);

package/src/timer.js

@@ -4,7 +4,7 @@ class Timer {
     this.timeit = timeit;
     this.start = performance.now();
     if (timeit) {
-      console.info(`three-cad-viewer: Timer ${prefix}:start`);
+      console.info(`three-cad-viewer: ${prefix}:timer start`);
     }
   }
 
@@ -12,7 +12,7 @@ class Timer {
     if (this.timeit) {
       const t = performance.now();
       console.info(
-        `three-cad-viewer: Timer ${this.prefix}:${msg} ${(
+        `three-cad-viewer: ${this.prefix}:${msg}:timer split ${(
           t - this.start
         ).toFixed(1)} ms`,
       );
@@ -23,9 +23,9 @@ class Timer {
     if (this.timeit) {
       const t = performance.now();
       console.info(
-        `three-cad-viewer: Timer ${this.prefix}:stop ${(t - this.start).toFixed(
+        `three-cad-viewer: ${this.prefix}:timer stop ${(t - this.start).toFixed(
           1,
-        )} ms`,
+        )} ms:`,
       );
     }
   }

package/src/utils.js

@@ -11,6 +11,9 @@ function clone(obj) {
     return obj;
   }
 }
+function flatten(arr, depth = 1) {
+  return (Array.isArray(arr)) ? arr.flat(depth) : arr;
+}
 
 function isEqual(obj1, obj2, tol = 1e-9) {
   if (Array.isArray(obj1) && Array.isArray(obj2)) {
@@ -96,4 +99,4 @@ function scaleLight(intensity) {
 
 const KeyMapper = new _KeyMapper();
 
-export { clone, isEqual, sceneTraverse, prettyPrintVector, KeyMapper, scaleLight };
+export { clone, flatten, isEqual, sceneTraverse, prettyPrintVector, KeyMapper, scaleLight };