@3driseai/3drise-viewer 0.1.8 → 0.1.10

package/dist/components/EnvironmentManager.d.ts

@@ -4,32 +4,46 @@ import { type SkySystemRef, type SkySystemProps } from './SkySystem';
 import type { EnvironmentConfig, FogSettings, HdrSettings, SkySettings, TimeSettings } from '@3driseai/3drise-core';
 import type { VolumetricCloudsSettings } from '../types/cloudConfigs';
 import type { ProceduralTerrainSettings } from '../types/terrainConfigs';
+import type { LandscapeSettings } from '../types/landscapeConfigs';
+import type { OceanWaterSettings } from '../types/oceanConfigs';
 import type { ObjectReadyProps } from '../types/objectReady';
 /**
  * The whole environment in one component: HDR background, image-based lighting,
- * sky, sun, fog, clouds and terrain.
+ * sky, sun, fog, clouds, terrain, landscape and water.
  *
  * This is the *composed* entry point, for SceneBuilder and for anyone embedding a
  * published scene, where the settings arrive as one saved blob and nothing
  * re-renders unless the project changes.
  *
- * A host with fine-grained reactive state — the editor — should compose the same
- * pieces itself, one store subscription per slice, so a fog change cannot
- * re-render the sun. Every piece here is exported for exactly that:
+ * **Everything comes off `environment`.** That prop is the environment record as
+ * it is stored — one object with a key per feature — and it is the same object
+ * the editor's `useLoadProject` fans out into Redux, key by key, before its
+ * connectors subscribe to the slices. Same blob, same components, two
+ * subscription granularities; that is the only thing that should ever differ
+ * between the editor and an embed.
+ *
+ * A host with fine-grained reactive state should compose the pieces itself, one
+ * store subscription per feature. Every piece here is exported for exactly that:
  * HdrEnvironment, useEnvironmentProbe, SkySystem, SceneFog, CloudsGenerator,
- * TerrainBuilder. Both paths run the same components; only the subscription
- * granularity differs, and that is the only thing that should ever differ.
+ * TerrainBuilder, LandscapeBuilder, OceanBuilder.
  */
-/** core's EnvironmentConfig still types `clouds` as the retired CloudsSettings.
- *  Narrowed here rather than in core, which cannot reference the viewer's cloud
- *  types — they live next to the shader that consumes them. */
-export type ViewerEnvironmentConfig = Omit<EnvironmentConfig, 'clouds'> & {
+/** The stored environment record.
+ *
+ *  core's `EnvironmentConfig` still types `clouds` and `ocean` as the retired
+ *  flat shapes and has no `terrain` or `landscape` at all. All four are declared
+ *  here rather than in core for the same reason: a feature's config type lives
+ *  next to the shader that consumes it, and core cannot reference the viewer.
+ *
+ *  A project saved before any of these existed still carries the old shape at
+ *  runtime. Each builder normalises its own blob on read and decides what an
+ *  absent or legacy block means — see `normalizeTerrain` (drops it: a scene
+ *  authored without ground should not gain a landscape) versus `normalizeOcean`
+ *  (maps it: a scene authored with the old flat plane really did have water). */
+export type ViewerEnvironmentConfig = Omit<EnvironmentConfig, 'clouds' | 'ocean'> & {
     clouds?: VolumetricCloudsSettings;
-    /** core's EnvironmentConfig has no terrain field at all, and its
-     *  `TerrainSettings` is the retired flat shape. Declared here for the same
-     *  reason `clouds` is narrowed here: the config type lives next to the shader
-     *  that consumes it, and core cannot reference the viewer. */
     terrain?: ProceduralTerrainSettings;
+    landscape?: LandscapeSettings;
+    ocean?: OceanWaterSettings;
 };
 export interface EnvironmentManagerProps extends ObjectReadyProps {
     timeSettings: TimeSettings;
@@ -39,6 +53,8 @@ export interface EnvironmentManagerProps extends ObjectReadyProps {
     skySettings?: SkySettings;
     cloudsSettings?: VolumetricCloudsSettings;
     terrainSettings?: ProceduralTerrainSettings;
+    landscapeSettings?: LandscapeSettings;
+    oceanSettings?: OceanWaterSettings;
     fogSettings?: FogSettings;
     cubeCameraResolution?: number;
     skyboxScale?: number;

package/dist/components/EnvironmentManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnvironmentManager.d.ts","sourceRoot":"","sources":["../../src/components/EnvironmentManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,KAAK,EACR,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D;;;;;;;;;;;;;;GAcG;AAEH;;+DAE+D;AAC/D,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,GAAG;IACtE,MAAM,CAAC,EAAE,wBAAwB,CAAC;IAClC;;;kEAG8D;IAC9D,OAAO,CAAC,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,YAAY,EAAE,YAAY,CAAC;IAC3B,iFAAiF;IACjF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;CACjD;AAoBD,QAAA,MAAM,kBAAkB,8FAwEtB,CAAC;AAGH,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"EnvironmentManager.d.ts","sourceRoot":"","sources":["../../src/components/EnvironmentManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,KAAK,EACR,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;iFAWiF;AACjF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG;IAChF,MAAM,CAAC,EAAE,wBAAwB,CAAC;IAClC,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,YAAY,EAAE,YAAY,CAAC;IAC3B,iFAAiF;IACjF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;CACjD;AAoBD,QAAA,MAAM,kBAAkB,8FAiGtB,CAAC;AAGH,eAAe,kBAAkB,CAAC"}

package/dist/components/EnvironmentManager.js

@@ -5,6 +5,8 @@ import SkySystem from './SkySystem.js';
 import HdrEnvironment, { isHdrActive } from './HdrEnvironment.js';
 import { useEnvironmentProbe } from '../hooks/useEnvironmentProbe.js';
 import TerrainBuilder from './TerrainBuilder.js';
+import LandscapeBuilder from './LandscapeBuilder.js';
+import OceanBuilder from './OceanBuilder.js';
 const DEFAULT_HDR = {
     visible: false,
     name: null,
@@ -21,23 +23,26 @@ const DEFAULT_HDR = {
     },
 };
 const ORIGIN = new Vector3(0, 0, 0);
-const EnvironmentManager = forwardRef(({ timeSettings, environment, hdrSettings, skySettings, cloudsSettings, terrainSettings, fogSettings, cubeCameraResolution = 512, skyboxScale = 100000, playerPosition = ORIGIN, onTimeOfDayChange, onTimeUpdate, onObjectReady, onObjectDispose, }, ref) => {
+const EnvironmentManager = forwardRef(({ timeSettings, environment, hdrSettings, skySettings, cloudsSettings, terrainSettings, landscapeSettings, oceanSettings, fogSettings, cubeCameraResolution = 512, skyboxScale = 100000, playerPosition = ORIGIN, onTimeOfDayChange, onTimeUpdate, onObjectReady, onObjectDispose, }, ref) => {
     const hdr = hdrSettings ?? environment?.hdr ?? DEFAULT_HDR;
     const sky = skySettings ?? environment?.sky;
     const clouds = cloudsSettings ?? environment?.clouds;
     const terrain = terrainSettings ?? environment?.terrain;
+    const landscape = landscapeSettings ?? environment?.landscape;
+    const ocean = oceanSettings ?? environment?.ocean;
     const fog = fogSettings ?? environment?.fog;
     const sunSystemVisible = !!sky?.sunSystem?.visible;
     // Previously hardcoded true, which kept a cube camera alive — and re-captured
     // its six faces — for scenes that have no sky at all.
     const skyActive = !!sky?.visible || sunSystemVisible;
+    const sunIntensity = sky?.sunSystem?.intensity ?? 1;
     useEnvironmentProbe({
         hdrActive: isHdrActive(hdr),
         skyActive,
         autoAnimate: !!timeSettings.autoAnimate,
         resolution: cubeCameraResolution,
     });
-    return (_jsxs(_Fragment, { children: [_jsx(HdrEnvironment, { hdr: hdr, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(TerrainBuilder, { settings: terrain, skySettings: sky, timeSettings: timeSettings, sunIntensity: sky?.sunSystem?.intensity ?? 1, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(SkySystem, { ref: ref, timeSettings: timeSettings, visible: true, sunSystemVisible: sunSystemVisible, sunSize: sky?.sunSystem?.sunSize, moonSize: sky?.sunSystem?.moonSize, skyboxScale: skyboxScale, sunIntensity: sky?.sunSystem?.intensity ?? 1, castShadow: sky?.sunSystem?.castShadow, shadowMapSize: sky?.sunSystem?.shadowMapSize, playerPosition: playerPosition, cloudsSettings: clouds, skyControllerSettings: sky, fogSettings: fog, onTimeOfDayChange: onTimeOfDayChange, onTimeUpdate: onTimeUpdate, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(HdrEnvironment, { hdr: hdr, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(TerrainBuilder, { settings: terrain, skySettings: sky, timeSettings: timeSettings, sunIntensity: sunIntensity, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(LandscapeBuilder, { settings: landscape, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(OceanBuilder, { settings: ocean, skySettings: sky, timeSettings: timeSettings, sunIntensity: sunIntensity, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }), _jsx(SkySystem, { ref: ref, timeSettings: timeSettings, visible: true, sunSystemVisible: sunSystemVisible, sunSize: sky?.sunSystem?.sunSize, moonSize: sky?.sunSystem?.moonSize, skyboxScale: skyboxScale, sunIntensity: sunIntensity, castShadow: sky?.sunSystem?.castShadow, shadowMapSize: sky?.sunSystem?.shadowMapSize, playerPosition: playerPosition, cloudsSettings: clouds, skyControllerSettings: sky, fogSettings: fog, onTimeOfDayChange: onTimeOfDayChange, onTimeUpdate: onTimeUpdate, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose })] }));
 });
 EnvironmentManager.displayName = 'EnvironmentManager';
 export default EnvironmentManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",