@inweb/viewer-three 25.3.19 → 25.3.21

package/src/Viewer/Viewer.ts

@@ -71,7 +71,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
   private components: Array<IComponent>;
 
-  private renderNeeded: boolean;
+  private renderNeeded = false;
   private renderTime: DOMHighResTimeStamp;
 
   constructor(client?: Client) {
@@ -80,7 +80,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
     this.client = client;
 
-    this.canvasEvents = CANVAS_EVENTS;
+    this.canvasEvents = CANVAS_EVENTS.slice();
     this.canvaseventlistener = (event: Event) => this.emit(event);
 
     this.draggerFactory = {
@@ -178,6 +178,8 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
   public render(time: DOMHighResTimeStamp): void {
     if (!this.renderNeeded) return;
     if (!this.renderer) return;
+    if (!this.scene) return;
+    if (!this.camera) return;
 
     this.renderer.render(this.scene, this.camera);
     this.renderNeeded = false;
@@ -210,8 +212,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];
@@ -290,7 +291,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
       this.emitEvent({ type: "databasechunk" });
       this.emitEvent({ type: "geometryend", data: gltf.scene });
-    } catch (error) {
+    } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error });
       throw error;
     } finally {

package/src/Viewer/components/BackgroundComponent.ts

@@ -45,7 +45,7 @@ export class BackgroundComponent implements IComponent {
     environment.dispose();
   }
 
-  dispose() {
+  dispose(): void {
     this.viewer.removeEventListener("optionschange", this.syncOptions);
     this.viewer.scene.environment = undefined;
     this.viewer.scene.background = undefined;

package/src/Viewer/components/DefaultCameraPositionComponent.ts

@@ -34,7 +34,7 @@ export class DefaultCameraPositionComponent implements IComponent {
     this.viewer.addEventListener("geometryend", this.geometryEnd);
   }
 
-  dispose() {
+  dispose(): void {
     this.viewer.removeEventListener("geometryend", this.geometryEnd);
   }
 

package/src/Viewer/components/LightComponent.ts

@@ -41,7 +41,7 @@ export class LightComponent implements IComponent {
     this.viewer.camera.add(this.directLight);
   }
 
-  dispose() {
+  dispose(): void {
     this.ambientLight.removeFromParent();
     this.directLight.removeFromParent();
   }

package/src/Viewer/components/ObjectSelectionComponent.ts

@@ -41,7 +41,7 @@ export class ObjectSelectionComponent implements IComponent {
     this.viewer.addEventListener("pointerup", this.onPointerUp);
   }
 
-  dispose() {
+  dispose(): void {
     this.viewer.removeEventListener("pointerdown", this.onPointerDown);
     this.viewer.removeEventListener("pointerup", this.onPointerUp);
   }

package/src/Viewer/components/RenderLoopComponent.ts

@@ -26,14 +26,14 @@ import type { Viewer } from "../Viewer";
 
 export class RenderLoopComponent implements IComponent {
   protected viewer: Viewer;
-  protected requestID: number;
+  protected requestID = 0;
 
   constructor(viewer: Viewer) {
     this.viewer = viewer;
     this.animate();
   }
 
-  dispose() {
+  dispose(): void {
     cancelAnimationFrame(this.requestID);
   }
 

package/src/Viewer/draggers/ClippingPlaneDragger.ts

@@ -51,7 +51,7 @@ export class ClippingPlaneDragger {
     this.viewer.scene.add(this.planeHelper);
   }
 
-  dispose() {
+  dispose(): void {
     this.viewer.removeEventListener("pointerdown", this.onPointerDown);
     this.viewer.removeEventListener("pointerup", this.onPointerUp);
     this.viewer.removeEventListener("pointermove", this.onPointerMove);
@@ -96,15 +96,15 @@ export class ClippingPlaneDragger {
     plane.translate(this.delta);
   };
 
-  update() {}
+  update(): void {}
 
-  screenToWorld(v: THREE.Vector3) {
+  screenToWorld(v: THREE.Vector3): THREE.Vector3 {
     v.x = (2 * v.x) / this.viewer.canvas.clientWidth - 1;
     v.y = 1 - (2 * v.y) / this.viewer.canvas.clientHeight;
     return v.unproject(this.viewer.camera);
   }
 
-  screenToPlane(v: THREE.Vector3) {
+  screenToPlane(v: THREE.Vector3): THREE.Vector3 {
     v = this.screenToWorld(v);
     const direction = v.sub(this.viewer.camera.position).normalize();
     const ray = new THREE.Ray(this.viewer.camera.position, direction);

package/src/Viewer/draggers/OrbitDragger.ts

@@ -40,7 +40,7 @@ export class OrbitDragger extends OrbitControls {
     this.addEventListener("change", this.updateViewer);
   }
 
-  override dispose() {
+  override dispose(): void {
     this.removeEventListener("change", this.updateViewer);
     this.viewer.removeEventListener("geometryend", this.geometryEnd);
     super.dispose();

package/src/Viewer/draggers/WalkDragger.ts

@@ -86,7 +86,7 @@ export class WalkDragger {
     document.addEventListener("keyup", this.onKeyUp);
   }
 
-  dispose() {
+  dispose(): void {
     this.viewer.removeEventListener("render", this.onRender);
 
     this.viewer.removeEventListener("contextmenu", this.onContextMenu);

package/src/Viewer/loaders/GLTFLoadingManager.ts

@@ -63,7 +63,7 @@ export class GLTFLoadingManager extends THREE.LoadingManager {
     });
   }
 
-  dispose() {
+  dispose(): void {
     this.dataURLs.forEach(URL.revokeObjectURL);
   }
 }