@ifc-lite/viewer 1.17.4 → 1.18.0

package/src/store/globalId.ts

@@ -4,7 +4,10 @@
 
 import type { EntityRef, FederatedModel } from './types.js';
 
-type ForwardModelMapLike = ReadonlyMap<string, { idOffset?: number }>;
+/** Shape accepted by `toGlobalIdFromModels` — re-export it so consumers can
+ *  drop the `as unknown as Map<...>` cast when threading the store's
+ *  federated `models` map through downstream helpers. */
+export type ForwardModelMapLike = ReadonlyMap<string, { idOffset?: number }>;
 type ReverseModelMapLike = ReadonlyMap<string, Pick<FederatedModel, 'idOffset' | 'maxExpressId'>>;
 
 /**

package/src/store/index.ts

@@ -34,6 +34,12 @@ import { createScriptSlice, type ScriptSlice } from './slices/scriptSlice.js';
 import { createChatSlice, type ChatSlice } from './slices/chatSlice.js';
 import { createCesiumSlice, type CesiumSlice } from './slices/cesiumSlice.js';
 import { createDesktopEntitlementSlice, type DesktopEntitlementSlice } from './slices/desktopEntitlementSlice.js';
+import { createScheduleSlice, type ScheduleSlice } from './slices/scheduleSlice.js';
+import { createPlaybackSlice, type PlaybackSlice } from './slices/playbackSlice.js';
+import { createOverlaySlice, type OverlaySlice } from './slices/overlaySlice.js';
+import { createSearchSlice, type SearchSlice } from './slices/searchSlice.js';
+import { createAnnotationsSlice, type AnnotationsSlice } from './slices/annotationsSlice.js';
+import { createAddElementSlice, type AddElementSlice } from './slices/addElementSlice.js';
 import { invalidateVisibleBasketCache } from './basketVisibleSet.js';
 
 // Import constants for reset function
@@ -43,7 +49,7 @@ import { CAMERA_DEFAULTS, SECTION_PLANE_DEFAULTS, UI_DEFAULTS, TYPE_VISIBILITY_D
 export type * from './types.js';
 
 // Explicitly re-export multi-model types that need to be imported by name
-export type { EntityRef, SchemaVersion, FederatedModel, MeasurementConstraintEdge, OrthogonalAxis } from './types.js';
+export type { EntityRef, SchemaVersion, FederatedModel, MeasurementConstraintEdge, OrthogonalAxis, SectionCapStyle, SectionCapHatchId, SectionPlane, SectionPlaneAxis } from './types.js';
 
 // Re-export utility functions for entity references
 export { entityRefToString, stringToEntityRef, entityRefEquals, isIfcxDataStore } from './types.js';
@@ -83,6 +89,21 @@ export type { DesktopEntitlementSlice } from './slices/desktopEntitlementSlice.j
 // Re-export Cesium types
 export type { CesiumSlice, CesiumDataSource } from './slices/cesiumSlice.js';
 
+// Re-export Schedule (4D) types + selectors
+export type { ScheduleSlice, ScheduleTimeRange, GanttTimeScale } from './slices/scheduleSlice.js';
+export type { PlaybackSlice } from './slices/playbackSlice.js';
+export type { OverlaySlice, OverlayLayer, RGBA as OverlayRGBA } from './slices/overlaySlice.js';
+export { composeLayers as composeOverlayLayers } from './slices/overlaySlice.js';
+export {
+  computeScheduleRange,
+  computeHiddenProductIds,
+  computeActiveProductIds,
+  taskStartEpoch,
+  taskFinishEpoch,
+  parseIsoDate,
+} from './slices/scheduleSlice.js';
+export { resolveScheduleSourceModelId } from './slices/schedule-edit-helpers.js';
+
 // Combined store type
 export type ViewerState = LoadingSlice &
   SelectionSlice &
@@ -105,7 +126,13 @@ export type ViewerState = LoadingSlice &
   ScriptSlice &
   ChatSlice &
   CesiumSlice &
-  DesktopEntitlementSlice & {
+  DesktopEntitlementSlice &
+  ScheduleSlice &
+  PlaybackSlice &
+  OverlaySlice &
+  SearchSlice &
+  AnnotationsSlice &
+  AddElementSlice & {
     resetViewerState: () => void;
   };
 
@@ -136,6 +163,12 @@ const createViewerStore = () => create<ViewerState>()((...args) => ({
   ...createChatSlice(...args),
   ...createCesiumSlice(...args),
   ...createDesktopEntitlementSlice(...args),
+  ...createScheduleSlice(...args),
+  ...createPlaybackSlice(...args),
+  ...createOverlaySlice(...args),
+  ...createSearchSlice(...args),
+  ...createAnnotationsSlice(...args),
+  ...createAddElementSlice(...args),
 
   // Reset all viewer state when loading new file
   // Note: Does NOT clear models - use clearAllModels() for that
@@ -195,12 +228,18 @@ const createViewerStore = () => create<ViewerState>()((...args) => ({
         cornerValence: 0,
       },
 
-      // Section plane
+      // Section plane: reset axis/position/enabled/flipped (those are
+      // model-relative and meaningless when switching files), but PRESERVE
+      // the user's cap appearance preferences (showCap, showOutlines,
+      // capStyle). Those round-trip to localStorage via the slice's
+      // persistence helpers; clobbering them here was the cause of "my
+      // hatch / colour resets to defaults every time I open a file".
       sectionPlane: {
-        axis: SECTION_PLANE_DEFAULTS.AXIS,
+        ...get().sectionPlane,
+        axis:     SECTION_PLANE_DEFAULTS.AXIS,
         position: SECTION_PLANE_DEFAULTS.POSITION,
-        enabled: SECTION_PLANE_DEFAULTS.ENABLED,
-        flipped: SECTION_PLANE_DEFAULTS.FLIPPED,
+        enabled:  SECTION_PLANE_DEFAULTS.ENABLED,
+        flipped:  SECTION_PLANE_DEFAULTS.FLIPPED,
       },
 
       // Camera
@@ -224,6 +263,7 @@ const createViewerStore = () => create<ViewerState>()((...args) => ({
       separationLinesRadius: UI_DEFAULTS.SEPARATION_LINES_RADIUS,
 
       // Cesium
+      cesiumAvailable: false,
       cesiumEnabled: false,
       cesiumTerrainHeight: null,
       cesiumTerrainClamp: false,
@@ -331,6 +371,21 @@ const createViewerStore = () => create<ViewerState>()((...args) => ({
       chatError: null,
       chatAbortController: null,
 
+      // Schedule (4D) - drop panel + data; definitions are re-extracted on
+      // next load. `playbackSpeed`, `playbackLoop`, and `ganttTimeScale` are
+      // intentionally preserved as user preferences that survive file loads.
+      ganttPanelVisible: false,
+      generateScheduleDialogOpen: false,
+      scheduleData: null,
+      scheduleRange: null,
+      activeWorkScheduleId: '',
+      expandedTaskGlobalIds: new Set<string>(),
+      hoveredTaskGlobalId: null,
+      selectedTaskGlobalIds: new Set<string>(),
+      animationEnabled: false,
+      playbackIsPlaying: false,
+      playbackTime: 0,
+
       // Mutations - clear all mutation state so stale changes don't carry over
       mutationViews: new Map(),
       changeSets: new Map(),
@@ -339,6 +394,27 @@ const createViewerStore = () => create<ViewerState>()((...args) => ({
       redoStacks: new Map(),
       dirtyModels: new Set(),
       mutationVersion: get().mutationVersion + 1,
+
+      // Search - results reference the previous model's expressIds, drop them.
+      searchQuery: '',
+      searchOpen: false,
+      searchHighlightIndex: 0,
+      searchIndexes: new Map(),
+      searchVimCycle: null,
+      searchModalOpen: false,
+      searchFieldFilter: 'all',
+      searchModelFilter: null,
+      searchFilterResult: null,
+      searchFilterRunning: false,
+      searchFilterError: null,
+      searchFilter: { rules: [], combinator: 'AND', limit: 500 },
+      searchFilterSchema: new Map(),
+
+      // Annotations — drop draft + selection so a new file doesn't
+      // inherit the previous file's pin authoring state. Persisted
+      // pins themselves stay in localStorage (cross-file workspace).
+      draft: null,
+      selectedAnnotationId: null,
     });
   },
 }));

package/src/store/slices/addElementMeshes.ts

@@ -0,0 +1,365 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+/**
+ * Build simple "instant preview" meshes for newly-added elements so
+ * the user sees them in 3D the moment the builder commits — without
+ * waiting for an export+re-parse round-trip.
+ *
+ * Coordinate-system note (matches the rest of the viewer):
+ *   - Builder params are in **IFC storey-local** metres (Z-up).
+ *   - The renderer is **Y-up** with `viewer.y = ifc.z + storeyElevation`,
+ *     `viewer.x = ifc.x`, `viewer.z = -ifc.y`.
+ *   - We emit positions directly in renderer-frame so the mesh slots
+ *     into the standard mesh-list pipeline.
+ *
+ * What we don't try to do here: cut openings, host walls, model door
+ * leaves correctly, tessellate non-convex polygons. The preview is a
+ * faithful extrusion of the user's parametric input, not a final
+ * presentation render — when the user exports, the IFC pipeline emits
+ * the proper sub-graph and a re-parse yields the canonical geometry.
+ */
+
+import type { MeshData } from '@ifc-lite/geometry';
+import type {
+  AddElementType,
+  AddElementWallParams,
+  AddElementSlabParams,
+  AddElementBeamParams,
+  AddElementColumnParams,
+  AddElementDoorParams,
+  AddElementWindowParams,
+  AddElementSpaceParams,
+  AddElementRoofParams,
+  AddElementPlateParams,
+  AddElementMemberParams,
+} from './addElementSlice';
+
+type Vec3 = [number, number, number];
+
+/** Per-type colour palette for the preview mesh. RGBA, 0..1. */
+const COLORS: Record<AddElementType, [number, number, number, number]> = {
+  wall:   [0.85, 0.85, 0.82, 1.0],
+  slab:   [0.78, 0.78, 0.78, 1.0],
+  beam:   [0.65, 0.50, 0.35, 1.0],
+  column: [0.65, 0.50, 0.35, 1.0],
+  door:   [0.55, 0.35, 0.20, 1.0],
+  window: [0.45, 0.65, 0.85, 0.45],
+  space:  [0.30, 0.85, 0.55, 0.18],
+  roof:   [0.55, 0.35, 0.30, 1.0],
+  plate:  [0.70, 0.70, 0.72, 1.0],
+  member: [0.55, 0.55, 0.50, 1.0],
+};
+
+const IFC_TYPE: Record<AddElementType, string> = {
+  wall:   'IfcWall',
+  slab:   'IfcSlab',
+  beam:   'IfcBeam',
+  column: 'IfcColumn',
+  door:   'IfcDoor',
+  window: 'IfcWindow',
+  space:  'IfcSpace',
+  roof:   'IfcRoof',
+  plate:  'IfcPlate',
+  member: 'IfcMember',
+};
+
+export interface ElementBuildContext {
+  type: AddElementType;
+  /** New entity's globalId (federation-aware). Tags every vertex. */
+  globalId: number;
+  /** Storey elevation in IFC Z (metres) — added to vertex Y in renderer. */
+  storeyElevation: number;
+  /** Per-element-type discriminated params + click points. */
+  payload: ElementMeshPayload;
+}
+
+export type ElementMeshPayload =
+  | { type: 'wall'; params: AddElementWallParams; start: Vec3; end: Vec3 }
+  | { type: 'beam'; params: AddElementBeamParams; start: Vec3; end: Vec3 }
+  | { type: 'member'; params: AddElementMemberParams; start: Vec3; end: Vec3 }
+  | { type: 'column'; params: AddElementColumnParams; position: Vec3 }
+  | { type: 'door'; params: AddElementDoorParams; position: Vec3 }
+  | { type: 'window'; params: AddElementWindowParams; position: Vec3 }
+  | { type: 'slab'; params: AddElementSlabParams; corners: Vec3[] }
+  | { type: 'space'; params: AddElementSpaceParams; corners: Vec3[] }
+  | { type: 'roof'; params: AddElementRoofParams; corners: Vec3[] }
+  | { type: 'plate'; params: AddElementPlateParams; corners: Vec3[] };
+
+/**
+ * Build a renderer-frame `MeshData` for a freshly-added element.
+ * Returns `null` when the payload is degenerate (zero-length wall etc.).
+ */
+export function buildElementMesh(ctx: ElementBuildContext): MeshData | null {
+  const { type, globalId, storeyElevation, payload } = ctx;
+  switch (payload.type) {
+    case 'wall':
+    case 'beam':
+    case 'member': {
+      // Linear extrusion: a (length × thickness × height) box centred
+      // along the click→click axis, sitting on the storey floor.
+      const thickness = 'Thickness' in payload.params
+        ? payload.params.Thickness
+        : payload.params.Width;
+      const height = 'Height' in payload.params ? payload.params.Height : 0.1;
+      return buildLinearBox(globalId, type, payload.start, payload.end, thickness, height, storeyElevation);
+    }
+    case 'column': {
+      const { Width, Depth, Height } = payload.params;
+      return buildAxisBox(globalId, type, payload.position, Width, Depth, Height, storeyElevation);
+    }
+    case 'door': {
+      const { Width, Height, FrameThickness } = payload.params;
+      return buildAxisBox(globalId, type, payload.position, Width, FrameThickness, Height, storeyElevation);
+    }
+    case 'window': {
+      const { Width, Height, FrameThickness } = payload.params;
+      return buildAxisBox(globalId, type, payload.position, Width, FrameThickness, Height, storeyElevation);
+    }
+    case 'slab':
+    case 'roof':
+    case 'plate': {
+      const thickness = payload.params.Thickness;
+      return buildPolygonExtrusion(globalId, type, payload.corners, thickness, storeyElevation, /* extrudeUp */ true);
+    }
+    case 'space': {
+      const height = payload.params.Height;
+      return buildPolygonExtrusion(globalId, type, payload.corners, height, storeyElevation, /* extrudeUp */ true);
+    }
+  }
+}
+
+/**
+ * Linear segment extruded into a thickness × height box (wall / beam /
+ * member shape). The bottom ring follows the segment's actual start/end
+ * Z so a sloped beam previews as a sloped prism instead of pinning to
+ * `startIfc[2]`. Walls reject sloped axes upstream
+ * (`addWallToStore` enforces planar XY); beams / members do not, which
+ * is why this routine has to honour both endpoints' Z.
+ */
+function buildLinearBox(
+  globalId: number,
+  type: AddElementType,
+  startIfc: Vec3,
+  endIfc: Vec3,
+  thickness: number,
+  height: number,
+  storeyElevation: number,
+): MeshData | null {
+  const dx = endIfc[0] - startIfc[0];
+  const dy = endIfc[1] - startIfc[1];
+  // Cross-section plane is perpendicular to the ground-plane axis;
+  // even on sloped segments we keep the cross-section vertical so
+  // walls/beams/members read like building elements (extrusion is
+  // along +Z, not perpendicular to the segment direction).
+  const lenXY = Math.hypot(dx, dy);
+  if (lenXY < 1e-6) return null;
+  const ax = dx / lenXY;
+  const ay = dy / lenXY;
+  const nx = -ay;
+  const ny = ax;
+  const half = thickness / 2;
+  const startBaseZ = startIfc[2];
+  const endBaseZ = endIfc[2];
+  const startTopZ = startBaseZ + height;
+  const endTopZ = endBaseZ + height;
+  const ifcCorners: Vec3[] = [
+    [startIfc[0] + nx * half, startIfc[1] + ny * half, startBaseZ],
+    [endIfc[0]   + nx * half, endIfc[1]   + ny * half, endBaseZ],
+    [endIfc[0]   - nx * half, endIfc[1]   - ny * half, endBaseZ],
+    [startIfc[0] - nx * half, startIfc[1] - ny * half, startBaseZ],
+    [startIfc[0] + nx * half, startIfc[1] + ny * half, startTopZ],
+    [endIfc[0]   + nx * half, endIfc[1]   + ny * half, endTopZ],
+    [endIfc[0]   - nx * half, endIfc[1]   - ny * half, endTopZ],
+    [startIfc[0] - nx * half, startIfc[1] - ny * half, startTopZ],
+  ];
+  return buildBoxFromIfcCorners(globalId, type, ifcCorners, storeyElevation);
+}
+
+/** Axis-aligned box centred on a single point (column / door / window shape). */
+function buildAxisBox(
+  globalId: number,
+  type: AddElementType,
+  centerIfc: Vec3,
+  sizeX: number,
+  sizeY: number,
+  sizeZ: number,
+  storeyElevation: number,
+): MeshData {
+  const hx = sizeX / 2;
+  const hy = sizeY / 2;
+  const baseZ = centerIfc[2];
+  const topZ = baseZ + sizeZ;
+  const cx = centerIfc[0];
+  const cy = centerIfc[1];
+  const ifcCorners: Vec3[] = [
+    [cx - hx, cy - hy, baseZ],
+    [cx + hx, cy - hy, baseZ],
+    [cx + hx, cy + hy, baseZ],
+    [cx - hx, cy + hy, baseZ],
+    [cx - hx, cy - hy, topZ],
+    [cx + hx, cy - hy, topZ],
+    [cx + hx, cy + hy, topZ],
+    [cx - hx, cy + hy, topZ],
+  ];
+  return buildBoxFromIfcCorners(globalId, type, ifcCorners, storeyElevation);
+}
+
+/** Polygon footprint extruded vertically (slab / space / roof / plate). */
+function buildPolygonExtrusion(
+  globalId: number,
+  type: AddElementType,
+  ifcFootprint: Vec3[],
+  thickness: number,
+  storeyElevation: number,
+  extrudeUp: boolean,
+): MeshData | null {
+  const n = ifcFootprint.length;
+  if (n < 3 || thickness <= 0) return null;
+  const baseZ = ifcFootprint[0][2];
+  const topZ = baseZ + (extrudeUp ? thickness : -thickness);
+
+  // Vertex layout: bottom ring [0..n-1], top ring [n..2n-1]. Side
+  // quads built from consecutive ring pairs. Cap fans triangulate
+  // both rings around vertex 0 — fine for convex profiles, tolerable
+  // for slightly concave (the export still emits the proper polygon).
+  const vertCount = 2 * n;
+  const positions = new Float32Array(vertCount * 3);
+  const normals = new Float32Array(vertCount * 3);
+  for (let i = 0; i < n; i++) {
+    const [ix, iy] = ifcFootprint[i];
+    // Bottom ring (renderer-frame)
+    positions[i * 3 + 0] = ix;
+    positions[i * 3 + 1] = baseZ + storeyElevation;
+    positions[i * 3 + 2] = -iy;
+    normals[i * 3 + 0] = 0;
+    normals[i * 3 + 1] = -1;
+    normals[i * 3 + 2] = 0;
+    // Top ring
+    const j = (n + i) * 3;
+    positions[j + 0] = ix;
+    positions[j + 1] = topZ + storeyElevation;
+    positions[j + 2] = -iy;
+    normals[j + 0] = 0;
+    normals[j + 1] = 1;
+    normals[j + 2] = 0;
+  }
+
+  // Triangle counts: 2(n-2) for caps + 2n for sides = 4n - 4 triangles.
+  const triCount = 4 * n - 4;
+  const indices = new Uint32Array(triCount * 3);
+  let k = 0;
+
+  // Bottom cap — fan around vertex 0 (CW so it faces -Y / down).
+  for (let i = 1; i < n - 1; i++) {
+    indices[k++] = 0;
+    indices[k++] = i + 1;
+    indices[k++] = i;
+  }
+  // Top cap — fan around vertex n (CCW so it faces +Y / up).
+  for (let i = 1; i < n - 1; i++) {
+    indices[k++] = n;
+    indices[k++] = n + i;
+    indices[k++] = n + i + 1;
+  }
+  // Side quads — two triangles per edge.
+  for (let i = 0; i < n; i++) {
+    const i0 = i;
+    const i1 = (i + 1) % n;
+    const t0 = n + i0;
+    const t1 = n + i1;
+    indices[k++] = i0;
+    indices[k++] = i1;
+    indices[k++] = t1;
+    indices[k++] = i0;
+    indices[k++] = t1;
+    indices[k++] = t0;
+  }
+
+  const entityIds = new Uint32Array(vertCount);
+  entityIds.fill(globalId);
+
+  return {
+    expressId: globalId,
+    ifcType: IFC_TYPE[type],
+    positions,
+    normals,
+    indices,
+    color: COLORS[type],
+    entityIds,
+  };
+}
+
+/**
+ * Box mesh from 8 IFC-frame corners (bottom ring 0..3, top ring 4..7).
+ * Emits 12 triangles with face-aligned normals.
+ */
+function buildBoxFromIfcCorners(
+  globalId: number,
+  type: AddElementType,
+  ifcCorners: Vec3[],
+  storeyElevation: number,
+): MeshData {
+  // Each face has 4 unique vertices (normal welded per face) → 24 verts.
+  // Faces: bottom, top, +U, +V, -U, -V (where U/V are the two sides).
+  const faces: Array<{ corners: number[]; normal: Vec3 }> = [
+    { corners: [0, 1, 2, 3], normal: [0, 0, -1] }, // bottom (IFC -Z)
+    { corners: [4, 7, 6, 5], normal: [0, 0, 1] },  // top (IFC +Z)
+    { corners: [0, 4, 5, 1], normal: faceNormal(ifcCorners, 0, 4, 1) },
+    { corners: [1, 5, 6, 2], normal: faceNormal(ifcCorners, 1, 5, 2) },
+    { corners: [2, 6, 7, 3], normal: faceNormal(ifcCorners, 2, 6, 3) },
+    { corners: [3, 7, 4, 0], normal: faceNormal(ifcCorners, 3, 7, 0) },
+  ];
+  const positions = new Float32Array(24 * 3);
+  const normals = new Float32Array(24 * 3);
+  const indices = new Uint32Array(36);
+  let v = 0;
+  let i = 0;
+  for (const face of faces) {
+    const baseV = v;
+    for (const ci of face.corners) {
+      const [ix, iy, iz] = ifcCorners[ci];
+      positions[v * 3 + 0] = ix;
+      positions[v * 3 + 1] = iz + storeyElevation;
+      positions[v * 3 + 2] = -iy;
+      // IFC-frame normal → renderer-frame.
+      normals[v * 3 + 0] = face.normal[0];
+      normals[v * 3 + 1] = face.normal[2];
+      normals[v * 3 + 2] = -face.normal[1];
+      v++;
+    }
+    // Two triangles per face — split as (0,1,2) + (0,2,3).
+    indices[i++] = baseV;
+    indices[i++] = baseV + 1;
+    indices[i++] = baseV + 2;
+    indices[i++] = baseV;
+    indices[i++] = baseV + 2;
+    indices[i++] = baseV + 3;
+  }
+  const entityIds = new Uint32Array(24);
+  entityIds.fill(globalId);
+  return {
+    expressId: globalId,
+    ifcType: IFC_TYPE[type],
+    positions,
+    normals,
+    indices,
+    color: COLORS[type],
+    entityIds,
+  };
+}
+
+function faceNormal(corners: Vec3[], a: number, b: number, c: number): Vec3 {
+  const ux = corners[b][0] - corners[a][0];
+  const uy = corners[b][1] - corners[a][1];
+  const uz = corners[b][2] - corners[a][2];
+  const vx = corners[c][0] - corners[a][0];
+  const vy = corners[c][1] - corners[a][1];
+  const vz = corners[c][2] - corners[a][2];
+  const nx = uy * vz - uz * vy;
+  const ny = uz * vx - ux * vz;
+  const nz = ux * vy - uy * vx;
+  const len = Math.hypot(nx, ny, nz) || 1;
+  return [nx / len, ny / len, nz / len];
+}