3dtiles-inspector 0.2.2 → 0.2.4

package/src/viewer/navigation/flyTo.js

@@ -1,4 +1,9 @@
 import { Raycaster, Sphere, Vector2, Vector3 } from 'three';
+import {
+  createCameraFlight,
+  flyTo as applyCameraFlyTo,
+  getFlyToParamsFromBoundingSphere,
+} from './cameraFlyTo.js';
 import { mouseToCoords, setRaycasterFromCamera } from '../utils.js';
 
 export function createFlyToController({
@@ -19,6 +24,8 @@ export function createFlyToController({
   const pickRaycaster = new Raycaster();
   const pickTargets = [];
   const sphere = new Sphere();
+  let activeCameraFlight = null;
+  let activeCameraFlightStatus = '';
 
   function getActiveEllipsoid() {
     return getTiles()?.ellipsoid || globeController.getEllipsoid();
@@ -74,6 +81,58 @@ export function createFlyToController({
     return geoCamera.getCartographicFromWorldPosition(coordinateWorldPosition);
   }
 
+  function startCameraFlight(
+    position,
+    target,
+    options = {},
+    { activeStatus = 'Moving camera.', doneStatus = 'Moved camera.' } = {},
+  ) {
+    cameraController.setCamera(camera);
+    activeCameraFlight = createCameraFlight(camera, position, target, options);
+    activeCameraFlightStatus = doneStatus;
+    if (!activeCameraFlight) {
+      cameraController.setCamera(camera);
+      setStatus(doneStatus);
+      return;
+    }
+
+    setStatus(activeStatus);
+  }
+
+  function startBoundingSphereFlight(
+    target,
+    radius,
+    options = {},
+    status = {},
+  ) {
+    const flyToParams = getFlyToParamsFromBoundingSphere(
+      camera,
+      target,
+      radius,
+      options,
+    );
+    startCameraFlight(
+      flyToParams.position,
+      flyToParams.target,
+      flyToParams.options,
+      status,
+    );
+  }
+
+  function update(time = performance.now()) {
+    if (!activeCameraFlight) {
+      return false;
+    }
+
+    const done = applyCameraFlyTo(camera, activeCameraFlight, time);
+    if (done) {
+      activeCameraFlight = null;
+      setStatus(activeCameraFlightStatus);
+      activeCameraFlightStatus = '';
+    }
+    return true;
+  }
+
   async function applyTilesSetPositionFromPointerEvent(event) {
     const coordinate = pickCoordinateFromPointerEvent(event);
     if (!coordinate) {
@@ -97,29 +156,32 @@ export function createFlyToController({
     }
   }
 
-  function frameTileset() {
+  function frameTileset({
+    activeStatus = 'Moving camera to the tileset.',
+    doneStatus = 'Moved camera to the tileset.',
+  } = {}) {
     if (!getTilesetBoundingSphere(sphere)) {
       return false;
     }
 
-    const pose = geoCamera.getFlyToPoseFromBoundingSphere(
+    startBoundingSphereFlight(
       sphere.center,
-      sphere.radius,
+      sphere.radius / 2,
       moveToTilesPose,
+      {
+        activeStatus,
+        doneStatus,
+      },
     );
-    camera.position.copy(pose.position);
-    camera.quaternion.copy(pose.quaternion);
-    camera.updateMatrixWorld(true);
-    cameraController.setCamera(camera);
     return true;
   }
 
   function moveCameraToTiles() {
     if (frameTileset()) {
-      setStatus('Moved camera to the tileset.');
-    } else {
-      setStatus('Tileset is not ready to frame yet.', true);
+      return;
     }
+
+    setStatus('Tileset is not ready to frame yet.', true);
   }
 
   function moveCameraToCoordinate(coordinate) {
@@ -129,16 +191,15 @@ export function createFlyToController({
       coordinate.height,
       coordinateWorldPosition,
     );
-    const pose = geoCamera.getFlyToPoseFromBoundingSphere(
+    startBoundingSphereFlight(
       coordinateWorldPosition,
       moveToCoordinateRadius,
       moveToTilesPose,
+      {
+        activeStatus: 'Moving camera to the specified coordinate.',
+        doneStatus: 'Moved camera to the specified coordinate.',
+      },
     );
-    camera.position.copy(pose.position);
-    camera.quaternion.copy(pose.quaternion);
-    camera.updateMatrixWorld(true);
-    cameraController.setCamera(camera);
-    setStatus('Moved camera to the specified coordinate.');
   }
 
   return {
@@ -148,5 +209,6 @@ export function createFlyToController({
     moveCameraToCoordinate,
     moveCameraToTiles,
     pickCoordinateFromPointerEvent,
+    update,
   };
 }

package/src/viewer/scene/cameraController.js

@@ -1100,7 +1100,7 @@ class CameraController extends EventDispatcher {
     const minScale = 0;
     metrics.distanceScale = baseScale;
     metrics.transitionWeight = 0;
-    if (!this.#ellipsoid) {
+    if (!this.#ellipsoid || this.#isCameraCenterMode()) {
       return metrics;
     }
     const taperStartRadius = this.#ellipsoidMaxRadius * 1.5;
@@ -1161,7 +1161,7 @@ class CameraController extends EventDispatcher {
     const source = _vec4.copy(this.#camera.position);
     let distanceScale = 1;
     let transitionWeight = 0;
-    if (zoomAmount < 0 && this.#ellipsoid) {
+    if (zoomAmount < 0 && this.#ellipsoid && !this.#isCameraCenterMode()) {
       const metrics = this.#getZoomOutMetrics(source, hit.virtual ? null : hit);
       distanceScale = metrics.distanceScale;
       transitionWeight = metrics.transitionWeight;

package/src/viewer/scene/sceneSetup.js

@@ -6,10 +6,7 @@ import {
   Scene,
   WebGLRenderer,
 } from 'three';
-import {
-  SplatEdit,
-  SplatEditRgbaBlendMode,
-} from '@sparkjsdev/spark';
+import { SplatEdit, SplatEditRgbaBlendMode } from '@sparkjsdev/spark';
 import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
 import { KTX2Loader } from 'three/addons/loaders/KTX2Loader.js';
 import { CameraController } from './cameraController.js';
@@ -47,9 +44,9 @@ export function createViewerScene({
     60,
     window.innerWidth / window.innerHeight,
     1,
-    2e7,
+    1.2e7,
   );
-  camera.position.set(0, 0, 1.75e7);
+  camera.position.set(0, 0, 1.2e7);
   camera.updateMatrixWorld(true);
 
   const contentGroup = new Group();