@inweb/viewer-three 27.4.7 → 27.6.0

package/extensions/components/AxesHelperComponent.ts

@@ -76,12 +76,14 @@ class AxesHelperComponent implements IComponent {
     this.axesHelper1.position.set(0, 0, 0);
     this.axesHelper1.scale.setScalar(extentsSize * 1.5);
     this.viewer.helpers.add(this.axesHelper1);
+    this.viewer.update();
 
     if (this.viewer.models.length < 1) return;
 
     this.axesHelper2.position.copy(extentsCenter);
     this.axesHelper2.scale.setScalar(extentsSize);
     this.viewer.helpers.add(this.axesHelper2);
+    this.viewer.update();
 
     if (this.viewer.models.length < 2) return;
 
@@ -95,6 +97,7 @@ class AxesHelperComponent implements IComponent {
 
       this.modelHelpers.push(helper);
       this.viewer.helpers.add(helper);
+      this.viewer.update();
     });
   };
 }

package/extensions/components/ExtentsHelperComponent.ts

@@ -74,17 +74,20 @@ class ExtentsHelperComponent implements IComponent {
 
     this.boxHelper.box = this.viewer.extents.clone();
     this.viewer.helpers.add(this.boxHelper);
+    this.viewer.update();
 
     if (this.viewer.models.length < 2) return;
 
-    this.viewer.models.forEach((model) => {
+    for (const model of this.viewer.models) {
       const extents = model.getExtents(new Box3());
+      if (extents.isEmpty()) continue;
 
       const helper = new Box3Helper(extents, "#ff0000");
 
       this.modelHelpers.push(helper);
       this.viewer.helpers.add(helper);
-    });
+    }
+    this.viewer.update();
   };
 }
 

package/extensions/components/GridHelperComponent.ts

@@ -59,6 +59,7 @@ class GridHelperComponent implements IComponent {
     this.gridHelper.quaternion.setFromUnitVectors(upY, up);
 
     this.viewer.helpers.add(this.gridHelper);
+    this.viewer.update();
   };
 }
 

package/extensions/components/LightHelperComponent.ts

@@ -57,7 +57,7 @@ class LightHelperComponent implements IComponent {
     const helperSize = extentsSize / 20;
 
     this.viewer.scene.traverse((object: any) => {
-      let helper: DirectionalLightHelper | HemisphereLightHelper | PointLightHelper;
+      let helper: DirectionalLightHelper | HemisphereLightHelper | PointLightHelper | null = null;
 
       if (object.isDirectionalLight) helper = new DirectionalLightHelper(object, helperSize, "#aa0000");
       else if (object.isHemisphereLight) helper = new HemisphereLightHelper(object, helperSize, "#ff9800");
@@ -66,6 +66,7 @@ class LightHelperComponent implements IComponent {
       if (helper) {
         this.lightHelpers.push(helper);
         this.viewer.helpers.add(helper);
+        this.viewer.update();
       }
     });
   };

package/extensions/components/StatsPanelComponent.ts

@@ -45,7 +45,6 @@ class StatsPanelComponent implements IComponent {
     this.viewer.removeEventListener("animate", this.updateViewer);
 
     this.stats.dom.remove();
-    this.stats = undefined;
   }
 
   updateStats = () => {

package/extensions/loaders/GLTFCloudLoader.ts

@@ -26,10 +26,16 @@ import { GLTFLoadingManager, Loader, loaders, ModelImpl, Viewer } from "@inweb/v
 
 class GLTFCloudLoader extends Loader {
   public viewer: Viewer;
+  private manager: GLTFLoadingManager | null;
 
   constructor(viewer: Viewer) {
     super();
     this.viewer = viewer;
+    this.manager = null;
+  }
+
+  override dispose() {
+    if (this.manager) this.manager.dispose();
   }
 
   override isSupport(file: any): boolean {
@@ -43,9 +49,9 @@ class GLTFCloudLoader extends Loader {
 
   override async load(model: any): Promise<this> {
     const url = `${model.httpClient.serverUrl}${model.path}/${model.database}`;
-    const manager = new GLTFLoadingManager(url);
+    this.manager = new GLTFLoadingManager(url);
 
-    const loader = new GLTFLoader(manager);
+    const loader = new GLTFLoader(this.manager);
     loader.setRequestHeader(model.httpClient.headers);
 
     const progress = (event: ProgressEvent) => {

package/extensions/loaders/GLTFFileLoader.ts

@@ -26,18 +26,19 @@ import { GLTFLoadingManager, GLTFLoadParams, Loader, loaders, ModelImpl, Viewer
 
 export class GLTFFileLoader extends Loader {
   public viewer: Viewer;
-  private manager: GLTFLoadingManager;
+  private manager: GLTFLoadingManager | null;
 
   constructor(viewer: Viewer) {
     super();
     this.viewer = viewer;
+    this.manager = null;
   }
 
   override dispose() {
     if (this.manager) this.manager.dispose();
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /(gltf|glb)$/i.test(format)

package/extensions/loaders/IFCX/IFCXFileLoader.ts

@@ -26,13 +26,19 @@ import { IFCXLoader } from "./IFCXLoader";
 
 export class IFCXFileLoader extends Loader {
   public viewer: Viewer;
+  private manager: GLTFLoadingManager | null;
 
   constructor(viewer: Viewer) {
     super();
     this.viewer = viewer;
+    this.manager = null;
   }
 
-  override isSupport(file: any, format?: string): boolean {
+  override dispose() {
+    if (this.manager) this.manager.dispose();
+  }
+
+  override isSupport(file: any, format = ""): boolean {
     return (
       (typeof file === "string" || file instanceof globalThis.File || file instanceof ArrayBuffer) &&
       /(ifcx)$/i.test(format)
@@ -40,10 +46,10 @@ export class IFCXFileLoader extends Loader {
   }
 
   override async load(file: any, format?: string, params: GLTFLoadParams = {}): Promise<this> {
-    const manager = new GLTFLoadingManager(file, params);
+    this.manager = new GLTFLoadingManager(file, params);
 
-    const loader = new IFCXLoader(manager);
-    loader.setPath(manager.path);
+    const loader = new IFCXLoader(this.manager);
+    loader.setPath(this.manager.path);
     loader.setCrossOrigin(params.crossOrigin || loader.crossOrigin);
     loader.setWithCredentials(params.withCredentials || loader.withCredentials);
 
@@ -53,7 +59,7 @@ export class IFCXFileLoader extends Loader {
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, file });
     };
 
-    const scene = await loader.loadAsync(manager.fileURL, progress);
+    const scene = await loader.loadAsync(this.manager.fileURL, progress);
     if (!this.viewer.scene) return this;
 
     let handle = 1;

package/lib/Viewer/Viewer.d.ts

@@ -1,16 +1,15 @@
-import { Box3, Object3D, OrthographicCamera, PerspectiveCamera, Scene, Vector3, WebGLRenderer } from "three";
+import { Box3, Group, Object3D, OrthographicCamera, PerspectiveCamera, Plane, Scene, Vector3, WebGLRenderer } from "three";
 import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer.js";
 import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js";
 import { FXAAPass } from "three/examples/jsm/postprocessing/FXAAPass.js";
 import { SMAAPass } from "three/examples/jsm/postprocessing/SMAAPass.js";
-import { SSAARenderPass } from "./postprocessing/SSAARenderPass.js";
+import { SSAARenderPass } from "three/examples/jsm/postprocessing/SSAARenderPass.js";
 import { OutputPass } from "three/examples/jsm/postprocessing/OutputPass.js";
 import { EventEmitter2 } from "@inweb/eventemitter2";
 import { Assembly, Client, Model, File } from "@inweb/client";
 import { CanvasEventMap, FileSource, IComponent, IDragger, IInfo, ILoader, IOptions, IViewer, IViewpoint, OptionsEventMap, ViewerEventMap } from "@inweb/viewer-core";
 import { IMarkup, IWorldTransform } from "@inweb/markup";
 import { IModelImpl } from "./models/IModelImpl";
-import { Helpers } from "./scenes/Helpers";
 /**
  * 3D viewer powered by {@link https://threejs.org/ | Three.js}.
  */
@@ -24,11 +23,10 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     info: IInfo;
     private canvaseventlistener;
     scene: Scene | undefined;
-    helpers: Helpers | undefined;
+    helpers: Group | undefined;
     camera: PerspectiveCamera | OrthographicCamera | undefined;
     renderer: WebGLRenderer | undefined;
     renderPass: RenderPass | undefined;
-    helpersPass: RenderPass | undefined;
     fxaaPass: FXAAPass | undefined;
     smaaPass: SMAAPass | undefined;
     ssaaRenderPass: SSAARenderPass | undefined;
@@ -37,9 +35,9 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     selected: Object3D[];
     extents: Box3;
     target: Vector3;
+    clippingPlanes: Plane[];
     private _activeDragger;
     private _components;
-    private _updateDelay;
     private _renderNeeded;
     private _renderTime;
     private _markup;
@@ -61,7 +59,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     dispose(): this;
     isInitialized(): boolean;
     setSize(width: number, height: number, updateStyle?: boolean): void;
-    update(force?: boolean): void;
+    update(force?: boolean | number): void;
     render(time?: DOMHighResTimeStamp, force?: boolean): void;
     loadReferences(model: Model | File | Assembly): Promise<this>;
     /**
@@ -163,7 +161,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/lib/Viewer/components/CameraComponent.d.ts

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

package/lib/Viewer/components/ClippingPlaneComponent.d.ts

@@ -0,0 +1,8 @@
+import { IComponent } from "@inweb/viewer-core";
+import type { Viewer } from "../Viewer";
+export declare class ClippingPlaneComponent implements IComponent {
+    protected viewer: Viewer;
+    constructor(viewer: Viewer);
+    dispose(): void;
+    applyClippingPlanes: () => void;
+}

package/lib/Viewer/components/HighlighterComponent.d.ts

@@ -14,7 +14,7 @@ export declare class HighlighterComponent implements IComponent {
     highlight(objects: Object3D | Object3D[]): void;
     unhighlight(objects: Object3D | Object3D[]): void;
     geometryEnd: () => void;
-    optionsChange: () => void;
+    syncOptions: () => void;
     syncHighlightColors(): void;
-    viewerResize(event: ResizeEvent): void;
+    viewerResize: (event: ResizeEvent) => void;
 }

package/lib/Viewer/components/InfoComponent.d.ts

@@ -10,7 +10,7 @@ export declare class InfoComponent implements IComponent {
     dispose(): void;
     initialize: () => void;
     clear: () => void;
-    optionsChange: ({ data: options }: {
+    syncOptions: ({ data: options }: {
         data: any;
     }) => void;
     geometryStart: () => void;

package/lib/Viewer/components/SectionsComponent.d.ts

@@ -0,0 +1,15 @@
+import { IComponent, ResizeEvent } from "@inweb/viewer-core";
+import type { Viewer } from "../Viewer";
+export declare class SectionsComponent implements IComponent {
+    private viewer;
+    private sectionsHelper;
+    private updateTimerId;
+    private updateDelay;
+    constructor(viewer: Viewer);
+    dispose(): void;
+    syncOptions: () => void;
+    syncHelper: () => void;
+    syncSections: () => void;
+    viewerResize: (event: ResizeEvent) => void;
+    updateSections: () => void;
+}

package/lib/Viewer/components/WCSHelperComponent.d.ts

@@ -1,11 +1,11 @@
 import { IComponent } from "@inweb/viewer-core";
 import type { Viewer } from "../Viewer";
 export declare class WCSHelperComponent implements IComponent {
-    private wcsHelper;
     private viewer;
+    private wcsHelper;
     constructor(viewer: Viewer);
     dispose(): void;
-    geometryEnd: () => void;
+    syncHelper: () => void;
     viewerRender: () => void;
     updateHelperCamera: () => void;
 }

package/lib/Viewer/draggers/CuttingPlaneDragger.d.ts

@@ -1,13 +1,12 @@
-import { Plane, Quaternion, Vector2, Vector3 } from "three";
+import { Quaternion, Vector2, Vector3 } from "three";
 import { TransformControls } from "three/examples/jsm/controls/TransformControls.js";
 import type { Viewer } from "../Viewer";
 import { PlaneHelper2 } from "../helpers/PlaneHelper2";
 import { Snapper } from "../measurement/Snapper";
 import { OrbitDragger } from "./OrbitDragger";
 export declare class CuttingPlaneDragger extends OrbitDragger {
-    protected clippingPlanes: Plane[];
     protected helpers: PlaneHelper2[];
-    protected activeHelper: PlaneHelper2;
+    protected activeHelper: PlaneHelper2 | undefined;
     protected snapper: Snapper;
     protected downPosition: Vector2;
     protected position0: Vector3;
@@ -16,18 +15,19 @@ export declare class CuttingPlaneDragger extends OrbitDragger {
     protected rotate: TransformControls;
     constructor(viewer: Viewer);
     dispose(): void;
+    transformUpdate: () => void;
     transformChange: () => void;
     translateDrag: (event: any) => void;
     rotateDrag: (event: any) => void;
-    updatePlaneSize: () => void;
-    updateTransformCamera: () => void;
+    syncHelpers: () => void;
     clearHelpers: () => void;
+    updateTransformCamera: () => void;
     onKeyDown: (event: KeyboardEvent) => void;
     onKeyUp: (event: KeyboardEvent) => void;
     onPointerDown: (event: PointerEvent) => void;
     onPointerUp: (event: PointerEvent) => void;
     onPointerCancel: (event: PointerEvent) => void;
-    onDoubleClick: (event: PointerEvent) => void;
+    onDoubleClick: (event: MouseEvent) => void;
     private addHelper;
     private setActiveHelper;
     private saveState;

package/lib/Viewer/draggers/OrbitDragger.d.ts

@@ -9,7 +9,7 @@ export declare class OrbitDragger implements IDragger {
     dispose(): void;
     updateControls: () => void;
     updateControlsCamera: () => void;
-    optionsChange: ({ data: options }: {
+    updateZoomSpeed: ({ data: options }: {
         data: any;
     }) => void;
     controlsStart: () => void;

package/lib/Viewer/measurement/Snapper.d.ts

@@ -1,16 +1,16 @@
-import { Camera, Intersection, Object3D, Vector2, Vector3, WebGLRenderer } from "three";
+import { Camera, Intersection, Object3D, Plane, Vector2, Vector3 } from "three";
 export declare class Snapper {
     camera: Camera;
-    renderer: WebGLRenderer;
+    clippingPlanes: Plane[];
     canvas: HTMLCanvasElement;
     threshold: number;
     private raycaster;
     private detectRadiusInPixels;
     private edgesCache;
-    constructor(camera: Camera, renderer: WebGLRenderer, canvas: HTMLCanvasElement);
+    constructor(camera: Camera, clippingPlanes: Plane[], canvas: HTMLCanvasElement);
     isMobile(): boolean;
     getMousePosition(event: MouseEvent, target: Vector2): Vector2;
     getPointerIntersects(mouse: Vector2, objects: Object3D[], recursive?: boolean, clip?: boolean): Array<Intersection<Object3D>>;
     getDetectRadius(point: Vector3): number;
-    getSnapPoint(mouse: Vector2, objects: Object3D[]): Vector3;
+    getSnapPoint(mouse: Vector2, objects: Object3D[]): Vector3 | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "27.4.7",
+  "version": "27.6.0",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using Three.js",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -35,10 +35,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"
   },
   "devDependencies": {
     "@streamparser/json": "^0.0.22",