three-cad-viewer 1.6.4 → 1.7.1

package/Readme.md

@@ -120,15 +120,46 @@ For the deployment, see [Release.md](./Release.md)
 
 # Changes
 
-v1.5.7
+v1.7.0
 
-- fixed ids of checkboxes to be unique across the document
+- Changed Z orientation to follow standard CAD programs. The old behaviour can be still used by using uo="L" (legacy)
+
+v1.6.4
+
+- add support for color alpha channel
+
+v1.6.3
+
+- Introduce a new parameter "up" that determines whther camera up is Y (up="Y") or Z (up="Z")
+
+v1.6.2
+
+- Fixed bounding box max_dist_from_center algorithm
+
+v1.6.1
+
+- Increase minimum width to 970
+- Handle more button in glassMode function
+- Allow resizing after view is created
+
+v1.6.0
+
+- Disable jupyter cell select on shift mousedown in cad tree
+- Remove bounding box for isolate mode and improve click states
+- Center isolated objects around bounding box center
+- Extend help for picking/hiding/isolating
+- highlight tree node when element picked
+- A new bounding box algorithm (AABB)
+
+v1.5.9
+
+- fixed a regression from v1.5.8 around initial zoom value handling)
 
 v1.5.8
 
 - fixed glass and tools paramewter handling
 - fixed initial zoom for wide cad views with low height
 
-v1.5.9
+v1.5.7
 
-- fixed a regression from v1.5.8 around initial zoom value handling)
+- fixed ids of checkboxes to be unique across the document

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

@@ -54263,7 +54263,7 @@ class NestedGroup {
       this.edgeColor,
       renderback,
     );
-    
+
     if (alpha == null) {
       alpha = 1.0;
     } else if (alpha < 1.0) {
@@ -54296,7 +54296,7 @@ class NestedGroup {
       side: FrontSide,
       visible: states[0] == 1,
     });
-    
+
     const backMaterial = new MeshBasicMaterial({
       color: new Color(this.edgeColor),
       side: BackSide,
@@ -54318,7 +54318,7 @@ class NestedGroup {
 
     const back = new Mesh(shapeGeometry, backMaterial);
     back.name = name;
-    
+
     // ensure, transparent objects will be rendered at the end
     if (alpha < 1.0) {
       back.renderOrder = 999;
@@ -54381,6 +54381,11 @@ class NestedGroup {
             states[shape.id],
           );
       }
+      // support object locations
+      if (shape.loc != null) {
+        mesh.position.set(...shape.loc[0]);
+        mesh.quaternion.set(...shape.loc[1]);
+      }
       return mesh;
     };
 
@@ -54477,7 +54482,7 @@ class NestedGroup {
 }
 
 class Grid {
-  constructor(display, bbox, ticks, axes0, grid) {
+  constructor(display, bbox, ticks, axes0, grid, flipY) {
     if (ticks === undefined) {
       ticks = 10;
     }
@@ -54514,7 +54519,7 @@ class Grid {
     this.gridHelper[1].rotateY(Math.PI / 2);
     this.gridHelper[2].rotateZ(Math.PI / 2);
 
-    this.setCenter(axes0);
+    this.setCenter(axes0, flipY);
 
     this.setVisible();
   }
@@ -54610,13 +54615,13 @@ class Grid {
     this.computeGrid();
   }
 
-  setCenter(axes0) {
+  setCenter(axes0, flipY) {
     if (axes0) {
       for (var i = 0; i < 3; i++) {
         this.gridHelper[i].position.set(0, 0, 0);
       }
       this.gridHelper[0].position.z = -this.size / 2;
-      this.gridHelper[1].position.y = -this.size / 2;
+      this.gridHelper[1].position.y = ((flipY ? 1 : -1) * this.size) / 2;
       this.gridHelper[2].position.x = -this.size / 2;
     } else {
       const c = this.bbox.center();
@@ -54624,7 +54629,7 @@ class Grid {
         this.gridHelper[i].position.set(...c);
       }
       this.gridHelper[0].position.z = -this.size / 2 + c[2];
-      this.gridHelper[1].position.y = -this.size / 2 + c[1];
+      this.gridHelper[1].position.y = ((flipY ? 1 : -1) * this.size) / 2 + c[1];
       this.gridHelper[2].position.x = -this.size / 2 + c[0];
     }
   }
@@ -57386,29 +57391,39 @@ class Controls {
 }
 
 const defaultDirections = {
-  y_up: {
-    iso: new Vector3(1, 1, 1),
-    front: new Vector3(0, 0, 1),
-    rear: new Vector3(0, 0, -1),
-    left: new Vector3(-1, 0, 0), // compatible to fusion 360
-    right: new Vector3(1, 0, 0), // compatible to fusion 360
-    top: new Vector3(0, 1, 0),
-    bottom: new Vector3(0, -1, 0),
+  y_up: {                              // compatible to fusion 360
+    iso: { pos: new Vector3(1, 1, 1), z_rot: 0 },
+    front: { pos: new Vector3(0, 0, 1), z_rot: 0 },
+    rear: { pos: new Vector3(0, 0, -1), z_rot: 0 },
+    left: { pos: new Vector3(-1, 0, 0), z_rot: 0 },
+    right: { pos: new Vector3(1, 0, 0), z_rot: 0 },
+    top: { pos: new Vector3(0, 1, 0), z_rot: 0 },
+    bottom: { pos: new Vector3(0, -1, 0), z_rot: 0 },
   },
-  z_up: {
-    iso: new Vector3(1, 1, 1),
-    front: new Vector3(1, 0, 0),
-    rear: new Vector3(-1, 0, 0),
-    left: new Vector3(0, 1, 0),
-    right: new Vector3(0, -1, 0),
-    top: new Vector3(0, 0, 1),
-    bottom: new Vector3(0, 0, -1),
+  z_up: {                              // compatible to FreeCAD, OnShape
+    iso: { pos: new Vector3(1, -1, 1), z_rot: 0 },
+    front: { pos: new Vector3(0, -1, 0), z_rot: 0 },
+    rear: { pos: new Vector3(0, 1, 0), z_rot: 0 },
+    left: { pos: new Vector3(-1, 0, 0), z_rot: 0 },
+    right: { pos: new Vector3(1, 0, 0), z_rot: 0 },
+    top: { pos: new Vector3(0, 0, 1), z_rot: -Math.PI / 2 },
+    bottom: { pos: new Vector3(0, 0, -1), z_rot: -Math.PI / 2 },
+  },
+  legacy: {                            // legacy Z up
+    iso: { pos: new Vector3(1, 1, 1), z_rot: 0 },
+    front: { pos: new Vector3(1, 0, 0), z_rot: 0 },
+    rear: { pos: new Vector3(-1, 0, 0), z_rot: 0 },
+    left: { pos: new Vector3(0, 1, 0), z_rot: 0 },
+    right: { pos: new Vector3(0, -1, 0), z_rot: 0 },
+    top: { pos: new Vector3(0, 0, 1), z_rot: 0 },
+    bottom: { pos: new Vector3(0, 0, -1), z_rot: 0 },
   }
 };
 
 const cameraUp = {
   y_up: [0, 1, 0],
   z_up: [0, 0, 1],
+  legacy: [0, 0, 1],
 };
 
 class Camera {
@@ -57422,9 +57437,14 @@ class Camera {
    * @param {string} up - Z or Y to define whether Z or Y direction is camera up.
    **/
   constructor(width, height, distance, target, ortho, up) {
+    const mapping = {
+      "Y": "y_up",
+      "Z": "z_up",
+      "L": "legacy"
+    };
     this.target = new Vector3(...target);
     this.ortho = ortho;
-    this.up = (up == "Y") ? "y_up" : "z_up";
+    this.up = mapping[up];
     this.yaxis = new Vector3(0, 1, 0);
     this.zaxis = new Vector3(0, 0, 1);
 
@@ -57531,10 +57551,10 @@ class Camera {
     if (position != null) {
       var cameraPosition = relative
         ? position
-            .clone()
-            .normalize()
-            .multiplyScalar(this.camera_distance)
-            .add(this.target)
+          .clone()
+          .normalize()
+          .multiplyScalar(this.camera_distance)
+          .add(this.target)
         : position;
 
       this.camera.position.set(...cameraPosition.toArray());
@@ -57560,8 +57580,14 @@ class Camera {
       zoom = this.camera.zoom;
     }
     // For the default directions quaternion can be ignored, it will be reset automatically
-    this.setupCamera(true, defaultDirections[this.up][dir], null, zoom);
+    this.setupCamera(true, defaultDirections[this.up][dir].pos, null, zoom);
     this.lookAtTarget();
+    if (defaultDirections[this.up][dir].z_rot != 0) {
+      var quaternion = new Quaternion();
+      quaternion.setFromAxisAngle(new Vector3(0, 0, 1), defaultDirections[this.up][dir].z_rot);
+      quaternion.multiply(this.getQuaternion());
+      this.setQuaternion(quaternion);
+    }
   }
 
   /**
@@ -57665,11 +57691,11 @@ class Camera {
 
     this.pCamera.aspect = aspect;
 
-    this.camera.updateProjectionMatrix();    
+    this.camera.updateProjectionMatrix();
   }
 }
 
-const version="1.6.4";
+const version="1.7.1";
 
 class Viewer {
   /**
@@ -58364,6 +58390,7 @@ class Viewer {
       this.ticks,
       this.axes0,
       this.grid,
+      options.up == "Z",
     );
     this.gridHelper.computeGrid();
 
@@ -58717,7 +58744,7 @@ class Viewer {
       this.treeview.removeLabelHighlight();
     }
   }
-  
+
   /**
    * Handle bounding box and notifications for picked elements
    * @function
@@ -58738,7 +58765,7 @@ class Viewer {
     const object = this.nestedGroup.groups[id];
     const boundingBox = new BoundingBox().setFromObject(object, true);
 
-    if(this.lastBbox != null && this.lastBbox.id === id && !meta && !shift){
+    if (this.lastBbox != null && this.lastBbox.id === id && !meta && !shift) {
       this.removeLastBbox();
     } else {
       if (highlight) {
@@ -58892,7 +58919,7 @@ class Viewer {
    */
   setAxes0 = (flag, notify = true) => {
     this.axes0 = flag;
-    this.gridHelper.setCenter(flag);
+    this.gridHelper.setCenter(flag, this.up == "Z");
     this.display.setAxes0Check(flag);
     this.axesHelper.setCenter(flag);
 
@@ -59576,23 +59603,27 @@ class Viewer {
    * @param {number} treeWidth - new width of navigation tree
    * @param {number} height - new height of CAD View
    * @param {boolean} [glass=false] - Whether to use glass mode or not
-   */  
-  resizeCadView(cadWidth, treeWidth, height, glass=false) {
+   */
+  resizeCadView(cadWidth, treeWidth, height, glass = false) {
     this.cadWidth = cadWidth;
     this.height = height;
-    
+
     // Adapt renderer dimensions
     this.renderer.setSize(cadWidth, height);
 
     // Adapt display dimensions
-    this.display.setSizes({"treeWidth": treeWidth, "cadWidth": cadWidth, "height": height});
+    this.display.setSizes({
+      treeWidth: treeWidth,
+      cadWidth: cadWidth,
+      height: height,
+    });
     this.display.cadView.children[2].style.width = `${cadWidth}px`;
     this.display.cadView.children[2].style.height = `${height}px`;
     this.display.glassMode(glass);
-    
+
     const fullWidth = cadWidth + (glass ? 0 : treeWidth);
     this.display.handleMoreButton(fullWidth);
-    
+
     // Adapt camers to new dimensions
     this.camera.changeDimensions(this.bb_radius, cadWidth, height);