@inweb/viewer-visualize 25.3.19 → 25.3.21

package/lib/Viewer/Loaders/LoaderFactory.d.ts

@@ -1,10 +1,10 @@
 import { Model } from "@inweb/client";
 import { IOptions } from "@inweb/viewer-core";
 import { TCSLoader } from "./TCSLoader";
+import { VsfXLoader } from "./VsfXLoader";
 import { VsfXStreamingLoader } from "./VsfXStreamingLoader";
 import { VsfXPartialLoader } from "./VsfXPartialLoader";
 import { Viewer } from "../Viewer";
-import { VsfXLoader } from "./VsfXLoader";
 export declare class LoaderFactory {
-    create(viewer: Viewer, model: Model, options: IOptions): TCSLoader | VsfXStreamingLoader | VsfXPartialLoader | VsfXLoader;
+    create(viewer: Viewer, model: Model, options: IOptions): TCSLoader | VsfXLoader | VsfXStreamingLoader | VsfXPartialLoader;
 }

package/lib/Viewer/Viewer.d.ts

@@ -28,7 +28,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventM
     visualizeJs: any;
     _abortController: AbortController | undefined;
     _abortControllerForRequestMap: Map<string, AbortController> | undefined;
-    client: Client;
+    client: Client | undefined;
     /**
      * @param client - The `Client` instance that provides access to a server. Do not specify
      *   `Client` if you need a standalone viewer instance without access to server models.

package/lib/Viewer/utils.d.ts

@@ -1,3 +1,2 @@
-export declare function loadScript(url: string): Promise<unknown>;
-export declare const memoize: (f: any) => (...args: any[]) => any;
-export declare const loadVisualizeJs: (url: string, onprogress: any) => Promise<unknown>;
+export declare function loadScript(url: string): Promise<HTMLScriptElement>;
+export declare const loadVisualizeJs: (url: string, onprogress: any) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "25.3.19",
+  "version": "25.3.21",
   "description": "3D CAD and BIM data Viewer powered by Visualize",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -28,9 +28,9 @@
     "test": "karma start karma.conf.js"
   },
   "dependencies": {
-    "@inweb/client": "^25.3.18",
-    "@inweb/eventemitter2": "^25.3.18",
-    "@inweb/viewer-core": "^25.3.18"
+    "@inweb/client": "^25.3.19",
+    "@inweb/eventemitter2": "^25.3.19",
+    "@inweb/viewer-core": "^25.3.19"
   },
   "devDependencies": {
     "canvas": "^2.11.2",

package/src/ConvetMath.ts

@@ -172,7 +172,7 @@ export function worldToScreen(
   worldPoint: [x: number, y: number, z: number],
   screenWidth: number,
   screenHeight: number
-) {
+): number[] {
   const widthHalf = screenWidth / 2;
   const heightHalf = screenHeight / 2;
 
@@ -188,6 +188,7 @@ export function worldToScreen(
 function lengthVector(a: { x: number; y: number; z: number }): number {
   return Math.sqrt(a.x * a.x + a.y * a.y + a.z * a.z);
 }
+
 function normalizeVector(a: { x: number; y: number; z: number }): { x: number; y: number; z: number } {
   const len = lengthVector(a);
   if (len === 0) return a;

package/src/Viewer/Loaders/LoaderFactory.ts

@@ -25,10 +25,10 @@ import { Model } from "@inweb/client";
 import { IOptions } from "@inweb/viewer-core";
 
 import { TCSLoader } from "./TCSLoader";
+import { VsfXLoader } from "./VsfXLoader";
 import { VsfXStreamingLoader } from "./VsfXStreamingLoader";
 import { VsfXPartialLoader } from "./VsfXPartialLoader";
 import { Viewer } from "../Viewer";
-import { VsfXLoader } from "./VsfXLoader";
 
 export class LoaderFactory {
   create(viewer: Viewer, model: Model, options: IOptions) {

package/src/Viewer/Loaders/TCSLoader.ts

@@ -31,25 +31,23 @@ export class TCSLoader extends BaseLoader {
     const visViewer = visLib.getViewer();
     const abortController = new AbortController();
 
-    const listFileForDownload = [this.model.database, ...this.model.geometry];
-    const chunksProgress = listFileForDownload.map(() => 0);
-
-    const calcProgress = (index: number, progress: number) => {
-      chunksProgress[index] = progress;
-      const fileProgress = chunksProgress.reduce((acc, progress) => (acc += progress)) / (chunksProgress.length || 1);
-      this.viewer.emitEvent({ type: "geometryprogress", data: fileProgress, model: this.model });
-    };
+    const filesToDownload = [this.model.database, ...this.model.geometry];
 
     this.viewer._abortController = abortController;
 
+    console.time("File load time");
     try {
       this.viewer.emitEvent({ type: "geometrystart", model: this.model });
 
-      for (let i = 0; i < listFileForDownload.length; i++) {
-        const chunk = listFileForDownload[i];
+      for (let i = 0; i < filesToDownload.length; i++) {
+        const dataId = filesToDownload[i];
+
+        const chunkLoadHandler = (progress: number) => {
+          const data = (i + progress) / filesToDownload.length;
+          this.viewer.emitEvent({ type: "geometryprogress", data, model: this.model });
+        };
 
-        const progressCb = (progress) => calcProgress(i, progress);
-        const arrayBuffer = await this.model.downloadResource(chunk, progressCb, abortController.signal);
+        const arrayBuffer = await this.model.downloadResource(dataId, chunkLoadHandler, abortController.signal);
 
         if (abortController.signal.aborted) {
           await Promise.reject(new Error(`Open model aborted ${this.model.name}`));
@@ -73,6 +71,8 @@ export class TCSLoader extends BaseLoader {
         }
       }
 
+      console.timeEnd("File load time");
+
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
     } catch (error) {
       this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });

package/src/Viewer/Loaders/UpdaterController.ts

@@ -15,6 +15,7 @@ export class UpdaterController {
   public delayUpdateTime: number;
 
   constructor() {
+    this.lastUpdate = 0;
     this.delayUpdateTime = START_UPDATE_TIME;
   }
 

package/src/Viewer/Loaders/VsfXLoader.ts

@@ -65,7 +65,7 @@ export class VsfXLoader extends BaseLoader {
 
       this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error) {
+    } catch (error: any) {
       this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       throw error;
     }

package/src/Viewer/Loaders/VsfXPartialLoader.ts

@@ -77,8 +77,8 @@ export class VsfXPartialLoader extends BaseLoader {
       const abortCtrl = new AbortController();
       abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
-        await this.model.downloadResourceRange(dataId, ranges, requestId, chunkLoadHandler, abortCtrl.signal);
-      } catch (error) {
+        await this.model.downloadResourceRange(dataId, requestId, ranges, chunkLoadHandler, abortCtrl.signal);
+      } catch (error: any) {
         this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       } finally {
         ranges.forEach((range) => visViewer.onRequestResponseComplete(range.requestId));
@@ -194,7 +194,7 @@ export class VsfXPartialLoader extends BaseLoader {
         });
 
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error) {
+    } catch (error: any) {
       if (pendingRequestsTimerId) {
         window.clearTimeout(pendingRequestsTimerId);
         pendingRequestsTimerId = 0;

package/src/Viewer/Loaders/VsfXStreamingLoader.ts

@@ -79,7 +79,7 @@ export class VsfXStreamingLoader extends BaseLoader {
       updaterController.update(UpdateType.kNormal);
 
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error) {
+    } catch (error: any) {
       this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       throw error;
     }

package/src/Viewer/Viewer.ts

@@ -74,14 +74,14 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
   private _renderTime: DOMHighResTimeStamp;
 
   protected _options: Options;
-  protected _visualizeJsUrl: string;
+  protected _visualizeJsUrl = "";
   protected _abortControllerForReferences: AbortController | undefined;
 
   private canvaseventlistener: (event: Event) => void;
 
   public draggerFactory: Map<string, typeof OdBaseDragger>;
   public canvasEvents: string[];
-  private frameId: number;
+  private frameId = 0;
   private _resizeObserver: ResizeObserver | undefined;
   public canvas: HTMLCanvasElement | undefined;
   public markup: IMarkup;
@@ -89,7 +89,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
   public visualizeJs: any;
   public _abortController: AbortController | undefined;
   public _abortControllerForRequestMap: Map<string, AbortController> | undefined;
-  public client: Client;
+  public client: Client | undefined;
 
   /**
    * @param client - The `Client` instance that provides access to a server. Do not specify
@@ -107,9 +107,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    */
   constructor(
     client?: Client,
-    params: { visualizeJsUrl?: string; enableAutoUpdate?: boolean; markupType?: MarkupType } = {
-      markupType: MarkupType.Konva,
-    }
+    params: { visualizeJsUrl?: string; enableAutoUpdate?: boolean; markupType?: MarkupType } = {}
   ) {
     super();
     this.configure(params);
@@ -119,6 +117,8 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     this.client = client;
 
     this._activeDragger = null;
+    this._zoomWheelDragger = null;
+    this._gestureManager = null;
     this._renderTime = 0;
 
     this.markup = MarkupFactory.createMarkup(params.markupType ?? MarkupType.Konva);
@@ -140,7 +140,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
       this.registerDragger(key, value);
     });
 
-    this.canvasEvents = CANVAS_EVENTS;
+    this.canvasEvents = CANVAS_EVENTS.slice();
     this.canvaseventlistener = (event: Event) => this.emit(event);
 
     this._enableAutoUpdate = params.enableAutoUpdate ?? true;
@@ -335,7 +335,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    * @param force - If `true` updates the viewer immidietly. Otherwise updates on next
    *   animation frame. Default is `false`.
    */
-  update(force?: boolean) {
+  update(force = false) {
     if (this._enableAutoUpdate) {
       if (force) {
         this.visViewer()?.update();
@@ -774,12 +774,13 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    */
   async loadReferences(model: Model | File | Assembly): Promise<this> {
     if (!this.visualizeJs) return this;
+    if (!this.client) return this;
 
     const abortController = new AbortController();
     this._abortControllerForReferences?.abort();
     this._abortControllerForReferences = abortController;
 
-    let references = [];
+    let references: any[] = [];
     await model
       .getReferences(abortController.signal)
       .then((data) => (references = data.references))
@@ -849,8 +850,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
     this.emitEvent({ type: "open", file, model: file });
 
-    let model: Model;
-
+    let model: Model | undefined = undefined;
     if (file) {
       const models = (await file.getModels()) || [];
       model = models.find((model: Model) => model.default) || models[0];
@@ -916,7 +916,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
       this.emitEvent({ type: "databasechunk", data, buffer });
       this.emitEvent({ type: "geometryend", buffer });
-    } catch (error) {
+    } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error, buffer });
       throw error;
     }
@@ -962,7 +962,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
       this.emitEvent({ type: "databasechunk", data, buffer });
       this.emitEvent({ type: "geometryend", buffer });
-    } catch (error) {
+    } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error, buffer });
       throw error;
     }

package/src/Viewer/utils.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-export function loadScript(url: string) {
+export function loadScript(url: string): Promise<HTMLScriptElement> {
   return new Promise((resolve, reject) => {
     const script = document.createElement("script");
     script.src = url;
@@ -35,16 +35,7 @@ export function loadScript(url: string) {
   });
 }
 
-export const memoize = (f) => {
-  const cache = {};
-  return (...args) => {
-    const argStr = JSON.stringify(args);
-    cache[argStr] = cache[argStr] || f(...args);
-    return cache[argStr];
-  };
-};
-
-function loadVisuazlizeJsScript(url) {
+function loadVisuazlizeJsScript(url: string): Promise<HTMLScriptElement> {
   if (window["getVisualizeLibInst"]) {
     const script = window["getVisualizeLibInst"].script;
     if (script) {
@@ -56,7 +47,7 @@ function loadVisuazlizeJsScript(url) {
   return loadScript(url);
 }
 
-export const loadVisualizeJs = (url: string, onprogress) => {
+export const loadVisualizeJs = (url: string, onprogress): Promise<any> => {
   return loadVisuazlizeJsScript(url).then((script) => {
     return new Promise((resolve, reject) => {
       const instance = window["getVisualizeLibInst"]({