@inweb/viewer-three 25.3.17 → 25.3.19

package/lib/{ThreejsViewer → Viewer}/draggers/OrbitDragger.d.ts

@@ -1,9 +1,9 @@
 import { GeometryEndEvent } from "@inweb/viewer-core";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 export declare class OrbitDragger extends OrbitControls {
     private viewer;
-    constructor(viewer: ThreejsViewer);
+    constructor(viewer: Viewer);
     dispose(): void;
     geometryEnd: (event: GeometryEndEvent) => void;
     updateViewer: () => void;

package/lib/{ThreejsViewer → Viewer}/draggers/PanDragger.d.ts

@@ -1,5 +1,5 @@
 import { OrbitDragger } from "./OrbitDragger";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 export declare class PanDragger extends OrbitDragger {
-    constructor(viewer: ThreejsViewer);
+    constructor(viewer: Viewer);
 }

package/lib/{ThreejsViewer → Viewer}/draggers/WalkDragger.d.ts

@@ -1,8 +1,8 @@
 import { RenderEvent } from "@inweb/viewer-core";
 import * as THREE from "three";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 export declare class WalkDragger {
-    protected viewer: ThreejsViewer;
+    protected viewer: Viewer;
     protected camera: THREE.Camera;
     protected canvas: HTMLCanvasElement;
     protected _target: THREE.Vector3;
@@ -20,7 +20,7 @@ export declare class WalkDragger {
     protected touchStartDistance: number;
     walkSpeed: number;
     boostSpeed: number;
-    constructor(viewer: ThreejsViewer);
+    constructor(viewer: Viewer);
     dispose(): void;
     onKeyDown: (event: KeyboardEvent) => void;
     onKeyUp: (event: KeyboardEvent) => void;

package/lib/{ThreejsViewer → Viewer}/draggers/ZoomDragger.d.ts

@@ -1,5 +1,5 @@
 import { OrbitDragger } from "./OrbitDragger";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 export declare class ZoomDragger extends OrbitDragger {
-    constructor(viewer: ThreejsViewer);
+    constructor(viewer: Viewer);
 }

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export { commands, Options } from "@inweb/viewer-core";
-export { ThreejsViewer as Viewer } from "./ThreejsViewer/ThreejsViewer";
+export * from "@inweb/viewer-core";
+export { Viewer } from "./Viewer/Viewer";

package/package.json

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

package/src/{ThreejsViewer/ThreejsViewer.ts → Viewer/Viewer.ts}

@@ -26,10 +26,10 @@ import { Assembly, Client, File, Model } from "@inweb/client";
 import {
   CANVAS_EVENTS,
   commands,
+  IOptions,
   IViewpoint,
   IViewer,
   Options,
-  OptionsData,
   OptionsEventMap,
   ViewerEventMap,
 } from "@inweb/viewer-core";
@@ -51,7 +51,7 @@ import { ResizeCanvasComponent } from "./components/ResizeCanvasComponent";
 import { RenderLoopComponent } from "./components/RenderLoopComponent";
 // import { ObjectSelectionComponent } from "./components/ObjectSelectionComponent";
 
-export class ThreejsViewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> implements IViewer {
+export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> implements IViewer {
   public client: Client | undefined;
   private _options: Options;
 
@@ -136,7 +136,7 @@ export class ThreejsViewer extends EventEmitter2<ViewerEventMap & OptionsEventMa
     this.components.push(new RenderLoopComponent(this as any));
     // this.components.push(new ObjectSelectionComponent(this as any));
 
-    this.options.notifierChangeEvent();
+    this.syncOptions();
 
     this.renderTime = performance.now();
     this.render(this.renderTime);
@@ -193,7 +193,7 @@ export class ThreejsViewer extends EventEmitter2<ViewerEventMap & OptionsEventMa
     this.emitEvent({ type: "update", data: force });
   }
 
-  public syncOptions(options: OptionsData = this.options.data): void {
+  public syncOptions(options: IOptions = this.options): void {
     // this.update();
   }
 

package/src/{ThreejsViewer → Viewer}/components/BackgroundComponent.ts

@@ -24,13 +24,13 @@
 import * as THREE from "three";
 import { RoomEnvironment } from "three/examples/jsm/environments/RoomEnvironment.js";
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class BackgroundComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected backgroundColor: THREE.Color;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
 
     this.backgroundColor = new THREE.Color(0xffffff);

package/src/{ThreejsViewer → Viewer}/components/DefaultCameraPositionComponent.ts

@@ -24,12 +24,12 @@
 import { GeometryEndEvent } from "@inweb/viewer-core";
 import * as THREE from "three";
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class DefaultCameraPositionComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
     this.viewer.addEventListener("geometryend", this.geometryEnd);
   }

package/src/{ThreejsViewer → Viewer}/components/LightComponent.ts

@@ -23,14 +23,14 @@
 
 import * as THREE from "three";
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class LightComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected ambientLight: THREE.AmbientLight;
   protected directLight: THREE.DirectionalLight;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
 
     this.ambientLight = new THREE.AmbientLight(0xffffff, 0);

package/src/{ThreejsViewer → Viewer}/components/ObjectSelectionComponent.ts

@@ -23,15 +23,15 @@
 
 import * as THREE from "three";
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class ObjectSelectionComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected raycaster: THREE.Raycaster;
   protected mouse: THREE.Vector2;
   protected selectionMaterial: THREE.MeshBasicMaterial;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
     this.raycaster = new THREE.Raycaster();
     this.mouse = new THREE.Vector2();

package/src/{ThreejsViewer → Viewer}/components/RenderLoopComponent.ts

@@ -22,13 +22,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class RenderLoopComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected requestID: number;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
     this.animate();
   }

package/src/{ThreejsViewer → Viewer}/components/ResizeCanvasComponent.ts

@@ -22,13 +22,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 import { IComponent } from "../IComponent";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class ResizeCanvasComponent implements IComponent {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected resizeObserver: ResizeObserver;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
     this.resizeObserver = new ResizeObserver(this.resizeViewer);
     this.resizeObserver.observe(viewer.canvas.parentElement);

package/src/{ThreejsViewer → Viewer}/draggers/OrbitDragger.ts

@@ -24,12 +24,12 @@
 import { GeometryEndEvent } from "@inweb/viewer-core";
 import * as THREE from "three";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class OrbitDragger extends OrbitControls {
-  private viewer: ThreejsViewer;
+  private viewer: Viewer;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     super(viewer.camera, viewer.canvas);
     this.mouseButtons = { LEFT: THREE.MOUSE.ROTATE, MIDDLE: THREE.MOUSE.PAN, RIGHT: THREE.MOUSE.PAN };
     this.touches = { ONE: THREE.TOUCH.ROTATE, TWO: THREE.TOUCH.DOLLY_PAN };

package/src/{ThreejsViewer → Viewer}/draggers/PanDragger.ts

@@ -23,10 +23,10 @@
 
 import * as THREE from "three";
 import { OrbitDragger } from "./OrbitDragger";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class PanDragger extends OrbitDragger {
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     super(viewer);
     this.mouseButtons = { LEFT: THREE.MOUSE.PAN, MIDDLE: THREE.MOUSE.PAN, RIGHT: THREE.MOUSE.PAN };
     this.touches = { ONE: THREE.TOUCH.PAN, TWO: THREE.TOUCH.DOLLY_ROTATE };

package/src/{ThreejsViewer → Viewer}/draggers/WalkDragger.ts

@@ -23,10 +23,10 @@
 
 import { RenderEvent } from "@inweb/viewer-core";
 import * as THREE from "three";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class WalkDragger {
-  protected viewer: ThreejsViewer;
+  protected viewer: Viewer;
   protected camera: THREE.Camera;
   protected canvas: HTMLCanvasElement;
   protected _target: THREE.Vector3;
@@ -46,7 +46,7 @@ export class WalkDragger {
   public walkSpeed: number;
   public boostSpeed: number;
 
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     this.viewer = viewer;
 
     this._target = new THREE.Vector3();

package/src/{ThreejsViewer → Viewer}/draggers/ZoomDragger.ts

@@ -23,10 +23,10 @@
 
 import * as THREE from "three";
 import { OrbitDragger } from "./OrbitDragger";
-import type { ThreejsViewer } from "../ThreejsViewer";
+import type { Viewer } from "../Viewer";
 
 export class ZoomDragger extends OrbitDragger {
-  constructor(viewer: ThreejsViewer) {
+  constructor(viewer: Viewer) {
     super(viewer);
     this.mouseButtons = { LEFT: THREE.MOUSE.DOLLY, MIDDLE: THREE.MOUSE.PAN, RIGHT: THREE.MOUSE.PAN };
     this.touches = { ONE: THREE.TOUCH.DOLLY_PAN, TWO: THREE.TOUCH.DOLLY_PAN };

package/src/index.ts

@@ -21,5 +21,5 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-export { commands, Options } from "@inweb/viewer-core";
-export { ThreejsViewer as Viewer } from "./ThreejsViewer/ThreejsViewer";
+export * from "@inweb/viewer-core";
+export { Viewer } from "./Viewer/Viewer";