three-cad-viewer 2.2.4 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-cad-viewer",
-  "version": "2.2.4",
+  "version": "2.3.0",
   "description": "",
   "repository": {
     "type": "git",

package/src/_version.js

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

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/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, 2));
 
     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"
       });
     }
 

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 };

package/src/viewer.js

@@ -316,6 +316,12 @@ class Viewer {
       this.roughness,
       this.normalLen,
     );
+    if (shapes.bb) {
+      this.bbox = new BoundingBox(
+        new THREE.Vector3(shapes.bb.xmin, shapes.bb.ymin, shapes.bb.zmin),
+        new THREE.Vector3(shapes.bb.xmax, shapes.bb.ymax, shapes.bb.zmax)
+      );
+    }
     nestedGroup.render(states);
     return nestedGroup;
   }
@@ -374,10 +380,30 @@ class Viewer {
         name: "faces",
         id: `${part.id}/faces`,
       };
+      var triangles;
       const vertices = shape.vertices;
       const normals = shape.normals;
-      for (j = 0; j < shape.triangles.length; j++) {
-        var triangles = shape.triangles[j];
+      const num = (shape.triangles_per_face) ? shape.triangles_per_face.length : shape.triangles.length;
+      var current = 0;
+      for (j = 0; j < num; j++) {
+        if (shape.triangles_per_face) {
+          triangles = shape.triangles.subarray(current, current + 3 * shape.triangles_per_face[j]);
+          current += 3 * shape.triangles_per_face[j];
+        } else {
+          triangles = shape.triangles[j];
+        }
+
+        var vecs = new Float32Array(triangles.length * 3);
+        var norms = new Float32Array(triangles.length * 3);
+        for (var i = 0; i < triangles.length; i++) {
+          var s = triangles[i];
+          vecs[3 * i] = vertices[3 * s];
+          vecs[3 * i + 1] = vertices[3 * s + 1];
+          vecs[3 * i + 2] = vertices[3 * s + 2];
+          norms[3 * i] = normals[3 * s];
+          norms[3 * i + 1] = normals[3 * s + 1];
+          norms[3 * i + 2] = normals[3 * s + 2];
+        }
         var new_shape = {
           loc: [
             [0, 0, 0],
@@ -395,20 +421,8 @@ class Viewer {
           subtype: part.subtype,
           shape: {
             triangles: [...Array(triangles.length).keys()],
-            vertices: triangles
-              .map((s) => [
-                vertices[3 * s],
-                vertices[3 * s + 1],
-                vertices[3 * s + 2],
-              ])
-              .flat(),
-            normals: triangles
-              .map((s) => [
-                normals[3 * s],
-                normals[3 * s + 1],
-                normals[3 * s + 2],
-              ])
-              .flat(),
+            vertices: vecs,
+            normals: norms,
             edges: [],
           },
         };
@@ -433,8 +447,17 @@ class Viewer {
       const multiColor =
         Array.isArray(part.color) && part.color.length == shape.edges.length;
       var color;
-      for (j = 0; j < shape.edges.length; j++) {
-        const edge = shape.edges[j];
+
+      const num = (shape.segments_per_edge) ? shape.segments_per_edge.length : shape.triangles.length;
+      current = 0;
+      var edge;
+      for (j = 0; j < num; j++) {
+        if (shape.segments_per_edge) {
+          edge = shape.edges.subarray(current, current + 6 * shape.segments_per_edge[j]);
+          current += 6 * shape.segments_per_edge[j];
+        } else {
+          edge = shape.edges[j];
+        }
         color = multiColor ? part.color[j] : part.color;
         new_shape = {
           loc: [
@@ -517,8 +540,8 @@ class Viewer {
   renderTessellatedShapes(shapes, states, options) {
     this.setRenderDefaults(options);
     const _render = (shapes, states, measureTools) => {
-      var part, shape;
-      if (shapes.version == 2) {
+      var part;
+      if (shapes.version == 2 || shapes.version == 3) {
         if (measureTools) {
           var i, tmp;
           let parts = [];
@@ -532,17 +555,6 @@ class Viewer {
             }
           }
           shapes.parts = parts;
-        } else {
-          for (i = 0; i < shapes.parts.length; i++) {
-            part = shapes.parts[i];
-            shape = part.shape;
-            if (part.type == "shapes") {
-              shape.triangles = shape.triangles.flat();
-              shape.edges = shape.edges.flat();
-            } else if (part.type == "edges" || part.type == "shapes") {
-              shape.edges = shape.edges.flat();
-            }
-          }
         }
       }
       return shapes;
@@ -871,7 +883,9 @@ class Viewer {
 
     timer.split("rendered nested group");
 
-    this.bbox = this.nestedGroup.boundingBox();
+    if (!this.bbox) {
+      this.bbox = this.nestedGroup.boundingBox();
+    }
     const center = new THREE.Vector3();
     this.bbox.getCenter(center);
     this.bb_max = this.bbox.max_dist_from_center();
@@ -1124,12 +1138,12 @@ class Viewer {
       this.tools,
       this.glass,
     );
-
+    timer.split("ui updated");
     this.display.autoCollapse();
 
     // ensure all for all deselected objects the stencil planes are invisible
     this.setObjects(this.states, true, true);
-
+    timer.split("stencil done");
     //
     // show the rendering
     //
@@ -1144,7 +1158,7 @@ class Viewer {
     //
     // notify calculated results
     //
-
+    timer.split("show done");
     if (this.notifyCallback) {
       this.notifyCallback({
         tab: { old: null, new: this.display.activeTab },
@@ -1155,8 +1169,10 @@ class Viewer {
         clip_normal_2: { old: null, new: this.clipNormal2 },
       });
     }
-    this.update(true, false);
+    timer.split("notification done");
 
+    this.update(true, false);
+    timer.split("update done");
     timer.stop();
   }