@pascal-app/viewer 0.8.0 → 0.9.1

package/dist/systems/roof/roof-materials.js

@@ -1,6 +1,5 @@
 import { getEffectiveRoofSurfaceMaterial, } from '@pascal-app/core';
-import * as THREE from 'three';
-import { createMaterial, createMaterialFromPresetRef } from '../../lib/materials';
+import { createMaterial, createMaterialFromPresetRef, createSurfaceRoleMaterial, } from '../../lib/materials';
 const roofMaterialArrayCache = new Map();
 function getSurfaceMaterialSignature(spec) {
     return JSON.stringify({
@@ -8,20 +7,24 @@ function getSurfaceMaterialSignature(spec) {
         materialPreset: spec.materialPreset ?? null,
     });
 }
-function createResolvedMaterial(material, materialPreset) {
+function createResolvedMaterial(material, materialPreset, shading) {
     if (materialPreset) {
-        return createMaterialFromPresetRef(materialPreset);
+        return createMaterialFromPresetRef(materialPreset, shading);
     }
     if (material) {
-        return createMaterial(material);
+        return createMaterial(material, shading);
     }
     return null;
 }
-export function getRoofMaterialArray(node) {
+export function getRoofMaterialArray(node, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme) {
     const top = getEffectiveRoofSurfaceMaterial(node, 'top');
     const edge = getEffectiveRoofSurfaceMaterial(node, 'edge');
     const wall = getEffectiveRoofSurfaceMaterial(node, 'wall');
     const cacheKey = JSON.stringify({
+        shading,
+        textures,
+        colorPreset,
+        sceneTheme,
         top: getSurfaceMaterialSignature(top),
         edge: getSurfaceMaterialSignature(edge),
         wall: getSurfaceMaterialSignature(wall),
@@ -29,17 +32,38 @@ export function getRoofMaterialArray(node) {
     const cached = roofMaterialArrayCache.get(cacheKey);
     if (cached)
         return cached;
-    const topMaterial = createResolvedMaterial(top.material, top.materialPreset);
-    const edgeMaterial = createResolvedMaterial(edge.material, edge.materialPreset);
-    const wallMaterial = createResolvedMaterial(wall.material, wall.materialPreset);
+    // Themed role colours: roof top/edge use the 'roof' role, the soffit/underside
+    // uses 'ceiling'. These also fill any untextured slot so an untextured roof is
+    // theme-coloured regardless of the textures toggle (no more white default).
+    const roofMaterial = createSurfaceRoleMaterial('roof', colorPreset, undefined, sceneTheme);
+    const ceilingMaterial = createSurfaceRoleMaterial('ceiling', colorPreset, undefined, sceneTheme);
+    const roleArray = [
+        roofMaterial,
+        ceilingMaterial,
+        ceilingMaterial,
+        roofMaterial,
+    ];
+    if (!textures) {
+        roofMaterialArrayCache.set(cacheKey, roleArray);
+        return roleArray;
+    }
+    const topMaterial = createResolvedMaterial(top.material, top.materialPreset, shading);
+    const edgeMaterial = createResolvedMaterial(edge.material, edge.materialPreset, shading);
+    const wallMaterial = createResolvedMaterial(wall.material, wall.materialPreset, shading);
     if (!(topMaterial || edgeMaterial || wallMaterial)) {
-        return null;
+        roofMaterialArrayCache.set(cacheKey, roleArray);
+        return roleArray;
     }
+    // Each slot resolves to its own role only, then the themed default — never
+    // another role. Cross-role fallback here used to splatter a single painted
+    // surface (e.g. the edge) across the shingle and soffit slots. The legacy
+    // catch-all still fills every role because `getEffectiveRoofSurfaceMaterial`
+    // returns it for top/edge/wall alike.
     const materialArray = [
-        edgeMaterial ?? wallMaterial ?? topMaterial ?? new THREE.MeshStandardMaterial(),
-        wallMaterial ?? edgeMaterial ?? topMaterial ?? new THREE.MeshStandardMaterial(),
-        wallMaterial ?? edgeMaterial ?? topMaterial ?? new THREE.MeshStandardMaterial(),
-        topMaterial ?? wallMaterial ?? edgeMaterial ?? new THREE.MeshStandardMaterial(),
+        edgeMaterial ?? roofMaterial,
+        wallMaterial ?? ceilingMaterial,
+        wallMaterial ?? ceilingMaterial,
+        topMaterial ?? roofMaterial,
     ];
     roofMaterialArrayCache.set(cacheKey, materialArray);
     return materialArray;

package/dist/systems/roof/roof-system.d.ts

@@ -2,6 +2,22 @@ import { type RoofSegmentNode } from '@pascal-app/core';
 import * as THREE from 'three';
 import { Brush } from 'three-bvh-csg';
 export declare const RoofSystem: () => null;
+/**
+ * Four dummy materials used as identity placeholders during CSG. Shared
+ * across every input brush so three-bvh-csg can preserve reference
+ * equality on the result and `mapRoofGroupMaterialIndex` can map result
+ * groups back to slots 0..3. Exposed so kinds that compose additional
+ * CSG ops on top of `getRoofSegmentBrushes` (e.g. dormer) use the same
+ * identity refs.
+ */
+export declare const roofCsgDummyMats: [
+    THREE.MeshBasicMaterial,
+    THREE.MeshBasicMaterial,
+    THREE.MeshBasicMaterial,
+    THREE.MeshBasicMaterial
+];
+export declare const ROOF_MATERIAL_SLOT_COUNT = 4;
+export declare function mapRoofGroupMaterialIndex(groupMaterialIndex: number | undefined, csgMaterials: THREE.Material[], matToIndex: Map<THREE.Material, number>): number;
 /**
  * Generate complete hollow-shell geometry for a roof segment.
  * Ports the prototype's CSG approach using three-bvh-csg.
@@ -13,4 +29,15 @@ export declare function getRoofSegmentBrushes(node: RoofSegmentNode): {
     innerBrush: Brush;
 } | null;
 export declare function generateRoofSegmentGeometry(node: RoofSegmentNode): THREE.BufferGeometry;
+export declare function remapRoofShellFaces(geometry: THREE.BufferGeometry, node: RoofSegmentNode): void;
+export type SurfaceFrame = {
+    point: THREE.Vector3;
+    normal: THREE.Vector3;
+};
+/**
+ * Returns the outer roof surface frame (point + normal) at a given segment-local XZ.
+ * This is used for skylight placement + cut direction so cutouts remain perpendicular
+ * to the true roof surface even on multi-slope roofs (gambrel/mansard/dutch).
+ */
+export declare function getRoofOuterSurfaceFrameAtPoint(segment: RoofSegmentNode, lx: number, lz: number): SurfaceFrame;
 //# sourceMappingURL=roof-system.d.ts.map

package/dist/systems/roof/roof-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roof-system.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAIrB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,KAAK,EAA0B,MAAM,eAAe,CAAA;AA4CvE,eAAO,MAAM,UAAU,YAsFtB,CAAA;AAqLD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,GACpB;IAAE,QAAQ,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,KAAK,CAAA;CAAE,GAAG,IAAI,CAqRlF;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAAC,cAAc,CAmDvF"}
+{"version":3,"file":"roof-system.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,eAAe,EAKrB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,KAAK,EAA0B,MAAM,eAAe,CAAA;AA0DvE,eAAO,MAAM,UAAU,YAmItB,CAAA;AA8PD;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;CAMxB,CAAA;AAID,eAAO,MAAM,wBAAwB,IAAI,CAAA;AAEzC,wBAAgB,yBAAyB,CACvC,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,EAC9B,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtC,MAAM,CAuBR;AAaD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,GACpB;IAAE,QAAQ,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,KAAK,CAAA;CAAE,GAAG,IAAI,CAmQlF;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAAC,cAAc,CAmDvF;AAcD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,eAAe,QAyExF;AAwWD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAA;IACpB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAA;CACtB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,eAAe,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,YAAY,CA6Kd"}