terrain water shader overhaul

packages/client/src/lib/gameClientUi.ts

@@ -1,5 +1,3 @@
-export function resolveGameClientUiDisplay(
-  visible: boolean,
-): "block" | "none" {
+export function resolveGameClientUiDisplay(visible: boolean): "block" | "none" {
   return visible ? "block" : "none";
 }

packages/client/src/lib/streamingAccessToken.ts

@@ -52,7 +52,9 @@ export function primeStreamingAccessTokenFromWindow(
     return cachedStreamingAccessToken;
   }
 
-  const resolved = resolveStreamingAccessTokenFromHref(targetWindow.location.href);
+  const resolved = resolveStreamingAccessTokenFromHref(
+    targetWindow.location.href,
+  );
   cachedStreamingAccessToken = resolved.token;
 
   if (resolved.nextUrl) {

packages/client/src/screens/GameClient.tsx

@@ -350,8 +350,7 @@ export function GameClient({
       // Default to game server on 5555, CDN on 8080
       const runtimeEnv = await loadRuntimeEnv();
       const runtimeWsUrl = normalizeEnvValue(runtimeEnv?.PUBLIC_WS_URL);
-      const finalWsUrl =
-        initialWsUrlRef.current || runtimeWsUrl || GAME_WS_URL;
+      const finalWsUrl = initialWsUrlRef.current || runtimeWsUrl || GAME_WS_URL;
       const runtimeCdnUrl = normalizeEnvValue(runtimeEnv?.PUBLIC_CDN_URL);
       const buildCdnUrl = normalizeEnvValue(CDN_URL);
       const resolvedCdnUrl = resolveCdnUrlForClient(runtimeCdnUrl, buildCdnUrl);

packages/client/tests/unit/lib/embeddedAuth.test.ts

@@ -25,9 +25,7 @@ describe("embeddedAuth", () => {
     expect(normalizeTrustedOrigin("javascript:alert(1)")).toBeNull();
   });
 
-  it(
-    "builds the trusted embed-origin allowlist from current, app, and configured origins",
-    () => {
+  it("builds the trusted embed-origin allowlist from current, app, and configured origins", () => {
     expect(
       resolveTrustedEmbedOrigins({
         currentOrigin: "https://game.example.com",
@@ -41,8 +39,7 @@ describe("embeddedAuth", () => {
       "https://embed.example.com",
       "https://partner.example.com",
     ]);
-    },
-  );
+  });
 
   it("ignores untrusted origins and parses valid bootstrap messages", () => {
     const trustedOrigins = resolveTrustedEmbedOrigins({
@@ -108,9 +105,7 @@ describe("embeddedAuth", () => {
     });
   });
 
-  it(
-    "targets HYPERSCAPE_READY to a trusted referrer or explicit allowed origin",
-    () => {
+  it("targets HYPERSCAPE_READY to a trusted referrer or explicit allowed origin", () => {
     const trustedOrigins = resolveTrustedEmbedOrigins({
       currentOrigin: "https://game.example.com",
       publicAppUrl: "https://app.example.com",
@@ -165,6 +160,5 @@ describe("embeddedAuth", () => {
         allowWildcardFallback: true,
       }),
     ).toBe("*");
-    },
-  );
+  });
 });

packages/client/tests/unit/lib/streamingAccessToken.test.ts

@@ -131,6 +131,8 @@ describe("streamingAccessToken", () => {
       },
     } as unknown as Window;
 
-    expect(primeStreamingAccessTokenFromWindow(freshWindow)).toBe("fresh-token");
+    expect(primeStreamingAccessTokenFromWindow(freshWindow)).toBe(
+      "fresh-token",
+    );
   });
 });

packages/client/tests/unit/screens/GameClient.test.tsx

@@ -37,7 +37,9 @@ vi.mock("../../../src/game/CoreUI", () => ({
 }));
 
 vi.mock("../../../src/components/common/ErrorBoundary", () => ({
-  ErrorBoundary: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  ErrorBoundary: ({ children }: { children: React.ReactNode }) => (
+    <>{children}</>
+  ),
 }));
 
 vi.mock("../../../src/lib/ThreeResourceManager", () => ({
@@ -97,7 +99,11 @@ describe("GameClient", () => {
     expect(screen.getByTestId("core-ui")).toBeInTheDocument();
 
     rerender(
-      <GameClient hideUI={true} onSetup={onSetupB} onInitError={onInitErrorB} />,
+      <GameClient
+        hideUI={true}
+        onSetup={onSetupB}
+        onInitError={onInitErrorB}
+      />,
     );
 
     await waitFor(() => {

packages/client/tests/unit/screens/LoadingScreen.test.tsx

@@ -65,10 +65,10 @@ describe("LoadingScreen", () => {
     );
 
     const progressHandler = (
-      (world.on as unknown as ReturnType<typeof vi.fn>).mock.calls.find(
-        ([event]) => event === EventType.ASSETS_LOADING_PROGRESS,
-      )?.[1] as ((payload: unknown) => void) | undefined
-    );
+      world.on as unknown as ReturnType<typeof vi.fn>
+    ).mock.calls.find(
+      ([event]) => event === EventType.ASSETS_LOADING_PROGRESS,
+    )?.[1] as ((payload: unknown) => void) | undefined;
 
     expect(progressHandler).toBeDefined();
 

packages/client/tests/unit/screens/StreamingMode.component.test.tsx

@@ -122,10 +122,14 @@ vi.mock("../../../src/components/streaming/StreamingOverlay", () => ({
     state,
   }: {
     state: { cycle?: { phase?: string } } | null;
-  }) => <div data-testid="streaming-overlay">{state?.cycle?.phase ?? "NONE"}</div>,
+  }) => (
+    <div data-testid="streaming-overlay">{state?.cycle?.phase ?? "NONE"}</div>
+  ),
 }));
 
-function createStreamingState(phase: "ANNOUNCEMENT" | "COUNTDOWN" | "FIGHTING" = "FIGHTING") {
+function createStreamingState(
+  phase: "ANNOUNCEMENT" | "COUNTDOWN" | "FIGHTING" = "FIGHTING",
+) {
   return {
     type: "STREAMING_STATE_UPDATE" as const,
     cycle: {
@@ -196,13 +200,17 @@ describe("StreamingMode component", () => {
         json: async () => createStreamingState(),
       })),
     );
-    (window as Window & {
-      __HYPERSCAPE_STREAM_READY__?: boolean;
-      __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: unknown;
-    }).__HYPERSCAPE_STREAM_READY__ = false;
-    (window as Window & {
-      __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: unknown;
-    }).__HYPERSCAPE_STREAM_RENDERER_HEALTH__ = null;
+    (
+      window as Window & {
+        __HYPERSCAPE_STREAM_READY__?: boolean;
+        __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: unknown;
+      }
+    ).__HYPERSCAPE_STREAM_READY__ = false;
+    (
+      window as Window & {
+        __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: unknown;
+      }
+    ).__HYPERSCAPE_STREAM_RENDERER_HEALTH__ = null;
   });
 
   afterEach(() => {
@@ -240,19 +248,23 @@ describe("StreamingMode component", () => {
 
     await waitFor(() => {
       expect(
-        (window as Window & {
-          __HYPERSCAPE_STREAM_READY__?: boolean;
-          __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: {
-            degradedReason?: string | null;
-          } | null;
-        }).__HYPERSCAPE_STREAM_READY__,
+        (
+          window as Window & {
+            __HYPERSCAPE_STREAM_READY__?: boolean;
+            __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: {
+              degradedReason?: string | null;
+            } | null;
+          }
+        ).__HYPERSCAPE_STREAM_READY__,
       ).toBe(false);
       expect(
-        (window as Window & {
-          __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: {
-            degradedReason?: string | null;
-          } | null;
-        }).__HYPERSCAPE_STREAM_RENDERER_HEALTH__?.degradedReason,
+        (
+          window as Window & {
+            __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: {
+              degradedReason?: string | null;
+            } | null;
+          }
+        ).__HYPERSCAPE_STREAM_RENDERER_HEALTH__?.degradedReason,
       ).toBe("initialization_failed");
     });
   });

packages/procgen/src/building/town/TownGenerator.ts

@@ -38,6 +38,7 @@ import {
   WATER_CHECK_DIRECTIONS,
   WATER_CHECK_MAX_DISTANCE,
   WATER_CHECK_STEP,
+  DEFAULT_WATER_THRESHOLD,
 } from "./constants";
 
 // Import grid alignment utilities from building generator
@@ -212,7 +213,8 @@ export class TownGenerator {
     const terrain = createTerrainProviderFromGenerator(terrainGenerator);
 
     // Extract water threshold from terrain generator if available
-    const waterThreshold = terrainGenerator.getWaterThreshold?.() ?? 5.4;
+    const waterThreshold =
+      terrainGenerator.getWaterThreshold?.() ?? DEFAULT_WATER_THRESHOLD;
 
     return new TownGenerator({
       ...options,

packages/procgen/src/building/town/constants.ts

@@ -21,9 +21,8 @@ export const DEFAULT_WORLD_SIZE = 10000;
 export const DEFAULT_MIN_TOWN_SPACING = 800;
 export const DEFAULT_FLATNESS_SAMPLE_RADIUS = 40;
 export const DEFAULT_FLATNESS_SAMPLE_COUNT = 16;
-// IMPORTANT: Water threshold must match TERRAIN_CONSTANTS.WATER_THRESHOLD (9.0)
-// This ensures town candidates are placed on actual land, not underwater areas
-export const DEFAULT_WATER_THRESHOLD = 9.0;
+import { DEFAULT_WATER_THRESHOLD } from "../../terrain/constants";
+export { DEFAULT_WATER_THRESHOLD };
 export const DEFAULT_OPTIMAL_WATER_DISTANCE_MIN = 30;
 export const DEFAULT_OPTIMAL_WATER_DISTANCE_MAX = 150;
 

packages/procgen/src/items/dock/DockGenerator.ts

@@ -47,8 +47,9 @@ import { createRng, type RNG } from "../../math/Random.js";
 // CONSTANTS
 // ============================================================================
 
-/** Default water level (Y coordinate) */
-const DEFAULT_WATER_LEVEL = 5.0;
+import { GAME_WATER_LEVEL } from "../../terrain/constants";
+
+const DEFAULT_WATER_LEVEL = GAME_WATER_LEVEL;
 
 /** Default water floor depth below water level */
 const DEFAULT_WATER_FLOOR_DEPTH = 3.0;

packages/procgen/src/terrain/TerrainGenerator.ts

@@ -11,6 +11,7 @@
 import { NoiseGenerator, createTileRNG } from "./NoiseGenerator";
 import { BiomeSystem } from "./BiomeSystem";
 import { IslandMask, DEFAULT_ISLAND_CONFIG } from "./IslandMask";
+import { DEFAULT_MAX_HEIGHT, DEFAULT_WATER_THRESHOLD } from "./constants";
 import type {
   TerrainConfig,
   TerrainNoiseConfig,
@@ -76,8 +77,8 @@ export const DEFAULT_TERRAIN_CONFIG: TerrainConfig = {
   tileSize: 100,
   worldSize: 100,
   tileResolution: 64,
-  maxHeight: 30,
-  waterThreshold: 5.4,
+  maxHeight: DEFAULT_MAX_HEIGHT,
+  waterThreshold: DEFAULT_WATER_THRESHOLD,
   seed: 0,
   noise: DEFAULT_NOISE_CONFIG,
   biomes: {

packages/procgen/src/terrain/TerrainShaderTSL.ts

@@ -52,7 +52,7 @@ export const TERRAIN_CONSTANTS = {
   DIRT_THRESHOLD: 0.5,
   LOD_FULL_DETAIL: 100.0,
   LOD_MEDIUM_DETAIL: 200.0,
-  WATER_LEVEL: 5.0,
+  WATER_LEVEL: 16, // Overridden at runtime by game; standalone default for procgen previews
   FOG_COLOR: new THREE.Color(0xd4c8b8),
 } as const;
 

packages/procgen/src/terrain/constants.ts

@@ -0,0 +1,26 @@
+/**
+ * Procgen Terrain Constants — single source of truth for terrain defaults.
+ *
+ * These values define the procgen package's default terrain parameters.
+ * All files in @hyperscape/procgen should reference these instead of
+ * hardcoding magic numbers.
+ *
+ * NOTE: The game runtime in @hyperscape/shared has its own
+ * TERRAIN_CONSTANTS.WATER_THRESHOLD (= 16) and MAX_HEIGHT (= 50).
+ * The procgen defaults below use a different height scale (maxHeight=30).
+ * When procgen is used inside the game, the game passes its own values
+ * via config overrides — these are just standalone defaults.
+ */
+
+/** Default max terrain height in world units */
+export const DEFAULT_MAX_HEIGHT = 30;
+
+/** Default water threshold in world units (terrain below this is underwater) */
+export const DEFAULT_WATER_THRESHOLD = 5.4;
+
+/**
+ * Water level in world-space Y for the game runtime.
+ * Must match TERRAIN_CONSTANTS.WATER_THRESHOLD in @hyperscape/shared.
+ * Used by systems that need the actual game water Y (e.g. DockGenerator).
+ */
+export const GAME_WATER_LEVEL = 16;

packages/procgen/src/terrain/index.ts

@@ -21,6 +21,13 @@
  * ```
  */
 
+// Shared constants (single source of truth for procgen terrain defaults)
+export {
+  DEFAULT_MAX_HEIGHT,
+  DEFAULT_WATER_THRESHOLD,
+  GAME_WATER_LEVEL,
+} from "./constants";
+
 // Core generator
 export {
   TerrainGenerator,

packages/procgen/src/terrain/presets.ts

@@ -7,6 +7,7 @@
 
 import type { TerrainConfig, TerrainPreset } from "./types";
 import { DEFAULT_TERRAIN_CONFIG } from "./TerrainGenerator";
+import { DEFAULT_MAX_HEIGHT, DEFAULT_WATER_THRESHOLD } from "./constants";
 
 /**
  * Small Island preset
@@ -20,8 +21,8 @@ export const SMALL_ISLAND_PRESET: TerrainPreset = {
   config: {
     tileSize: 100,
     worldSize: 10, // 1km x 1km
-    maxHeight: 30,
-    waterThreshold: 5.4,
+    maxHeight: DEFAULT_MAX_HEIGHT,
+    waterThreshold: DEFAULT_WATER_THRESHOLD,
     island: {
       enabled: true,
       maxWorldSizeTiles: 10,
@@ -52,8 +53,8 @@ export const LARGE_ISLAND_PRESET: TerrainPreset = {
   config: {
     tileSize: 100,
     worldSize: 100, // 10km x 10km
-    maxHeight: 30,
-    waterThreshold: 5.4,
+    maxHeight: DEFAULT_MAX_HEIGHT,
+    waterThreshold: DEFAULT_WATER_THRESHOLD,
     island: {
       enabled: true,
       maxWorldSizeTiles: 100,

packages/procgen/src/vegetation/types.ts

@@ -169,8 +169,8 @@ export const DEFAULT_PLACER_CONFIG: VegetationPlacerConfig = {
   steepSlopeThreshold: 0.6,
 };
 
-/** Default water threshold when not provided */
-export const DEFAULT_WATER_THRESHOLD = 5.4;
+import { DEFAULT_WATER_THRESHOLD } from "../terrain/constants";
+export { DEFAULT_WATER_THRESHOLD };
 
 /** Generator-like interface for terrain provider adapter */
 export interface TerrainGeneratorLike {

packages/server/scripts/stream-to-rtmp.ts

@@ -100,9 +100,8 @@ function withViewerAccessToken(rawUrl: string): string {
 const GAME_URL_CANDIDATES = Array.from(
   new Set([GAME_URL, ...GAME_FALLBACK_URLS].map(withViewerAccessToken)),
 );
-const ALLOWED_CAPTURE_ORIGINS = resolveAllowedCaptureOrigins(
-  GAME_URL_CANDIDATES,
-);
+const ALLOWED_CAPTURE_ORIGINS =
+  resolveAllowedCaptureOrigins(GAME_URL_CANDIDATES);
 
 const BRIDGE_PORT = parseInt(process.env.RTMP_BRIDGE_PORT || "8765", 10);
 const BRIDGE_URL = `ws://localhost:${BRIDGE_PORT}`;
@@ -497,7 +496,9 @@ function assertAllowedCaptureNavigation(rawUrl: string): void {
   );
 }
 
-async function abortCaptureForUnexpectedNavigation(rawUrl: string): Promise<void> {
+async function abortCaptureForUnexpectedNavigation(
+  rawUrl: string,
+): Promise<void> {
   if (captureNavigationAbortInFlight) {
     return;
   }

packages/server/src/routes/streaming.ts

@@ -77,7 +77,10 @@ const STREAMING_SSE_MAX_PENDING_BYTES = Math.max(
   128 * 1024,
   Math.min(
     16 * 1024 * 1024,
-    Number.parseInt(process.env.STREAMING_SSE_MAX_PENDING_BYTES || "1048576", 10),
+    Number.parseInt(
+      process.env.STREAMING_SSE_MAX_PENDING_BYTES || "1048576",
+      10,
+    ),
   ),
 );
 const STREAMING_SSE_REPLAY_MAX_BYTES = Math.max(

packages/server/src/startup/uws-server.ts

@@ -121,11 +121,9 @@ export function createUwsServer(
           userData.query,
         ),
       ).catch((err: unknown) => {
-          const msg = err instanceof Error ? err.message : String(err);
-          console.error(
-            `[uWS] onConnection error for ${userData.wsId}: ${msg}`,
-          );
-        });
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`[uWS] onConnection error for ${userData.wsId}: ${msg}`);
+      });
     },
 
     message: (ws, message, _isBinary) => {