vim-web 0.4.0 → 0.4.1-dev.0

package/dist/types/core-viewers/webgl/viewer/camera/camera.d.ts

@@ -17,7 +17,7 @@ export declare class Camera implements ICamera {
     camPerspective: PerspectiveCamera;
     camOrthographic: OrthographicCamera;
     private _viewport;
-    _scene: RenderScene;
+    private _scene;
     private _lerp;
     private _movement;
     private _inputVelocity;
@@ -29,8 +29,7 @@ export declare class Camera implements ICamera {
     private _lastTarget;
     private _tmp1;
     private _tmp2;
-    _savedPosition: THREE.Vector3;
-    _savedTarget: THREE.Vector3;
+    private _savedState;
     /**
      * A signal that is dispatched when camera settings change.
      */
@@ -126,7 +125,7 @@ export declare class Camera implements ICamera {
      * The target at which the camera is looking at and around which it rotates.
      */
     get target(): THREE.Vector3;
-    applySettings(settings: ViewerSettings): void;
+    private applySettings;
     /**
      * The distance from the camera to the target.
      */

package/dist/types/core-viewers/webgl/viewer/camera/cameraInterface.d.ts

@@ -96,3 +96,12 @@ export interface ICamera {
      */
     orthographic: boolean;
 }
+export declare class CameraSaveState {
+    private _camera;
+    private _position;
+    private _target;
+    constructor(camera: ICamera);
+    save(): void;
+    get position(): THREE.Vector3;
+    get target(): THREE.Vector3;
+}

package/dist/types/core-viewers/webgl/viewer/camera/cameraMovement.d.ts

@@ -6,9 +6,12 @@ import { Element3D } from '../../loader/element3d';
 import { Selectable } from '../selection';
 import * as THREE from 'three';
 import { Vim } from '../../loader/vim';
+import { CameraSaveState } from './cameraInterface';
 export declare abstract class CameraMovement {
     protected _camera: Camera;
-    constructor(camera: Camera);
+    private _savedState;
+    private _getBoundingBox;
+    constructor(camera: Camera, savedState: CameraSaveState, getBoundingBox: () => THREE.Box3);
     /**
      * Moves the camera by the specified 3D vector.
      * @param {THREE.Vector3} vector - The 3D vector representing the direction and distance of movement.
@@ -59,7 +62,7 @@ export declare abstract class CameraMovement {
     /**
      * Resets the camera to its last saved position and orientation.
      */
-    abstract reset(): void;
+    reset(): void;
     /**
      * Moves both the camera and its target to the given positions.
      * @param {THREE.Vector3} position - The new position of the camera.

package/dist/types/core-viewers/webgl/viewer/camera/cameraMovementLerp.d.ts

@@ -6,12 +6,13 @@ import { Camera } from './camera';
 import { Element3D } from '../../loader/element3d';
 import { CameraMovementSnap } from './cameraMovementSnap';
 import { CameraMovement } from './cameraMovement';
+import { CameraSaveState } from './cameraInterface';
 export declare class CameraLerp extends CameraMovement {
     _movement: CameraMovementSnap;
     _clock: THREE.Clock;
     onProgress: ((progress: number) => void) | undefined;
     _duration: number;
-    constructor(camera: Camera, movement: CameraMovementSnap);
+    constructor(camera: Camera, movement: CameraMovementSnap, savedState: CameraSaveState, getBoundingBox: () => THREE.Box3);
     get isLerping(): boolean;
     init(duration: number): void;
     cancel(): void;
@@ -23,6 +24,5 @@ export declare class CameraLerp extends CameraMovement {
     setDistance(dist: number): void;
     orbit(angle: THREE.Vector2): void;
     target(target: Element3D | THREE.Vector3): Promise<void>;
-    reset(): void;
     set(position: THREE.Vector3, target?: THREE.Vector3): void;
 }

package/dist/types/core-viewers/webgl/viewer/camera/cameraMovementSnap.d.ts

@@ -10,7 +10,6 @@ export declare class CameraMovementSnap extends CameraMovement {
      * @param amount movement size.
      */
     zoom(amount: number): void;
-    reset(): void;
     setDistance(dist: number): void;
     rotate(angle: THREE.Vector2): void;
     applyRotation(quaternion: THREE.Quaternion): void;

package/dist/types/core-viewers/webgl/viewer/camera/cameraOrthographic.d.ts

@@ -5,8 +5,7 @@ import * as THREE from 'three';
 import { ViewerSettings } from '../settings/viewerSettings';
 export declare class OrthographicCamera {
     camera: THREE.OrthographicCamera;
-    constructor(camera: THREE.OrthographicCamera);
+    constructor(camera: THREE.OrthographicCamera, settings: ViewerSettings);
     frustrumSizeAt(point: THREE.Vector3): THREE.Vector2;
-    applySettings(settings: ViewerSettings): void;
     updateProjection(size: THREE.Vector2, aspect: number): void;
 }

package/dist/types/core-viewers/webgl/viewer/camera/cameraPerspective.d.ts

@@ -5,8 +5,7 @@ import * as THREE from 'three';
 import { ViewerSettings } from '../settings/viewerSettings';
 export declare class PerspectiveCamera {
     camera: THREE.PerspectiveCamera;
-    constructor(camera: THREE.PerspectiveCamera);
-    applySettings(settings: ViewerSettings): void;
+    constructor(camera: THREE.PerspectiveCamera, settings: ViewerSettings);
     updateProjection(aspect: number): void;
     frustrumSizeAt(point: THREE.Vector3): THREE.Vector2;
 }

package/dist/vim-web.iife.js

@@ -50047,6 +50047,24 @@ void main() {
     createTransparent,
     createWireframe
   }, Symbol.toStringTag, { value: "Module" }));
+  class CameraSaveState {
+    constructor(camera2) {
+      __publicField(this, "_camera");
+      __publicField(this, "_position", new Vector3());
+      __publicField(this, "_target", new Vector3());
+      this._camera = camera2;
+    }
+    save() {
+      this._position.copy(this._camera.position);
+      this._target.copy(this._camera.target);
+    }
+    get position() {
+      return this._position;
+    }
+    get target() {
+      return this._target;
+    }
+  }
   const _Marker = class _Marker {
     /**
      * Constructs a new Marker object.
@@ -50230,9 +50248,13 @@ void main() {
   __publicField(_Marker, "_unitVector", new Vector3(1, 1, 1));
   let Marker = _Marker;
   class CameraMovement {
-    constructor(camera2) {
+    constructor(camera2, savedState, getBoundingBox) {
       __publicField(this, "_camera");
+      __publicField(this, "_savedState");
+      __publicField(this, "_getBoundingBox");
       this._camera = camera2;
+      this._savedState = savedState;
+      this._getBoundingBox = getBoundingBox;
     }
     /**
      * Moves the camera in a specified 2D direction within a plane defined by the given axes.
@@ -50280,6 +50302,12 @@ void main() {
       angle.multiplyScalar(180 / Math.PI);
       this.orbit(angle);
     }
+    /**
+     * Resets the camera to its last saved position and orientation.
+     */
+    reset() {
+      this.set(this._camera.position, this._camera.target);
+    }
     /**
      * Sets the camera's orientation and position to focus on the specified target.
      * @param {IObject | Vim | THREE.Sphere | THREE.Box3 | 'all' | undefined} target - The target object, or 'all' to frame all objects.
@@ -50294,7 +50322,7 @@ void main() {
       }
       if (target === "all") {
         console.log("frame all");
-        target = this._camera._scene.getAverageBoundingBox();
+        target = this._getBoundingBox();
       }
       if (target instanceof Box3) {
         target = target.getBoundingSphere(new Sphere());
@@ -50326,8 +50354,8 @@ void main() {
     }
   }
   class CameraLerp extends CameraMovement {
-    constructor(camera2, movement) {
-      super(camera2);
+    constructor(camera2, movement, savedState, getBoundingBox) {
+      super(camera2, savedState, getBoundingBox);
       __publicField(this, "_movement");
       __publicField(this, "_clock", new Clock());
       // position
@@ -50368,11 +50396,11 @@ void main() {
       const start = this._camera.position.clone();
       const end = this._camera.position.clone().add(v);
       const pos = new Vector3();
+      const offset = this._camera.forward.multiplyScalar(this._camera.orbitDistance);
       this.onProgress = (progress) => {
-        console.log("progress", progress);
         pos.copy(start);
         pos.lerp(end, progress);
-        this._movement.move3(pos);
+        this._movement.set(pos, pos.clone().add(offset));
       };
     }
     rotate(angle) {
@@ -50428,9 +50456,6 @@ void main() {
         this._movement.applyRotation(r);
       };
     }
-    reset() {
-      this.set(this._camera._savedPosition, this._camera._savedTarget);
-    }
     set(position, target) {
       const endTarget = target ?? this._camera.target;
       const startPos = this._camera.position.clone();
@@ -50452,9 +50477,6 @@ void main() {
       const dist2 = this._camera.orbitDistance * amount;
       this.setDistance(dist2);
     }
-    reset() {
-      this.set(this._camera._savedPosition, this._camera._savedTarget);
-    }
     setDistance(dist2) {
       const pos = this._camera.target.clone().sub(this._camera.forward.multiplyScalar(dist2));
       this.set(pos, this._camera.target);
@@ -51154,10 +51176,14 @@ void main() {
     );
   }
   class OrthographicCamera {
-    constructor(camera2) {
+    constructor(camera2, settings2) {
       __publicField(this, "camera");
       this.camera = camera2;
       this.camera.layers.enable(Layers.NoRaycast);
+      this.camera.zoom = settings2.camera.zoom;
+      this.camera.near = -settings2.camera.far;
+      this.camera.far = settings2.camera.far;
+      this.camera.updateProjectionMatrix();
     }
     frustrumSizeAt(point) {
       return new Vector2(
@@ -51165,12 +51191,6 @@ void main() {
         this.camera.top - this.camera.bottom
       );
     }
-    applySettings(settings2) {
-      this.camera.zoom = settings2.camera.zoom;
-      this.camera.near = -settings2.camera.far;
-      this.camera.far = settings2.camera.far;
-      this.camera.updateProjectionMatrix();
-    }
     updateProjection(size, aspect2) {
       const max2 = Math.max(size.x, size.y);
       this.camera.left = -max2 * aspect2;
@@ -51181,12 +51201,10 @@ void main() {
     }
   }
   class PerspectiveCamera {
-    constructor(camera2) {
+    constructor(camera2, settings2) {
       __publicField(this, "camera");
       this.camera = camera2;
       this.camera.layers.enable(Layers.NoRaycast);
-    }
-    applySettings(settings2) {
       this.camera.fov = settings2.camera.fov;
       this.camera.zoom = settings2.camera.zoom;
       this.camera.near = settings2.camera.near;
@@ -51226,8 +51244,7 @@ void main() {
       __publicField(this, "_tmp1", new Vector3());
       __publicField(this, "_tmp2", new Vector3());
       // saves
-      __publicField(this, "_savedPosition", new Vector3(0, 0, -5));
-      __publicField(this, "_savedTarget", new Vector3(0, 0, 0));
+      __publicField(this, "_savedState", new CameraSaveState(this));
       __publicField(this, "_onValueChanged", new distExports$1.SignalDispatcher());
       __publicField(this, "_hasMoved");
       __publicField(this, "_onMoved", new distExports$1.SignalDispatcher());
@@ -51245,18 +51262,24 @@ void main() {
       __publicField(this, "_defaultForward", new Vector3(1, -1, 1).normalize());
       // Settings
       __publicField(this, "_velocityBlendFactor", 1e-4);
-      this.camPerspective = new PerspectiveCamera(new PerspectiveCamera$1());
+      this.camPerspective = new PerspectiveCamera(new PerspectiveCamera$1(), settings2);
       this.camPerspective.camera.up = new Vector3(0, 0, 1);
       this.camPerspective.camera.lookAt(new Vector3(0, 1, 0));
       this.camOrthographic = new OrthographicCamera(
-        new OrthographicCamera$1()
+        new OrthographicCamera$1(),
+        settings2
       );
-      this._movement = new CameraMovementSnap(this);
-      this._lerp = new CameraLerp(this, this._movement);
+      this._savedState = new CameraSaveState(this);
+      this._movement = new CameraMovementSnap(this, this._savedState, () => this._scene.getBoundingBox());
+      this._lerp = new CameraLerp(this, this._movement, this._savedState, () => this._scene.getBoundingBox());
       this._scene = scene;
       this._viewport = viewport;
       this._viewport.onResize.sub(() => this.updateProjection());
-      this.applySettings(settings2);
+      this.defaultForward = settings2.camera.forward;
+      this._orthographic = settings2.camera.orthographic;
+      this.allowedMovement = settings2.camera.allowedMovement;
+      this.allowedRotation = settings2.camera.allowedRotation;
+      this._onValueChanged.dispatch();
       this.snap(true).setDistance(-1e3);
       this.snap(true).orbitTowards(this._defaultForward);
       this.updateProjection();
@@ -51407,13 +51430,6 @@ void main() {
       return this._target;
     }
     applySettings(settings2) {
-      this.defaultForward = settings2.camera.forward;
-      this._orthographic = settings2.camera.orthographic;
-      this.allowedMovement = settings2.camera.allowedMovement;
-      this.allowedRotation = settings2.camera.allowedRotation;
-      this.camPerspective.applySettings(settings2);
-      this.camOrthographic.applySettings(settings2);
-      this._onValueChanged.dispatch();
     }
     /**
      * The distance from the camera to the target.
@@ -51426,8 +51442,7 @@ void main() {
      */
     save() {
       this._lerp.cancel();
-      this._savedPosition.copy(this.position);
-      this._savedTarget.copy(this._target);
+      this._savedState.save();
     }
     /**
      * Represents whether the camera projection is orthographic.