@rydr/game-sdk 1.16.0 → 1.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +28 -0
- package/dist/client/HardwareStore.d.ts +6 -0
- package/dist/client/HardwareStore.d.ts.map +1 -1
- package/dist/client/HardwareStore.js +1 -0
- package/dist/client/HardwareStore.js.map +1 -1
- package/dist/client/PlatformClient.d.ts +4 -0
- package/dist/client/PlatformClient.d.ts.map +1 -1
- package/dist/client/PlatformClient.js +3 -0
- package/dist/client/PlatformClient.js.map +1 -1
- package/dist/host/PlatformHost.d.ts +6 -1
- package/dist/host/PlatformHost.d.ts.map +1 -1
- package/dist/host/PlatformHost.js +6 -0
- package/dist/host/PlatformHost.js.map +1 -1
- package/dist/protocol/capabilities.d.ts +2 -1
- package/dist/protocol/capabilities.d.ts.map +1 -1
- package/dist/protocol/capabilities.js.map +1 -1
- package/dist/protocol/guards.d.ts.map +1 -1
- package/dist/protocol/guards.js +1 -0
- package/dist/protocol/guards.js.map +1 -1
- package/dist/protocol/messages.d.ts +16 -1
- package/dist/protocol/messages.d.ts.map +1 -1
- package/dist/protocol/version.d.ts +1 -1
- package/dist/protocol/version.js +1 -1
- package/dist/three/index.d.ts +3 -0
- package/dist/three/index.d.ts.map +1 -1
- package/dist/three/index.js +3 -0
- package/dist/three/index.js.map +1 -1
- package/dist/three/merge.d.ts +88 -0
- package/dist/three/merge.d.ts.map +1 -0
- package/dist/three/merge.js +148 -0
- package/dist/three/merge.js.map +1 -0
- package/dist/three/perf-marks.d.ts +50 -0
- package/dist/three/perf-marks.d.ts.map +1 -0
- package/dist/three/perf-marks.js +86 -0
- package/dist/three/perf-marks.js.map +1 -0
- package/dist/three/perf-overlay.d.ts +104 -0
- package/dist/three/perf-overlay.d.ts.map +1 -0
- package/dist/three/perf-overlay.js +446 -0
- package/dist/three/perf-overlay.js.map +1 -0
- package/dist/three/world-loader.d.ts +10 -0
- package/dist/three/world-loader.d.ts.map +1 -1
- package/dist/three/world-loader.js +7 -0
- package/dist/three/world-loader.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,446 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* perf-overlay — a shared, collapsible Three.js performance HUD for every rydr
|
|
3
|
+
* game. Shows FPS / CPU / GPU (via WebGL2 timer queries) / `renderer.info`, a
|
|
4
|
+
* `perfMark` phase breakdown, live entity counters, a copy-report button, and a
|
|
5
|
+
* generic draw-call audit. Default-off; zero cost when disabled.
|
|
6
|
+
*
|
|
7
|
+
* This is the SDK's first browser-UI module (the core protocol/client stay
|
|
8
|
+
* isomorphic). It is intentionally **self-contained**: it injects nothing
|
|
9
|
+
* global, depends on no CSS variables, and builds its own top-right overlay
|
|
10
|
+
* stack — so any Three.js game gets the panel by constructing it.
|
|
11
|
+
*
|
|
12
|
+
* Core is generic; each game extends it through a plain options object
|
|
13
|
+
* ({@link PerfOverlayOptions}) — `counters`, `phases`, `buttons`, `scene` — no
|
|
14
|
+
* formal capability interface (the surface is too small to warrant one).
|
|
15
|
+
*
|
|
16
|
+
* Enable: `?perf=1` on the page (or parent frame, for iframed games) or
|
|
17
|
+
* `window.__PERF__ = true`. Toggle the panel with the backtick key.
|
|
18
|
+
*
|
|
19
|
+
* Per-frame call order (mirrors a typical render loop):
|
|
20
|
+
* ```ts
|
|
21
|
+
* perf.frameStart();
|
|
22
|
+
* update();
|
|
23
|
+
* perf.gpuBegin(); render(); perf.gpuEnd();
|
|
24
|
+
* perf.frameEnd(dtSeconds);
|
|
25
|
+
* ```
|
|
26
|
+
*/
|
|
27
|
+
import { perfReport, perfAvg, perfPeak } from "./perf-marks.js";
|
|
28
|
+
// ── Ring buffer (Float32) ──────────────────────────────────────
|
|
29
|
+
class Ring {
|
|
30
|
+
buf;
|
|
31
|
+
i = 0;
|
|
32
|
+
n = 0;
|
|
33
|
+
constructor(len) {
|
|
34
|
+
this.buf = new Float32Array(len);
|
|
35
|
+
}
|
|
36
|
+
push(v) {
|
|
37
|
+
this.buf[this.i % this.buf.length] = v;
|
|
38
|
+
this.i++;
|
|
39
|
+
if (this.n < this.buf.length)
|
|
40
|
+
this.n++;
|
|
41
|
+
}
|
|
42
|
+
avg() {
|
|
43
|
+
if (!this.n)
|
|
44
|
+
return 0;
|
|
45
|
+
let s = 0;
|
|
46
|
+
for (let i = 0; i < this.n; i++)
|
|
47
|
+
s += this.buf[i];
|
|
48
|
+
return s / this.n;
|
|
49
|
+
}
|
|
50
|
+
max() {
|
|
51
|
+
if (!this.n)
|
|
52
|
+
return 0;
|
|
53
|
+
let m = 0;
|
|
54
|
+
for (let i = 0; i < this.n; i++)
|
|
55
|
+
if (this.buf[i] > m)
|
|
56
|
+
m = this.buf[i];
|
|
57
|
+
return m;
|
|
58
|
+
}
|
|
59
|
+
min() {
|
|
60
|
+
if (!this.n)
|
|
61
|
+
return 0;
|
|
62
|
+
let m = Infinity;
|
|
63
|
+
for (let i = 0; i < this.n; i++)
|
|
64
|
+
if (this.buf[i] < m)
|
|
65
|
+
m = this.buf[i];
|
|
66
|
+
return m === Infinity ? 0 : m;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
// ── Formatting helpers ─────────────────────────────────────────
|
|
70
|
+
const f1 = (v, w = 5) => v.toFixed(1).padStart(w);
|
|
71
|
+
const f0 = (v, w = 4) => Math.round(v).toString().padStart(w);
|
|
72
|
+
function kFmt(v, w = 6) {
|
|
73
|
+
if (v >= 10000)
|
|
74
|
+
return ((v / 1000).toFixed(0) + "k").padStart(w);
|
|
75
|
+
if (v >= 1000)
|
|
76
|
+
return ((v / 1000).toFixed(1) + "k").padStart(w);
|
|
77
|
+
return Math.round(v).toString().padStart(w);
|
|
78
|
+
}
|
|
79
|
+
const MONO = "11px/1.6 ui-monospace, 'SF Mono', Menlo, Consolas, monospace";
|
|
80
|
+
/**
|
|
81
|
+
* Bucket a scene's renderable objects (≈ draw calls) by top-level child, plus a
|
|
82
|
+
* material/geometry composition of the biggest bucket. Renderer-agnostic — the
|
|
83
|
+
* same audit the tower-defense game used, generalized over any `scene`.
|
|
84
|
+
*/
|
|
85
|
+
export function auditScene(scene) {
|
|
86
|
+
const isRenderable = (o) => o.isMesh === true || o.isLine === true || o.isPoints === true || o.isSprite === true;
|
|
87
|
+
const buckets = [];
|
|
88
|
+
let total = 0;
|
|
89
|
+
for (const child of scene.children) {
|
|
90
|
+
let visible = 0;
|
|
91
|
+
let hidden = 0;
|
|
92
|
+
child.traverse((o) => {
|
|
93
|
+
if (!isRenderable(o))
|
|
94
|
+
return;
|
|
95
|
+
if (o.visible && child.visible)
|
|
96
|
+
visible++;
|
|
97
|
+
else
|
|
98
|
+
hidden++;
|
|
99
|
+
});
|
|
100
|
+
if (visible + hidden === 0)
|
|
101
|
+
continue;
|
|
102
|
+
total += visible;
|
|
103
|
+
buckets.push({ name: child.name || child.type || "unnamed", visible, hidden });
|
|
104
|
+
}
|
|
105
|
+
buckets.sort((a, b) => b.visible - a.visible);
|
|
106
|
+
const lines = buckets.map((b) => `${b.name.slice(0, 22).padEnd(22)} ${String(b.visible).padStart(5)} vis ${String(b.hidden).padStart(5)} hidden`);
|
|
107
|
+
// Composition of the biggest bucket: unique geometries vs. materials, and the
|
|
108
|
+
// most-repeated geometry+material pair (merge-by-material vs. instancing cue).
|
|
109
|
+
const top = buckets[0];
|
|
110
|
+
let detail = "";
|
|
111
|
+
if (top) {
|
|
112
|
+
const topChild = scene.children.find((c) => (c.name || c.type || "unnamed") === top.name);
|
|
113
|
+
if (topChild) {
|
|
114
|
+
const geos = new Set();
|
|
115
|
+
const matInfo = new Map();
|
|
116
|
+
const pairCounts = new Map();
|
|
117
|
+
topChild.traverse((o) => {
|
|
118
|
+
const m = o;
|
|
119
|
+
if (!m.isMesh || !o.visible || !m.geometry)
|
|
120
|
+
return;
|
|
121
|
+
geos.add(m.geometry.uuid);
|
|
122
|
+
const matList = Array.isArray(m.material) ? m.material : m.material ? [m.material] : [];
|
|
123
|
+
for (const mm of matList) {
|
|
124
|
+
const entry = matInfo.get(mm.uuid);
|
|
125
|
+
if (entry)
|
|
126
|
+
entry.count++;
|
|
127
|
+
else
|
|
128
|
+
matInfo.set(mm.uuid, { mat: mm, count: 1 });
|
|
129
|
+
}
|
|
130
|
+
const pairKey = `${m.geometry.uuid}|${matList.map((mm) => mm.uuid).join("+")}`;
|
|
131
|
+
pairCounts.set(pairKey, (pairCounts.get(pairKey) ?? 0) + 1);
|
|
132
|
+
});
|
|
133
|
+
let maxRepeat = 0;
|
|
134
|
+
for (const n of pairCounts.values())
|
|
135
|
+
if (n > maxRepeat)
|
|
136
|
+
maxRepeat = n;
|
|
137
|
+
const describe = (mat) => {
|
|
138
|
+
const color = mat.color ? "#" + mat.color.getHexString() : "—";
|
|
139
|
+
const maps = [];
|
|
140
|
+
if (mat.map)
|
|
141
|
+
maps.push("map");
|
|
142
|
+
if (mat.normalMap)
|
|
143
|
+
maps.push("normal");
|
|
144
|
+
if (mat.emissive && mat.emissiveMap)
|
|
145
|
+
maps.push("emissiveMap");
|
|
146
|
+
if (mat.emissive && mat.emissive.getHex() !== 0)
|
|
147
|
+
maps.push("emissive");
|
|
148
|
+
if (mat.transparent)
|
|
149
|
+
maps.push("transparent");
|
|
150
|
+
const name = mat.name || "(unnamed)";
|
|
151
|
+
return `${name.slice(0, 18).padEnd(18)} ${(mat.type ?? "").replace("Material", "").slice(0, 10).padEnd(10)} ${color} ${maps.join(",") || "flat"}`;
|
|
152
|
+
};
|
|
153
|
+
const matLines = [...matInfo.values()]
|
|
154
|
+
.sort((a, b) => b.count - a.count)
|
|
155
|
+
.map((e) => ` ${String(e.count).padStart(5)}× ${describe(e.mat)}`);
|
|
156
|
+
detail =
|
|
157
|
+
`[${top.name}] composition:\n` +
|
|
158
|
+
` unique geometries: ${geos.size}\n` +
|
|
159
|
+
` unique materials: ${matInfo.size}\n` +
|
|
160
|
+
` most-repeated geo+mat pair: ${maxRepeat}×\n` +
|
|
161
|
+
` materials (count × name / type / color / maps):\n` +
|
|
162
|
+
matLines.join("\n") +
|
|
163
|
+
`\n\n`;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
return detail + `~${total} visible draw calls (scene.children = ${scene.children.length})\n` + lines.join("\n");
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* The performance overlay. Construct once with the canvas host + renderer, drive
|
|
170
|
+
* it from the render loop, and pass game specifics via {@link PerfOverlayOptions}.
|
|
171
|
+
*/
|
|
172
|
+
export class PerfOverlay {
|
|
173
|
+
renderer;
|
|
174
|
+
opts;
|
|
175
|
+
gl;
|
|
176
|
+
ext;
|
|
177
|
+
fps = new Ring(60);
|
|
178
|
+
frameMs = new Ring(60);
|
|
179
|
+
cpuMs = new Ring(60);
|
|
180
|
+
gpuMs = new Ring(30);
|
|
181
|
+
prevFrameTime = 0;
|
|
182
|
+
cpuStart = 0;
|
|
183
|
+
gpuPool = [];
|
|
184
|
+
gpuPending = [];
|
|
185
|
+
gpuCurrent = null;
|
|
186
|
+
lastInfo = { calls: 0, tris: 0, lines: 0, geos: 0, texs: 0, prgs: 0 };
|
|
187
|
+
domTick = 0;
|
|
188
|
+
DOM_INTERVAL = 1 / 8; // 8 Hz — 60 Hz numbers are unreadable
|
|
189
|
+
visible;
|
|
190
|
+
stack;
|
|
191
|
+
pill;
|
|
192
|
+
panel;
|
|
193
|
+
pre;
|
|
194
|
+
reportOut;
|
|
195
|
+
onKey;
|
|
196
|
+
constructor(host, renderer, opts = {}) {
|
|
197
|
+
this.renderer = renderer;
|
|
198
|
+
this.opts = opts;
|
|
199
|
+
this.gl = renderer.getContext();
|
|
200
|
+
this.ext = this.initGpuExt();
|
|
201
|
+
// Visibility: `?perf=1` on this frame OR the parent (games run iframed),
|
|
202
|
+
// or `window.__PERF__`. Showing the panel enables sampling.
|
|
203
|
+
let parentSearch = "";
|
|
204
|
+
try {
|
|
205
|
+
if (window.parent !== window)
|
|
206
|
+
parentSearch = window.parent.location.search;
|
|
207
|
+
}
|
|
208
|
+
catch {
|
|
209
|
+
/* cross-origin parent — ignore */
|
|
210
|
+
}
|
|
211
|
+
const urlFlag = new URLSearchParams(location.search).get("perf") === "1" ||
|
|
212
|
+
new URLSearchParams(parentSearch).get("perf") === "1";
|
|
213
|
+
this.visible = urlFlag || window.__PERF__ === true;
|
|
214
|
+
if (this.visible)
|
|
215
|
+
window.__PERF__ = true;
|
|
216
|
+
// ── Self-contained top-right overlay stack ──
|
|
217
|
+
const offTop = opts.offset?.top ?? 8;
|
|
218
|
+
const offRight = opts.offset?.right ?? 8;
|
|
219
|
+
this.stack = document.createElement("div");
|
|
220
|
+
this.stack.style.cssText = `
|
|
221
|
+
position: absolute; top: ${offTop}px; right: ${offRight}px; z-index: 99999;
|
|
222
|
+
display: flex; flex-direction: column; align-items: flex-end; gap: 6px;
|
|
223
|
+
pointer-events: none;`;
|
|
224
|
+
host.appendChild(this.stack);
|
|
225
|
+
this.pill = this.makeButton("PERF", "rgba(7,9,20,0.82)");
|
|
226
|
+
this.pill.addEventListener("click", () => this.toggle());
|
|
227
|
+
this.stack.appendChild(this.pill);
|
|
228
|
+
this.panel = document.createElement("div");
|
|
229
|
+
this.panel.style.cssText = `
|
|
230
|
+
background: rgba(7,9,20,0.90);
|
|
231
|
+
border: 1px solid rgba(255,255,255,0.12);
|
|
232
|
+
backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px);
|
|
233
|
+
border-radius: 5px; padding: 8px 11px 7px;
|
|
234
|
+
pointer-events: auto; user-select: none;`;
|
|
235
|
+
this.stack.appendChild(this.panel);
|
|
236
|
+
const titleRow = document.createElement("div");
|
|
237
|
+
titleRow.style.cssText = "display:flex;align-items:center;justify-content:space-between;margin-bottom:4px;";
|
|
238
|
+
const titleText = document.createElement("span");
|
|
239
|
+
titleText.textContent = "PERF";
|
|
240
|
+
titleText.style.cssText = `font:600 9px/1.8 ${MONO};letter-spacing:0.12em;color:rgba(120,180,255,0.6);`;
|
|
241
|
+
const closeBtn = document.createElement("button");
|
|
242
|
+
closeBtn.textContent = "×";
|
|
243
|
+
closeBtn.style.cssText = `background:none;border:none;font:11px/1 ${MONO};color:rgba(255,255,255,0.35);cursor:pointer;padding:0 0 0 10px;pointer-events:auto;`;
|
|
244
|
+
closeBtn.addEventListener("click", () => this.toggle());
|
|
245
|
+
titleRow.append(titleText, closeBtn);
|
|
246
|
+
this.panel.appendChild(titleRow);
|
|
247
|
+
this.pre = document.createElement("pre");
|
|
248
|
+
this.pre.style.cssText = `margin:0;font:${MONO};color:rgba(220,230,255,0.85);white-space:pre;`;
|
|
249
|
+
this.panel.appendChild(this.pre);
|
|
250
|
+
this.buildButtons();
|
|
251
|
+
this.reportOut = document.createElement("pre");
|
|
252
|
+
this.reportOut.style.cssText = `margin:4px 0 0;font:10px/1.5 ${MONO};color:rgba(180,255,205,0.9);white-space:pre;max-height:240px;overflow:auto;`;
|
|
253
|
+
this.panel.appendChild(this.reportOut);
|
|
254
|
+
this.onKey = (e) => {
|
|
255
|
+
if (e.key === "`")
|
|
256
|
+
this.toggle();
|
|
257
|
+
};
|
|
258
|
+
document.addEventListener("keydown", this.onKey);
|
|
259
|
+
this.applyVisibility();
|
|
260
|
+
}
|
|
261
|
+
// ── Public per-frame API ─────────────────────────────────────
|
|
262
|
+
frameStart() {
|
|
263
|
+
const now = performance.now();
|
|
264
|
+
if (this.prevFrameTime) {
|
|
265
|
+
const frameMs = now - this.prevFrameTime;
|
|
266
|
+
this.frameMs.push(frameMs);
|
|
267
|
+
if (frameMs > 0)
|
|
268
|
+
this.fps.push(1000 / frameMs);
|
|
269
|
+
}
|
|
270
|
+
this.prevFrameTime = now;
|
|
271
|
+
this.cpuStart = now;
|
|
272
|
+
}
|
|
273
|
+
gpuBegin() {
|
|
274
|
+
if (!this.ext)
|
|
275
|
+
return;
|
|
276
|
+
const gl = this.gl;
|
|
277
|
+
const q = this.gpuPool.pop() ?? gl.createQuery();
|
|
278
|
+
if (!q)
|
|
279
|
+
return;
|
|
280
|
+
this.gpuCurrent = q;
|
|
281
|
+
gl.beginQuery(this.ext.TIME_ELAPSED_EXT, q);
|
|
282
|
+
}
|
|
283
|
+
gpuEnd() {
|
|
284
|
+
if (!this.ext || !this.gpuCurrent)
|
|
285
|
+
return;
|
|
286
|
+
const gl = this.gl;
|
|
287
|
+
gl.endQuery(this.ext.TIME_ELAPSED_EXT);
|
|
288
|
+
this.gpuPending.push(this.gpuCurrent);
|
|
289
|
+
this.gpuCurrent = null;
|
|
290
|
+
}
|
|
291
|
+
/** End of frame. `dt` is seconds since last frame (drives the DOM throttle). */
|
|
292
|
+
frameEnd(dt) {
|
|
293
|
+
this.cpuMs.push(performance.now() - this.cpuStart);
|
|
294
|
+
if (this.ext)
|
|
295
|
+
this.pollGpu();
|
|
296
|
+
const ri = this.renderer.info;
|
|
297
|
+
this.lastInfo = {
|
|
298
|
+
calls: ri.render.calls,
|
|
299
|
+
tris: ri.render.triangles,
|
|
300
|
+
lines: ri.render.lines,
|
|
301
|
+
geos: ri.memory.geometries,
|
|
302
|
+
texs: ri.memory.textures,
|
|
303
|
+
prgs: ri.programs?.length ?? 0,
|
|
304
|
+
};
|
|
305
|
+
this.domTick -= dt;
|
|
306
|
+
if (this.domTick <= 0) {
|
|
307
|
+
this.domTick = this.DOM_INTERVAL;
|
|
308
|
+
this.updatePill();
|
|
309
|
+
if (this.visible)
|
|
310
|
+
this.updateDom();
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
toggle() {
|
|
314
|
+
this.visible = !this.visible;
|
|
315
|
+
window.__PERF__ = this.visible;
|
|
316
|
+
this.applyVisibility();
|
|
317
|
+
}
|
|
318
|
+
destroy() {
|
|
319
|
+
document.removeEventListener("keydown", this.onKey);
|
|
320
|
+
this.stack.remove();
|
|
321
|
+
const gl = this.gl;
|
|
322
|
+
if (this.ext) {
|
|
323
|
+
for (const q of this.gpuPool)
|
|
324
|
+
gl.deleteQuery(q);
|
|
325
|
+
for (const q of this.gpuPending)
|
|
326
|
+
gl.deleteQuery(q);
|
|
327
|
+
if (this.gpuCurrent) {
|
|
328
|
+
gl.endQuery(this.ext.TIME_ELAPSED_EXT);
|
|
329
|
+
gl.deleteQuery(this.gpuCurrent);
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
// ── Internals ────────────────────────────────────────────────
|
|
334
|
+
applyVisibility() {
|
|
335
|
+
this.panel.style.display = this.visible ? "block" : "none";
|
|
336
|
+
this.pill.style.display = this.visible ? "none" : "block";
|
|
337
|
+
}
|
|
338
|
+
makeButton(label, bg) {
|
|
339
|
+
const b = document.createElement("button");
|
|
340
|
+
b.textContent = label;
|
|
341
|
+
b.style.cssText = `
|
|
342
|
+
margin: 6px 6px 0 0; padding: 4px 9px;
|
|
343
|
+
font: ${MONO}; color: rgba(225,235,255,0.95);
|
|
344
|
+
background: ${bg};
|
|
345
|
+
border: 1px solid rgba(255,255,255,0.18); border-radius: 4px;
|
|
346
|
+
cursor: pointer; pointer-events: auto; user-select: none;`;
|
|
347
|
+
return b;
|
|
348
|
+
}
|
|
349
|
+
buildButtons() {
|
|
350
|
+
const reportBtn = this.makeButton("Log perf report", "rgba(80,120,200,0.28)");
|
|
351
|
+
reportBtn.addEventListener("click", () => this.dumpReport(reportBtn));
|
|
352
|
+
this.panel.appendChild(reportBtn);
|
|
353
|
+
if (this.opts.scene) {
|
|
354
|
+
const scene = this.opts.scene;
|
|
355
|
+
const auditBtn = this.makeButton("Audit draw calls", "rgba(120,180,120,0.28)");
|
|
356
|
+
auditBtn.addEventListener("click", () => {
|
|
357
|
+
const text = auditScene(scene);
|
|
358
|
+
console.log("[perf] draw-call audit\n" + text);
|
|
359
|
+
this.reportOut.textContent = "✓ LOGGED IN CONSOLE\n\n" + text;
|
|
360
|
+
});
|
|
361
|
+
this.panel.appendChild(auditBtn);
|
|
362
|
+
}
|
|
363
|
+
for (const spec of this.opts.buttons ?? []) {
|
|
364
|
+
const btn = this.makeButton(spec.label, spec.color ?? "rgba(200,120,80,0.28)");
|
|
365
|
+
btn.addEventListener("click", spec.onClick);
|
|
366
|
+
this.panel.appendChild(btn);
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
dumpReport(btn) {
|
|
370
|
+
if (!window.__PERF__) {
|
|
371
|
+
window.__PERF__ = true;
|
|
372
|
+
this.reportOut.textContent = "Perf sampling enabled — run a few seconds, then click again.";
|
|
373
|
+
return;
|
|
374
|
+
}
|
|
375
|
+
const r = perfReport();
|
|
376
|
+
if (!r || !Object.keys(r).length) {
|
|
377
|
+
this.reportOut.textContent = "No samples yet — run a few seconds, then click again.";
|
|
378
|
+
return;
|
|
379
|
+
}
|
|
380
|
+
const text = Object.entries(r)
|
|
381
|
+
.sort((a, b) => b[1].avg - a[1].avg)
|
|
382
|
+
.map(([label, e]) => `${label.padEnd(16)} avg ${e.avg.toFixed(2).padStart(7)}ms max ${e.max.toFixed(2).padStart(7)}ms n${e.n}`)
|
|
383
|
+
.join("\n");
|
|
384
|
+
console.log("[perf] report\n" + text + "\n\n" + JSON.stringify(r, null, 2));
|
|
385
|
+
this.reportOut.textContent = "✓ LOGGED IN CONSOLE\n\n" + text;
|
|
386
|
+
btn.textContent = "Logged ✓";
|
|
387
|
+
setTimeout(() => {
|
|
388
|
+
btn.textContent = "Log perf report";
|
|
389
|
+
}, 1500);
|
|
390
|
+
}
|
|
391
|
+
initGpuExt() {
|
|
392
|
+
if (typeof WebGL2RenderingContext === "undefined")
|
|
393
|
+
return null;
|
|
394
|
+
if (!(this.gl instanceof WebGL2RenderingContext))
|
|
395
|
+
return null;
|
|
396
|
+
return this.gl.getExtension("EXT_disjoint_timer_query_webgl2");
|
|
397
|
+
}
|
|
398
|
+
pollGpu() {
|
|
399
|
+
const gl = this.gl;
|
|
400
|
+
const ext = this.ext;
|
|
401
|
+
const disjoint = gl.getParameter(ext.GPU_DISJOINT_EXT);
|
|
402
|
+
for (let i = this.gpuPending.length - 1; i >= 0; i--) {
|
|
403
|
+
const q = this.gpuPending[i];
|
|
404
|
+
if (!gl.getQueryParameter(q, gl.QUERY_RESULT_AVAILABLE))
|
|
405
|
+
continue;
|
|
406
|
+
if (!disjoint) {
|
|
407
|
+
const ns = gl.getQueryParameter(q, gl.QUERY_RESULT);
|
|
408
|
+
this.gpuMs.push(ns / 1_000_000);
|
|
409
|
+
}
|
|
410
|
+
this.gpuPool.push(q);
|
|
411
|
+
const last = this.gpuPending.length - 1;
|
|
412
|
+
if (i !== last)
|
|
413
|
+
this.gpuPending[i] = this.gpuPending[last];
|
|
414
|
+
this.gpuPending.pop();
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
updatePill() {
|
|
418
|
+
const gpuStr = this.ext ? `${this.gpuMs.avg().toFixed(1)}ms` : "n/a";
|
|
419
|
+
this.pill.textContent = `${Math.round(this.fps.avg())} fps • GPU ${gpuStr} • CPU ${this.cpuMs.avg().toFixed(1)}ms`;
|
|
420
|
+
}
|
|
421
|
+
updateDom() {
|
|
422
|
+
const { calls, tris, geos, texs, prgs } = this.lastInfo;
|
|
423
|
+
const gpuStr = this.ext ? `${f1(this.gpuMs.avg())}ms ↑${f1(this.gpuMs.max())}ms` : " n/a";
|
|
424
|
+
const rows = [
|
|
425
|
+
`FPS ${f1(this.fps.avg())} lo ${f0(this.fps.min(), 3)} frame ${f1(this.frameMs.avg())}ms`,
|
|
426
|
+
`CPU ${f1(this.cpuMs.avg())}ms ↑${f1(this.cpuMs.max())}ms GPU ${gpuStr}`,
|
|
427
|
+
];
|
|
428
|
+
for (const label of this.opts.phases ?? []) {
|
|
429
|
+
rows.push(` ${label.padEnd(16)} ${f1(perfAvg(label))}ms ↑${f1(perfPeak(label))}ms`);
|
|
430
|
+
}
|
|
431
|
+
rows.push("", `calls ${f0(calls, 4)} tris ${kFmt(tris)}`, `geos ${f0(geos, 4)} tex ${f0(texs, 4)} prgs ${f0(prgs, 3)}`);
|
|
432
|
+
const counters = this.opts.counters?.();
|
|
433
|
+
if (counters) {
|
|
434
|
+
rows.push("");
|
|
435
|
+
const entries = Object.entries(counters);
|
|
436
|
+
for (let i = 0; i < entries.length; i += 2) {
|
|
437
|
+
const a = entries[i];
|
|
438
|
+
const b = entries[i + 1];
|
|
439
|
+
const left = `${a[0].slice(0, 7).padEnd(7)} ${f0(a[1], 4)}`;
|
|
440
|
+
rows.push(b ? `${left} ${b[0].slice(0, 7).padEnd(7)} ${f0(b[1], 4)}` : left);
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
this.pre.textContent = rows.join("\n");
|
|
444
|
+
}
|
|
445
|
+
}
|
|
446
|
+
//# sourceMappingURL=perf-overlay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"perf-overlay.js","sourceRoot":"","sources":["../../src/three/perf-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAIH,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAC;AAyCjF,kEAAkE;AAClE,MAAM,IAAI;IACS,GAAG,CAAe;IAC3B,CAAC,GAAG,CAAC,CAAC;IACN,CAAC,GAAG,CAAC,CAAC;IACd,YAAY,GAAW;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,CAAC,CAAS;QACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,CAAC,EAAE,CAAC;QACT,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM;YAAE,IAAI,CAAC,CAAC,EAAE,CAAC;IACzC,CAAC;IACD,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE;YAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;QACnD,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE;YAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;QACxE,OAAO,CAAC,CAAC;IACX,CAAC;IACD,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,QAAQ,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE;YAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;QACxE,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;CACF;AAED,kEAAkE;AAClE,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,CAAC,GAAG,CAAC,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAClE,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,CAAC,GAAG,CAAC,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAC9E,SAAS,IAAI,CAAC,CAAS,EAAE,CAAC,GAAG,CAAC;IAC5B,IAAI,CAAC,IAAI,KAAK;QAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,IAAI,GAAG,8DAA8D,CAAC;AAE5E;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAqB;IAoB9C,MAAM,YAAY,GAAG,CAAC,CAAa,EAAW,EAAE,CAC9C,CAAC,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC;IAEvF,MAAM,OAAO,GAA6D,EAAE,CAAC;IAC7E,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,IAAI,CAAC,YAAY,CAAC,CAAe,CAAC;gBAAE,OAAO;YAC3C,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO;gBAAE,OAAO,EAAE,CAAC;;gBACrC,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC;YAAE,SAAS;QACrC,KAAK,IAAI,OAAO,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CACvB,CAAC,CAAC,EAAE,EAAE,CACJ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACnH,CAAC;IAEF,8EAA8E;IAC9E,+EAA+E;IAC/E,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1F,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgD,CAAC;YACxE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC7C,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtB,MAAM,CAAC,GAAG,CAAe,CAAC;gBAC1B,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,QAAQ;oBAAE,OAAO;gBACnD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxF,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBACnC,IAAI,KAAK;wBAAE,KAAK,CAAC,KAAK,EAAE,CAAC;;wBACpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBACnD,CAAC;gBACD,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/E,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE;gBAAE,IAAI,CAAC,GAAG,SAAS;oBAAE,SAAS,GAAG,CAAC,CAAC;YACtE,MAAM,QAAQ,GAAG,CAAC,GAAiB,EAAU,EAAE;gBAC7C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC/D,MAAM,IAAI,GAAa,EAAE,CAAC;gBAC1B,IAAI,GAAG,CAAC,GAAG;oBAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC9B,IAAI,GAAG,CAAC,SAAS;oBAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvC,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,WAAW;oBAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC9D,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;oBAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACvE,IAAI,GAAG,CAAC,WAAW;oBAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC9C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,WAAW,CAAC;gBACrC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;YACrJ,CAAC,CAAC;YACF,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;iBACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;iBACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM;gBACJ,IAAI,GAAG,CAAC,IAAI,kBAAkB;oBAC9B,wBAAwB,IAAI,CAAC,IAAI,IAAI;oBACrC,wBAAwB,OAAO,CAAC,IAAI,IAAI;oBACxC,iCAAiC,SAAS,KAAK;oBAC/C,qDAAqD;oBACrD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;oBACnB,MAAM,CAAC;QACX,CAAC;IACH,CAAC;IACD,OAAO,MAAM,GAAG,IAAI,KAAK,yCAAyC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClH,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,WAAW;IACL,QAAQ,CAAsB;IAC9B,IAAI,CAAqB;IACzB,EAAE,CAAiD;IACnD,GAAG,CAA+B;IAElC,GAAG,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;IACnB,OAAO,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;IACvB,KAAK,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;IACrB,KAAK,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;IAE9B,aAAa,GAAG,CAAC,CAAC;IAClB,QAAQ,GAAG,CAAC,CAAC;IAEJ,OAAO,GAAiB,EAAE,CAAC;IAC3B,UAAU,GAAiB,EAAE,CAAC;IACvC,UAAU,GAAsB,IAAI,CAAC;IAErC,QAAQ,GAAuB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAE1F,OAAO,GAAG,CAAC,CAAC;IACH,YAAY,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC;IAErE,OAAO,CAAU;IACR,KAAK,CAAiB;IACtB,IAAI,CAAoB;IACxB,KAAK,CAAiB;IACtB,GAAG,CAAiB;IACpB,SAAS,CAAiB;IAC1B,KAAK,CAA6B;IAEnD,YAAY,IAAiB,EAAE,QAA6B,EAAE,OAA2B,EAAE;QACzF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAE7B,yEAAyE;QACzE,4DAA4D;QAC5D,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM;gBAAE,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7E,CAAC;QAAC,MAAM,CAAC;YACP,kCAAkC;QACpC,CAAC;QACD,MAAM,OAAO,GACX,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG;YACxD,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC;QACnD,IAAI,IAAI,CAAC,OAAO;YAAE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEzC,+CAA+C;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG;iCACE,MAAM,cAAc,QAAQ;;4BAEjC,CAAC;QACzB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG;;;;;+CAKgB,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/C,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,kFAAkF,CAAC;QAC5G,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACjD,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC;QAC/B,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,oBAAoB,IAAI,qDAAqD,CAAC;QACxG,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAClD,QAAQ,CAAC,WAAW,GAAG,GAAG,CAAC;QAC3B,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,2CAA2C,IAAI,sFAAsF,CAAC;QAC/J,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACxD,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,GAAG,iBAAiB,IAAI,gDAAgD,CAAC;QAC/F,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjC,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,gCAAgC,IAAI,8EAA8E,CAAC;QAClJ,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG;gBAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC;QACF,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEjD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,gEAAgE;IAEhE,UAAU;QACR,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC;YACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,IAAI,OAAO,GAAG,CAAC;gBAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,OAAO;QACtB,MAAM,EAAE,GAAG,IAAI,CAAC,EAA4B,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACjD,IAAI,CAAC,CAAC;YAAE,OAAO;QACf,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,EAA4B,CAAC;QAC7C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,gFAAgF;IAChF,QAAQ,CAAC,EAAU;QACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,IAAI,CAAC,GAAG;YAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QAE7B,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG;YACd,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK;YACtB,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS;YACzB,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK;YACtB,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU;YAC1B,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ;YACxB,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;SAC/B,CAAC;QAEF,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YACjC,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,OAAO;QACL,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,GAAG,IAAI,CAAC,EAA4B,CAAC;QAC7C,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO;gBAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAChD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU;gBAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBACvC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,gEAAgE;IAExD,eAAe;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,CAAC;IAEO,UAAU,CAAC,KAAa,EAAE,EAAU;QAC1C,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,WAAW,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG;;cAER,IAAI;oBACE,EAAE;;gEAE0C,CAAC;QAC7D,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,YAAY;QAClB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,uBAAuB,CAAC,CAAC;QAC9E,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAElC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;YAC/E,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;gBAC/C,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,yBAAyB,GAAG,IAAI,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAC;YAC/E,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,GAAsB;QACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,8DAA8D,CAAC;YAC5F,OAAO;QACT,CAAC;QACD,MAAM,CAAC,GAAsB,UAAU,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,uDAAuD,CAAC;YACrF,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;aAC3B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;aACnC,GAAG,CACF,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CACb,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAC9G;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,yBAAyB,GAAG,IAAI,CAAC;QAC9D,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC;QAC7B,UAAU,CAAC,GAAG,EAAE;YACd,GAAG,CAAC,WAAW,GAAG,iBAAiB,CAAC;QACtC,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAEO,UAAU;QAChB,IAAI,OAAO,sBAAsB,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC;QAC/D,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,sBAAsB,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9D,OAAO,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,iCAAiC,CAAiC,CAAC;IACjG,CAAC;IAEO,OAAO;QACb,MAAM,EAAE,GAAG,IAAI,CAAC,EAA4B,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAI,CAAC;QACtB,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvD,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC;gBAAE,SAAS;YAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAW,CAAC;gBAC9D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAE,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,UAAU;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACrE,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,MAAM,UAAU,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACrH,CAAC;IAEO,SAAS;QACf,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;QAE5F,MAAM,IAAI,GAAa;YACrB,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI;YAChG,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,aAAa,MAAM,EAAE;SAC9E,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;QACxF,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAE5H,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAChF,CAAC;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACF"}
|
|
@@ -41,6 +41,16 @@ export interface WorldPlacement {
|
|
|
41
41
|
export interface LoadWorldOptions extends GlbLoaderOptions {
|
|
42
42
|
/** Optional transform applied to the world group on every `loadWorld` call (incl. cache hits). */
|
|
43
43
|
placement?: WorldPlacement;
|
|
44
|
+
/**
|
|
45
|
+
* Merge the assembled world's static meshes by material (≈one draw call per material) before
|
|
46
|
+
* returning — see {@link mergeByMaterial}. Default: `false` (opt-in; no behavior change for
|
|
47
|
+
* existing games). Done once per world (the result is cached), and idempotent across cache hits.
|
|
48
|
+
*
|
|
49
|
+
* Caveat: merging bakes each prop's transform into shared vertex data, so a world that needs
|
|
50
|
+
* per-prop animation or toggling must opt that subtree out with `userData.__noMerge = true`
|
|
51
|
+
* (no current static platform world does).
|
|
52
|
+
*/
|
|
53
|
+
mergeStatics?: boolean;
|
|
44
54
|
}
|
|
45
55
|
/**
|
|
46
56
|
* A loaded platform world — the single owner of its GPU resources.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"world-loader.d.ts","sourceRoot":"","sources":["../../src/three/world-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"world-loader.d.ts","sourceRoot":"","sources":["../../src/three/world-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,iFAAiF;AACjF,eAAO,MAAM,kBAAkB,4DAA4D,CAAC;AAE5F,MAAM,WAAW,gBAAgB;IAC/B,qFAAqF;IACrF,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,2FAA2F;AAC3F,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,kGAAkG;IAClG,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B,oDAAoD;IACpD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,uGAAuG;IACvG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;IAC5B,6GAA6G;IAC7G,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;IACrC,2GAA2G;IAC3G,MAAM,IAAI,IAAI,CAAC;IACf,iGAAiG;IACjG,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,IAAI,GAAE,gBAAqB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAgBrG;AAKD;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,CAcjG;AAwBD,0FAA0F;AAC1F,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,cAAc,GAAG,IAAI,CAIrF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAWjD"}
|
|
@@ -26,6 +26,7 @@ import * as THREE from "three";
|
|
|
26
26
|
import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js";
|
|
27
27
|
import { DRACOLoader } from "three/addons/loaders/DRACOLoader.js";
|
|
28
28
|
import { applyWorld } from "../world-runtime.js";
|
|
29
|
+
import { mergeByMaterial } from "./merge.js";
|
|
29
30
|
/** DRACO decoder — pinned to the same version the platform world editor uses. */
|
|
30
31
|
export const DRACO_DECODER_PATH = "https://www.gstatic.com/draco/versioned/decoders/1.5.6/";
|
|
31
32
|
/**
|
|
@@ -88,6 +89,12 @@ async function buildWorld(coreWorld, opts) {
|
|
|
88
89
|
const group = new THREE.Group();
|
|
89
90
|
group.name = "platform-world";
|
|
90
91
|
await applyWorld(group, coreWorld, { loadGlb: createGlbLoader(opts) });
|
|
92
|
+
// Collapse the static world's per-mesh draw calls to ≈one per material. Detach-only (no
|
|
93
|
+
// disposeConsumed): createGlbLoader dedups props by URL path and `.clone()`s shared
|
|
94
|
+
// geometry/material, so a source geometry may back sibling clones. `disposeGroup` frees the
|
|
95
|
+
// merged batches on teardown like any other mesh.
|
|
96
|
+
if (opts.mergeStatics)
|
|
97
|
+
mergeByMaterial(group, { groupBy: "instance", disposeConsumed: false });
|
|
91
98
|
const id = coreWorld.id;
|
|
92
99
|
return {
|
|
93
100
|
id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"world-loader.js","sourceRoot":"","sources":["../../src/three/world-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"world-loader.js","sourceRoot":"","sources":["../../src/three/world-loader.ts"],"names":[],"mappings":"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"}
|