3dtiles-inspector 0.2.13 → 0.2.15

package/src/viewer/screenSelection/index.js

@@ -1,5 +1,6 @@
 import {
   SCREEN_SELECTION_ACTION_EXCLUDE,
+  SCREEN_SELECTION_ACTION_INCLUDE,
   SCREEN_SELECTION_MIN_DEPTH_RANGE,
   cameraPosition,
   copyDepthRange,
@@ -27,6 +28,7 @@ import {
 } from './farHandle.js';
 
 export { SCREEN_SELECTION_ACTION_EXCLUDE } from './state.js';
+export { SCREEN_SELECTION_ACTION_INCLUDE } from './state.js';
 export {
   createScreenSelectionEdit,
   setScreenSelectionEditSelection,
@@ -38,6 +40,7 @@ export {
 export { createScreenSelectionPointerTracker } from './pointerTracker.js';
 
 export function createScreenSelection({
+  action = SCREEN_SELECTION_ACTION_EXCLUDE,
   cameraPosition: sourceCameraPosition,
   depthRange,
   farPlane,
@@ -51,7 +54,7 @@ export function createScreenSelection({
   const copiedPlaneMatrices = planeMatrices.map((matrix) => matrix.slice());
   const referenceTransformMatrix = copyMatrix4Array(transformMatrix);
   return {
-    action: SCREEN_SELECTION_ACTION_EXCLUDE,
+    action,
     basePlaneMatrices: copiedPlaneMatrices.map((matrix) => matrix.slice()),
     cameraPosition: copyVectorArray(sourceCameraPosition),
     currentTransformMatrix: referenceTransformMatrix.slice(),
@@ -80,8 +83,18 @@ export function disposeScreenSelection(selection) {
 }
 
 export function getScreenSelectionPayload(selection) {
+  if (selection?.type === 'sphere') {
+    return {
+      action: SCREEN_SELECTION_ACTION_INCLUDE,
+      sphere: {
+        center: selection.worldCenter.slice(),
+        radius: selection.worldRadius,
+      },
+    };
+  }
+
   return {
-    action: SCREEN_SELECTION_ACTION_EXCLUDE,
+    action: selection.action || SCREEN_SELECTION_ACTION_EXCLUDE,
     planeMatrices: selection.planeMatrices.map((matrix) => matrix.slice()),
     rect: copyRect(selection.rect),
     viewProjectionMatrix: selection.viewProjectionMatrix.slice(),

package/src/viewer/screenSelection/sdf.js

@@ -36,6 +36,46 @@ export function createScreenSelectionSdfs(planeMatrices) {
   return planeMatrices.map((matrix) => createScreenSelectionSdf(matrix));
 }
 
+export function createSphereSelectionSdf(selection) {
+  const sdf = new SplatEditSdf({
+    type: SplatEditSdfType.SPHERE,
+    invert: false,
+    color: SCREEN_SELECTION_EXCLUDE_COLOR.clone(),
+    opacity: 1,
+    radius: Number(selection?.worldRadius) || 0,
+  });
+  if (Array.isArray(selection?.worldCenter)) {
+    sdf.position.fromArray(selection.worldCenter);
+  }
+  sdf.updateMatrix();
+  sdf.updateMatrixWorld(true);
+  return sdf;
+}
+
+export function applySphereSelectionSdf(selection) {
+  if (!selection) {
+    return;
+  }
+  if (!Array.isArray(selection.sdfs) || selection.sdfs.length !== 1) {
+    selection.sdfs?.forEach((sdf) => {
+      sdf.removeFromParent();
+    });
+    selection.sdfs = [createSphereSelectionSdf(selection)];
+    return;
+  }
+
+  const sdf = selection.sdfs[0];
+  sdf.type = SplatEditSdfType.SPHERE;
+  sdf.invert = false;
+  sdf.radius = Number(selection.worldRadius) || 0;
+  if (Array.isArray(selection.worldCenter)) {
+    sdf.position.fromArray(selection.worldCenter);
+  }
+  sdf.scale.setScalar(1);
+  sdf.updateMatrix();
+  sdf.updateMatrixWorld(true);
+}
+
 export function applyScreenSelectionSdfMatrices(selection) {
   if (
     !selection.sdfs ||
@@ -54,10 +94,11 @@ export function applyScreenSelectionSdfMatrices(selection) {
 }
 
 export function setScreenSelectionEditSelection(edit, selection, style) {
-  const hidden = style === true || style === 'exclude';
+  const hidden = style === true || style === 'exclude' || style === 'include';
+  const sphere = selection?.type === 'sphere';
   edit.sdfs = null;
   edit.clear();
-  edit.invert = !!selection;
+  edit.invert = sphere ? hidden : !!selection;
   edit.rgbaBlendMode = hidden
     ? SplatEditRgbaBlendMode.MULTIPLY
     : SplatEditRgbaBlendMode.SET_RGB;
@@ -66,10 +107,14 @@ export function setScreenSelectionEditSelection(edit, selection, style) {
   }
 
   edit.name = hidden
-    ? `Screen Selection ${selection.id} Exclude`
-    : `Screen Selection ${selection.id} Preview`;
+    ? sphere
+      ? `Crop Sphere ${selection.id} Include`
+      : `Screen Selection ${selection.id} Exclude`
+    : sphere
+      ? `Crop Sphere ${selection.id} Preview`
+      : `Screen Selection ${selection.id} Preview`;
   selection.sdfs.forEach((sdf) => {
-    sdf.invert = true;
+    sdf.invert = sphere ? false : true;
     if (hidden) {
       sdf.color.copy(SCREEN_SELECTION_HIDDEN_COLOR);
       sdf.opacity = SCREEN_SELECTION_HIDDEN_ALPHA;
@@ -82,7 +127,7 @@ export function setScreenSelectionEditSelection(edit, selection, style) {
 }
 
 export function createScreenSelectionEdit({ style, hidden, name }) {
-  const isHidden = style === 'exclude' || hidden === true;
+  const isHidden = style === 'exclude' || style === 'include' || hidden === true;
   return new SplatEdit({
     name,
     rgbaBlendMode: isHidden

package/src/viewer/screenSelection/state.js

@@ -1,6 +1,7 @@
 import { Color, Matrix4, Plane, Vector2, Vector3 } from 'three';
 
 export const SCREEN_SELECTION_ACTION_EXCLUDE = 'exclude';
+export const SCREEN_SELECTION_ACTION_INCLUDE = 'include';
 
 export const SCREEN_SELECTION_EXCLUDE_COLOR = new Color(1, 0.82, 0);
 export const SCREEN_SELECTION_HIDDEN_COLOR = new Color(1, 1, 1);

package/src/viewer/transform/geoCamera.js

@@ -83,7 +83,7 @@ export function createGeoCameraController({
 
   function getLocalFrameQuaternion(referencePoint, target) {
     if (
-      referencePoint.lengthSq() < centerModeDistanceSq ||
+      referencePoint.lengthSq() <= centerModeDistanceSq ||
       !getActiveEllipsoid()
     ) {
       return target.identity();

package/src/viewer/transform/transformModeController.js

@@ -24,10 +24,19 @@ export function createTransformModeController({
     const pendingPositionPick =
       setPositionController.isPending() || cropController.getPendingMode();
     const activeCropScreenSelection = cropController.getActiveSelection();
+    const activeKeepSphere =
+      activeCropScreenSelection?.type === 'sphere'
+        ? activeCropScreenSelection
+        : null;
     const farControlsVisible =
       !!activeCropScreenSelection?.farHandle && !pendingPositionPick;
+    const sphereControlsVisible =
+      !!activeKeepSphere?.wireframe && !pendingPositionPick;
     const rootControlsVisible =
-      activeMode !== null && !farControlsVisible && !pendingPositionPick;
+      activeMode !== null &&
+      !farControlsVisible &&
+      !sphereControlsVisible &&
+      !pendingPositionPick;
 
     if (farControlsVisible) {
       if (transformControls.object !== activeCropScreenSelection.farHandle) {
@@ -36,6 +45,13 @@ export function createTransformModeController({
       transformControls.setMode('translate');
       transformControls.setSpace('local');
       setAxes(false, false, true);
+    } else if (sphereControlsVisible) {
+      if (transformControls.object !== activeKeepSphere.wireframe) {
+        transformControls.attach(activeKeepSphere.wireframe);
+      }
+      transformControls.setMode('translate');
+      transformControls.setSpace('local');
+      setAxes(true, true, true);
     } else if (rootControlsVisible) {
       if (transformControls.object !== transformHandle) {
         transformControls.attach(transformHandle);
@@ -47,7 +63,8 @@ export function createTransformModeController({
       transformControls.detach();
     }
 
-    const controlsVisible = farControlsVisible || rootControlsVisible;
+    const controlsVisible =
+      farControlsVisible || sphereControlsVisible || rootControlsVisible;
     transformControls.enabled = controlsVisible;
     if (transformControlsHelper) {
       transformControlsHelper.visible = controlsVisible;