Merge branch 'main' into fix/default-3dtiles-style

reearth · Nov 19, 2024 · 89d57af · 89d57af
2 parents 186b2a4 + e518108
commit 89d57af
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/web/src/beta/features/Dashboard/ContentsContainer/RecycleBin/items/RecycleBinItem.tsx b/web/src/beta/features/Dashboard/ContentsContainer/RecycleBin/items/RecycleBinItem.tsx
@@ -2,6 +2,7 @@ import { Button, PopupMenu, PopupMenuItem } from "@reearth/beta/lib/reearth-ui";
 import { useT } from "@reearth/services/i18n";
 import { styled } from "@reearth/services/theme";
 import { FC, useCallback, useState } from "react";
+import defaultProjectBackgroundImage from "@reearth/beta/ui/assets/defaultProjectBackgroundImage.webp";
 
 import { DeletedProject } from "../../../type";
 import ProjectDeleteModal from "../ProjectDeleteModal";
@@ -48,7 +49,7 @@ const RecycleBinItem: FC<Prop> = ({
   return (
     <Card>
       <CardImage
-        backgroundImage={project?.imageUrl}
+        backgroundImage={project?.imageUrl ?? defaultProjectBackgroundImage}
         isHovered={isHovered ?? false}
         onMouseEnter={() => handleProjectHover(true)}
         onMouseLeave={() => handleProjectHover(false)}
@@ -94,9 +95,8 @@ const CardImage = styled("div")<{
 }>(({ theme, backgroundImage, isHovered }) => ({
   flex: 1,
   position: "relative",
-  background: backgroundImage
-    ? `url(${backgroundImage}) center/cover`
-    : theme.bg[1],
+  background: backgroundImage ? `url(${backgroundImage}) center/cover` : "",
+  backgroundColor: theme.bg[1],
   borderRadius: theme.radius.normal,
   boxSizing: "border-box",
   cursor: "pointer",

diff --git a/web/src/beta/features/Editor/Visualizer/hooks.ts b/web/src/beta/features/Editor/Visualizer/hooks.ts
@@ -96,6 +96,16 @@ export default ({
   );
   const isInitialized = useRef(false);
 
+  // Workaround: Temporarily disable terrain when terrain is enabled
+  // We don't know the root cause yet, but it seems that terrain is not loaded properly when terrain is enabled on Editor
+  const [tempDisableTerrain, setTempDisableTerrain] = useState(true);
+
+  useEffect(() => {
+    setTimeout(() => {
+      setTempDisableTerrain(false);
+    }, 0);
+  }, []);
+
   const { viewerProperty, cesiumIonAccessToken } = useMemo(() => {
     const sceneProperty = processProperty(scene?.property);
     const cesiumIonAccessToken = sceneProperty?.default?.ion;
@@ -113,16 +123,27 @@ export default ({
       setInitialCamera(initialCamera);
     }
 
+    const viewerProperty = sceneProperty
+      ? (convertData(
+          sceneProperty,
+          sceneProperty2ViewerPropertyMapping
+        ) as ViewerProperty)
+      : undefined;
+
+    if (
+      viewerProperty &&
+      tempDisableTerrain &&
+      viewerProperty.terrain &&
+      viewerProperty.terrain.enabled
+    ) {
+      viewerProperty.terrain.enabled = false;
+    }
+
     return {
-      viewerProperty: sceneProperty
-        ? (convertData(
-            sceneProperty,
-            sceneProperty2ViewerPropertyMapping
-          ) as ViewerProperty)
-        : undefined,
+      viewerProperty,
       cesiumIonAccessToken
     };
-  }, [scene?.property]);
+  }, [scene?.property, tempDisableTerrain]);
 
   useEffect(() => {
     if (isInitialized.current) return;