@inweb/viewer-visualize 27.2.1 → 27.2.3

package/lib/Viewer/Draggers/OdBaseCuttingPlaneDragger.d.ts

@@ -1,18 +1,15 @@
 import { Viewer } from "../Viewer";
-import { Point2d, Point3d } from "./Common/Geometry";
+import { Point3d } from "./Common/Geometry";
 import { OdBaseDragger } from "./Common/OdBaseDragger";
 export declare class OdBaseCuttingPlaneDragger extends OdBaseDragger {
-    protected m_size_x: number;
-    protected m_size_y: number;
-    protected m_size_z: number;
+    protected m_size: number;
     protected m_center: Point3d;
     protected m_normal: number[];
     protected index: number;
     protected m_model: any;
     protected m_entity: any;
-    protected planePreview: any;
+    protected m_planePreview: any;
     protected m_last: Point3d;
-    protected m_click: Point2d;
     constructor(subject: Viewer);
     dispose(): void;
     createNormal(): number[];
@@ -21,6 +18,7 @@ export declare class OdBaseCuttingPlaneDragger extends OdBaseDragger {
     start(x: number, y: number): void;
     drag(x: number, y: number): void;
     end(x: number, y: number): void;
+    dblclick(ev: MouseEvent): void;
     createPreview(): void;
     drawPreview(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "27.2.1",
+  "version": "27.2.3",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using VisualizeJS",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~27.2.1",
-    "@inweb/eventemitter2": "~27.2.1",
-    "@inweb/markup": "~27.2.1",
-    "@inweb/viewer-core": "~27.2.1"
+    "@inweb/client": "~27.2.3",
+    "@inweb/eventemitter2": "~27.2.3",
+    "@inweb/markup": "~27.2.3",
+    "@inweb/viewer-core": "~27.2.3"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Draggers/OdBaseCuttingPlaneDragger.ts

@@ -21,21 +21,18 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 import { Viewer } from "../Viewer";
-import { Point2d, Point3d } from "./Common/Geometry";
+import { Point3d } from "./Common/Geometry";
 import { OdBaseDragger } from "./Common/OdBaseDragger";
 
 export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
-  protected m_size_x: number;
-  protected m_size_y: number;
-  protected m_size_z: number;
+  protected m_size: number;
   protected m_center: Point3d;
   protected m_normal: number[];
   protected index: number;
   protected m_model: any;
   protected m_entity: any;
-  protected planePreview: any;
+  protected m_planePreview: any;
   protected m_last: Point3d;
-  protected m_click: Point2d;
 
   constructor(subject: Viewer) {
     super(subject);
@@ -47,9 +44,11 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
     const min = ext.min();
     const max = ext.max();
 
-    this.m_size_x = Math.abs(max[0] - min[0]) / 2;
-    this.m_size_y = Math.abs(max[1] - min[1]) / 2;
-    this.m_size_z = Math.abs(max[2] - min[2]) / 2;
+    const sizeX = Math.abs(max[0] - min[0]);
+    const sizeY = Math.abs(max[1] - min[1]);
+    const sizeZ = Math.abs(max[2] - min[2]);
+
+    this.m_size = Math.sqrt(sizeX * sizeX + sizeY * sizeY + sizeZ * sizeZ) || 1;
 
     this.m_center = this.toPoint(ext.center());
     this.m_normal = this.createNormal();
@@ -63,7 +62,7 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
     const { red, green, blue } = this.subject.options.cuttingPlaneFillColor;
     avp.setEnableCuttingPlaneFill(true, red, green, blue);
-    avp.setCuttingPlaneFillPatternEnabled(true, this.m_module.CuttingPlaneFillStyle.kHorizontalBars, 0x0, 0x0, 0x0);
+    avp.setCuttingPlaneFillPatternEnabled(true, this.m_module.CuttingPlaneFillStyle.kSlantRight, 0x0, 0x0, 0x0);
 
     this.m_model = this.getModel();
     this.createPreview();
@@ -76,9 +75,9 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
     if (this.m_entity) {
       this.m_model.removeEntity(this.m_entity);
-      this.deleteAll([this.m_model, this.m_entity, this.planePreview, this.m_center]);
+      this.deleteAll([this.m_model, this.m_entity, this.m_planePreview, this.m_center]);
       this.m_entity = null;
-      this.planePreview = null;
+      this.m_planePreview = null;
       this.subject.update();
     }
   }
@@ -98,7 +97,6 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
   override start(x: number, y: number): void {
     this.press = true;
     this.m_last = this.screenToWorld(x, y);
-    this.m_click = { x, y };
   }
 
   override drag(x: number, y: number): void {
@@ -114,12 +112,12 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
       const avp = this.getViewer().activeView;
       const plane = this.createPlane();
-      const newPlane = plane.set(this.toGePoint(this.m_center), this.m_normal);
-      const newCutting = avp.updateCuttingPlane(this.index, plane);
+      plane.set(this.toGePoint(this.m_center), this.m_normal);
+      avp.updateCuttingPlane(this.index, plane);
 
       this.drawPreview();
 
-      this.deleteAll([avp, plane, oldCenter, delta, oldLast, newPlane, newCutting]);
+      this.deleteAll([avp, plane, oldCenter, delta, oldLast]);
 
       const device = this.getViewer().getActiveDevice();
       device.invalidate(device.getSize());
@@ -128,19 +126,20 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
   override end(x: number, y: number): void {
     this.press = false;
-    if (x === this.m_click.x && y === this.m_click.y) {
-      this.m_normal = [this.m_normal[0] * -1, this.m_normal[1] * -1, this.m_normal[2] * -1];
+  }
 
-      const avp = this.getViewer().activeView;
-      const plane = this.createPlane();
-      plane.set(this.toGePoint(this.m_center), this.m_normal);
-      avp.updateCuttingPlane(this.index, plane);
+  override dblclick(ev: MouseEvent): void {
+    this.m_normal = [this.m_normal[0] * -1, this.m_normal[1] * -1, this.m_normal[2] * -1];
 
-      this.deleteAll([avp, plane, this.m_last]);
+    const avp = this.getViewer().activeView;
+    const plane = this.createPlane();
+    plane.set(this.toGePoint(this.m_center), this.m_normal);
+    avp.updateCuttingPlane(this.index, plane);
 
-      const device = this.getViewer().getActiveDevice();
-      device.invalidate(device.getSize());
-    }
+    this.deleteAll([avp, plane, this.m_last]);
+
+    const device = this.getViewer().getActiveDevice();
+    device.invalidate(device.getSize());
   }
 
   createPreview(): void {
@@ -148,35 +147,30 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
     const GeometryTypes = this.m_module.GeometryTypes;
 
-    const transparencyDef = new this.m_module.OdTvTransparencyDef();
-    const colorDef = new this.m_module.OdTvColorDef(112, 112, 112); //0x53, 0x72, 0xAE
+    const facesColorDef = new this.m_module.OdTvColorDef(0xf0, 0xf0, 0xf0);
+    const facesTransparencyDef = new this.m_module.OdTvTransparencyDef(0.7);
 
-    transparencyDef.setValue(0.9);
+    const edgesColorDef = new this.m_module.OdTvColorDef(0xd0, 0xd0, 0xd0);
 
     const entityPtr = this.m_entity.openObject();
-    entityPtr.setColor(colorDef, GeometryTypes.kFaces.value);
 
-    colorDef.setColor(112, 112, 112); //0xcd, 0xe2, 0xff
-    entityPtr.setColor(colorDef, GeometryTypes.kEdges.value);
+    entityPtr.setColor(facesColorDef, GeometryTypes.kFaces);
+    entityPtr.setTransparency(facesTransparencyDef, GeometryTypes.kFaces);
 
-    entityPtr.setLineWeight(5);
+    entityPtr.setColor(edgesColorDef, GeometryTypes.kEdges);
 
-    entityPtr.setTransparency(transparencyDef, GeometryTypes.kFaces);
-    transparencyDef.setValue(1.0);
-    entityPtr.setTransparency(transparencyDef, GeometryTypes.kEdges);
+    entityPtr.setLineWeight(2);
 
-    this.planePreview = entityPtr.appendPolygon(this.getPlanePreviewCoordinate());
-    const polygonPtr = this.planePreview.openAsPolygon();
+    this.m_planePreview = entityPtr.appendPolygon(this.getPlanePreviewCoordinate());
+    const polygonPtr = this.m_planePreview.openAsPolygon();
     polygonPtr.setFilled(true);
 
-    this.deleteAll([transparencyDef, colorDef, entityPtr, polygonPtr, GeometryTypes]);
-    this.subject.syncOverlay();
+    this.deleteAll([facesColorDef, facesTransparencyDef, edgesColorDef, entityPtr, polygonPtr, GeometryTypes]);
   }
 
   drawPreview(): void {
-    const polygonPtr = this.planePreview.openAsPolygon();
+    const polygonPtr = this.m_planePreview.openAsPolygon();
     polygonPtr.setPoints(this.getPlanePreviewCoordinate());
     this.deleteAll([polygonPtr]);
-    this.subject.syncOverlay();
   }
 }

package/src/Viewer/Draggers/OdCuttingPlaneXAxisDragger.ts

@@ -35,19 +35,20 @@ export class OdCuttingPlaneXAxisDragger extends OdBaseCuttingPlaneDragger {
   }
 
   override getPlanePreviewCoordinate(): number[] {
+    const halfSize = this.m_size / 2;
     return [
       this.m_center.x,
-      this.m_center.y - this.m_size_y,
-      this.m_center.z - this.m_size_z,
+      this.m_center.y - halfSize,
+      this.m_center.z - halfSize,
       this.m_center.x,
-      this.m_center.y + this.m_size_y,
-      this.m_center.z - this.m_size_z,
+      this.m_center.y + halfSize,
+      this.m_center.z - halfSize,
       this.m_center.x,
-      this.m_center.y + this.m_size_y,
-      this.m_center.z + this.m_size_z,
+      this.m_center.y + halfSize,
+      this.m_center.z + halfSize,
       this.m_center.x,
-      this.m_center.y - this.m_size_y,
-      this.m_center.z + this.m_size_z,
+      this.m_center.y - halfSize,
+      this.m_center.z + halfSize,
     ];
   }
 }

package/src/Viewer/Draggers/OdCuttingPlaneYAxisDragger.ts

@@ -35,19 +35,20 @@ export class OdCuttingPlaneYAxisDragger extends OdBaseCuttingPlaneDragger {
   }
 
   override getPlanePreviewCoordinate(): number[] {
+    const halfSize = this.m_size / 2;
     return [
-      this.m_center.x - this.m_size_x,
+      this.m_center.x - halfSize,
       this.m_center.y,
-      this.m_center.z - this.m_size_z,
-      this.m_center.x + this.m_size_x,
+      this.m_center.z - halfSize,
+      this.m_center.x + halfSize,
       this.m_center.y,
-      this.m_center.z - this.m_size_z,
-      this.m_center.x + this.m_size_x,
+      this.m_center.z - halfSize,
+      this.m_center.x + halfSize,
       this.m_center.y,
-      this.m_center.z + this.m_size_z,
-      this.m_center.x - this.m_size_x,
+      this.m_center.z + halfSize,
+      this.m_center.x - halfSize,
       this.m_center.y,
-      this.m_center.z + this.m_size_z,
+      this.m_center.z + halfSize,
     ];
   }
 }

package/src/Viewer/Draggers/OdCuttingPlaneZAxisDragger.ts

@@ -35,18 +35,19 @@ export class OdCuttingPlaneZAxisDragger extends OdBaseCuttingPlaneDragger {
   }
 
   override getPlanePreviewCoordinate(): number[] {
+    const halfSize = this.m_size / 2;
     return [
-      this.m_center.x - this.m_size_x,
-      this.m_center.y - this.m_size_y,
+      this.m_center.x - halfSize,
+      this.m_center.y - halfSize,
       this.m_center.z,
-      this.m_center.x + this.m_size_x,
-      this.m_center.y - this.m_size_y,
+      this.m_center.x + halfSize,
+      this.m_center.y - halfSize,
       this.m_center.z,
-      this.m_center.x + this.m_size_x,
-      this.m_center.y + this.m_size_y,
+      this.m_center.x + halfSize,
+      this.m_center.y + halfSize,
       this.m_center.z,
-      this.m_center.x - this.m_size_x,
-      this.m_center.y + this.m_size_y,
+      this.m_center.x - halfSize,
+      this.m_center.y + halfSize,
       this.m_center.z,
     ];
   }

package/src/Viewer/Viewer.ts

@@ -801,6 +801,8 @@ export class Viewer
     if (!this.visualizeJs) return;
 
     this._markup.clearOverlay();
+
+    this.emitEvent({ type: "clearoverlay" });
     this.update();
   }
 
@@ -812,6 +814,7 @@ export class Viewer
     activeView.removeCuttingPlanes();
     activeView.delete();
 
+    this.emitEvent({ type: "clearslices" });
     this.update();
   }