Merge branch 'main' into release

reearth · Oct 29, 2024 · 9da6e63 · 9da6e63
2 parents ba9a2e3 + d837a91
commit 9da6e63
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/index.tsx b/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/index.tsx
@@ -57,6 +57,14 @@ const fieldComponents = {
       assetsTypes={IMAGE_TYPES}
       onChange={props.onUpdate}
     />
+  ),
+  model: (props: FieldProps) => (
+    <AssetField
+      inputMethod="asset"
+      value={props.value as string}
+      assetsTypes={["glb"]}
+      onChange={props.onUpdate}
+    />
   )
 };
 

diff --git a/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts b/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts
@@ -63,7 +63,7 @@ export const markerNodes: AppearanceNode[] = [
     id: "imageSize",
     title: "Image Size",
     field: "number",
-    defaultValue: 100
+    defaultValue: 1
   },
   {
     id: "imageSizeInMeters",

diff --git a/...c/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/model.ts b/...c/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/model.ts
@@ -12,7 +12,7 @@ export const modelNodes: AppearanceNode[] = [
   {
     id: "url",
     title: "Url",
-    field: "text",
+    field: "model",
     defaultValue: ""
   },
   {

diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts
@@ -12,7 +12,8 @@ export type AppearanceField =
   | "select"
   | "text"
   | "typography"
-  | "image";
+  | "image"
+  | "model";
 
 export type AppearanceNodes = Record<AppearanceType, AppearanceNode[]>;