@3driseai/3drise-viewer 0.1.30 → 0.1.31

package/dist/utils/environmentDrawOrder.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Draw order of the camera-centred environment surfaces.
+ *
+ * three sorts opaque objects by renderOrder, then by MATERIAL ID, then by depth.
+ * The world ocean and the terrain clipmaps are both centred on the camera, so the
+ * depth tie never helps, and with renderOrder left at 0 the material id decides:
+ * whichever surface was created last draws last. That made the frame cost depend
+ * on mount order — measured 13 ms vs 22-27 ms GPU in the same view — because when
+ * the terrain drew first, every terrain pixel under the sea ran the full terrain
+ * shader (textures, 8 noise octaves) and was then painted over by water.
+ *
+ * Fixed order instead, all below the scene's objects (0):
+ *   1. water, inner rings first   (cheap shader; hides the seabed from the depth test)
+ *   2. terrain, inner rings first (near ground hides far ground: front to back)
+ * Drawing near-to-far is what lets the early depth test throw hidden pixels away
+ * before their shader runs. Wasted water pixels behind land are cheap; wasted
+ * terrain pixels under water were most of the frame.
+ */
+export declare const OCEAN_DRAW_ORDER = -40;
+export declare const TERRAIN_DRAW_ORDER = -20;
+/** Inner ring (level 0) first, then outward. */
+export declare const ringDrawOrder: (base: number, level: number) => number;
+//# sourceMappingURL=environmentDrawOrder.d.ts.map

package/dist/utils/environmentDrawOrder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"environmentDrawOrder.d.ts","sourceRoot":"","sources":["../../src/utils/environmentDrawOrder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,gDAAgD;AAChD,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,WAAiB,CAAC"}

package/dist/utils/environmentDrawOrder.js

@@ -0,0 +1,22 @@
+/**
+ * Draw order of the camera-centred environment surfaces.
+ *
+ * three sorts opaque objects by renderOrder, then by MATERIAL ID, then by depth.
+ * The world ocean and the terrain clipmaps are both centred on the camera, so the
+ * depth tie never helps, and with renderOrder left at 0 the material id decides:
+ * whichever surface was created last draws last. That made the frame cost depend
+ * on mount order — measured 13 ms vs 22-27 ms GPU in the same view — because when
+ * the terrain drew first, every terrain pixel under the sea ran the full terrain
+ * shader (textures, 8 noise octaves) and was then painted over by water.
+ *
+ * Fixed order instead, all below the scene's objects (0):
+ *   1. water, inner rings first   (cheap shader; hides the seabed from the depth test)
+ *   2. terrain, inner rings first (near ground hides far ground: front to back)
+ * Drawing near-to-far is what lets the early depth test throw hidden pixels away
+ * before their shader runs. Wasted water pixels behind land are cheap; wasted
+ * terrain pixels under water were most of the frame.
+ */
+export const OCEAN_DRAW_ORDER = -40;
+export const TERRAIN_DRAW_ORDER = -20;
+/** Inner ring (level 0) first, then outward. */
+export const ringDrawOrder = (base, level) => base + level;

package/dist/utils/terrainUniforms.d.ts

@@ -2,6 +2,13 @@ import * as THREE from 'three';
 import type { TerrainConfig, TerrainQualityConfig } from '@3driseai/3drise-core';
 import type { TerrainTextureState } from '../hooks/useTerrainTextures';
 import type { CloudSunState } from '../hooks/useCloudSun';
+/**
+ * The height field's own uniforms (terrainFormUniforms): landform, scale, octaves,
+ * warp, erosion, shaping. Shared by the terrain material and by every material that
+ * includes `terrainFieldOnly` to read the ground — the ocean, for its shoreline —
+ * so the two can never disagree about where the ground is.
+ */
+export declare function applyTerrainFieldUniforms(material: THREE.ShaderMaterial, config: TerrainConfig): void;
 export declare function applyTerrainUniforms(material: THREE.ShaderMaterial, config: TerrainConfig, quality: TerrainQualityConfig): void;
 export default applyTerrainUniforms;
 /**

package/dist/utils/terrainUniforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrainUniforms.d.ts","sourceRoot":"","sources":["../../src/utils/terrainUniforms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAe,MAAM,uBAAuB,CAAC;AAE9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAoD1D,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,oBAAoB,GAC9B,IAAI,CAwDN;AAED,eAAe,oBAAoB,CAAC;AAUpC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,mBAAmB,GACzB,IAAI,CAyDN;AAiCD,wDAAwD;AACxD,wBAAgB,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CA4BlG;AAMD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAwC5F"}
+{"version":3,"file":"terrainUniforms.d.ts","sourceRoot":"","sources":["../../src/utils/terrainUniforms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAe,MAAM,uBAAuB,CAAC;AAE9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAoD1D;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAwBrG;AAED,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,oBAAoB,GAC9B,IAAI,CAqCN;AAED,eAAe,oBAAoB,CAAC;AAUpC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,mBAAmB,GACzB,IAAI,CAyDN;AAiCD,wDAAwD;AACxD,wBAAgB,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CA4BlG;AAMD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAwC5F"}

package/dist/utils/terrainUniforms.js

@@ -45,9 +45,15 @@ function setColor(uniform, hex) {
         return;
     uniform.value.setStyle(hex, THREE.SRGBColorSpace);
 }
-export function applyTerrainUniforms(material, config, quality) {
+/**
+ * The height field's own uniforms (terrainFormUniforms): landform, scale, octaves,
+ * warp, erosion, shaping. Shared by the terrain material and by every material that
+ * includes `terrainFieldOnly` to read the ground — the ocean, for its shoreline —
+ * so the two can never disagree about where the ground is.
+ */
+export function applyTerrainFieldUniforms(material, config) {
     const u = material.uniforms;
-    if (!u)
+    if (!u || !u.u_terrainType)
         return;
     u.u_terrainType.value = TYPE_INDEX[config.terrainType] ?? 2;
     u.u_elevation.value = Math.max(config.elevation, 0.01);
@@ -68,6 +74,13 @@ export function applyTerrainUniforms(material, config, quality) {
     u.u_plateau.value = config.plateau;
     u.u_valleyDepth.value = config.valleyDepth;
     u.u_valleyWidth.value = config.valleyWidth;
+    u.u_shadowSoftness.value = config.shadowSoftness;
+}
+export function applyTerrainUniforms(material, config, quality) {
+    const u = material.uniforms;
+    if (!u)
+        return;
+    applyTerrainFieldUniforms(material, config);
     setColor(u.u_lowColor, config.lowColor);
     setColor(u.u_midColor, config.midColor);
     setColor(u.u_rockColor, config.rockColor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@3driseai/3drise-common": "^1.0.1",
-    "@3driseai/3drise-core": "^1.0.23"
+    "@3driseai/3drise-core": "^1.0.24"
   }
 }