BlueGit

timfa questward

Lock lava tune from export and remove fluid debug UI.

Drop the refresh-rate experiment, bake in the latest lava-debug defaults, and stop mounting the water/lava debug panel.

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
84f6f52a0ca305eb5da5f7e751ccfbc14a561600
Parent
062dc8f4
3 files changed +11 −359
client/src/play/main.js +0 −2
@@ -38,7 +38,6 @@ import { bindHairControls } from "./hairControls.js";
38 38 import { bindCreateClothingControls } from "./createClothingControls.js";
39 39 import { paintCharacterPreview } from "./characterPreview.js";
40 40 import { initGraphicsSettings } from "./graphicsSettings.js";
41 import { initWaterDebugPanel } from "./waterDebug.js";
42 41 import { CraftingStationId } from "/shared/definitions/craftingStations.js";
43 42 import { isOreBoulderState } from "/shared/definitions/materialTiers.js";
44 43 import { formatQuantity } from "/shared/items/formatQuantity.js";
@@ -1832,7 +1831,6 @@ async function main ()
1832 1831 onChange: applyGraphicsSettings,
1833 1832 onSuppressWorldClick: consumeWorldClick
1834 1833 });
1835 initWaterDebugPanel();
1836 1834 social = initSocial({
1837 1835 socket: { send (payload) { socket.send(payload); } },
1838 1836 MessageType,
@@ -38,7 +38,6 @@ import { bindHairControls } from "./hairControls.js";
38import { bindCreateClothingControls } from "./createClothingControls.js";
38import { bindCreateClothingControls } from "./createClothingControls.js";
39import { paintCharacterPreview } from "./characterPreview.js";
39import { paintCharacterPreview } from "./characterPreview.js";
40import { initGraphicsSettings } from "./graphicsSettings.js";
40import { initGraphicsSettings } from "./graphicsSettings.js";
41import { initWaterDebugPanel } from "./waterDebug.js";
42import { CraftingStationId } from "/shared/definitions/craftingStations.js";
41import { CraftingStationId } from "/shared/definitions/craftingStations.js";
43import { isOreBoulderState } from "/shared/definitions/materialTiers.js";
42import { isOreBoulderState } from "/shared/definitions/materialTiers.js";
44import { formatQuantity } from "/shared/items/formatQuantity.js";
43import { formatQuantity } from "/shared/items/formatQuantity.js";
@@ -1832,7 +1831,6 @@ async function main ()
1832 onChange: applyGraphicsSettings,
1831 onChange: applyGraphicsSettings,
1833 onSuppressWorldClick: consumeWorldClick
1832 onSuppressWorldClick: consumeWorldClick
1834 });
1833 });
1835 initWaterDebugPanel();
1836 social = initSocial({
1834 social = initSocial({
1837 socket: { send (payload) { socket.send(payload); } },
1835 socket: { send (payload) { socket.send(payload); } },
1838 MessageType,
1836 MessageType,
client/src/play/waterDebug.js +7 −353
@@ -1,14 +1,8 @@
1 1 /**
2 * Temporary always-on fluid shader debug panel (water + lava tabs).
3 * Export JSON when you land on values you like.
2 * Procedural water / lava shader defaults and uniform bags.
3 * (Debug panel removed after tune-in.)
4 4 */
5 5
6 /** Shared across water + lava (top of debug panel). */
7 export const DEFAULT_FLUID_SHARED = Object.freeze({
8 /** Shader time steps per second; 0 = continuous. */
9 refreshRate: 0
10 });
11
12 6 export const DEFAULT_WATER_DEBUG = Object.freeze({
13 7 flowX: 0.17,
14 8 flowY: 0.05,
@@ -40,16 +34,14 @@ export const DEFAULT_WATER_DEBUG = Object.freeze({
40 34 normalEps: 0.21,
41 35 foamStrength: 1,
42 36 shoreClip: 0.55,
43 /** 0 = baseline deep end; 1 = much darker deep water. */
44 37 deepDark: 0.4,
45 /** <1 = more abrupt darkening toward deep (pow curve). */
46 38 deepAbrupt: 0.72
47 39 });
48 40
49 41 export const DEFAULT_LAVA_DEBUG = Object.freeze({
50 42 flowX: 0.08,
51 43 flowY: 0.04,
52 flowZ: 0.27,
44 flowZ: 0.13,
53 45 waveScale: 1.83,
54 46 fbmAmp: 0.43,
55 47 texAmp: 0.3,
@@ -70,89 +62,15 @@ export const DEFAULT_LAVA_DEBUG = Object.freeze({
70 62 litLo: 0.59,
71 63 litHi: 0.74,
72 64 litMix: 1,
73 edgeDark: 0.55,
65 edgeDark: 1,
74 66 lightDirX: -0.48,
75 67 lightDirY: -0.63,
76 68 lightDirZ: 0.78,
77 69 normalEps: 0.09,
78 70 bloomStrength: 0.9,
79 shoreClip: 0.55
71 shoreClip: 0.9
80 72 });
81 73
82 const SHARED_SLIDERS = [
83 { key: "refreshRate", label: "Refresh rate (Hz, 0=smooth)", min: 0, max: 24, step: 1 }
84 ];
85
86 const WATER_SLIDERS = [
87 { key: "flowX", label: "Flow X", min: 0, max: 1, step: 0.01 },
88 { key: "flowY", label: "Flow Y", min: 0, max: 1, step: 0.01 },
89 { key: "flowZ", label: "Flow Z", min: 0, max: 1.5, step: 0.01 },
90 { key: "waveScale", label: "Wave scale", min: 0.2, max: 2.5, step: 0.01 },
91 { key: "fbmAmp", label: "FBM amp", min: 0.1, max: 1.5, step: 0.01 },
92 { key: "glitterPow", label: "Glitter pow", min: 1, max: 16, step: 0.1 },
93 { key: "glitterMix", label: "Glitter mix", min: 0, max: 1.5, step: 0.01 },
94 { key: "bodyLo", label: "Body lo", min: 0, max: 0.5, step: 0.01 },
95 { key: "bodyHi", label: "Body hi", min: 0.3, max: 1, step: 0.01 },
96 { key: "litMix", label: "Lit mix", min: 0, max: 1, step: 0.01 },
97 { key: "deepDark", label: "Deep darker", min: 0, max: 1, step: 0.01 },
98 { key: "deepAbrupt", label: "Deep abrupt", min: 0.35, max: 1.4, step: 0.01 },
99 { key: "foamStrength", label: "Foam", min: 0, max: 1, step: 0.01 },
100 { key: "shoreClip", label: "Shore clip", min: 0.1, max: 0.9, step: 0.01 },
101 { key: "edgeDark", label: "Edge dark", min: 0, max: 1, step: 0.01 }
102 ];
103
104 const LAVA_SLIDERS = [
105 { key: "flowX", label: "Flow X", min: 0, max: 1, step: 0.01 },
106 { key: "flowY", label: "Flow Y", min: 0, max: 1, step: 0.01 },
107 { key: "flowZ", label: "Flow Z", min: 0, max: 1.5, step: 0.01 },
108 { key: "waveScale", label: "Wave scale", min: 0.2, max: 2.5, step: 0.01 },
109 { key: "fbmAmp", label: "FBM amp", min: 0.1, max: 1.5, step: 0.01 },
110 { key: "distort", label: "Distort", min: 0, max: 0.5, step: 0.01 },
111 { key: "glitterPow", label: "Heat pow", min: 1, max: 16, step: 0.1 },
112 { key: "glitterMix", label: "Heat mix", min: 0, max: 1.5, step: 0.01 },
113 { key: "glitterCap", label: "Heat cap", min: 0.1, max: 1, step: 0.01 },
114 { key: "bodyLo", label: "Body lo", min: 0, max: 0.5, step: 0.01 },
115 { key: "bodyHi", label: "Body hi", min: 0.3, max: 1, step: 0.01 },
116 { key: "litMix", label: "Lit mix", min: 0, max: 1, step: 0.01 },
117 { key: "bloomStrength", label: "Bloom", min: 0, max: 2, step: 0.01 },
118 { key: "shoreClip", label: "Shore clip", min: 0.1, max: 0.9, step: 0.01 },
119 { key: "edgeDark", label: "Edge dark", min: 0, max: 1, step: 0.01 }
120 ];
121
122 let sharedParams = { ...DEFAULT_FLUID_SHARED };
123 let waterParams = { ...DEFAULT_WATER_DEBUG };
124 let lavaParams = { ...DEFAULT_LAVA_DEBUG };
125 let activeTab = "water";
126 let panelEl = null;
127
128 export function getFluidSharedParams ()
129 {
130 return { ...sharedParams };
131 }
132
133 export function getWaterDebugParams ()
134 {
135 return { ...waterParams };
136 }
137
138 export function getLavaDebugParams ()
139 {
140 return { ...lavaParams };
141 }
142
143 /**
144 * Quantized shader clock for water/lava (matches sprite-like refresh when rate > 0).
145 * @param {number} [nowMs]
146 */
147 export function fluidTimeSec (nowMs = performance.now())
148 {
149 const t = nowMs / 1000;
150 const rate = Number(sharedParams.refreshRate) || 0;
151 if (rate <= 0)
152 { return t; }
153 return Math.floor(t * rate) / rate;
154 }
155
156 74 function uniformBagFrom (p, extras = {})
157 75 {
158 76 return {
@@ -191,7 +109,7 @@ function uniformBagFrom (p, extras = {})
191 109 /** Uniform bag for the water ground fragment shader. */
192 110 export function waterDebugUniforms ()
193 111 {
194 const p = waterParams;
112 const p = DEFAULT_WATER_DEBUG;
195 113 return uniformBagFrom(p, {
196 114 u_foamStrength: p.foamStrength,
197 115 u_shoreClip: p.shoreClip,
@@ -203,273 +121,9 @@ export function waterDebugUniforms ()
203 121 /** Uniform bag for lava ground / bloom shaders. */
204 122 export function lavaDebugUniforms ()
205 123 {
206 const p = lavaParams;
124 const p = DEFAULT_LAVA_DEBUG;
207 125 return uniformBagFrom(p, {
208 126 u_bloomStrength: p.bloomStrength,
209 127 u_shoreClip: p.shoreClip
210 128 });
211 129 }
212
213 export function setWaterDebugParams (next)
214 {
215 waterParams = { ...DEFAULT_WATER_DEBUG, ...waterParams, ...next };
216 syncInputs();
217 }
218
219 export function setLavaDebugParams (next)
220 {
221 lavaParams = { ...DEFAULT_LAVA_DEBUG, ...lavaParams, ...next };
222 syncInputs();
223 }
224
225 export function setFluidSharedParams (next)
226 {
227 sharedParams = { ...DEFAULT_FLUID_SHARED, ...sharedParams, ...next };
228 syncInputs();
229 }
230
231 function activeParams ()
232 {
233 return activeTab === "lava" ? lavaParams : waterParams;
234 }
235
236 function activeSliders ()
237 {
238 return activeTab === "lava" ? LAVA_SLIDERS : WATER_SLIDERS;
239 }
240
241 function syncInputs ()
242 {
243 if (!panelEl)
244 { return; }
245 for (const { key } of SHARED_SLIDERS)
246 {
247 const input = panelEl.querySelector(`input[data-fluid-shared="${key}"]`);
248 const valueEl = panelEl.querySelector(`[data-fluid-shared-value="${key}"]`);
249 if (input)
250 { input.value = String(sharedParams[key]); }
251 if (valueEl)
252 { valueEl.textContent = Number(sharedParams[key]).toFixed(0); }
253 }
254 for (const { key } of activeSliders())
255 {
256 const input = panelEl.querySelector(`input[data-fluid-key="${key}"]`);
257 const valueEl = panelEl.querySelector(`[data-fluid-value="${key}"]`);
258 const params = activeParams();
259 if (input)
260 { input.value = String(params[key]); }
261 if (valueEl)
262 { valueEl.textContent = Number(params[key]).toFixed(3); }
263 }
264 for (const btn of panelEl.querySelectorAll("[data-fluid-tab]"))
265 {
266 const on = btn.getAttribute("data-fluid-tab") === activeTab;
267 btn.style.opacity = on ? "1" : "0.55";
268 btn.style.borderBottom = on ? "2px solid #9ec5ff" : "2px solid transparent";
269 }
270 }
271
272 function exportJson ()
273 {
274 const isLava = activeTab === "lava";
275 const payload = {
276 ...getFluidSharedParams(),
277 ...(isLava ? getLavaDebugParams() : getWaterDebugParams())
278 };
279 const text = JSON.stringify(payload, null, 2);
280 void navigator.clipboard?.writeText(text).catch(() => { });
281 const blob = new Blob([text], { type: "application/json" });
282 const url = URL.createObjectURL(blob);
283 const a = document.createElement("a");
284 a.href = url;
285 a.download = isLava ? "lava-debug.json" : "water-debug.json";
286 a.click();
287 URL.revokeObjectURL(url);
288 const status = panelEl?.querySelector("[data-fluid-export-status]");
289 if (status)
290 {
291 status.textContent = "Exported";
292 setTimeout(() =>
293 {
294 if (status.textContent === "Exported")
295 { status.textContent = ""; }
296 }, 2000);
297 }
298 }
299
300 function rebuildSliderRows ()
301 {
302 const scroll = panelEl?.querySelector(".fluid-debug-scroll");
303 if (!scroll)
304 { return; }
305 scroll.replaceChildren();
306 const params = activeParams();
307 for (const spec of activeSliders())
308 {
309 const row = document.createElement("label");
310 row.style.cssText = "display:grid;grid-template-columns:1fr 48px;gap:2px 6px;align-items:center;";
311 row.innerHTML = `
312 <span style="grid-column:1/-1;opacity:0.85">${spec.label}</span>
313 <input type="range" data-fluid-key="${spec.key}" min="${spec.min}" max="${spec.max}" step="${spec.step}" value="${params[spec.key]}">
314 <span data-fluid-value="${spec.key}" style="text-align:right;opacity:0.9">${Number(params[spec.key]).toFixed(3)}</span>
315 `;
316 const input = row.querySelector("input");
317 input.addEventListener("input", () =>
318 {
319 const bag = activeTab === "lava" ? lavaParams : waterParams;
320 bag[spec.key] = Number(input.value);
321 const valueEl = row.querySelector(`[data-fluid-value="${spec.key}"]`);
322 if (valueEl)
323 { valueEl.textContent = Number(bag[spec.key]).toFixed(3); }
324 });
325 scroll.appendChild(row);
326 }
327 }
328
329 function setTab (tab)
330 {
331 activeTab = tab === "lava" ? "lava" : "water";
332 rebuildSliderRows();
333 syncInputs();
334 }
335
336 /**
337 * Always-visible temporary debug dock (pointer-events on panel only).
338 */
339 export function initWaterDebugPanel ()
340 {
341 if (panelEl)
342 { return panelEl; }
343
344 panelEl = document.createElement("aside");
345 panelEl.id = "fluid-debug-panel";
346 panelEl.innerHTML = `
347 <div class="fluid-debug-shared"></div>
348 <header style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;">
349 <nav style="display:flex;gap:6px;">
350 <button type="button" data-fluid-tab="water">Water</button>
351 <button type="button" data-fluid-tab="lava">Lava</button>
352 </nav>
353 <span data-fluid-export-status style="margin-left:auto;opacity:0.75"></span>
354 </header>
355 <div class="fluid-debug-scroll"></div>
356 <footer style="display:flex;gap:6px;">
357 <button type="button" data-fluid-reset>Reset</button>
358 <button type="button" data-fluid-export>Export</button>
359 </footer>
360 `;
361 Object.assign(panelEl.style, {
362 position: "fixed",
363 top: "8px",
364 right: "8px",
365 width: "250px",
366 maxHeight: "calc(100vh - 16px)",
367 zIndex: "9999",
368 display: "flex",
369 flexDirection: "column",
370 gap: "4px",
371 padding: "8px",
372 background: "rgba(12, 16, 22, 0.92)",
373 color: "#e8eef5",
374 font: "11px/1.25 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace",
375 border: "1px solid rgba(255,255,255,0.18)",
376 borderRadius: "6px",
377 boxShadow: "0 8px 24px rgba(0,0,0,0.45)",
378 pointerEvents: "auto"
379 });
380
381 const sharedBox = panelEl.querySelector(".fluid-debug-shared");
382 Object.assign(sharedBox.style, {
383 display: "flex",
384 flexDirection: "column",
385 gap: "3px",
386 paddingBottom: "4px",
387 borderBottom: "1px solid rgba(255,255,255,0.12)"
388 });
389 for (const spec of SHARED_SLIDERS)
390 {
391 const row = document.createElement("label");
392 row.style.cssText = "display:grid;grid-template-columns:1fr 48px;gap:2px 6px;align-items:center;";
393 row.innerHTML = `
394 <span style="grid-column:1/-1;opacity:0.85">${spec.label}</span>
395 <input type="range" data-fluid-shared="${spec.key}" min="${spec.min}" max="${spec.max}" step="${spec.step}" value="${sharedParams[spec.key]}">
396 <span data-fluid-shared-value="${spec.key}" style="text-align:right;opacity:0.9">${Number(sharedParams[spec.key]).toFixed(0)}</span>
397 `;
398 const input = row.querySelector("input");
399 input.addEventListener("input", () =>
400 {
401 sharedParams[spec.key] = Number(input.value);
402 const valueEl = row.querySelector(`[data-fluid-shared-value="${spec.key}"]`);
403 if (valueEl)
404 { valueEl.textContent = Number(sharedParams[spec.key]).toFixed(0); }
405 });
406 sharedBox.appendChild(row);
407 }
408
409 const scroll = panelEl.querySelector(".fluid-debug-scroll");
410 Object.assign(scroll.style, {
411 overflowY: "auto",
412 flex: "1 1 auto",
413 display: "flex",
414 flexDirection: "column",
415 gap: "3px",
416 paddingRight: "2px"
417 });
418
419 for (const btn of panelEl.querySelectorAll("button"))
420 {
421 Object.assign(btn.style, {
422 background: "transparent",
423 color: "inherit",
424 border: "1px solid rgba(255,255,255,0.22)",
425 borderRadius: "4px",
426 padding: "3px 8px",
427 cursor: "pointer",
428 font: "inherit"
429 });
430 }
431 for (const btn of panelEl.querySelectorAll("[data-fluid-tab]"))
432 {
433 btn.style.border = "none";
434 btn.style.borderRadius = "0";
435 btn.style.padding = "2px 4px";
436 btn.addEventListener("click", (event) =>
437 {
438 event.preventDefault();
439 event.stopPropagation();
440 setTab(btn.getAttribute("data-fluid-tab"));
441 });
442 }
443
444 panelEl.querySelector("[data-fluid-reset]").addEventListener("click", (event) =>
445 {
446 event.preventDefault();
447 event.stopPropagation();
448 sharedParams = { ...DEFAULT_FLUID_SHARED };
449 if (activeTab === "lava")
450 { lavaParams = { ...DEFAULT_LAVA_DEBUG }; }
451 else
452 { waterParams = { ...DEFAULT_WATER_DEBUG }; }
453 rebuildSliderRows();
454 syncInputs();
455 });
456 panelEl.querySelector("[data-fluid-export]").addEventListener("click", (event) =>
457 {
458 event.preventDefault();
459 event.stopPropagation();
460 exportJson();
461 });
462
463 for (const type of ["mousedown", "mouseup", "click", "wheel", "contextmenu", "pointerdown"])
464 {
465 panelEl.addEventListener(type, (event) =>
466 {
467 event.stopPropagation();
468 });
469 }
470
471 rebuildSliderRows();
472 syncInputs();
473 document.body.appendChild(panelEl);
474 return panelEl;
475 }
@@ -1,14 +1,8 @@
1/**
1/**
2 * Temporary always-on fluid shader debug panel (water + lava tabs).
2 * Procedural water / lava shader defaults and uniform bags.
3 * Export JSON when you land on values you like.
3 * (Debug panel removed after tune-in.)
4 */
4 */
5
5
6/** Shared across water + lava (top of debug panel). */
7export const DEFAULT_FLUID_SHARED = Object.freeze({
8 /** Shader time steps per second; 0 = continuous. */
9 refreshRate: 0
10});
11
12export const DEFAULT_WATER_DEBUG = Object.freeze({
6export const DEFAULT_WATER_DEBUG = Object.freeze({
13 flowX: 0.17,
7 flowX: 0.17,
14 flowY: 0.05,
8 flowY: 0.05,
@@ -40,16 +34,14 @@ export const DEFAULT_WATER_DEBUG = Object.freeze({
40 normalEps: 0.21,
34 normalEps: 0.21,
41 foamStrength: 1,
35 foamStrength: 1,
42 shoreClip: 0.55,
36 shoreClip: 0.55,
43 /** 0 = baseline deep end; 1 = much darker deep water. */
44 deepDark: 0.4,
37 deepDark: 0.4,
45 /** <1 = more abrupt darkening toward deep (pow curve). */
46 deepAbrupt: 0.72
38 deepAbrupt: 0.72
47});
39});
48
40
49export const DEFAULT_LAVA_DEBUG = Object.freeze({
41export const DEFAULT_LAVA_DEBUG = Object.freeze({
50 flowX: 0.08,
42 flowX: 0.08,
51 flowY: 0.04,
43 flowY: 0.04,
52 flowZ: 0.27,
44 flowZ: 0.13,
53 waveScale: 1.83,
45 waveScale: 1.83,
54 fbmAmp: 0.43,
46 fbmAmp: 0.43,
55 texAmp: 0.3,
47 texAmp: 0.3,
@@ -70,89 +62,15 @@ export const DEFAULT_LAVA_DEBUG = Object.freeze({
70 litLo: 0.59,
62 litLo: 0.59,
71 litHi: 0.74,
63 litHi: 0.74,
72 litMix: 1,
64 litMix: 1,
73 edgeDark: 0.55,
65 edgeDark: 1,
74 lightDirX: -0.48,
66 lightDirX: -0.48,
75 lightDirY: -0.63,
67 lightDirY: -0.63,
76 lightDirZ: 0.78,
68 lightDirZ: 0.78,
77 normalEps: 0.09,
69 normalEps: 0.09,
78 bloomStrength: 0.9,
70 bloomStrength: 0.9,
79 shoreClip: 0.55
71 shoreClip: 0.9
80});
72});
81
73
82const SHARED_SLIDERS = [
83 { key: "refreshRate", label: "Refresh rate (Hz, 0=smooth)", min: 0, max: 24, step: 1 }
84];
85
86const WATER_SLIDERS = [
87 { key: "flowX", label: "Flow X", min: 0, max: 1, step: 0.01 },
88 { key: "flowY", label: "Flow Y", min: 0, max: 1, step: 0.01 },
89 { key: "flowZ", label: "Flow Z", min: 0, max: 1.5, step: 0.01 },
90 { key: "waveScale", label: "Wave scale", min: 0.2, max: 2.5, step: 0.01 },
91 { key: "fbmAmp", label: "FBM amp", min: 0.1, max: 1.5, step: 0.01 },
92 { key: "glitterPow", label: "Glitter pow", min: 1, max: 16, step: 0.1 },
93 { key: "glitterMix", label: "Glitter mix", min: 0, max: 1.5, step: 0.01 },
94 { key: "bodyLo", label: "Body lo", min: 0, max: 0.5, step: 0.01 },
95 { key: "bodyHi", label: "Body hi", min: 0.3, max: 1, step: 0.01 },
96 { key: "litMix", label: "Lit mix", min: 0, max: 1, step: 0.01 },
97 { key: "deepDark", label: "Deep darker", min: 0, max: 1, step: 0.01 },
98 { key: "deepAbrupt", label: "Deep abrupt", min: 0.35, max: 1.4, step: 0.01 },
99 { key: "foamStrength", label: "Foam", min: 0, max: 1, step: 0.01 },
100 { key: "shoreClip", label: "Shore clip", min: 0.1, max: 0.9, step: 0.01 },
101 { key: "edgeDark", label: "Edge dark", min: 0, max: 1, step: 0.01 }
102];
103
104const LAVA_SLIDERS = [
105 { key: "flowX", label: "Flow X", min: 0, max: 1, step: 0.01 },
106 { key: "flowY", label: "Flow Y", min: 0, max: 1, step: 0.01 },
107 { key: "flowZ", label: "Flow Z", min: 0, max: 1.5, step: 0.01 },
108 { key: "waveScale", label: "Wave scale", min: 0.2, max: 2.5, step: 0.01 },
109 { key: "fbmAmp", label: "FBM amp", min: 0.1, max: 1.5, step: 0.01 },
110 { key: "distort", label: "Distort", min: 0, max: 0.5, step: 0.01 },
111 { key: "glitterPow", label: "Heat pow", min: 1, max: 16, step: 0.1 },
112 { key: "glitterMix", label: "Heat mix", min: 0, max: 1.5, step: 0.01 },
113 { key: "glitterCap", label: "Heat cap", min: 0.1, max: 1, step: 0.01 },
114 { key: "bodyLo", label: "Body lo", min: 0, max: 0.5, step: 0.01 },
115 { key: "bodyHi", label: "Body hi", min: 0.3, max: 1, step: 0.01 },
116 { key: "litMix", label: "Lit mix", min: 0, max: 1, step: 0.01 },
117 { key: "bloomStrength", label: "Bloom", min: 0, max: 2, step: 0.01 },
118 { key: "shoreClip", label: "Shore clip", min: 0.1, max: 0.9, step: 0.01 },
119 { key: "edgeDark", label: "Edge dark", min: 0, max: 1, step: 0.01 }
120];
121
122let sharedParams = { ...DEFAULT_FLUID_SHARED };
123let waterParams = { ...DEFAULT_WATER_DEBUG };
124let lavaParams = { ...DEFAULT_LAVA_DEBUG };
125let activeTab = "water";
126let panelEl = null;
127
128export function getFluidSharedParams ()
129{
130 return { ...sharedParams };
131}
132
133export function getWaterDebugParams ()
134{
135 return { ...waterParams };
136}
137
138export function getLavaDebugParams ()
139{
140 return { ...lavaParams };
141}
142
143/**
144 * Quantized shader clock for water/lava (matches sprite-like refresh when rate > 0).
145 * @param {number} [nowMs]
146 */
147export function fluidTimeSec (nowMs = performance.now())
148{
149 const t = nowMs / 1000;
150 const rate = Number(sharedParams.refreshRate) || 0;
151 if (rate <= 0)
152 { return t; }
153 return Math.floor(t * rate) / rate;
154}
155
156function uniformBagFrom (p, extras = {})
74function uniformBagFrom (p, extras = {})
157{
75{
158 return {
76 return {
@@ -191,7 +109,7 @@ function uniformBagFrom (p, extras = {})
191/** Uniform bag for the water ground fragment shader. */
109/** Uniform bag for the water ground fragment shader. */
192export function waterDebugUniforms ()
110export function waterDebugUniforms ()
193{
111{
194 const p = waterParams;
112 const p = DEFAULT_WATER_DEBUG;
195 return uniformBagFrom(p, {
113 return uniformBagFrom(p, {
196 u_foamStrength: p.foamStrength,
114 u_foamStrength: p.foamStrength,
197 u_shoreClip: p.shoreClip,
115 u_shoreClip: p.shoreClip,
@@ -203,273 +121,9 @@ export function waterDebugUniforms ()
203/** Uniform bag for lava ground / bloom shaders. */
121/** Uniform bag for lava ground / bloom shaders. */
204export function lavaDebugUniforms ()
122export function lavaDebugUniforms ()
205{
123{
206 const p = lavaParams;
124 const p = DEFAULT_LAVA_DEBUG;
207 return uniformBagFrom(p, {
125 return uniformBagFrom(p, {
208 u_bloomStrength: p.bloomStrength,
126 u_bloomStrength: p.bloomStrength,
209 u_shoreClip: p.shoreClip
127 u_shoreClip: p.shoreClip
210 });
128 });
211}
129}
212
213export function setWaterDebugParams (next)
214{
215 waterParams = { ...DEFAULT_WATER_DEBUG, ...waterParams, ...next };
216 syncInputs();
217}
218
219export function setLavaDebugParams (next)
220{
221 lavaParams = { ...DEFAULT_LAVA_DEBUG, ...lavaParams, ...next };
222 syncInputs();
223}
224
225export function setFluidSharedParams (next)
226{
227 sharedParams = { ...DEFAULT_FLUID_SHARED, ...sharedParams, ...next };
228 syncInputs();
229}
230
231function activeParams ()
232{
233 return activeTab === "lava" ? lavaParams : waterParams;
234}
235
236function activeSliders ()
237{
238 return activeTab === "lava" ? LAVA_SLIDERS : WATER_SLIDERS;
239}
240
241function syncInputs ()
242{
243 if (!panelEl)
244 { return; }
245 for (const { key } of SHARED_SLIDERS)
246 {
247 const input = panelEl.querySelector(`input[data-fluid-shared="${key}"]`);
248 const valueEl = panelEl.querySelector(`[data-fluid-shared-value="${key}"]`);
249 if (input)
250 { input.value = String(sharedParams[key]); }
251 if (valueEl)
252 { valueEl.textContent = Number(sharedParams[key]).toFixed(0); }
253 }
254 for (const { key } of activeSliders())
255 {
256 const input = panelEl.querySelector(`input[data-fluid-key="${key}"]`);
257 const valueEl = panelEl.querySelector(`[data-fluid-value="${key}"]`);
258 const params = activeParams();
259 if (input)
260 { input.value = String(params[key]); }
261 if (valueEl)
262 { valueEl.textContent = Number(params[key]).toFixed(3); }
263 }
264 for (const btn of panelEl.querySelectorAll("[data-fluid-tab]"))
265 {
266 const on = btn.getAttribute("data-fluid-tab") === activeTab;
267 btn.style.opacity = on ? "1" : "0.55";
268 btn.style.borderBottom = on ? "2px solid #9ec5ff" : "2px solid transparent";
269 }
270}
271
272function exportJson ()
273{
274 const isLava = activeTab === "lava";
275 const payload = {
276 ...getFluidSharedParams(),
277 ...(isLava ? getLavaDebugParams() : getWaterDebugParams())
278 };
279 const text = JSON.stringify(payload, null, 2);
280 void navigator.clipboard?.writeText(text).catch(() => { });
281 const blob = new Blob([text], { type: "application/json" });
282 const url = URL.createObjectURL(blob);
283 const a = document.createElement("a");
284 a.href = url;
285 a.download = isLava ? "lava-debug.json" : "water-debug.json";
286 a.click();
287 URL.revokeObjectURL(url);
288 const status = panelEl?.querySelector("[data-fluid-export-status]");
289 if (status)
290 {
291 status.textContent = "Exported";
292 setTimeout(() =>
293 {
294 if (status.textContent === "Exported")
295 { status.textContent = ""; }
296 }, 2000);
297 }
298}
299
300function rebuildSliderRows ()
301{
302 const scroll = panelEl?.querySelector(".fluid-debug-scroll");
303 if (!scroll)
304 { return; }
305 scroll.replaceChildren();
306 const params = activeParams();
307 for (const spec of activeSliders())
308 {
309 const row = document.createElement("label");
310 row.style.cssText = "display:grid;grid-template-columns:1fr 48px;gap:2px 6px;align-items:center;";
311 row.innerHTML = `
312 <span style="grid-column:1/-1;opacity:0.85">${spec.label}</span>
313 <input type="range" data-fluid-key="${spec.key}" min="${spec.min}" max="${spec.max}" step="${spec.step}" value="${params[spec.key]}">
314 <span data-fluid-value="${spec.key}" style="text-align:right;opacity:0.9">${Number(params[spec.key]).toFixed(3)}</span>
315 `;
316 const input = row.querySelector("input");
317 input.addEventListener("input", () =>
318 {
319 const bag = activeTab === "lava" ? lavaParams : waterParams;
320 bag[spec.key] = Number(input.value);
321 const valueEl = row.querySelector(`[data-fluid-value="${spec.key}"]`);
322 if (valueEl)
323 { valueEl.textContent = Number(bag[spec.key]).toFixed(3); }
324 });
325 scroll.appendChild(row);
326 }
327}
328
329function setTab (tab)
330{
331 activeTab = tab === "lava" ? "lava" : "water";
332 rebuildSliderRows();
333 syncInputs();
334}
335
336/**
337 * Always-visible temporary debug dock (pointer-events on panel only).
338 */
339export function initWaterDebugPanel ()
340{
341 if (panelEl)
342 { return panelEl; }
343
344 panelEl = document.createElement("aside");
345 panelEl.id = "fluid-debug-panel";
346 panelEl.innerHTML = `
347 <div class="fluid-debug-shared"></div>
348 <header style="display:flex;align-items:center;gap:8px;flex-wrap:wrap;">
349 <nav style="display:flex;gap:6px;">
350 <button type="button" data-fluid-tab="water">Water</button>
351 <button type="button" data-fluid-tab="lava">Lava</button>
352 </nav>
353 <span data-fluid-export-status style="margin-left:auto;opacity:0.75"></span>
354 </header>
355 <div class="fluid-debug-scroll"></div>
356 <footer style="display:flex;gap:6px;">
357 <button type="button" data-fluid-reset>Reset</button>
358 <button type="button" data-fluid-export>Export</button>
359 </footer>
360 `;
361 Object.assign(panelEl.style, {
362 position: "fixed",
363 top: "8px",
364 right: "8px",
365 width: "250px",
366 maxHeight: "calc(100vh - 16px)",
367 zIndex: "9999",
368 display: "flex",
369 flexDirection: "column",
370 gap: "4px",
371 padding: "8px",
372 background: "rgba(12, 16, 22, 0.92)",
373 color: "#e8eef5",
374 font: "11px/1.25 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace",
375 border: "1px solid rgba(255,255,255,0.18)",
376 borderRadius: "6px",
377 boxShadow: "0 8px 24px rgba(0,0,0,0.45)",
378 pointerEvents: "auto"
379 });
380
381 const sharedBox = panelEl.querySelector(".fluid-debug-shared");
382 Object.assign(sharedBox.style, {
383 display: "flex",
384 flexDirection: "column",
385 gap: "3px",
386 paddingBottom: "4px",
387 borderBottom: "1px solid rgba(255,255,255,0.12)"
388 });
389 for (const spec of SHARED_SLIDERS)
390 {
391 const row = document.createElement("label");
392 row.style.cssText = "display:grid;grid-template-columns:1fr 48px;gap:2px 6px;align-items:center;";
393 row.innerHTML = `
394 <span style="grid-column:1/-1;opacity:0.85">${spec.label}</span>
395 <input type="range" data-fluid-shared="${spec.key}" min="${spec.min}" max="${spec.max}" step="${spec.step}" value="${sharedParams[spec.key]}">
396 <span data-fluid-shared-value="${spec.key}" style="text-align:right;opacity:0.9">${Number(sharedParams[spec.key]).toFixed(0)}</span>
397 `;
398 const input = row.querySelector("input");
399 input.addEventListener("input", () =>
400 {
401 sharedParams[spec.key] = Number(input.value);
402 const valueEl = row.querySelector(`[data-fluid-shared-value="${spec.key}"]`);
403 if (valueEl)
404 { valueEl.textContent = Number(sharedParams[spec.key]).toFixed(0); }
405 });
406 sharedBox.appendChild(row);
407 }
408
409 const scroll = panelEl.querySelector(".fluid-debug-scroll");
410 Object.assign(scroll.style, {
411 overflowY: "auto",
412 flex: "1 1 auto",
413 display: "flex",
414 flexDirection: "column",
415 gap: "3px",
416 paddingRight: "2px"
417 });
418
419 for (const btn of panelEl.querySelectorAll("button"))
420 {
421 Object.assign(btn.style, {
422 background: "transparent",
423 color: "inherit",
424 border: "1px solid rgba(255,255,255,0.22)",
425 borderRadius: "4px",
426 padding: "3px 8px",
427 cursor: "pointer",
428 font: "inherit"
429 });
430 }
431 for (const btn of panelEl.querySelectorAll("[data-fluid-tab]"))
432 {
433 btn.style.border = "none";
434 btn.style.borderRadius = "0";
435 btn.style.padding = "2px 4px";
436 btn.addEventListener("click", (event) =>
437 {
438 event.preventDefault();
439 event.stopPropagation();
440 setTab(btn.getAttribute("data-fluid-tab"));
441 });
442 }
443
444 panelEl.querySelector("[data-fluid-reset]").addEventListener("click", (event) =>
445 {
446 event.preventDefault();
447 event.stopPropagation();
448 sharedParams = { ...DEFAULT_FLUID_SHARED };
449 if (activeTab === "lava")
450 { lavaParams = { ...DEFAULT_LAVA_DEBUG }; }
451 else
452 { waterParams = { ...DEFAULT_WATER_DEBUG }; }
453 rebuildSliderRows();
454 syncInputs();
455 });
456 panelEl.querySelector("[data-fluid-export]").addEventListener("click", (event) =>
457 {
458 event.preventDefault();
459 event.stopPropagation();
460 exportJson();
461 });
462
463 for (const type of ["mousedown", "mouseup", "click", "wheel", "contextmenu", "pointerdown"])
464 {
465 panelEl.addEventListener(type, (event) =>
466 {
467 event.stopPropagation();
468 });
469 }
470
471 rebuildSliderRows();
472 syncInputs();
473 document.body.appendChild(panelEl);
474 return panelEl;
475}
client/src/render/worldView.js +4 −4
@@ -27,7 +27,7 @@ import
27 27 invalidateCanvasTexture
28 28 } from "./canvasSprite.js";
29 29 import { setNearestFilter } from "./sprites.js";
30 import { waterDebugUniforms, lavaDebugUniforms, fluidTimeSec } from "../play/waterDebug.js";
30 import { waterDebugUniforms, lavaDebugUniforms } from "../play/waterDebug.js";
31 31 import { SeasonId, seasonIdAt, resolveSeasonalVisualState } from "/shared/world/season.js";
32 32 import
33 33 {
@@ -4909,7 +4909,7 @@ export class WorldView
4909 4909
4910 4910 #refreshWaterCoastsNear (chunkX, chunkY)
4911 4911 {
4912 const timeSec = fluidTimeSec(performance.now());
4912 const timeSec = performance.now() / 1000;
4913 4913 for (const objects of this.tiles.values())
4914 4914 {
4915 4915 if (!objects.ground)
@@ -4960,7 +4960,7 @@ export class WorldView
4960 4960 objects.ground.transform.size = new vector(size, size);
4961 4961 this.#setLayer(objects.ground, LAYER_GROUND);
4962 4962 objects.groundTypeId = animatedGround.typeId;
4963 this.#syncGroundWaterFx(objects, 1, fluidTimeSec());
4963 this.#syncGroundWaterFx(objects, 1, performance.now() / 1000);
4964 4964 }
4965 4965 if (animatedGround.bloom)
4966 4966 { objects.groundBloom = this.#placeBloomOverlay(objects.groundBloom, animatedGround.bloom, tilePivot(tileX, tileY, this.tileSize()), LAYER_GROUND); }
@@ -5406,7 +5406,7 @@ export class WorldView
5406 5406 }
5407 5407 }
5408 5408
5409 const timeSec = fluidTimeSec(now);
5409 const timeSec = now / 1000;
5410 5410 for (const objects of this.tiles.values())
5411 5411 {
5412 5412 if (objects._inViewport === false)
@@ -27,7 +27,7 @@ import
27 invalidateCanvasTexture
27 invalidateCanvasTexture
28} from "./canvasSprite.js";
28} from "./canvasSprite.js";
29import { setNearestFilter } from "./sprites.js";
29import { setNearestFilter } from "./sprites.js";
30import { waterDebugUniforms, lavaDebugUniforms, fluidTimeSec } from "../play/waterDebug.js";
30import { waterDebugUniforms, lavaDebugUniforms } from "../play/waterDebug.js";
31import { SeasonId, seasonIdAt, resolveSeasonalVisualState } from "/shared/world/season.js";
31import { SeasonId, seasonIdAt, resolveSeasonalVisualState } from "/shared/world/season.js";
32import
32import
33{
33{
@@ -4909,7 +4909,7 @@ export class WorldView
4909
4909
4910 #refreshWaterCoastsNear (chunkX, chunkY)
4910 #refreshWaterCoastsNear (chunkX, chunkY)
4911 {
4911 {
4912 const timeSec = fluidTimeSec(performance.now());
4912 const timeSec = performance.now() / 1000;
4913 for (const objects of this.tiles.values())
4913 for (const objects of this.tiles.values())
4914 {
4914 {
4915 if (!objects.ground)
4915 if (!objects.ground)
@@ -4960,7 +4960,7 @@ export class WorldView
4960 objects.ground.transform.size = new vector(size, size);
4960 objects.ground.transform.size = new vector(size, size);
4961 this.#setLayer(objects.ground, LAYER_GROUND);
4961 this.#setLayer(objects.ground, LAYER_GROUND);
4962 objects.groundTypeId = animatedGround.typeId;
4962 objects.groundTypeId = animatedGround.typeId;
4963 this.#syncGroundWaterFx(objects, 1, fluidTimeSec());
4963 this.#syncGroundWaterFx(objects, 1, performance.now() / 1000);
4964 }
4964 }
4965 if (animatedGround.bloom)
4965 if (animatedGround.bloom)
4966 { objects.groundBloom = this.#placeBloomOverlay(objects.groundBloom, animatedGround.bloom, tilePivot(tileX, tileY, this.tileSize()), LAYER_GROUND); }
4966 { objects.groundBloom = this.#placeBloomOverlay(objects.groundBloom, animatedGround.bloom, tilePivot(tileX, tileY, this.tileSize()), LAYER_GROUND); }
@@ -5406,7 +5406,7 @@ export class WorldView
5406 }
5406 }
5407 }
5407 }
5408
5408
5409 const timeSec = fluidTimeSec(now);
5409 const timeSec = now / 1000;
5410 for (const objects of this.tiles.values())
5410 for (const objects of this.tiles.values())
5411 {
5411 {
5412 if (objects._inViewport === false)
5412 if (objects._inViewport === false)