fix: allow enter ground option for clipping box on reearth/core (#500)

reearth · Mar 1, 2023 · f8e1293 · f8e1293
1 parent 6448bac
commit f8e1293
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/src/core/engines/Cesium/Feature/Box/hooks/box.ts b/src/core/engines/Cesium/Feature/Box/hooks/box.ts
@@ -28,10 +28,9 @@ import { computeMouseMoveAmount, updateTrs } from "../utils";
 export const useHooks = ({
   property,
   geometry,
-  sceneProperty,
   feature,
   onLayerEdit,
-}: Pick<FeatureProps<Property>, "property" | "sceneProperty" | "geometry" | "feature"> & {
+}: Pick<FeatureProps<Property>, "property" | "geometry" | "feature"> & {
   onLayerEdit?: (e: LayerEditEvent) => void;
 }) => {
   const { viewer } = useCesium();
@@ -49,8 +48,8 @@ export const useHooks = ({
     activePointOutlineColor,
     axisLineColor,
     cursor,
+    allowEnterGround,
   } = property ?? {};
-  const { allowEnterGround } = sceneProperty?.default || {};
 
   const [terrainHeightEstimate, setTerrainHeightEstimate] = useState(0);
   const [trs] = useState(() =>

diff --git a/src/core/engines/Cesium/Feature/Box/index.tsx b/src/core/engines/Cesium/Feature/Box/index.tsx
@@ -21,7 +21,6 @@ const Box: React.FC<Props> = memo(function BoxPresenter({
   property,
   geometry,
   isVisible,
-  sceneProperty,
   layer,
   feature,
   onLayerEdit,
@@ -50,7 +49,7 @@ const Box: React.FC<Props> = memo(function BoxPresenter({
     handleEdgeMouseDown,
     handleEdgeMouseMove,
     handleEdgeMouseUp,
-  } = useHooks({ property, geometry, sceneProperty, feature, onLayerEdit });
+  } = useHooks({ property, geometry, feature, onLayerEdit });
 
   const scalePointDimension = ((width + height + length) / 3) * 0.05;
 

diff --git a/src/core/engines/Cesium/Feature/Tileset/hooks.ts b/src/core/engines/Cesium/Feature/Tileset/hooks.ts
@@ -242,7 +242,6 @@ export const useHooks = ({
   boxId,
   isVisible,
   property,
-  sceneProperty,
   layer,
   feature,
   meta,
@@ -277,8 +276,8 @@ export const useHooks = ({
     visible: clippingVisible = true,
     direction = "inside",
     builtinBoxProps,
-  } = useClippingBox({ clipping: experimental_clipping, sceneProperty, boxId });
-  const { allowEnterGround } = sceneProperty?.default || {};
+    allowEnterGround,
+  } = useClippingBox({ clipping: experimental_clipping, boxId });
   const [style, setStyle] = useState<Cesium3DTileStyle>();
   const { url, type } = useData(layer);
 

diff --git a/src/core/engines/Cesium/Feature/Tileset/index.tsx b/src/core/engines/Cesium/Feature/Tileset/index.tsx
@@ -34,7 +34,6 @@ function Tileset({
     layer,
     feature,
     property,
-    sceneProperty,
     meta,
     evalFeature,
     onComputedFeatureFetch,

diff --git a/src/core/engines/Cesium/Feature/Tileset/useClippingBox.ts b/src/core/engines/Cesium/Feature/Tileset/useClippingBox.ts
@@ -12,7 +12,7 @@ import { RootEventTarget, useCesium } from "resium";
 
 import { computeMoveAmount } from "@reearth/components/molecules/Visualizer/Engine/Cesium/Box/utils";
 import { Camera, EXPERIMENTAL_clipping } from "@reearth/core/mantle";
-import { LayerEditEvent, SceneProperty } from "@reearth/core/Map";
+import { LayerEditEvent } from "@reearth/core/Map";
 
 import {
   getCamera,
@@ -84,17 +84,15 @@ export const BUILTIN_BOX_SIDE_PLANES = [
 
 export const useClippingBox = ({
   clipping,
-  sceneProperty,
   boxId,
 }: {
   clipping?: EXPERIMENTAL_clipping;
-  sceneProperty?: SceneProperty;
   boxId: string;
 }) => {
   const {
     useBuiltinBox,
     visible,
-    keepAboveGround,
+    allowEnterGround,
     coordinates,
     width,
     height,
@@ -106,11 +104,6 @@ export const useClippingBox = ({
 
   const { viewer }: { viewer: Viewer } = useCesium();
 
-  const allowEnterGround = useCallback(
-    () => !!sceneProperty?.default?.allowEnterGround || !keepAboveGround,
-    [sceneProperty?.default?.allowEnterGround, keepAboveGround],
-  );
-
   const isBoxClicked = useRef(false);
   const isTopBottomSidePlaneClicked = useRef(false);
   const currentCameraPosition = useRef<Camera | undefined>();
@@ -229,7 +222,7 @@ export const useClippingBox = ({
       if (isTopBottomSidePlaneClicked.current) {
         const locationHeight = coords?.[2] || 0;
         const terrainHeight = await (async () => {
-          if (!allowEnterGround()) {
+          if (!allowEnterGround) {
             const boxBottomHeight = locationHeight - (dimensions?.height || 0) / 2;
             const floorHeight =
               (await sampleTerrainHeight(viewer.scene, coords?.[0] || 0, coords?.[1] || 0)) || 0;
@@ -250,9 +243,6 @@ export const useClippingBox = ({
         );
         const direction = new Cartesian3(0, 0, vector.y < 0 ? -1 : 1);
 
-        // FIXME()
-        // const scale =
-        //   Math.floor(locationHeight) > 5 ? getCamera().height / locationHeight : 1;
         const { moveAmount } = computeMoveAmount(
           viewer.scene,
           {
@@ -263,15 +253,19 @@ export const useClippingBox = ({
           direction,
         );
         const moveVector = Cartesian3.multiplyByScalar(direction, moveAmount, new Cartesian3());
-        setCoords(v => [v?.[0] || 0, v?.[1] || 0, (v?.[2] || 0) + moveVector.z + terrainHeight]);
+        setCoords(v => [
+          v?.[0] || 0,
+          v?.[1] || 0,
+          (terrainHeight ? terrainHeight : v?.[2] || 0) + moveVector.z,
+        ]);
       } else {
         const position = e.endPosition
           ? getLocationFromScreen(viewer.scene, e.endPosition.x, e.endPosition.y, true)
           : undefined;
         setCoords(v => [
           position?.lng || 0,
           position?.lat || 0,
-          (!allowEnterGround() ? position?.height : undefined) || v?.[2] || 0,
+          (!allowEnterGround ? position?.height : undefined) || v?.[2] || 0,
         ]);
       }
     },

diff --git a/src/core/mantle/types/value.ts b/src/core/mantle/types/value.ts
@@ -54,7 +54,7 @@ export type Plane = {
 // Familiar with Cesium
 export type EXPERIMENTAL_clipping = {
   useBuiltinBox?: boolean;
-  keepAboveGround?: boolean;
+  allowEnterGround?: boolean;
   planes?: {
     normal: {
       x: number;