@pascal-app/nodes 1.0.3 → 1.0.4

package/dist/wall/treatments.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { getWallCurveFrameAt, getWallMiterBoundaryPoints, getWallThickness, isCurvedWall, useScene, WALL_CHAIR_RAIL_DEFAULT, WALL_CROWN_DEFAULT, WALL_SKIRTING_DEFAULT, WALL_SURFACE_SLOT_DEFAULTS, } from '@pascal-app/core';
+import { getWallCurveFrameAt, getWallLocalFaceZ, getWallMiterBoundaryPoints, getWallTrimFaces, getWallTrimSlotId, isCurvedWall, spatialGridManager, useScene, WALL_CHAIR_RAIL_DEFAULT, WALL_CROWN_DEFAULT, WALL_SKIRTING_DEFAULT, WALL_SURFACE_SLOT_DEFAULTS, wallDoorStepRuns, } from '@pascal-app/core';
 import { baseMaterial, createMaterialFromPresetRef, resolveMaterialRef, } from '@pascal-app/viewer';
 import { memo, useEffect, useMemo } from 'react';
 import * as THREE from 'three';
@@ -202,18 +202,9 @@ const TRIM_PROFILES = {
     },
 };
 const TRIM_KIND_CONFIG = {
-    skirting: {
-        defaultConfig: WALL_SKIRTING_DEFAULT,
-        slots: { interior: 'skirtingInterior', exterior: 'skirtingExterior' },
-    },
-    crown: {
-        defaultConfig: WALL_CROWN_DEFAULT,
-        slots: { interior: 'crownInterior', exterior: 'crownExterior' },
-    },
-    chairRail: {
-        defaultConfig: WALL_CHAIR_RAIL_DEFAULT,
-        slots: { interior: 'chairRailInterior', exterior: 'chairRailExterior' },
-    },
+    skirting: { defaultConfig: WALL_SKIRTING_DEFAULT },
+    crown: { defaultConfig: WALL_CROWN_DEFAULT },
+    chairRail: { defaultConfig: WALL_CHAIR_RAIL_DEFAULT },
 };
 function resolveTrimProfile(kind, trim) {
     const defaultProfile = TRIM_KIND_CONFIG[kind].defaultConfig.profile;
@@ -247,19 +238,9 @@ export function wallTreatmentProudOffsets(node) {
     }
     return [...offsets];
 }
-function resolveTreatmentSideSign(node, side) {
-    if (side === 'interior') {
-        if (node.frontSide === 'interior')
-            return 1;
-        if (node.backSide === 'interior')
-            return -1;
-        return 1;
-    }
-    if (node.frontSide === 'exterior')
-        return 1;
-    if (node.backSide === 'exterior')
-        return -1;
-    return -1;
+// Face a is the wall's left (+normal), face b its right.
+function resolveTreatmentSideSign(_node, side) {
+    return side === 'a' ? 1 : -1;
 }
 function wallToLocalTransform(node) {
     const dx = node.end[0] - node.start[0];
@@ -294,11 +275,11 @@ function buildMiteredSidePolyline(node, levelData, side, offset) {
         return buildSidePolyline(node, side, offset);
     const sideSign = resolveTreatmentSideSign(node, side);
     const toLocal = wallToLocalTransform(node);
-    const proud = offset - getWallThickness(node) / 2;
+    const proud = offset - getWallLocalFaceZ(node, sideSign > 0 ? 'a' : 'b') * sideSign;
     const boundarySource = treatmentMiterDataForProud(levelData, proud);
     if (!boundarySource)
         return buildSidePolyline(node, side, offset);
-    const boundary = getWallMiterBoundaryPoints({ ...node, thickness: offset * 2 }, boundarySource);
+    const boundary = getWallMiterBoundaryPoints(node, boundarySource, proud);
     if (!boundary)
         return buildSidePolyline(node, side, offset);
     const start = sideSign > 0 ? boundary.startLeft : boundary.startRight;
@@ -417,7 +398,7 @@ function applyWorldScaleUvs(geometry) {
     }
     geometry.setAttribute('uv', new THREE.BufferAttribute(uv, 2));
 }
-function buildTrimSliceGeometry(outer, inner, extrudeHeight, translateY) {
+function buildTrimSliceGeometry(outer, inner, extrudeHeight, translateY, slope = 0, slopeStart = 0) {
     const shape = buildPlanPolygon(outer, inner);
     if (!shape)
         return null;
@@ -429,6 +410,11 @@ function buildTrimSliceGeometry(outer, inner, extrudeHeight, translateY) {
     });
     geometry.rotateX(-Math.PI / 2);
     geometry.translate(0, translateY, 0);
+    if (slope !== 0) {
+        const positions = geometry.getAttribute('position');
+        for (let i = 0; i < positions.count; i++)
+            positions.setY(i, positions.getY(i) + (positions.getX(i) - slopeStart) * slope);
+    }
     geometry.computeVertexNormals();
     applyWorldScaleUvs(geometry);
     return geometry;
@@ -449,14 +435,44 @@ export function buildTrimGeometry(node, side, trim, kind, childrenNodes, levelDa
         : kind === 'chairRail'
             ? Math.max(0, Math.min(wallHeight - height, trim.offsetY ?? WALL_CHAIR_RAIL_DEFAULT.offsetY ?? 0.9))
             : 0;
-    const thickness = getWallThickness(node);
-    const inner = buildMiteredSidePolyline(node, levelData, side, thickness / 2);
+    const faceOffset = getWallLocalFaceZ(node, resolveTreatmentSideSign(node, side) > 0 ? 'a' : 'b') *
+        resolveTreatmentSideSign(node, side);
+    const inner = buildMiteredSidePolyline(node, levelData, side, faceOffset);
     if (inner.length < 2)
         return null;
     const wallLength = Math.hypot(node.end[0] - node.start[0], node.end[1] - node.start[1]);
-    const openingRanges = trimOpeningRanges(node, childrenNodes, yBottom, height);
-    const fullRanges = [[0, wallLength]];
-    const runs = subtractOpeningRanges(fullRanges, openingRanges);
+    const support = kind === 'skirting' && node.parentId
+        ? (levelData.supports?.get(node.id) ??
+            spatialGridManager.getSlabSupportForWall(node.parentId, node.start, node.end, node.curveOffset ?? 0, node.thickness, node.supportSlabId, undefined, node.supportOffset, node.justification))
+        : undefined;
+    const bases = support?.faceDatum[resolveTreatmentSideSign(node, side) > 0 ? 'a' : 'b'] ?? [
+        { start: 0, end: 1, elevation: yBottom },
+    ];
+    const stationX = (t) => {
+        if (!isCurvedWall(node))
+            return t * wallLength;
+        const frame = getWallCurveFrameAt(node, t);
+        return wallToLocalTransform(node)(frame.point.x, frame.point.y).x;
+    };
+    const runs = bases.flatMap((base) => {
+        const bottom = support ? base.elevation - support.elevation : yBottom;
+        const openingRanges = trimOpeningRanges(node, childrenNodes, bottom, height);
+        if (support)
+            for (const child of childrenNodes) {
+                for (const run of wallDoorStepRuns(node, child, support.faceDatum, support.elevation))
+                    if (run.bottom < bottom + height && run.top > bottom)
+                        openingRanges.push([run.start, run.end]);
+            }
+        return subtractOpeningRanges([[stationX(base.start), stationX(base.end)]], openingRanges).map(([start, end]) => ({
+            start,
+            end,
+            bottom,
+            slopeStart: stationX(base.start),
+            slope: base.endElevation === undefined
+                ? 0
+                : (base.endElevation - base.elevation) / (stationX(base.end) - stationX(base.start)),
+        }));
+    });
     if (runs.length === 0)
         return null;
     const slices = [];
@@ -464,7 +480,7 @@ export function buildTrimGeometry(node, side, trim, kind, childrenNodes, levelDa
     if (!profile)
         return null;
     const sliceHeight = height / profile.samples;
-    for (const [runStart, runEnd] of runs) {
+    for (const { start: runStart, end: runEnd, bottom, slope, slopeStart } of runs) {
         const clipStart = runStart > EPS ? runStart : undefined;
         const clipEnd = runEnd < wallLength - EPS ? runEnd : undefined;
         const innerRun = clipPolyline(inner, clipStart, clipEnd);
@@ -473,11 +489,11 @@ export function buildTrimGeometry(node, side, trim, kind, childrenNodes, levelDa
         for (let index = 0; index < profile.samples; index += 1) {
             const t = (index + 0.5) / profile.samples;
             const proud = Math.max(MIN_SLICE_PROUD, trim.proud * profile.proudAt(t));
-            const outerRun = buildMiteredSidePolyline(node, levelData, side, thickness / 2 + proud);
+            const outerRun = buildMiteredSidePolyline(node, levelData, side, faceOffset + proud);
             const outerClipped = clipPolyline(outerRun, clipStart, clipEnd);
             if (outerClipped.length < 2)
                 continue;
-            const slice = buildTrimSliceGeometry(outerClipped, innerRun, sliceHeight, yBottom + index * sliceHeight);
+            const slice = buildTrimSliceGeometry(outerClipped, innerRun, sliceHeight, bottom + index * sliceHeight, slope, slopeStart);
             if (slice)
                 slices.push(slice);
         }
@@ -499,21 +515,21 @@ function resolveWallSlotMaterial(node, slotId, shading, sceneMaterials) {
 }
 export function createWallExtraSlotMaterials(node, shading, sceneMaterials) {
     return {
-        skirtingInterior: resolveWallSlotMaterial(node, 'skirtingInterior', shading, sceneMaterials),
-        skirtingExterior: resolveWallSlotMaterial(node, 'skirtingExterior', shading, sceneMaterials),
-        crownInterior: resolveWallSlotMaterial(node, 'crownInterior', shading, sceneMaterials),
-        crownExterior: resolveWallSlotMaterial(node, 'crownExterior', shading, sceneMaterials),
-        chairRailInterior: resolveWallSlotMaterial(node, 'chairRailInterior', shading, sceneMaterials),
-        chairRailExterior: resolveWallSlotMaterial(node, 'chairRailExterior', shading, sceneMaterials),
+        aSkirting: resolveWallSlotMaterial(node, 'aSkirting', shading, sceneMaterials),
+        bSkirting: resolveWallSlotMaterial(node, 'bSkirting', shading, sceneMaterials),
+        aCrown: resolveWallSlotMaterial(node, 'aCrown', shading, sceneMaterials),
+        bCrown: resolveWallSlotMaterial(node, 'bCrown', shading, sceneMaterials),
+        aChairRail: resolveWallSlotMaterial(node, 'aChairRail', shading, sceneMaterials),
+        bChairRail: resolveWallSlotMaterial(node, 'bChairRail', shading, sceneMaterials),
     };
 }
 export const WallTreatments = memo(function WallTreatments({ node, childrenNodes, levelData, materials, }) {
-    const fallbackMaterial = materials.skirtingInterior ??
-        materials.skirtingExterior ??
-        materials.crownInterior ??
-        materials.crownExterior ??
-        materials.chairRailInterior ??
-        materials.chairRailExterior;
+    const fallbackMaterial = materials.aSkirting ??
+        materials.bSkirting ??
+        materials.aCrown ??
+        materials.bCrown ??
+        materials.aChairRail ??
+        materials.bChairRail;
     const trimEntries = useMemo(() => {
         const out = [];
         const configs = [
@@ -525,14 +541,11 @@ export const WallTreatments = memo(function WallTreatments({ node, childrenNodes
             const trim = { ...TRIM_KIND_CONFIG[kind].defaultConfig, ...(rawConfig ?? {}) };
             if (!trim.enabled)
                 continue;
-            const sides = trim.sides === 'both'
-                ? ['interior', 'exterior']
-                : [trim.sides];
-            for (const side of sides) {
+            for (const side of getWallTrimFaces(trim.sides)) {
                 const geometry = buildTrimGeometry(node, side, trim, kind, childrenNodes, levelData);
                 if (!geometry)
                     continue;
-                const slotId = TRIM_KIND_CONFIG[kind].slots[side];
+                const slotId = getWallTrimSlotId(side, kind);
                 out.push({
                     key: `${kind}-${side}`,
                     slotId,

package/dist/wall/wall-batch-system.d.ts

@@ -36,6 +36,13 @@ export declare function canBatchWalls(wallMode: WallMode, isolationActive: boole
  * calls is what lighting them costs.
  */
 export declare function collectTintedWalls(wallIds: ReadonlySet<string>): Set<string>;
+/**
+ * The materials a wall actually draws, in canonical (uuid) order. Two walls
+ * showing the same finishes batch together however their palettes are laid out
+ * — a room's finish on side a of one wall and side b of the next is one set.
+ */
+export declare function canonicalWallMaterials(mesh: Pick<Mesh, 'geometry'>, materials: readonly Material[]): Material[];
+export declare function materialSetKey(materials: readonly Material[]): string;
 export declare function collectWallBatchCandidates(levelId: string, excludedNodeIds?: ReadonlySet<string>): Map<string, WallBatchCandidate[]>;
 export declare const WallBatchSystem: () => null;
 /**

package/dist/wall/wall-batch-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-batch-system.d.ts","sourceRoot":"","sources":["../../src/wall/wall-batch-system.tsx"],"names":[],"mappings":"AAGA,OAAO,EAML,KAAK,QAAQ,EACd,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAAE,KAAK,QAAQ,EAAW,IAAI,EAAiB,MAAM,OAAO,CAAA;AAkGnE,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAKnD;AA6BD,MAAM,MAAM,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAA;AAiCtF;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,GAAG,OAAO,CAEnF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAW5E;AAMD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,eAAe,GAAE,WAAW,CAAC,MAAM,CAAa,GAC/C,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAoBnC;AAsFD,eAAO,MAAM,eAAe,YAmE3B,CAAA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,IAAI,EACtB,OAAO,EAAE;IAAE,OAAO,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAA;CAAE,QAyI3D"}
+{"version":3,"file":"wall-batch-system.d.ts","sourceRoot":"","sources":["../../src/wall/wall-batch-system.tsx"],"names":[],"mappings":"AAGA,OAAO,EAML,KAAK,QAAQ,EACd,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAAE,KAAK,QAAQ,EAAW,IAAI,EAAiB,MAAM,OAAO,CAAA;AAmGnE,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAKnD;AA6BD,MAAM,MAAM,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAA;AAiCtF;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,GAAG,OAAO,CAEnF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAe5E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAC5B,SAAS,EAAE,SAAS,QAAQ,EAAE,GAC7B,QAAQ,EAAE,CAcZ;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,MAAM,CAErE;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,eAAe,GAAE,WAAW,CAAC,MAAM,CAAa,GAC/C,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAoBnC;AA2FD,eAAO,MAAM,eAAe,YAmE3B,CAAA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,IAAI,EACtB,OAAO,EAAE;IAAE,OAAO,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAA;CAAE,QAyI3D"}

package/dist/wall/wall-batch-system.js

@@ -4,6 +4,7 @@ import { drainRebuiltWalls, getPendingWallRebuildCount, isIsolationActive, SCENE
 import { useFrame, useThree } from '@react-three/fiber';
 import { useEffect, useRef } from 'react';
 import { Matrix4, Mesh } from 'three';
+import { isSlotPaintPreviewActive } from '../shared/slot-paint';
 import { applyWallBatchGroups, buildWallBatch, hideBatchedWall, revealBatchedWall, } from './wall-batch';
 // A level's walls are merged only once they stop changing. Below this many
 // walls a merge is not worth the buffer, and the leftovers (a selected wall,
@@ -167,9 +168,35 @@ export function collectTintedWalls(wallIds) {
     const hovered = viewer.hoveredId;
     if (hovered && wallIds.has(hovered))
         tinted.add(hovered);
+    // A paint preview spreads past the hovered wall (a room's walls): each one it
+    // repaints has to draw itself, or the merged copy hides the preview.
+    for (const id of wallIds)
+        if (isSlotPaintPreviewActive(id))
+            tinted.add(id);
     return tinted;
 }
-function materialSetKey(materials) {
+/**
+ * The materials a wall actually draws, in canonical (uuid) order. Two walls
+ * showing the same finishes batch together however their palettes are laid out
+ * — a room's finish on side a of one wall and side b of the next is one set.
+ */
+export function canonicalWallMaterials(mesh, materials) {
+    const groups = mesh.geometry.groups;
+    const used = new Set();
+    if (groups.length === 0) {
+        if (materials[0])
+            used.add(materials[0]);
+    }
+    else {
+        for (const group of groups) {
+            const material = materials[group.materialIndex ?? 0];
+            if (material)
+                used.add(material);
+        }
+    }
+    return [...used].sort((left, right) => left.uuid < right.uuid ? -1 : left.uuid > right.uuid ? 1 : 0);
+}
+export function materialSetKey(materials) {
     return materials.map((material) => material.uuid).join('|');
 }
 export function collectWallBatchCandidates(levelId, excludedNodeIds = EMPTY_IDS) {
@@ -185,7 +212,7 @@ export function collectWallBatchCandidates(levelId, excludedNodeIds = EMPTY_IDS)
         const candidate = toCandidate(childId, child, excludedNodeIds);
         if (!candidate)
             continue;
-        const key = materialSetKey(candidate.materials);
+        const key = materialSetKey(canonicalWallMaterials(candidate.mesh, candidate.materials));
         const bucket = grouped.get(key);
         if (bucket)
             bucket.push(candidate);
@@ -234,18 +261,23 @@ function mergeLevel(levelId, excludedNodeIds = EMPTY_IDS) {
     for (const candidates of collectWallBatchCandidates(levelId, excludedNodeIds).values()) {
         if (candidates.length < MIN_BATCH_WALLS)
             continue;
+        const canonical = canonicalWallMaterials(candidates[0].mesh, candidates[0].materials);
         const sources = candidates.map((candidate) => {
             candidate.mesh.updateWorldMatrix(true, false);
             return {
                 nodeId: candidate.nodeId,
                 geometry: candidate.mesh.geometry,
                 matrix: localMatrix.multiplyMatrices(rootInverse, candidate.mesh.matrixWorld).clone(),
+                materialIndexMap: candidate.materials.map((material) => {
+                    const index = canonical.indexOf(material);
+                    return index < 0 ? undefined : index;
+                }),
             };
         });
         const batch = buildWallBatch(sources);
         if (!batch)
             continue;
-        const mesh = new Mesh(batch.geometry, candidates[0].materials);
+        const mesh = new Mesh(batch.geometry, canonical);
         mesh.name = 'wall-batch';
         mesh.userData.pascalExport = 'strip';
         mesh.castShadow = true;

package/dist/wall/wall-batch.d.ts

@@ -17,6 +17,12 @@ export type WallBatchSource = {
     geometry: THREE.BufferGeometry;
     /** Source-local to batch-root transform, baked into the merged vertices. */
     matrix: THREE.Matrix4;
+    /**
+     * Source material index → batch material index. Walls that draw the same
+     * materials in a different palette order share a batch this way; a group
+     * whose index maps nowhere draws nothing and is dropped.
+     */
+    materialIndexMap?: ReadonlyArray<number | undefined>;
 };
 export type WallBatch = {
     geometry: THREE.BufferGeometry;

package/dist/wall/wall-batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-batch.d.ts","sourceRoot":"","sources":["../../src/wall/wall-batch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,mEAAmE;AACnE,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,cAAc,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAA;IAC9B,4EAA4E;IAC5E,MAAM,EAAE,KAAK,CAAC,OAAO,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAA;IAC9B,IAAI,EAAE,YAAY,EAAE,CAAA;CACrB,CAAA;AAkCD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,GAAG,SAAS,GAAG,IAAI,CAmEpF;AAwCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAmBxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAE1D;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAE5D"}
+{"version":3,"file":"wall-batch.d.ts","sourceRoot":"","sources":["../../src/wall/wall-batch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,mEAAmE;AACnE,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,cAAc,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAA;IAC9B,4EAA4E;IAC5E,MAAM,EAAE,KAAK,CAAC,OAAO,CAAA;IACrB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAA;IAC9B,IAAI,EAAE,YAAY,EAAE,CAAA;CACrB,CAAA;AAuCD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,GAAG,SAAS,GAAG,IAAI,CAmEpF;AAwCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAmBxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAE1D;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAE5D"}

package/dist/wall/wall-batch.js

@@ -20,7 +20,13 @@ function planSource(source) {
         const count = Math.min(group.count, position.count - start);
         if (count <= 0)
             continue;
-        groups.push({ materialIndex: group.materialIndex ?? 0, start, count });
+        const sourceIndex = group.materialIndex ?? 0;
+        const materialIndex = source.materialIndexMap
+            ? source.materialIndexMap[sourceIndex]
+            : sourceIndex;
+        if (materialIndex === undefined)
+            continue;
+        groups.push({ materialIndex, start, count });
     }
     return groups.length > 0 ? { source, groups } : null;
 }

package/dist/window/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/window/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAGT,cAAc,EAEd,QAAQ,EAER,UAAU,IAAI,cAAc,EAC7B,MAAM,kBAAkB,CAAA;AAwBzB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAQrC,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,GAC3B,SAAS,GAAG,IAAI,CAWlB;AAwMD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,OAAO,UAAU,CAsG9D,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/window/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAGT,cAAc,EAEd,QAAQ,EAER,UAAU,IAAI,cAAc,EAC7B,MAAM,kBAAkB,CAAA;AA6BzB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAOrC,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,GAC3B,SAAS,GAAG,IAAI,CAWlB;AAwMD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,OAAO,UAAU,CA4G9D,CAAA"}

package/dist/window/definition.js

@@ -1,21 +1,24 @@
-import { getDormerWallHorizontalBoundsAtHeight, getDormerWallOpeningVerticalBounds, } from '@pascal-app/core';
+import { getDormerWallHorizontalBoundsAtHeight, getDormerWallOpeningVerticalBounds, windowSlots, } from '@pascal-app/core';
 import { curtainOpeningResizeMax } from '../shared/curtain-opening-limits';
+import { windowBatchable } from '../shared/node-batch/batchable';
 import { buildWindowFloorplanSchedule, computeWindowFloorplanLevelData, } from '../shared/opening-documentation';
 import { publishOpeningResizeGuides } from '../shared/opening-guides-runtime';
 import { createOpeningPropertyPreview } from '../shared/opening-property-preview';
 import { openingPropertyPreviewHost } from '../shared/opening-property-preview-host';
 import { readRoofFaceHeightMax, readRoofFaceWidthMax } from '../shared/roof-opening-host';
 import { buildRoofWallOpeningCut } from '../shared/roof-wall-opening-cut';
+import { scriptedOpeningHandles } from '../shared/scripted-opening-handles';
 import { readHostWallCeiling } from '../shared/wall-opening-ceiling';
 import { wallFloorplanSiblingOverrides } from '../wall/floorplan-overrides';
 import { buildWindowContextualDimensions } from './contextual-dimensions';
 import { buildWindowFloorplan } from './floorplan';
 import { windowWidthAffordance } from './floorplan-affordances';
 import { windowFloorplanMoveTarget } from './floorplan-move';
+import { windowMechanism } from './mechanism';
 import { windowPaint } from './paint';
 import { windowParametrics } from './parametrics';
+import { WINDOW_PLACEMENT_HINTS } from './placement';
 import { WindowNode } from './schema';
-import { windowSlots } from './slots';
 const SIDE_HANDLE_OFFSET = 0.24;
 const HEIGHT_HANDLE_OFFSET = 0.24;
 const MIN_WINDOW_HEIGHT = 0.3;
@@ -137,7 +140,7 @@ function windowHeightHandle(edge) {
             const curtainMax = curtainOpeningResizeMax(n, scene.nodes(), 'y', sign);
             if (curtainMax !== undefined)
                 return curtainMax;
-            const wallH = readHostWallCeiling(n.wallId, scene);
+            const wallH = readHostWallCeiling(n.wallId, scene, n);
             const anchored = edge === 'top' ? n.position[1] - n.height / 2 : n.position[1] + n.height / 2;
             return edge === 'top'
                 ? Math.max(MIN_WINDOW_HEIGHT, wallH - anchored)
@@ -241,6 +244,7 @@ export const windowDefinition = {
         return rest;
     },
     capabilities: {
+        batchable: windowBatchable,
         selectable: { hitVolume: 'bbox' },
         duplicable: true,
         deletable: true,
@@ -260,9 +264,12 @@ export const windowDefinition = {
         // each mesh with its `userData.slotId`; paint writes `node.slots`.
         slots: () => windowSlots(),
         paint: windowPaint,
+        mechanism: windowMechanism,
     },
     parametrics: windowParametrics,
-    handles: windowHandles,
+    handles: (node) => node.source
+        ? scriptedOpeningHandles(node, windowWidthHandle, () => windowHeightHandle('top'))
+        : windowHandles,
     rendersChildren: false,
     renderer: {
         kind: 'parametric',
@@ -299,6 +306,7 @@ export const windowDefinition = {
     },
     toolHints: [
         { key: 'Left click', label: 'Place window on wall' },
+        ...WINDOW_PLACEMENT_HINTS,
         { key: 'R', label: 'Flip side' },
         { key: 'Alt', label: 'Force place' },
         { key: 'Esc', label: 'Cancel' },

package/dist/window/floorplan-move.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/window/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EAOxB,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAA;AAmBzB;;;;;;;;;;GAUG;AAEH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,UAAU,CAkPrE,CAAA"}
+{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/window/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EAOxB,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAA;AAoBzB;;;;;;;;;;GAUG;AAEH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,UAAU,CAmPrE,CAAA"}

package/dist/window/floorplan-move.js

@@ -1,6 +1,7 @@
 import { useLiveNodeOverrides, useLiveTransforms, useScene, WallNode as WallNodeSchema, } from '@pascal-app/core';
 import { isGridSnapActive, isMagneticSnapActive, snapToHalf, triggerSFX, useEditor, usePlacementPreview, } from '@pascal-app/editor';
 import { createFloorplanCursorResolver } from '../shared/floorplan-cursor';
+import { openingPlaneOffsetOnWall } from '../shared/opening-plane-offset';
 import { getOpeningHostLevelId, getRoofHostedOpeningPlanPoint } from '../shared/roof-opening-host';
 import { findClosestWallInPlan, projectWallLocalPointToPlan, resolveOpeningPlacement, snapLocalXToNeighbors, } from '../shared/wall-attach-target';
 import { clampToWall, DEFAULT_WINDOW_SILL_M, hasWallChildOverlap } from './window-math';
@@ -163,7 +164,8 @@ export const windowFloorplanMoveTarget = ({ node }) => {
                 : hit.side;
             const itemRotation = hit.itemRotation + (flipped ? Math.PI : 0);
             lastValid = {
-                position: [clampedX, clampedY, 0],
+                // Same-wall moves keep the wall-local plane offset; another host resets it.
+                position: [clampedX, clampedY, openingPlaneOffsetOnWall(node, hit.wall.id)],
                 rotation: [0, itemRotation, 0],
                 side,
                 parentId: hit.wall.id,

package/dist/window/floorplan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/window/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,eAAe,EAEf,UAAU,EACX,MAAM,kBAAkB,CAAA;AAQzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CA4J1B"}
+{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/window/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,eAAe,EAEf,UAAU,EACX,MAAM,kBAAkB,CAAA;AAUzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CAgP1B"}