@treasuryspatial/viewer-kit 0.2.44 → 0.2.50

package/dist/materials/presets.js

@@ -1,38 +1,107 @@
 import { findMaterial } from "./catalogue";
-export const BASELINE_MATERIAL_PRESET_ID = "calenv-baseline";
-const materialSlot = (catalogId, overrides) => ({
+export const ARCHITECTURAL_WHITE_MATERIAL_PRESET_ID = "architectural-white";
+export const MONOCHROME_CLAY_MATERIAL_PRESET_ID = "monochrome-clay";
+export const UPLOAD_VISIBLE_MATERIAL_PRESET_ID = "upload-visible";
+const materialBinding = (catalogId, overrides) => ({
     catalogId,
     overrides,
 });
 export const MATERIAL_PRESET_DATA = {
-    [BASELINE_MATERIAL_PRESET_ID]: {
-        id: BASELINE_MATERIAL_PRESET_ID,
-        label: "calenv baseline surfaces",
+    [ARCHITECTURAL_WHITE_MATERIAL_PRESET_ID]: {
+        id: ARCHITECTURAL_WHITE_MATERIAL_PRESET_ID,
+        label: "architectural white surfaces",
         materials: {
-            walls: materialSlot("white_wall", { reflectance: 0.7, roughness: 0.3 }),
-            floor: materialSlot("stone_light", {
-                color: { r: 232, g: 234, b: 240 },
-                reflectance: 0.52,
-                roughness: 0.4,
+            walls: materialBinding("white_wall", {
+                color: { r: 244, g: 244, b: 240 },
+                reflectance: 0.66,
+                roughness: 0.52,
+            }),
+            floor: materialBinding("stone_light", {
+                color: { r: 226, g: 225, b: 219 },
+                reflectance: 0.46,
+                roughness: 0.64,
+            }),
+            ceiling: materialBinding("acoustic_ceiling_white", {
+                color: { r: 248, g: 248, b: 244 },
+                reflectance: 0.72,
+                roughness: 0.56,
+            }),
+        },
+    },
+    [MONOCHROME_CLAY_MATERIAL_PRESET_ID]: {
+        id: MONOCHROME_CLAY_MATERIAL_PRESET_ID,
+        label: "monochrome clay surfaces",
+        materials: {
+            walls: materialBinding("white_wall", {
+                color: { r: 238, g: 238, b: 234 },
+                reflectance: 0.68,
+                roughness: 0.7,
+            }),
+            floor: materialBinding("white_wall", {
+                color: { r: 232, g: 232, b: 228 },
+                reflectance: 0.62,
+                roughness: 0.76,
+            }),
+            ceiling: materialBinding("white_wall", {
+                color: { r: 245, g: 245, b: 241 },
+                reflectance: 0.72,
+                roughness: 0.68,
+            }),
+            surfaces: {
+                roof: materialBinding("white_wall", {
+                    color: { r: 238, g: 238, b: 234 },
+                    reflectance: 0.66,
+                    roughness: 0.72,
+                }),
+                door: materialBinding("white_wall", {
+                    color: { r: 230, g: 230, b: 226 },
+                    reflectance: 0.58,
+                    roughness: 0.74,
+                }),
+                glazing: materialBinding("white_wall", {
+                    color: { r: 224, g: 228, b: 230 },
+                    reflectance: 0.54,
+                    roughness: 0.62,
+                }),
+            },
+        },
+    },
+    [UPLOAD_VISIBLE_MATERIAL_PRESET_ID]: {
+        id: UPLOAD_VISIBLE_MATERIAL_PRESET_ID,
+        label: "upload visible surfaces",
+        materials: {
+            walls: materialBinding("white_wall", {
+                color: { r: 245, g: 245, b: 244 },
+                reflectance: 0.72,
+                roughness: 0.34,
+            }),
+            floor: materialBinding("stone_light", {
+                color: { r: 225, g: 226, b: 230 },
+                reflectance: 0.48,
+                roughness: 0.44,
+            }),
+            ceiling: materialBinding("acoustic_ceiling_white", {
+                color: { r: 248, g: 248, b: 246 },
+                reflectance: 0.76,
+                roughness: 0.28,
             }),
-            ceiling: materialSlot("acoustic_ceiling_white", { reflectance: 0.7, roughness: 0.3 }),
         },
     },
     studio: {
         id: "studio",
         label: "studio high-contrast surfaces",
         materials: {
-            walls: materialSlot("concrete_charcoal", {
+            walls: materialBinding("concrete_charcoal", {
                 color: { r: 48, g: 52, b: 58 },
                 reflectance: 0.22,
                 roughness: 0.45,
             }),
-            floor: materialSlot("stone_dark", {
+            floor: materialBinding("stone_dark", {
                 color: { r: 28, g: 30, b: 34 },
                 reflectance: 0.18,
                 roughness: 0.4,
             }),
-            ceiling: materialSlot("white_wall", {
+            ceiling: materialBinding("white_wall", {
                 color: { r: 220, g: 222, b: 228 },
                 reflectance: 0.58,
                 roughness: 0.25,
@@ -43,17 +112,17 @@ export const MATERIAL_PRESET_DATA = {
         id: "daylight",
         label: "daylight pavilion surfaces",
         materials: {
-            walls: materialSlot("white_wall", {
+            walls: materialBinding("white_wall", {
                 color: { r: 240, g: 242, b: 248 },
                 reflectance: 0.68,
                 roughness: 0.35,
             }),
-            floor: materialSlot("stone_light", {
+            floor: materialBinding("stone_light", {
                 color: { r: 214, g: 206, b: 190 },
                 reflectance: 0.45,
                 roughness: 0.5,
             }),
-            ceiling: materialSlot("acoustic_ceiling_white", {
+            ceiling: materialBinding("acoustic_ceiling_white", {
                 color: { r: 252, g: 252, b: 248 },
                 reflectance: 0.78,
                 roughness: 0.22,
@@ -64,19 +133,19 @@ export const MATERIAL_PRESET_DATA = {
         id: "gallery-spot",
         label: "immersive gallery surfaces",
         materials: {
-            walls: materialSlot("white_wall", {
+            walls: materialBinding("white_wall", {
                 color: { r: 246, g: 237, b: 225 },
                 reflectance: 0.6,
                 roughness: 0.25,
             }),
-            floor: materialSlot("stone_dark", {
+            floor: materialBinding("stone_dark", {
                 color: { r: 90, g: 88, b: 83 },
                 reflectance: 0.32,
                 roughness: 0.6,
                 pattern: "grid",
                 patternScale: 0.4,
             }),
-            ceiling: materialSlot("acoustic_ceiling_white", {
+            ceiling: materialBinding("acoustic_ceiling_white", {
                 color: { r: 255, g: 250, b: 245 },
                 reflectance: 0.75,
                 roughness: 0.2,
@@ -87,17 +156,17 @@ export const MATERIAL_PRESET_DATA = {
         id: "lab-neutral",
         label: "neutral lab surfaces",
         materials: {
-            walls: materialSlot("white_wall", {
+            walls: materialBinding("white_wall", {
                 color: { r: 240, g: 240, b: 246 },
                 reflectance: 0.82,
                 roughness: 0.3,
             }),
-            floor: materialSlot("timber_floor_warm", {
+            floor: materialBinding("timber_floor_warm", {
                 color: { r: 172, g: 168, b: 160 },
                 reflectance: 0.35,
                 roughness: 0.55,
             }),
-            ceiling: materialSlot("acoustic_ceiling_white", {
+            ceiling: materialBinding("acoustic_ceiling_white", {
                 color: { r: 233, g: 235, b: 239 },
                 reflectance: 0.88,
                 roughness: 0.25,
@@ -108,19 +177,19 @@ export const MATERIAL_PRESET_DATA = {
         id: "atrium-suntrack",
         label: "atrium daylight surfaces",
         materials: {
-            walls: materialSlot("stone_light", {
+            walls: materialBinding("stone_light", {
                 color: { r: 210, g: 210, b: 205 },
                 reflectance: 0.55,
                 roughness: 0.4,
             }),
-            floor: materialSlot("stone_light", {
+            floor: materialBinding("stone_light", {
                 color: { r: 190, g: 190, b: 183 },
                 reflectance: 0.4,
                 roughness: 0.6,
                 pattern: "grid",
                 patternScale: 0.5,
             }),
-            ceiling: materialSlot("glass_structural_clear", {
+            ceiling: materialBinding("glass_structural_clear", {
                 color: { r: 230, g: 238, b: 245 },
                 reflectance: 0.65,
                 roughness: 0.15,
@@ -131,19 +200,19 @@ export const MATERIAL_PRESET_DATA = {
         id: "flow-horizon",
         label: "flow horizon surfaces",
         materials: {
-            walls: materialSlot("glass_structural_clear", {
+            walls: materialBinding("glass_structural_clear", {
                 color: { r: 210, g: 225, b: 235 },
                 reflectance: 0.4,
                 roughness: 0.2,
             }),
-            floor: materialSlot("timber_floor_warm", {
+            floor: materialBinding("timber_floor_warm", {
                 color: { r: 140, g: 110, b: 85 },
                 reflectance: 0.28,
                 roughness: 0.6,
                 pattern: "herringbone",
                 patternScale: 0.4,
             }),
-            ceiling: materialSlot("timber_floor_warm", {
+            ceiling: materialBinding("timber_floor_warm", {
                 color: { r: 210, g: 200, b: 185 },
                 reflectance: 0.5,
                 roughness: 0.35,
@@ -154,17 +223,17 @@ export const MATERIAL_PRESET_DATA = {
         id: "biophilic-soft",
         label: "biophilic loft surfaces",
         materials: {
-            walls: materialSlot("white_wall", {
+            walls: materialBinding("white_wall", {
                 color: { r: 214, g: 224, b: 214 },
                 reflectance: 0.58,
                 roughness: 0.35,
             }),
-            floor: materialSlot("timber_floor_warm", {
+            floor: materialBinding("timber_floor_warm", {
                 color: { r: 170, g: 142, b: 110 },
                 reflectance: 0.32,
                 roughness: 0.55,
             }),
-            ceiling: materialSlot("acoustic_ceiling_white", {
+            ceiling: materialBinding("acoustic_ceiling_white", {
                 color: { r: 250, g: 248, b: 240 },
                 reflectance: 0.78,
                 roughness: 0.25,
@@ -182,6 +251,14 @@ const hexToRgb = (hex) => {
         b: value & 0xff,
     };
 };
+const findMaterialDefinition = (materialId, materialDefinitions) => {
+    if (materialDefinitions && "get" in materialDefinitions) {
+        return materialDefinitions.get(materialId) ?? findMaterial(materialId);
+    }
+    const toolMaterial = materialDefinitions?.find((material) => material.materialId === materialId);
+    return toolMaterial ?? findMaterial(materialId);
+};
+export const hasMaterialDefinition = (materialId, materialDefinitions) => Boolean(findMaterialDefinition(materialId, materialDefinitions));
 const resolveMaterialConfig = (definition, catalogId, overrides) => {
     const baselineColor = definition?.baseline?.color ?? "#ffffff";
     const baseColor = overrides?.color ?? hexToRgb(baselineColor);
@@ -194,15 +271,39 @@ const resolveMaterialConfig = (definition, catalogId, overrides) => {
         patternScale: overrides?.patternScale ?? 0.5,
     };
 };
-export function resolveMaterialSlot(slot) {
-    const definition = findMaterial(slot.catalogId);
-    return resolveMaterialConfig(definition, slot.catalogId, slot.overrides);
+export function resolveMaterialBinding(binding, materialDefinitions) {
+    const definition = findMaterialDefinition(binding.catalogId, materialDefinitions);
+    return resolveMaterialConfig(definition, binding.catalogId, binding.overrides);
 }
-export function resolveMaterialPresetMaterials(preset) {
+export function resolveMaterialSurfaceMap(surfaces, materialDefinitions) {
+    if (!surfaces)
+        return undefined;
+    const entries = Object.entries(surfaces)
+        .filter(([surfaceId]) => Boolean(surfaceId))
+        .map(([surfaceId, binding]) => [surfaceId, resolveMaterialBinding(binding, materialDefinitions)]);
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+}
+export function resolveMaterialPresetMaterials(preset, materialDefinitions) {
+    const walls = resolveMaterialBinding(preset.materials.walls, materialDefinitions);
+    const floor = resolveMaterialBinding(preset.materials.floor, materialDefinitions);
+    const ceiling = resolveMaterialBinding(preset.materials.ceiling, materialDefinitions);
+    const defaultSharedSurfaces = {
+        roof: { ...walls },
+        door: { ...walls },
+        glazing: resolveMaterialBinding(materialBinding("glass_structural_clear", {
+            color: { r: 224, g: 232, b: 240 },
+            reflectance: 0.62,
+            roughness: 0.16,
+        }), materialDefinitions),
+    };
+    const authoredSurfaces = resolveMaterialSurfaceMap(preset.materials.surfaces, materialDefinitions);
     return {
-        walls: resolveMaterialSlot(preset.materials.walls),
-        floor: resolveMaterialSlot(preset.materials.floor),
-        ceiling: resolveMaterialSlot(preset.materials.ceiling),
+        walls,
+        floor,
+        ceiling,
+        surfaces: Object.keys(authoredSurfaces ?? {}).length > 0
+            ? { ...defaultSharedSurfaces, ...(authoredSurfaces ?? {}) }
+            : defaultSharedSurfaces,
     };
 }
 export function listMaterialPresets() {

package/dist/materials/resolve.d.ts

@@ -1,13 +1,55 @@
 import type { MaterialsConfig, SurfaceMaterialConfig } from "./types";
+import { type MaterialDefinitionLookup } from "./presets";
 export type MaterialOverrides = {
     walls?: Partial<SurfaceMaterialConfig>;
     floor?: Partial<SurfaceMaterialConfig>;
     ceiling?: Partial<SurfaceMaterialConfig>;
+    surfaces?: Record<string, Partial<SurfaceMaterialConfig>>;
+};
+export type CoreMaterialSurface = "walls" | "floor" | "ceiling";
+export type MaterialOverrideTargetKind = "core" | "surface";
+export type SurfaceOverride = Partial<Pick<SurfaceMaterialConfig, "roughness" | "reflectance" | "patternScale" | "pattern" | "type" | "color">>;
+export type MaterialOverrideNumberKey = "roughness" | "reflectance" | "patternScale";
+export type MaterialOverrideAction = {
+    type: "reset";
+} | {
+    type: "set-core-number";
+    surface: CoreMaterialSurface;
+    key: MaterialOverrideNumberKey;
+    value: number | null;
+} | {
+    type: "set-surface-number";
+    surfaceId: string;
+    key: MaterialOverrideNumberKey;
+    value: number | null;
+} | {
+    type: "set-core-type";
+    surface: CoreMaterialSurface;
+    value: string | null;
+} | {
+    type: "set-surface-type";
+    surfaceId: string;
+    value: string | null;
+} | {
+    type: "set-core-color";
+    surface: CoreMaterialSurface;
+    color: SurfaceMaterialConfig["color"] | null;
+} | {
+    type: "set-surface-color";
+    surfaceId: string;
+    color: SurfaceMaterialConfig["color"] | null;
 };
 export type MaterialResolveOptions = {
     payload?: Record<string, unknown> | null;
     presetId?: string | null;
     overrides?: MaterialOverrides | null;
 };
+export declare const CORE_MATERIAL_SURFACES: CoreMaterialSurface[];
+export declare const isCoreMaterialSurface: (value: string) => value is CoreMaterialSurface;
+export declare const normalizeMaterialSurfaceId: (value: string | null | undefined) => string;
+export declare const normalizeMaterialSurfaceConfigMap: (surfaces: MaterialsConfig["surfaces"] | null | undefined) => MaterialsConfig["surfaces"] | undefined;
+export declare const normalizeMaterialOverrides: (overrides: MaterialOverrides | null | undefined) => MaterialOverrides;
+export declare const reduceMaterialOverrides: (previous: MaterialOverrides | null | undefined, action: MaterialOverrideAction) => MaterialOverrides;
+export declare const mergeMaterialsConfigWithOverrides: (base: MaterialsConfig | null, overrides: MaterialOverrides | null | undefined, materialDefinitions?: MaterialDefinitionLookup) => MaterialsConfig | null;
 export declare function resolveMaterialConfig(options: MaterialResolveOptions): MaterialsConfig | null;
 //# sourceMappingURL=resolve.d.ts.map

package/dist/materials/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/materials/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAGtE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvC,KAAK,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CACtC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,GAAG,IAAI,CAyB7F"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/materials/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvC,KAAK,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAChE,MAAM,MAAM,0BAA0B,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,IAAI,CAAC,qBAAqB,EAAE,WAAW,GAAG,aAAa,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,CACzG,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,CAAC;AACrF,MAAM,MAAM,sBAAsB,GAC9B;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,GAAG,EAAE,yBAAyB,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC/G;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,yBAAyB,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACvG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7E;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACrE;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,GACtG;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,CAAC;AAEnG,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,mBAAmB,EAAkC,CAAC;AAE3F,eAAO,MAAM,qBAAqB,GAAI,OAAO,MAAM,KAAG,KAAK,IAAI,mBACA,CAAC;AAEhE,eAAO,MAAM,0BAA0B,GAAI,OAAO,MAAM,GAAG,IAAI,GAAG,SAAS,WAAsC,CAAC;AAElH,eAAO,MAAM,iCAAiC,GAC5C,UAAU,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,SAAS,KACvD,eAAe,CAAC,UAAU,CAAC,GAAG,SAKhC,CAAC;AAWF,eAAO,MAAM,0BAA0B,GAAI,WAAW,iBAAiB,GAAG,IAAI,GAAG,SAAS,KAAG,iBAS5F,CAAC;AA6CF,eAAO,MAAM,uBAAuB,GAClC,UAAU,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAC9C,QAAQ,sBAAsB,KAC7B,iBAwBF,CAAC;AA+FF,eAAO,MAAM,iCAAiC,GAC5C,MAAM,eAAe,GAAG,IAAI,EAC5B,WAAW,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAC/C,sBAAsB,wBAAwB,KAC7C,eAAe,GAAG,IA2BpB,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,GAAG,IAAI,CAoC7F"}

package/dist/materials/resolve.js

@@ -1,15 +1,223 @@
-import { getMaterialPreset, resolveMaterialPresetMaterials } from "./presets";
+import { getMaterialPreset, resolveMaterialBinding, resolveMaterialPresetMaterials, } from "./presets";
+export const CORE_MATERIAL_SURFACES = ["walls", "floor", "ceiling"];
+export const isCoreMaterialSurface = (value) => CORE_MATERIAL_SURFACES.includes(value);
+export const normalizeMaterialSurfaceId = (value) => value?.trim().toLowerCase() ?? "";
+export const normalizeMaterialSurfaceConfigMap = (surfaces) => {
+    const entries = Object.entries(surfaces ?? {})
+        .map(([surfaceId, config]) => [normalizeMaterialSurfaceId(surfaceId), config])
+        .filter((entry) => Boolean(entry[0] && entry[1]));
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+};
+const normalizeSurfaceOverrideMap = (surfaces) => {
+    const entries = Object.entries(surfaces ?? {})
+        .map(([surfaceId, config]) => [normalizeMaterialSurfaceId(surfaceId), config])
+        .filter((entry) => Boolean(entry[0] && entry[1]));
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+};
+export const normalizeMaterialOverrides = (overrides) => {
+    if (!overrides)
+        return {};
+    const next = {};
+    if (overrides.walls && Object.keys(overrides.walls).length > 0)
+        next.walls = { ...overrides.walls };
+    if (overrides.floor && Object.keys(overrides.floor).length > 0)
+        next.floor = { ...overrides.floor };
+    if (overrides.ceiling && Object.keys(overrides.ceiling).length > 0)
+        next.ceiling = { ...overrides.ceiling };
+    const surfaces = normalizeSurfaceOverrideMap(overrides.surfaces);
+    if (surfaces)
+        next.surfaces = surfaces;
+    return next;
+};
+const compactOverride = (override) => {
+    if (!override)
+        return undefined;
+    const next = Object.fromEntries(Object.entries(override).filter(([, value]) => value !== null && value !== undefined && value !== ""));
+    return Object.keys(next).length > 0 ? next : undefined;
+};
+const setCoreOverride = (previous, surface, patch) => {
+    const next = { ...previous };
+    const merged = compactOverride({ ...previous[surface], ...patch });
+    if (merged) {
+        next[surface] = merged;
+    }
+    else {
+        delete next[surface];
+    }
+    return normalizeMaterialOverrides(next);
+};
+const setSurfaceOverride = (previous, surfaceId, patch) => {
+    const normalizedSurfaceId = normalizeMaterialSurfaceId(surfaceId);
+    if (!normalizedSurfaceId)
+        return normalizeMaterialOverrides(previous);
+    const surfaces = { ...(previous.surfaces ?? {}) };
+    const merged = compactOverride({ ...surfaces[normalizedSurfaceId], ...patch });
+    if (merged) {
+        surfaces[normalizedSurfaceId] = merged;
+    }
+    else {
+        delete surfaces[normalizedSurfaceId];
+    }
+    return normalizeMaterialOverrides({
+        ...previous,
+        surfaces: Object.keys(surfaces).length > 0 ? surfaces : undefined,
+    });
+};
+export const reduceMaterialOverrides = (previous, action) => {
+    const current = normalizeMaterialOverrides(previous);
+    switch (action.type) {
+        case "reset":
+            return {};
+        case "set-core-number":
+            return setCoreOverride(current, action.surface, { [action.key]: action.value ?? undefined });
+        case "set-surface-number":
+            return setSurfaceOverride(current, action.surfaceId, { [action.key]: action.value ?? undefined });
+        case "set-core-type": {
+            const value = action.value?.trim() || undefined;
+            return setCoreOverride(current, action.surface, { type: value });
+        }
+        case "set-surface-type": {
+            const value = action.value?.trim() || undefined;
+            return setSurfaceOverride(current, action.surfaceId, { type: value });
+        }
+        case "set-core-color":
+            return setCoreOverride(current, action.surface, { color: action.color ?? undefined });
+        case "set-surface-color":
+            return setSurfaceOverride(current, action.surfaceId, { color: action.color ?? undefined });
+        default:
+            return current;
+    }
+};
+const isCompleteSurfaceMaterialConfig = (value) => Boolean(value &&
+    value.type &&
+    value.color &&
+    typeof value.reflectance === "number" &&
+    typeof value.roughness === "number");
+const mergeMaterialMap = (base, overrides) => {
+    if (!base && !overrides)
+        return undefined;
+    const surfaceIds = new Set([...Object.keys(base ?? {}), ...Object.keys(overrides ?? {})]);
+    const nextEntries = [...surfaceIds]
+        .map((surfaceId) => {
+        const baseConfig = base?.[surfaceId];
+        const overrideConfig = overrides?.[surfaceId];
+        if (!baseConfig && !isCompleteSurfaceMaterialConfig(overrideConfig))
+            return null;
+        return [
+            surfaceId,
+            {
+                ...(baseConfig ?? overrideConfig),
+                ...(overrideConfig ?? {}),
+            },
+        ];
+    })
+        .filter((entry) => Boolean(entry));
+    return nextEntries.length > 0 ? Object.fromEntries(nextEntries) : undefined;
+};
+const defaultSurfaceConfig = () => ({
+    type: "custom",
+    color: { r: 255, g: 255, b: 255 },
+    reflectance: 0.5,
+    roughness: 0.6,
+});
+const cleanBindingOverrides = (override) => {
+    if (!override)
+        return undefined;
+    const next = {};
+    if (override.color)
+        next.color = override.color;
+    if (typeof override.reflectance === "number")
+        next.reflectance = override.reflectance;
+    if (typeof override.roughness === "number")
+        next.roughness = override.roughness;
+    if (override.pattern)
+        next.pattern = override.pattern;
+    if (typeof override.patternScale === "number")
+        next.patternScale = override.patternScale;
+    return Object.keys(next).length > 0 ? next : undefined;
+};
+const normalizeMaterialDefinitionLookup = (materialDefinitions) => {
+    if (!Array.isArray(materialDefinitions))
+        return materialDefinitions;
+    const seen = new Set();
+    return materialDefinitions.filter((definition) => {
+        if (!definition?.materialId || seen.has(definition.materialId))
+            return false;
+        seen.add(definition.materialId);
+        return true;
+    });
+};
+const resolveOverrideConfig = (baseConfig, overrideConfig, materialDefinitions) => {
+    if (!overrideConfig)
+        return baseConfig ?? null;
+    const overrideType = typeof overrideConfig.type === "string" && overrideConfig.type.trim()
+        ? overrideConfig.type.trim()
+        : null;
+    if (overrideType && overrideType !== baseConfig?.type && overrideType !== "custom") {
+        return resolveMaterialBinding({
+            catalogId: overrideType,
+            overrides: cleanBindingOverrides(overrideConfig),
+        }, normalizeMaterialDefinitionLookup(materialDefinitions));
+    }
+    const seed = baseConfig ?? defaultSurfaceConfig();
+    return {
+        ...seed,
+        ...(overrideConfig ?? {}),
+        type: overrideType ?? seed.type,
+        color: overrideConfig.color ?? seed.color,
+        reflectance: typeof overrideConfig.reflectance === "number" ? overrideConfig.reflectance : seed.reflectance,
+        roughness: typeof overrideConfig.roughness === "number" ? overrideConfig.roughness : seed.roughness,
+    };
+};
+export const mergeMaterialsConfigWithOverrides = (base, overrides, materialDefinitions) => {
+    if (!base)
+        return null;
+    const baseSurfaces = normalizeMaterialSurfaceConfigMap(base.surfaces);
+    const overrideSurfaces = normalizeSurfaceOverrideMap(overrides?.surfaces);
+    const surfaceIds = new Set([
+        ...Object.keys(baseSurfaces ?? {}),
+        ...Object.keys(overrideSurfaces ?? {}),
+    ]);
+    const surfaces = [...surfaceIds]
+        .map((surfaceId) => {
+        const baseConfig = baseSurfaces?.[surfaceId];
+        const overrideConfig = overrideSurfaces?.[surfaceId];
+        const config = resolveOverrideConfig(baseConfig, overrideConfig, materialDefinitions);
+        if (!config)
+            return null;
+        return [surfaceId, config];
+    })
+        .filter((entry) => Boolean(entry));
+    const next = {
+        surfaces: surfaces.length > 0 ? Object.fromEntries(surfaces) : baseSurfaces,
+    };
+    const walls = resolveOverrideConfig(base.walls, overrides?.walls, materialDefinitions);
+    const floor = resolveOverrideConfig(base.floor, overrides?.floor, materialDefinitions);
+    const ceiling = resolveOverrideConfig(base.ceiling, overrides?.ceiling, materialDefinitions);
+    if (walls)
+        next.walls = walls;
+    if (floor)
+        next.floor = floor;
+    if (ceiling)
+        next.ceiling = ceiling;
+    return next;
+};
 export function resolveMaterialConfig(options) {
     const { payload, presetId, overrides } = options;
     if (presetId) {
         try {
             const preset = getMaterialPreset(presetId);
             const base = resolveMaterialPresetMaterials(preset);
-            return {
-                walls: { ...base.walls, ...(overrides?.walls ?? {}) },
-                floor: { ...base.floor, ...(overrides?.floor ?? {}) },
-                ceiling: { ...base.ceiling, ...(overrides?.ceiling ?? {}) },
+            const next = {
+                surfaces: mergeMaterialMap(base.surfaces, overrides?.surfaces),
             };
+            if (base.walls)
+                next.walls = { ...base.walls, ...(overrides?.walls ?? {}) };
+            if (base.floor)
+                next.floor = { ...base.floor, ...(overrides?.floor ?? {}) };
+            if (base.ceiling)
+                next.ceiling = { ...base.ceiling, ...(overrides?.ceiling ?? {}) };
+            return next.walls || next.floor || next.ceiling || next.surfaces ? next : null;
         }
         catch {
             return null;
@@ -17,12 +225,19 @@ export function resolveMaterialConfig(options) {
     }
     const record = payload;
     const directMaterials = record?.materials ?? record?.room?.materials;
-    if (directMaterials?.walls && directMaterials?.floor && directMaterials?.ceiling) {
-        return {
-            walls: { ...directMaterials.walls, ...(overrides?.walls ?? {}) },
-            floor: { ...directMaterials.floor, ...(overrides?.floor ?? {}) },
-            ceiling: { ...directMaterials.ceiling, ...(overrides?.ceiling ?? {}) },
-        };
-    }
-    return null;
+    if (!directMaterials)
+        return null;
+    const next = {
+        surfaces: mergeMaterialMap(directMaterials?.surfaces, overrides?.surfaces),
+    };
+    if (directMaterials?.walls) {
+        next.walls = { ...directMaterials.walls, ...(overrides?.walls ?? {}) };
+    }
+    if (directMaterials?.floor) {
+        next.floor = { ...directMaterials.floor, ...(overrides?.floor ?? {}) };
+    }
+    if (directMaterials?.ceiling) {
+        next.ceiling = { ...directMaterials.ceiling, ...(overrides?.ceiling ?? {}) };
+    }
+    return next.walls || next.floor || next.ceiling || next.surfaces ? next : null;
 }

package/dist/materials/types.d.ts

@@ -42,9 +42,38 @@ export type SurfaceMaterialConfig = {
     pattern?: string;
     patternScale?: number;
 };
+export type MaterialSurfaceRole = "walls" | "floor" | "ceiling";
+export type MaterialSurfaceConfigMap = Record<string, SurfaceMaterialConfig>;
 export type MaterialsConfig = {
-    walls: SurfaceMaterialConfig;
-    floor: SurfaceMaterialConfig;
-    ceiling: SurfaceMaterialConfig;
+    walls?: SurfaceMaterialConfig;
+    floor?: SurfaceMaterialConfig;
+    ceiling?: SurfaceMaterialConfig;
+    surfaces?: MaterialSurfaceConfigMap;
+};
+export type SurfaceDefinition = {
+    id: string;
+    label?: string;
+    summary?: string;
+    parentId?: string;
+};
+export type SurfaceMappingRule = {
+    surfaceId: string;
+    surfaceIds?: string[];
+    classes?: string[];
+    subclasses?: string[];
+    roles?: string[];
+    layers?: string[];
+    materials?: string[];
+};
+export type MaterialApplicationPolicy = {
+    honorObjectColor?: boolean;
+    surfaceDefinitions?: SurfaceDefinition[];
+    surfaceMappings?: SurfaceMappingRule[];
+    runtimeSurfaceOverrides?: string[];
+    requiredSurfaceBindingIds?: string[];
+    defaultSurfaceMaterial?: SurfaceMaterialConfig;
+    includeCoreSurfaceRoles?: boolean;
+    honorCoreSurfaceMaterials?: boolean;
+    honorSurfaceParentMaterials?: boolean;
 };
 //# sourceMappingURL=types.d.ts.map