@pascal-app/viewer 1.0.6 → 1.0.7

package/dist/store/use-viewer.js

@@ -2,6 +2,29 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { getSceneTheme, projectSceneTheme, SCENE_THEME_IDS, } from '../lib/scene-themes';
+const TIMES_OF_DAY = ['golden', 'midday', 'blue', 'night'];
+const WEATHERS = ['clear', 'fair', 'cloudy', 'overcast'];
+const RENDER_QUALITY_CHOICES = ['auto', 'low', 'medium', 'high'];
+/** Until the renderer is up and the device detected: touch devices Medium, others High. */
+function provisionalRenderQuality() {
+    if (typeof window === 'undefined' || !window.matchMedia)
+        return 'high';
+    return window.matchMedia('(pointer: coarse)').matches ? 'medium' : 'high';
+}
+function effectiveRenderQuality(choice, detected) {
+    return choice === 'auto' ? (detected ?? provisionalRenderQuality()) : choice;
+}
+function normalizeLatLng(value) {
+    if (!value || typeof value !== 'object')
+        return null;
+    const { lat, lng } = value;
+    return typeof lat === 'number' &&
+        typeof lng === 'number' &&
+        Number.isFinite(lat) &&
+        Number.isFinite(lng)
+        ? { lat, lng }
+        : null;
+}
 const CAMERA_MODES = ['perspective', 'orthographic'];
 const RENDER_SHADINGS = ['solid', 'rendered'];
 const COLOR_PRESETS = ['clay', 'white', 'mono', 'blueprint'];
@@ -127,7 +150,7 @@ function normalizePersistedViewerState(value) {
         shadingByContext: normalizeShadingByContext(state.shadingByContext),
         textures: typeof state.textures === 'boolean' ? state.textures : true,
         colorPreset: pickString(state.colorPreset, COLOR_PRESETS, 'clay'),
-        edges: pickString(state.edges, EDGE_MODES, 'soft'),
+        edges: state.edges === 'off' ? 'off' : 'soft',
         shadows: typeof state.shadows === 'boolean' ? state.shadows : true,
         unit: pickString(state.unit, UNITS, detectDefaultUnit()),
         metricNotation: pickString(state.metricNotation, METRIC_NOTATIONS, 'meters'),
@@ -135,8 +158,25 @@ function normalizePersistedViewerState(value) {
         levelMode: pickString(state.levelMode, LEVEL_MODES, 'stacked'),
         wallMode: pickString(state.wallMode, WALL_MODES, 'up'),
         projectPreferences: normalizeProjectPreferences(state.projectPreferences),
+        timeOfDay: pickString(state.timeOfDay, TIMES_OF_DAY, 'midday'),
+        timeOfDayMinutes: typeof state.timeOfDayMinutes === 'number' &&
+            state.timeOfDayMinutes >= 0 &&
+            state.timeOfDayMinutes <= 1440
+            ? state.timeOfDayMinutes
+            : null,
+        skyLive: state.skyLive === true,
+        weather: pickString(state.weather, WEATHERS, 'fair'),
+        deviceLocation: normalizeLatLng(state.deviceLocation),
+        // Solid shading was retired into the quality tiers: a saved Solid pick becomes Low.
+        renderQualityChoice: pickString(state.renderQuality, RENDER_QUALITY_CHOICES, persistedSolid(state) ? 'low' : 'auto'),
     };
 }
+function persistedSolid(state) {
+    const byContext = state.shadingByContext;
+    return (!!byContext &&
+        typeof byContext === 'object' &&
+        Object.values(byContext).includes('solid'));
+}
 /** The owner's pick (16 Oct): the section cut's clean edge over earth walls, and the simple fade. */
 export const DEFAULT_UNDERGROUND_LOOK = {
     edge: 'section-earth',
@@ -152,14 +192,16 @@ function resolveLook(state, patch) {
         savedSceneTheme: savedTheme,
         sceneTheme: theme.id,
         sceneAppearance: projectSceneTheme(theme, next.previewSceneTheme === null && !local?.theme ? next.projectPresentation : undefined),
-        shading: local?.shadingByContext?.[next.renderContext] ??
-            next.projectPresentation?.shading ??
-            next.shadingByContext[next.renderContext] ??
-            next.contextDefaultShading,
-        edges: local?.edges ?? next.projectPresentation?.edges ?? next.lookDefaults.edges,
+        // Solid (Lambert) shading is retired: the quality tiers replace it (Low is the cheap one).
+        shading: 'rendered',
+        // Edges are on (soft ink) or off; a saved 'strong' reads as on.
+        edges: onOffEdges(local?.edges ?? next.projectPresentation?.edges ?? next.lookDefaults.edges),
         shadows: local?.shadows ?? next.projectPresentation?.shadows ?? next.lookDefaults.shadows,
     };
 }
+function onOffEdges(edges) {
+    return edges === 'off' ? 'off' : 'soft';
+}
 function chooseLook(state, look) {
     const key = state.projectId ?? '';
     const previous = state.projectPreferences[key];
@@ -243,11 +285,17 @@ const useViewer = create()(persist((set) => ({
     setRenderPaused: (value) => set({ renderPaused: value }),
     shading: 'rendered',
     shadingByContext: {},
-    setShading: (shading) => set((state) => chooseLook(state, {
-        shadingByContext: {
-            ...state.projectPreferences[state.projectId ?? '']?.look?.shadingByContext,
-            [state.renderContext]: shading,
-        },
+    // Solid is retired into the quality tiers: asking for it picks the Low tier.
+    setShading: (shading) => set((state) => ({
+        ...chooseLook(state, {
+            shadingByContext: {
+                ...state.projectPreferences[state.projectId ?? '']?.look?.shadingByContext,
+                [state.renderContext]: shading,
+            },
+        }),
+        ...(shading === 'solid'
+            ? { renderQuality: 'low', renderQualityChoice: 'low' }
+            : {}),
     })),
     textures: true,
     setTextures: (textures) => set({ textures }),
@@ -276,7 +324,6 @@ const useViewer = create()(persist((set) => ({
     hasLevelBelowGrade: false,
     diveAvailable: false,
     eyeUnderGround: false,
-    pluginFoundationLevelIds: [],
     ambianceActive: false,
     undergroundLook: DEFAULT_UNDERGROUND_LOOK,
     setUndergroundLook: (look) => set((state) => ({ undergroundLook: { ...state.undergroundLook, ...look } })),
@@ -328,8 +375,37 @@ const useViewer = create()(persist((set) => ({
     }),
     showZones: true,
     setShowZones: (show) => set({ showZones: show }),
+    showCeilingTops: false,
+    setShowCeilingTops: (show) => set({ showCeilingTops: show }),
+    framingOnly: false,
+    setFramingOnly: (on) => set({ framingOnly: on }),
+    framingShown: false,
+    setFramingShown: (on) => set((state) => (state.framingShown === on ? state : { framingShown: on })),
     transparentBackground: false,
     setTransparentBackground: (transparent) => set({ transparentBackground: transparent }),
+    timeOfDay: 'midday',
+    setTimeOfDay: (timeOfDay) => set({ timeOfDay, timeOfDayMinutes: null, skyLive: false }),
+    timeOfDayMinutes: null,
+    setTimeOfDayMinutes: (timeOfDayMinutes) => set({ timeOfDayMinutes, skyLive: false }),
+    skyLive: false,
+    setSkyLive: (skyLive) => set({ skyLive }),
+    weather: 'fair',
+    setWeather: (weather) => set({ weather }),
+    deviceLocation: null,
+    setDeviceLocation: (deviceLocation) => set({ deviceLocation }),
+    renderQuality: provisionalRenderQuality(),
+    renderQualityChoice: 'auto',
+    detectedRenderQuality: null,
+    softwareRenderer: false,
+    setRenderQuality: (renderQualityChoice) => set((state) => ({
+        renderQualityChoice,
+        renderQuality: effectiveRenderQuality(renderQualityChoice, state.detectedRenderQuality),
+    })),
+    setDetectedRenderQuality: (detectedRenderQuality, softwareRenderer = false) => set((state) => ({
+        detectedRenderQuality,
+        softwareRenderer,
+        renderQuality: effectiveRenderQuality(state.renderQualityChoice, detectedRenderQuality),
+    })),
     inkOpacity: null,
     setInkOpacity: (opacity) => set({ inkOpacity: opacity }),
     projectId: null,
@@ -343,6 +419,8 @@ const useViewer = create()(persist((set) => ({
             projectPreferences,
             projectPresentation: undefined,
             previewSceneTheme: null,
+            framingOnly: false,
+            framingShown: false,
             showScans: prefs.showScans ?? true,
             showGuides: prefs.showGuides ?? true,
             showGrid: prefs.showGrid ?? true,
@@ -390,7 +468,11 @@ const useViewer = create()(persist((set) => ({
     debugColors: false,
     setDebugColors: (enabled) => set({ debugColors: enabled }),
     walkthroughMode: false,
-    setWalkthroughMode: (mode) => set({ walkthroughMode: mode, walkthroughSuspended: false }),
+    setWalkthroughMode: (mode) => set(mode
+        ? { walkthroughMode: true, walkthroughSuspended: false }
+        : { walkthroughMode: false, walkthroughSuspended: false, walkthroughMovement: 'walk' }),
+    walkthroughMovement: 'walk',
+    setWalkthroughMovement: (movement) => set({ walkthroughMovement: movement }),
     walkthroughSuspended: false,
     setWalkthroughSuspended: (suspended) => set({ walkthroughSuspended: suspended }),
     cameraDragging: false,
@@ -401,9 +483,11 @@ const useViewer = create()(persist((set) => ({
     name: 'viewer-preferences',
     merge: (persistedState, currentState) => {
         const persisted = normalizePersistedViewerState(persistedState);
+        const renderQualityChoice = persisted.renderQualityChoice ?? currentState.renderQualityChoice;
         return {
             ...currentState,
             ...persisted,
+            renderQuality: effectiveRenderQuality(renderQualityChoice, currentState.detectedRenderQuality),
             ...resolveLook(currentState, {
                 ...persisted,
                 lookDefaults: {
@@ -427,6 +511,12 @@ const useViewer = create()(persist((set) => ({
         levelMode: state.levelMode,
         wallMode: state.wallMode,
         projectPreferences: Object.fromEntries(Object.entries(state.projectPreferences).filter(([key]) => key !== '')),
+        timeOfDay: state.timeOfDay,
+        timeOfDayMinutes: state.timeOfDayMinutes,
+        skyLive: state.skyLive,
+        weather: state.weather,
+        deviceLocation: state.deviceLocation,
+        renderQuality: state.renderQualityChoice,
     }),
 }));
 /**
@@ -441,11 +531,6 @@ export function groundVeiled(state) {
         state.gradeStanding !== 'partly-below-grade' &&
         state.walkthroughMode !== true);
 }
-/** Whether any ground is veiled now, wholesale or through the eye's window. */
-export function anyGroundVeiled(state) {
-    return (groundVeiled(state) ||
-        (state.groundMode === 'auto' && state.groundWindowVeiled && state.walkthroughMode !== true));
-}
 /**
  * Whether the site draws its own ground. `showGround: false` says other geometry supplies the
  * ground (an authored landscape), which stands on a level above a basement; while a level below

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

@@ -2,6 +2,11 @@ import { type CeilingNode, type CeilingSurfaceCell, useScene } from '@pascal-app
 import * as THREE from 'three';
 /** Name of the meshes a ceiling draws its paint regions with, one per region. */
 export declare const CEILING_REGION_MESH = "ceiling-region";
+/**
+ * Name of the mesh that draws a ceiling's upper face while `showCeilingTops` is on. It shares the
+ * grid's geometry, which covers the whole ceiling, and stands on top of the ceiling's build-up.
+ */
+export declare const CEILING_CAP_MESH = "ceiling-cap";
 /**
  * The material a ceiling draws a region finish with. The ceiling's renderer
  * owns materials (theme, textures, scene materials) and leaves this on the

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

@@ -1 +1 @@
-{"version":3,"file":"ceiling-system.d.ts","sourceRoot":"","sources":["../../../src/systems/ceiling/ceiling-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EAYvB,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAA;AAE5F,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAA;AAa/D,eAAO,MAAM,aAAa,YA4BzB,CAAA;AAsCD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,UAAU,GAAE,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAM,EAC/C,KAAK,GAAE,UAAsC,QA8C9C;AAuDD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAM,GAC9C,KAAK,CAAC,cAAc,CA6DtB"}
+{"version":3,"file":"ceiling-system.d.ts","sourceRoot":"","sources":["../../../src/systems/ceiling/ceiling-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EAavB,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,gBAAgB,CAAA;AAE7C;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAA;AAE5F,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAA;AAa/D,eAAO,MAAM,aAAa,YA4BzB,CAAA;AAsCD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,UAAU,GAAE,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAM,EAC/C,KAAK,GAAE,UAAsC,QAmD9C;AAuDD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAM,GAC9C,KAAK,CAAC,cAAc,CA6DtB"}

package/dist/systems/ceiling/ceiling-system.js

@@ -1,10 +1,15 @@
-import { CEILING_DRAW_OFFSET, CEILING_SURFACE_ROLE, ceilingPaintRegions, computeCeilingSurfaceCells, getEffectiveCutterNode, getEffectiveNode, hostedCutterHoles, isScriptedNode, nodeRegistry, resolveCeilingHeight, sceneRegistry, useLiveTransforms, useScene, } from '@pascal-app/core';
+import { CEILING_DRAW_OFFSET, CEILING_SURFACE_ROLE, ceilingCapLift, ceilingPaintRegions, computeCeilingSurfaceCells, getEffectiveCutterNode, getEffectiveNode, hostedCutterHoles, isScriptedNode, nodeRegistry, resolveCeilingHeight, sceneRegistry, useLiveTransforms, useScene, } from '@pascal-app/core';
 import { useFrame } from '@react-three/fiber';
 import * as THREE from 'three';
 import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
 import { mergeSurfaceHolePolygons } from '../surface-hole-geometry';
 /** Name of the meshes a ceiling draws its paint regions with, one per region. */
 export const CEILING_REGION_MESH = 'ceiling-region';
+/**
+ * Name of the mesh that draws a ceiling's upper face while `showCeilingTops` is on. It shares the
+ * grid's geometry, which covers the whole ceiling, and stands on top of the ceiling's build-up.
+ */
+export const CEILING_CAP_MESH = 'ceiling-cap';
 function ensureUv2Attribute(geometry) {
     const uv = geometry.getAttribute('uv');
     if (!uv)
@@ -96,6 +101,11 @@ export function updateCeilingGeometry(node, mesh, extraHoles = [], nodes = useSc
     if (gridMesh) {
         gridMesh.geometry.dispose();
         gridMesh.geometry = cells ? newGeo : newGeo.clone();
+        const capMesh = mesh.getObjectByName(CEILING_CAP_MESH);
+        if (capMesh) {
+            capMesh.geometry = gridMesh.geometry;
+            capMesh.position.y = ceilingCapLift(node, nodes);
+        }
     }
     else if (cells) {
         newGeo.dispose();

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

@@ -1 +1 @@
-{"version":3,"file":"door-system.d.ts","sourceRoot":"","sources":["../../../src/systems/door/door-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,QAAQ,EAcd,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AA6D9B,eAAO,MAAM,UAAU,YAyHtB,CAAA;AAiqCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,SAAS,EAChC,KAAK,EAAE,MAAM,GACZ,OAAO,CA6GT;AA6wCD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC,IAAI,CAI/D"}
+{"version":3,"file":"door-system.d.ts","sourceRoot":"","sources":["../../../src/systems/door/door-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,QAAQ,EAmBd,MAAM,kBAAkB,CAAA;AAIzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AA6E9B,eAAO,MAAM,UAAU,YAyHtB,CAAA;AAggDD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,SAAS,EAChC,KAAK,EAAE,MAAM,GACZ,OAAO,CAmHT;AAo3CD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC,IAAI,CAI/D"}