@inweb/viewer-three 26.8.0 → 26.8.2

package/lib/Viewer/Viewer.d.ts

@@ -1,9 +1,16 @@
 import { Box3, Object3D, OrthographicCamera, PerspectiveCamera, 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 { 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, ILoader, IOptions, IViewer, IViewpoint, Options, OptionsEventMap, ViewerEventMap } from "@inweb/viewer-core";
 import { IMarkup, IWorldTransform } from "@inweb/markup";
-import { IModelImpl } from "./model";
+import { IModelImpl } from "./models/IModelImpl";
+import { Helpers } from "./scenes/Helpers";
 /**
  * 3D viewer powered by {@link https://threejs.org/ | Three.js}.
  */
@@ -14,9 +21,16 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     canvas: HTMLCanvasElement | undefined;
     canvasEvents: string[];
     scene: Scene | undefined;
-    helpers: Scene | undefined;
+    helpers: Helpers | undefined;
     camera: PerspectiveCamera | OrthographicCamera | undefined;
     renderer: WebGLRenderer | undefined;
+    renderPass: RenderPass | undefined;
+    helpersPass: RenderPass | undefined;
+    fxaaPass: FXAAPass | undefined;
+    smaaPass: SMAAPass | undefined;
+    ssaaRenderPass: SSAARenderPass | undefined;
+    outputPass: OutputPass | undefined;
+    composer: EffectComposer | undefined;
     loaders: ILoader[];
     models: IModelImpl[];
     selected: Object3D[];
@@ -46,7 +60,7 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
     dispose(): this;
     isInitialized(): boolean;
     update(force?: boolean): void;
-    render(time: DOMHighResTimeStamp): void;
+    render(time?: DOMHighResTimeStamp, force?: boolean): void;
     loadReferences(model: Model | File | Assembly): Promise<this>;
     /**
      * Loads a file into the viewer.

package/lib/Viewer/commands/SetDefaultViewPosition.d.ts

@@ -1,15 +1,15 @@
 import { Vector3 } from "three";
 import type { Viewer } from "../Viewer";
 export declare const defaultViewPositions: {
-    top: Vector3;
-    bottom: Vector3;
-    left: Vector3;
-    right: Vector3;
     front: Vector3;
     back: Vector3;
+    left: Vector3;
+    right: Vector3;
+    bottom: Vector3;
+    top: Vector3;
+    ns: Vector3;
     sw: Vector3;
-    se: Vector3;
-    ne: Vector3;
     nw: Vector3;
+    se: Vector3;
 };
 export declare function setDefaultViewPosition(viewer: Viewer, position: string): void;

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

@@ -5,15 +5,16 @@ import { Viewer } from "../Viewer";
 export declare class HighlighterComponent implements IComponent {
     protected viewer: Viewer;
     renderTarget: WebGLRenderTarget;
-    highlightMaterial: MeshPhongMaterial;
-    outlineMaterial: LineMaterial;
-    highlightLineMaterial: LineBasicMaterial;
-    highlightLineGlowMaterial: LineMaterial;
+    facesMaterial: MeshPhongMaterial;
+    edgesMaterial: LineMaterial;
+    lineMaterial: LineBasicMaterial;
+    lineGlowMaterial: LineMaterial;
     constructor(viewer: Viewer);
     dispose(): void;
     highlight(objects: Object3D | Object3D[]): void;
     unhighlight(objects: Object3D | Object3D[]): void;
     geometryEnd: () => void;
     optionsChange: () => void;
+    syncHighlightColors(): void;
     viewerResize(event: ResizeEvent): void;
 }

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

@@ -1,7 +1,7 @@
 import { Intersection, Object3D, Raycaster, Vector2 } from "three";
 import type { IComponent } from "@inweb/viewer-core";
 import type { Viewer } from "../Viewer";
-import type { IModelImpl } from "../model";
+import type { IModelImpl } from "../models/IModelImpl";
 import type { HighlighterComponent } from "./HighlighterComponent";
 export declare class SelectionComponent implements IComponent {
     protected viewer: Viewer;

package/lib/Viewer/loaders/DynamicGltfLoader/DynamicModelImpl.d.ts

@@ -1,13 +1,15 @@
 import { Box3, Object3D } from "three";
-import { ModelImpl } from "../../model";
+import { ModelImpl } from "../../models/ModelImpl";
 import { DynamicGltfLoader } from "./DynamicGltfLoader.js";
 export declare class DynamicModelImpl extends ModelImpl {
     gltfLoader: DynamicGltfLoader;
+    modelId: number;
     getExtents(target: Box3): Box3;
     getObjects(): Object3D[];
     getVisibleObjects(): Object3D[];
     hasObject(object: any): boolean;
     getObjectsByHandles(handles: string | string[]): Object3D[];
+    getHandlesByObjects(objects: Object3D | Object3D[]): string[];
     hideObjects(objects: Object3D | Object3D[]): this;
     isolateObjects(objects: Object3D | Object3D[]): this;
     showObjects(objects: Object3D | Object3D[]): this;

package/lib/Viewer/models/IModelImpl.d.ts

@@ -0,0 +1,27 @@
+import { Box3, Object3D } from "three";
+import { ILoader, IViewer } from "@inweb/viewer-core";
+/**
+ * Model interface.
+ */
+export interface IModelImpl {
+    handle: string;
+    scene: Object3D;
+    loader: ILoader;
+    viewer: IViewer;
+    dispose(): void;
+    getExtents(target: Box3): Box3;
+    getObjects(): Object3D[];
+    getVisibleObjects(): Object3D[];
+    hasObject(objects: Object3D): boolean;
+    getOwnObjects(objects: Object3D | Object3D[]): Object3D[];
+    getObjectsByHandles(handles: string | string[]): Object3D[];
+    getHandlesByObjects(objects: Object3D | Object3D[]): string[];
+    hideObjects(objects: Object3D | Object3D[]): this;
+    hideAllObjects(): this;
+    isolateObjects(objects: Object3D | Object3D[]): this;
+    showObjects(objects: Object3D | Object3D[]): this;
+    showAllObjects(): this;
+    showOriginalObjects(objects: Object3D | Object3D[]): this;
+    hideOriginalObjects(objects: Object3D | Object3D[]): this;
+    explode(scale: number, coeff?: number): this;
+}

package/lib/Viewer/models/ModelImpl.d.ts

@@ -0,0 +1,27 @@
+import { Box3, Object3D } from "three";
+import { ILoader } from "@inweb/viewer-core";
+import { IModelImpl } from "./IModelImpl";
+import { Viewer } from "../Viewer";
+export declare class ModelImpl implements IModelImpl {
+    handle: string;
+    scene: Object3D;
+    loader: ILoader;
+    viewer: Viewer;
+    constructor(scene: Object3D);
+    dispose(): void;
+    getExtents(target: Box3): Box3;
+    getObjects(): Object3D[];
+    getVisibleObjects(): Object3D[];
+    hasObject(object: Object3D): boolean;
+    getOwnObjects(objects: Object3D | Object3D[]): Object3D[];
+    getObjectsByHandles(handles: string | string[]): Object3D[];
+    getHandlesByObjects(objects: Object3D | Object3D[]): string[];
+    hideObjects(objects: Object3D | Object3D[]): this;
+    hideAllObjects(): this;
+    isolateObjects(objects: Object3D | Object3D[]): this;
+    showObjects(objects: Object3D | Object3D[]): this;
+    showAllObjects(): this;
+    showOriginalObjects(objects: Object3D | Object3D[]): this;
+    hideOriginalObjects(objects: Object3D | Object3D[]): this;
+    explode(scale?: number, coeff?: number): this;
+}

package/lib/Viewer/scenes/Helpers.d.ts

@@ -0,0 +1,7 @@
+import { Scene, WebGLRenderer } from "three";
+export declare class Helpers extends Scene {
+    private oldAutoClear;
+    private oldClippingPlanes;
+    onBeforeRender(renderer: WebGLRenderer): void;
+    onAfterRender(renderer: WebGLRenderer): void;
+}

package/lib/index.d.ts

@@ -3,7 +3,8 @@ export * from "./Viewer/commands";
 export * from "./Viewer/components";
 export * from "./Viewer/loaders";
 export * from "./Viewer/loaders/GLTFLoadingManager";
-export * from "./Viewer/model";
+export * from "./Viewer/models/IModelImpl";
+export * from "./Viewer/models/ModelImpl";
 export * from "./Viewer/Viewer";
 export * from "@inweb/viewer-core";
 export * from "@inweb/markup";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-three",
-  "version": "26.8.0",
+  "version": "26.8.2",
   "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,17 +35,17 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.8.0",
-    "@inweb/eventemitter2": "~26.8.0",
-    "@inweb/markup": "~26.8.0",
-    "@inweb/viewer-core": "~26.8.0"
+    "@inweb/client": "~26.8.2",
+    "@inweb/eventemitter2": "~26.8.2",
+    "@inweb/markup": "~26.8.2",
+    "@inweb/viewer-core": "~26.8.2"
   },
   "devDependencies": {
-    "@types/three": "^0.173.0",
-    "three": "^0.173.0"
+    "@types/three": "^0.179.0",
+    "three": "^0.179.1"
   },
   "peerDependencies": {
-    "@types/three": "^0.173.0",
-    "three": "^0.173.0"
+    "@types/three": "^0.179.0",
+    "three": "^0.179.1"
   }
 }

package/plugins/components/StatsPanelComponent.ts

@@ -45,8 +45,8 @@ class StatsPanelComponent implements IComponent {
   }
 
   updateStats = () => {
+    this.viewer.render(null, true);
     this.stats.update();
-    this.viewer.update();
   };
 }
 

package/plugins/loaders/IFCX/IFCXLoader.ts

@@ -58,13 +58,10 @@ class IFCXLoader extends Loader<Scene> {
   }
 
   parse(json: any, onLoad: (scene: Scene) => void, onError: (err: unknown) => void) {
-    try {
-      onLoad(parse(json));
-    } catch (e) {
-      onError(e);
-    } finally {
-      clear();
-    }
+    parse(json)
+      .then((scene: Scene) => onLoad(scene))
+      .catch((err: unknown) => onError(err))
+      .finally(() => clear());
   }
 }