@inweb/viewer-visualize 27.4.7 → 27.6.0

package/lib/Viewer/Components/CameraComponent.d.ts

@@ -6,6 +6,6 @@ export declare class CameraComponent implements IComponent {
     dispose(): void;
     getCameraMode(view: any): CameraMode;
     switchCameraMode(mode: CameraMode): void;
-    optionsChange: () => void;
+    syncOptions: () => void;
     geometryEnd: () => void;
 }

package/lib/Viewer/Draggers/MeasureLineDragger/index.d.ts

@@ -23,6 +23,6 @@ export declare class MeasureLineDragger extends OdBaseDragger {
     end(): void;
     createNewMeasureIfNeed(): void;
     createMeasureLine(): MeasureLineItem;
-    optionsChange(event: any): void;
+    updateUnits(event: any): void;
     getKUnitByName(unitName: string): any;
 }

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

@@ -3,7 +3,6 @@ import { OdBaseDragger } from "./Common/OdBaseDragger";
 export declare const MARKUP_ENTITY_LINE = "$MarkupTempEntity_Line";
 export declare class OdaLineDragger extends OdBaseDragger {
     protected entity: any;
-    protected points: any[];
     protected drawPoints: any[];
     constructor(subject: Viewer);
     dispose(): void;

package/lib/Viewer/Markup/Visualize/VisualizeMarkup.d.ts

@@ -9,7 +9,7 @@ export declare class VisualizeMarkup implements IMarkup {
         b: number;
     };
     lineWidth: number;
-    lineType: "solid";
+    lineType: string;
     fontSize: number;
     initialize(container: HTMLElement, containerEvents: string[], viewer?: IEventEmitter, worldTransformer?: IWorldTransform): void;
     dispose(): void;

package/lib/Viewer/Viewer.d.ts

@@ -23,7 +23,6 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     private _crossOrigin;
     private _activeDragger;
     private _components;
-    private _updateDelay;
     private _renderNeeded;
     private _renderTime;
     private _enableAutoUpdate;
@@ -132,10 +131,11 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
      * - {@link UpdateEvent | update}
      * - {@link RenderEvent | render}
      *
-     * @param force - If `true` updates the viewer immidietly. Otherwise updates on next animation frame.
-     *   Default is `false`.
+     * @param force - If `true` updates the viewer immidietly. If a `number` is specified and more than the
+     *   given amount of milliseconds has elapsed since the last rendering, the update is performed
+     *   immediately as well. Otherwise updates on next animation frame. Default is `false`.
      */
-    update(force?: boolean): void;
+    update(force?: boolean | number): void;
     render(time?: DOMHighResTimeStamp): void;
     loadReferences(model: Model | File | Assembly): Promise<this>;
     applyModelTransformMatrix(model: Model | Assembly): void;
@@ -232,7 +232,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     activeDragger(): IDragger | null;
     setActiveDragger(name?: string): IDragger | null;
     resetActiveDragger(): void;
-    getComponent(name: string): IComponent;
+    getComponent(name: string): IComponent | null;
     drawViewpoint(viewpoint: IViewpoint): void;
     createViewpoint(): IViewpoint;
     getSnapshot(type?: string, quality?: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "27.4.7",
+  "version": "27.6.0",
   "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.4.7",
-    "@inweb/eventemitter2": "~27.4.7",
-    "@inweb/markup": "~27.4.7",
-    "@inweb/viewer-core": "~27.4.7"
+    "@inweb/client": "~27.6.0",
+    "@inweb/eventemitter2": "~27.6.0",
+    "@inweb/markup": "~27.6.0",
+    "@inweb/viewer-core": "~27.6.0"
   },
-  "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/27.4/Visualize.js"
+  "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Commands/SetSelected2.ts

@@ -24,7 +24,7 @@
 import { Viewer } from "../Viewer";
 
 export function setSelected2(viewer: Viewer, handles2: string[] = []): void {
-  const handles = [];
+  const handles: string[] = [];
 
   handles2.forEach((handle) => {
     if (!handle.includes(":")) {

package/src/Viewer/Commands/index.ts

@@ -106,18 +106,29 @@ commands.registerCommand("zoomToObjects", zoomToObjects);
 commands.registerCommand("zoomToSelected", zoomToSelected);
 commands.registerCommand("autoTransformAllModelsToCentralPoint", autoTransformAllModelsToCentralPoint);
 
-commands.registerCommand("k3DViewTop", (viewer) => setDefaultViewPosition(viewer, "k3DViewTop"));
-commands.registerCommand("k3DViewBottom", (viewer) => setDefaultViewPosition(viewer, "k3DViewBottom"));
-commands.registerCommand("k3DViewLeft", (viewer) => setDefaultViewPosition(viewer, "k3DViewLeft"));
-commands.registerCommand("k3DViewRight", (viewer) => setDefaultViewPosition(viewer, "k3DViewRight"));
-commands.registerCommand("k3DViewFront", (viewer) => setDefaultViewPosition(viewer, "k3DViewFront"));
-commands.registerCommand("k3DViewBack", (viewer) => setDefaultViewPosition(viewer, "k3DViewBack"));
-commands.registerCommand("k3DViewSE", (viewer) => setDefaultViewPosition(viewer, "k3DViewSE"));
-commands.registerCommand("k3DViewSW", (viewer) => setDefaultViewPosition(viewer, "k3DViewSW"));
-commands.registerCommand("k3DViewNE", (viewer) => setDefaultViewPosition(viewer, "k3DViewNE"));
-commands.registerCommand("k3DViewNW", (viewer) => setDefaultViewPosition(viewer, "k3DViewNW"));
+commands.registerCommand("top", (viewer) => setDefaultViewPosition(viewer, "k3DViewTop"));
+commands.registerCommand("bottom", (viewer) => setDefaultViewPosition(viewer, "k3DViewBottom"));
+commands.registerCommand("left", (viewer) => setDefaultViewPosition(viewer, "k3DViewLeft"));
+commands.registerCommand("right", (viewer) => setDefaultViewPosition(viewer, "k3DViewRight"));
+commands.registerCommand("front", (viewer) => setDefaultViewPosition(viewer, "k3DViewFront"));
+commands.registerCommand("back", (viewer) => setDefaultViewPosition(viewer, "k3DViewBack"));
+commands.registerCommand("se", (viewer) => setDefaultViewPosition(viewer, "k3DViewSE"));
+commands.registerCommand("sw", (viewer) => setDefaultViewPosition(viewer, "k3DViewSW"));
+commands.registerCommand("ne", (viewer) => setDefaultViewPosition(viewer, "k3DViewNE"));
+commands.registerCommand("nw", (viewer) => setDefaultViewPosition(viewer, "k3DViewNW"));
 
 commands.registerCommandAlias("clearMarkup", "clearOverlay");
 commands.registerCommandAlias("clearSelected", "unselect");
 commands.registerCommandAlias("getSnapshot", "createPreview");
 commands.registerCommandAlias("zoomToExtents", "zoomExtents");
+
+commands.registerCommandAlias("top", "k3DViewTop");
+commands.registerCommandAlias("bottom", "k3DViewBottom");
+commands.registerCommandAlias("left", "k3DViewLeft");
+commands.registerCommandAlias("right", "k3DViewRight");
+commands.registerCommandAlias("front", "k3DViewFront");
+commands.registerCommandAlias("back", "k3DViewBack");
+commands.registerCommandAlias("se", "k3DViewSE");
+commands.registerCommandAlias("sw", "k3DViewSW");
+commands.registerCommandAlias("ne", "k3DViewNE");
+commands.registerCommandAlias("nw", "k3DViewNW");

package/src/Viewer/Components/CameraComponent.ts

@@ -31,15 +31,15 @@ export class CameraComponent implements IComponent {
     this.viewer = viewer;
     this.viewer.addEventListener("databasechunk", this.geometryEnd);
     this.viewer.addEventListener("clear", this.geometryEnd);
-    this.viewer.addEventListener("optionschange", this.optionsChange);
-    this.viewer.addEventListener("initialize", this.optionsChange);
+    this.viewer.addEventListener("optionschange", this.syncOptions);
+    this.viewer.addEventListener("initialize", this.syncOptions);
   }
 
   dispose() {
     this.viewer.removeEventListener("databasechunk", this.geometryEnd);
     this.viewer.removeEventListener("clear", this.geometryEnd);
-    this.viewer.removeEventListener("optionschange", this.optionsChange);
-    this.viewer.removeEventListener("initialize", this.optionsChange);
+    this.viewer.removeEventListener("optionschange", this.syncOptions);
+    this.viewer.removeEventListener("initialize", this.syncOptions);
   }
 
   getCameraMode(view: any): CameraMode {
@@ -61,7 +61,7 @@ export class CameraComponent implements IComponent {
     activeView.delete();
   }
 
-  optionsChange = () => {
+  syncOptions = () => {
     this.switchCameraMode(this.viewer.options.cameraMode);
   };
 

package/src/Viewer/Components/CanvasRemoveComponent.ts

@@ -36,7 +36,6 @@ export class CanvasRemoveComponent implements IComponent {
 
   dispose() {
     this.mutationObserver.disconnect();
-    this.mutationObserver = undefined;
   }
 
   cleanupViewer = (mutations: MutationRecord[]) => {

package/src/Viewer/Components/GestureManagerComponent.ts

@@ -34,6 +34,5 @@ export class GestureManagerComponent implements IComponent {
 
   dispose() {
     this.gestureManager.dispose();
-    this.gestureManager = undefined;
   }
 }

package/src/Viewer/Components/ZoomWheelComponent.ts

@@ -35,6 +35,5 @@ export class ZoomWheelComponent implements IComponent {
 
   dispose() {
     this.zoomWheelDragger.dispose();
-    this.zoomWheelDragger = undefined;
   }
 }

package/src/Viewer/Draggers/Common/OdBaseDragger.ts

@@ -37,7 +37,7 @@ export class OdBaseDragger extends OdaGeAction {
   protected isDragging: boolean;
   protected press: boolean;
 
-  public name: string;
+  public name = "";
 
   constructor(subject: Viewer) {
     super(subject.visualizeJs);
@@ -45,6 +45,8 @@ export class OdBaseDragger extends OdaGeAction {
     this.needInputText = false;
     this.mouseDownPosition = { x: 0, y: 0 };
     this.autoSelect = false;
+    this.isDragging = false;
+    this.press = false;
 
     this.pointerdown = this.pointerdown.bind(this);
     this.pointerup = this.pointerup.bind(this);

package/src/Viewer/Draggers/MeasureLineDragger/MeasureUtils.ts

@@ -142,8 +142,8 @@ export function getDataForDrawLineWithFixed(p1: Point2d, p2: Point2d, width: num
   checkSegmentsIntersect(p1, p2, pLB, pRB, intersects);
   checkSegmentsIntersect(p1, p2, pRB, pRU, intersects);
 
-  let fixedP1: Point2d = null;
-  let fixedP2: Point2d = null;
+  let fixedP1: Point2d | null = null;
+  let fixedP2: Point2d | null = null;
 
   if (intersects.length === 0) {
     fixedP1 = p1;

package/src/Viewer/Draggers/MeasureLineDragger/index.ts

@@ -78,10 +78,10 @@ export class MeasureLineDragger extends OdBaseDragger {
     this.m_overlayElement.style.pointerEvents = "none";
     document.body.appendChild(this.m_overlayElement);
 
-    this.optionsChange = this.optionsChange.bind(this);
+    this.updateUnits = this.updateUnits.bind(this);
     this.updatePreview = this.updatePreview.bind(this);
 
-    this.subject.addEventListener("optionschange", this.optionsChange);
+    this.subject.addEventListener("optionschange", this.updateUnits);
     this.subject.addEventListener("render", this.updatePreview);
 
     this.resize();
@@ -92,7 +92,7 @@ export class MeasureLineDragger extends OdBaseDragger {
 
     this.m_overlayElement.remove();
 
-    this.subject.removeEventListener("optionschange", this.optionsChange);
+    this.subject.removeEventListener("optionschange", this.updateUnits);
     this.subject.removeEventListener("render", this.updatePreview);
   }
 
@@ -209,7 +209,7 @@ export class MeasureLineDragger extends OdBaseDragger {
     return item;
   }
 
-  optionsChange(event): void {
+  updateUnits(event): void {
     const options: IOptions = event.data;
     const toUnitName = options.rulerUnit ?? "Default";
     const toPrecision = options.rulerPrecision ?? "Default";

package/src/Viewer/Draggers/OdBaseCuttingPlaneDragger.ts

@@ -59,10 +59,9 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
 
     avp.addCuttingPlane(plane);
     this.index = avp.numCuttingPlanes() - 1;
+    this.subject.syncOptions(); // <- sync cutting plane fill options
 
-    const { red, green, blue } = this.subject.options.cuttingPlaneFillColor;
-    avp.setEnableCuttingPlaneFill(true, red, green, blue);
-    avp.setCuttingPlaneFillPatternEnabled(true, this.m_module.CuttingPlaneFillStyle.kSlantRight, 0x0, 0x0, 0x0);
+    this.subject.emitEvent({ type: "changecuttingplanes" });
 
     this.m_model = this.getModel();
     this.createPreview();
@@ -115,6 +114,8 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
       plane.set(this.toGePoint(this.m_center), this.m_normal);
       avp.updateCuttingPlane(this.index, plane);
 
+      this.subject.emitEvent({ type: "changecuttingplanes" });
+
       this.drawPreview();
 
       this.deleteAll([avp, plane, oldCenter, delta, oldLast]);
@@ -136,6 +137,8 @@ export class OdBaseCuttingPlaneDragger extends OdBaseDragger {
     plane.set(this.toGePoint(this.m_center), this.m_normal);
     avp.updateCuttingPlane(this.index, plane);
 
+    this.subject.emitEvent({ type: "changecuttingplanes" });
+
     this.deleteAll([avp, plane, this.m_last]);
 
     const device = this.getViewer().getActiveDevice();

package/src/Viewer/Draggers/OdCuttingPlaneZAxisDragger.ts

@@ -25,7 +25,7 @@ import { OdBaseCuttingPlaneDragger } from "./OdBaseCuttingPlaneDragger";
 
 export class OdCuttingPlaneZAxisDragger extends OdBaseCuttingPlaneDragger {
   override createNormal(): number[] {
-    return [0, 0, 1];
+    return [0, 0, -1];
   }
 
   override handleDelta(delta: Point3d): Point3d {

package/src/Viewer/Draggers/OdaLineDragger.ts

@@ -27,24 +27,23 @@ export const MARKUP_ENTITY_LINE = "$MarkupTempEntity_Line";
 
 export class OdaLineDragger extends OdBaseDragger {
   protected entity: any;
-  protected points: any[];
   protected drawPoints: any[];
 
   constructor(subject: Viewer) {
     super(subject);
     this.press = false;
+    this.drawPoints = [];
   }
 
   override dispose(): void {
     super.dispose();
     this.end();
-    this.points = null;
-    this.drawPoints = null;
+    this.drawPoints.length = 0;
   }
 
   override start(x: number, y: number): void {
     const point = this.getViewer().screenToWorld(x, y);
-    this.drawPoints = [point[0], point[1], point[2]];
+    this.drawPoints.push(point[0], point[1], point[2]);
   }
 
   override drag(x: number, y: number): void {
@@ -58,7 +57,7 @@ export class OdaLineDragger extends OdBaseDragger {
   override end(): void {
     if (this.entity) {
       this.entity.delete();
-      this.drawPoints = null;
+      this.drawPoints.length = 0;
       this.entity = null;
     }
   }

package/src/Viewer/Loaders/FileLoader.ts

@@ -24,12 +24,11 @@
 export class FileLoader {
   private requestHeader: HeadersInit;
   private withCredentials: boolean;
-  private abortSignal: AbortSignal;
+  private abortSignal: AbortSignal | undefined;
 
   constructor() {
     this.requestHeader = {};
     this.withCredentials = false;
-    this.abortSignal = undefined;
   }
 
   setRequestHeader(requestHeader: HeadersInit) {
@@ -56,13 +55,16 @@ export class FileLoader {
         .then((response) => {
           if (!response.ok) throw new Error(`Failed to fetch "${response.url}", status ${response.status}`);
 
+          const body = response.body;
+          if (!body) return response;
+
           const contentLength = response.headers.get("X-File-Size") || response.headers.get("Content-Length");
           const total = parseInt(contentLength || "", 10) || 0;
           const lengthComputable = total > 0;
 
           const stream = new ReadableStream({
             async start(controller) {
-              const reader = response.body.getReader();
+              const reader = body.getReader();
               let loaded = 0;
               try {
                 while (true) {
@@ -91,7 +93,7 @@ export class FileLoader {
         const reader = new FileReader();
         reader.onload = () => resolve(reader.result as any);
         reader.onerror = () => reject(reader.error);
-        reader.onprogress = onProgress;
+        reader.onprogress = onProgress || null;
         reader.readAsArrayBuffer(new Blob([file]));
       });
     }

package/src/Viewer/Loaders/VSFFileLoader.ts

@@ -34,7 +34,7 @@ export class VSFFileLoader extends Loader {
     this.viewer = viewer;
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /vsf$/i.test(format)

package/src/Viewer/Loaders/VSFXCloudPartialLoader.ts

@@ -52,6 +52,8 @@ export class VSFXCloudPartialLoader extends Loader {
   override async load(model: any): Promise<this> {
     if (!this.viewer.visualizeJs) return this;
 
+    type Range = { requestId: number; begin: number; end: number };
+
     const visViewer = this.viewer.visViewer();
     visViewer.memoryLimit = this.viewer.options.memoryLimit;
 
@@ -90,11 +92,11 @@ export class VSFXCloudPartialLoader extends Loader {
         this.viewer.update(true);
       } else {
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
-        this.viewer.update();
+        this.viewer.update(500);
       }
     };
 
-    const downloadResourceRange = async (dataId: string, requestId: number, ranges: any) => {
+    const downloadResourceRange = async (dataId: string, requestId: number, ranges: Range[]) => {
       const abortCtrl = new AbortController();
       this.abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
@@ -107,8 +109,8 @@ export class VSFXCloudPartialLoader extends Loader {
       }
     };
 
-    const requestRecordsToRanges = (requestId: number, records: any): any => {
-      const ranges = [];
+    const requestRecordsToRanges = (requestId: number, records: any): Range[] => {
+      const ranges: Range[] = [];
       for (let i = 0; i < records.size(); i++) {
         const record = records.get(i);
         ranges.push({
@@ -151,7 +153,7 @@ export class VSFXCloudPartialLoader extends Loader {
         const dataId = `${model.fileId}${model.file.type}`;
         const ranges = requestRecordsToRanges(requestId, records);
 
-        let pendingRanges = [];
+        let pendingRanges: Range[] = [];
         let requestNumber = 0;
         const pendingRequest = pendingRequestsMap.get(dataId);
         if (pendingRequest) {

package/src/Viewer/Loaders/VSFXCloudStreamingLoader.ts

@@ -88,7 +88,7 @@ export class VSFXCloudStreamingLoader extends Loader {
         this.viewer.update(true);
       } else {
         this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
-        this.viewer.update();
+        this.viewer.update(500);
       }
     };
 

package/src/Viewer/Loaders/VSFXFileLoader.ts

@@ -34,7 +34,7 @@ export class VSFXFileLoader extends Loader {
     this.viewer = viewer;
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /vsfx$/i.test(format)

package/src/Viewer/Markup/Visualize/VisualizeMarkup.ts

@@ -33,7 +33,7 @@ export class VisualizeMarkup implements IMarkup {
   protected _markupColor = { r: 255, g: 0, b: 0 };
 
   public lineWidth = 4;
-  public lineType: "solid";
+  public lineType = "solid";
   public fontSize = 34;
 
   initialize(

package/src/Viewer/Models/ModelImpl.ts

@@ -26,7 +26,7 @@ import { IModelImpl } from "./IModelImpl";
 // Basic model implementation.
 
 export class ModelImpl implements IModelImpl {
-  public id: string;
+  public id = "";
 
   dispose(): void {}
 }