vim-web 0.4.0 → 0.4.1-dev.0

package/dist/vim-web.js

@@ -50031,6 +50031,24 @@ const index$9 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   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.
@@ -50214,9 +50232,13 @@ __publicField(_Marker, "_tmpMatrix", new Matrix4());
 __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.
@@ -50264,6 +50286,12 @@ class CameraMovement {
     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.
@@ -50278,7 +50306,7 @@ class CameraMovement {
     }
     if (target === "all") {
       console.log("frame all");
-      target = this._camera._scene.getAverageBoundingBox();
+      target = this._getBoundingBox();
     }
     if (target instanceof Box3) {
       target = target.getBoundingSphere(new Sphere());
@@ -50310,8 +50338,8 @@ class CameraMovement {
   }
 }
 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
@@ -50352,11 +50380,11 @@ class CameraLerp extends CameraMovement {
     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) {
@@ -50412,9 +50440,6 @@ class CameraLerp extends CameraMovement {
       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();
@@ -50436,9 +50461,6 @@ class CameraMovementSnap extends CameraMovement {
     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);
@@ -51138,10 +51160,14 @@ function threeNDCFromVector2(position) {
   );
 }
 class OrthographicCamera2 {
-  constructor(camera2) {
+  constructor(camera2, settings2) {
     __publicField(this, "camera");
     this.camera = camera2;
     this.camera.layers.enable(Layers2.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(
@@ -51149,12 +51175,6 @@ class OrthographicCamera2 {
       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;
@@ -51165,12 +51185,10 @@ class OrthographicCamera2 {
   }
 }
 class PerspectiveCamera2 {
-  constructor(camera2) {
+  constructor(camera2, settings2) {
     __publicField(this, "camera");
     this.camera = camera2;
     this.camera.layers.enable(Layers2.NoRaycast);
-  }
-  applySettings(settings2) {
     this.camera.fov = settings2.camera.fov;
     this.camera.zoom = settings2.camera.zoom;
     this.camera.near = settings2.camera.near;
@@ -51210,8 +51228,7 @@ let Camera$1 = class Camera2 {
     __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());
@@ -51229,18 +51246,24 @@ let Camera$1 = class Camera2 {
     __publicField(this, "_defaultForward", new Vector3(1, -1, 1).normalize());
     // Settings
     __publicField(this, "_velocityBlendFactor", 1e-4);
-    this.camPerspective = new PerspectiveCamera2(new PerspectiveCamera$1());
+    this.camPerspective = new PerspectiveCamera2(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 OrthographicCamera2(
-      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();
@@ -51391,13 +51414,6 @@ let Camera$1 = class Camera2 {
     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.
@@ -51410,8 +51426,7 @@ let Camera$1 = class Camera2 {
    */
   save() {
     this._lerp.cancel();
-    this._savedPosition.copy(this.position);
-    this._savedTarget.copy(this._target);
+    this._savedState.save();
   }
   /**
    * Represents whether the camera projection is orthographic.