@needle-tools/engine 4.7.0 → 4.7.1
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/CHANGELOG.md +4 -0
- package/dist/{gltf-progressive-Bl4okF1b.min.js → gltf-progressive-60Qk5ebF.min.js} +6 -6
- package/dist/{gltf-progressive-DSpdn0QT.js → gltf-progressive-DM5ZiecW.js} +176 -170
- package/dist/gltf-progressive-wxtaVmio.umd.cjs +8 -0
- package/dist/{needle-engine.bundle-BxOXkBoQ.umd.cjs → needle-engine.bundle-B7M9iBIa.umd.cjs} +115 -115
- package/dist/{needle-engine.bundle-BodidWhS.js → needle-engine.bundle-BpCihhaP.js} +3451 -3439
- package/dist/{needle-engine.bundle-BFsiOavn.min.js → needle-engine.bundle-CN9UC6Ju.min.js} +113 -113
- package/dist/needle-engine.js +3 -3
- package/dist/needle-engine.min.js +1 -1
- package/dist/needle-engine.umd.cjs +1 -1
- package/lib/engine/engine_addressables.d.ts +1 -3
- package/lib/engine/engine_addressables.js +5 -12
- package/lib/engine/engine_addressables.js.map +1 -1
- package/lib/engine/engine_lightdata.js +12 -2
- package/lib/engine/engine_lightdata.js.map +1 -1
- package/lib/engine/engine_lods.d.ts +4 -0
- package/lib/engine/engine_lods.js +19 -5
- package/lib/engine/engine_lods.js.map +1 -1
- package/package.json +2 -2
- package/plugins/common/logger.js +8 -1
- package/plugins/vite/logger.client.js +11 -1
- package/src/engine/engine_addressables.ts +6 -15
- package/src/engine/engine_lightdata.ts +10 -2
- package/src/engine/engine_lods.ts +23 -5
- package/dist/gltf-progressive-P8b8a0qY.umd.cjs +0 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_lods.js","sourceRoot":"","sources":["../../src/engine/engine_lods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,kBAAkB,EAA6B,MAAM,gCAAgC,CAAC;AAE5H,OAAO,EAAE,IAAI,EAA0C,MAAM,EAAiB,MAAM,OAAO,CAAC;AAI5F,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,KAAK,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;AAE3C,MAAM,QAAQ,GAAS,IAAI,IAAI,EAAE,CAAC;AAClC,MAAM,WAAW,GAAW,IAAI,MAAM,EAAE,CAAC;AAEzC;;;;GAIG;AACH,MAAM,OAAO,WAAW;IACX,OAAO,CAAU;IAClB,YAAY,CAAgB;
|
|
1
|
+
{"version":3,"file":"engine_lods.js","sourceRoot":"","sources":["../../src/engine/engine_lods.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@needle-tools/engine",
|
|
3
|
-
"version": "4.7.
|
|
3
|
+
"version": "4.7.1",
|
|
4
4
|
"description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in.",
|
|
5
5
|
"main": "dist/needle-engine.min.js",
|
|
6
6
|
"exports": {
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
],
|
|
94
94
|
"dependencies": {
|
|
95
95
|
"@dimforge/rapier3d-compat": "^0.14.0",
|
|
96
|
-
"@needle-tools/gltf-progressive": "^2.1.
|
|
96
|
+
"@needle-tools/gltf-progressive": "^2.1.6",
|
|
97
97
|
"@webxr-input-profiles/motion-controllers": "^1.0.0",
|
|
98
98
|
"flatbuffers": "2.0.4",
|
|
99
99
|
"md5": "^2.3.0",
|
package/plugins/common/logger.js
CHANGED
|
@@ -116,7 +116,8 @@ function stringifyLog(log, seen = new Set(), depth = 0) {
|
|
|
116
116
|
const isServer = typeof window === "undefined";
|
|
117
117
|
const stringify_limits = {
|
|
118
118
|
string: isServer ? 100_000 : 2000,
|
|
119
|
-
object_keys: isServer ?
|
|
119
|
+
object_keys: isServer ? 300 : 100,
|
|
120
|
+
object_depth: isServer ? 10 : 3,
|
|
120
121
|
array_items: isServer ? 2_000 : 100,
|
|
121
122
|
}
|
|
122
123
|
|
|
@@ -144,6 +145,11 @@ function stringifyLog(log, seen = new Set(), depth = 0) {
|
|
|
144
145
|
return stringifyArray(log);
|
|
145
146
|
}
|
|
146
147
|
if (typeof log === "object") {
|
|
148
|
+
|
|
149
|
+
if (depth > stringify_limits.object_depth) {
|
|
150
|
+
return "<object too deep>";
|
|
151
|
+
}
|
|
152
|
+
|
|
147
153
|
seen.add(log);
|
|
148
154
|
// const str = JSON.stringify(log, (key, value) => {
|
|
149
155
|
// if (typeof value === "function") return "<function>";
|
|
@@ -205,6 +211,7 @@ function stringifyLog(log, seen = new Set(), depth = 0) {
|
|
|
205
211
|
|
|
206
212
|
|
|
207
213
|
|
|
214
|
+
|
|
208
215
|
// #region utility functions
|
|
209
216
|
|
|
210
217
|
/**
|
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
function sendLogToServer(level, ...message) {
|
|
9
9
|
if ("hot" in import.meta) {
|
|
10
10
|
message = stringifyLog(message);
|
|
11
|
+
// keep messages below payload limit
|
|
12
|
+
if(message.length > 100_000) {
|
|
13
|
+
message = message.slice(0, 100_000) + "... <truncated>";
|
|
14
|
+
}
|
|
11
15
|
// @ts-ignore
|
|
12
16
|
import.meta.hot.send("needle:client-log", { level, message: message });
|
|
13
17
|
}
|
|
@@ -174,7 +178,8 @@ function stringifyLog(log, seen = new Set(), depth = 0) {
|
|
|
174
178
|
const isServer = typeof window === "undefined";
|
|
175
179
|
const stringify_limits = {
|
|
176
180
|
string: isServer ? 100_000 : 2000,
|
|
177
|
-
object_keys: isServer ?
|
|
181
|
+
object_keys: isServer ? 300 : 100,
|
|
182
|
+
object_depth: isServer ? 10 : 3,
|
|
178
183
|
array_items: isServer ? 2_000 : 100,
|
|
179
184
|
}
|
|
180
185
|
|
|
@@ -202,6 +207,11 @@ function stringifyLog(log, seen = new Set(), depth = 0) {
|
|
|
202
207
|
return stringifyArray(log);
|
|
203
208
|
}
|
|
204
209
|
if (typeof log === "object") {
|
|
210
|
+
|
|
211
|
+
if (depth > stringify_limits.object_depth) {
|
|
212
|
+
return "<object too deep>";
|
|
213
|
+
}
|
|
214
|
+
|
|
205
215
|
seen.add(log);
|
|
206
216
|
// const str = JSON.stringify(log, (key, value) => {
|
|
207
217
|
// if (typeof value === "function") return "<function>";
|
|
@@ -188,14 +188,11 @@ export class AssetReference {
|
|
|
188
188
|
private _urlName: string;
|
|
189
189
|
private _progressListeners: ProgressCallback[] = [];
|
|
190
190
|
|
|
191
|
-
private _hash?: string;
|
|
192
|
-
private _hashedUri: string;
|
|
193
|
-
|
|
194
191
|
private _isLoadingRawBinary: boolean = false;
|
|
195
192
|
private _rawBinary?: ArrayBufferLike | null;
|
|
196
193
|
|
|
197
194
|
/** @internal */
|
|
198
|
-
constructor(uri: string,
|
|
195
|
+
constructor(uri: string, _hash?: string, asset: any = null) {
|
|
199
196
|
this._url = uri;
|
|
200
197
|
|
|
201
198
|
const lastUriPart = uri.lastIndexOf("/");
|
|
@@ -210,14 +207,8 @@ export class AssetReference {
|
|
|
210
207
|
else {
|
|
211
208
|
this._urlName = uri;
|
|
212
209
|
}
|
|
213
|
-
|
|
214
|
-
this._hash = hash;
|
|
215
|
-
if (uri.includes("?v="))
|
|
216
|
-
this._hashedUri = uri;
|
|
217
|
-
else
|
|
218
|
-
this._hashedUri = hash ? uri + "?v=" + hash : uri;
|
|
210
|
+
|
|
219
211
|
if (asset !== null) this.asset = asset;
|
|
220
|
-
|
|
221
212
|
registerPrefabProvider(this._url, this.onResolvePrefab.bind(this));
|
|
222
213
|
}
|
|
223
214
|
|
|
@@ -263,8 +254,8 @@ export class AssetReference {
|
|
|
263
254
|
if (this._isLoadingRawBinary) return null;
|
|
264
255
|
if (this._rawBinary !== undefined) return this._rawBinary;
|
|
265
256
|
this._isLoadingRawBinary = true;
|
|
266
|
-
if (debug) console.log("Preload", this.
|
|
267
|
-
const res = await BlobStorage.download(this.
|
|
257
|
+
if (debug) console.log("Preload", this.url);
|
|
258
|
+
const res = await BlobStorage.download(this.url, p => {
|
|
268
259
|
this.raiseProgressEvent(p);
|
|
269
260
|
});
|
|
270
261
|
this._rawBinary = res?.buffer ?? null;
|
|
@@ -294,7 +285,7 @@ export class AssetReference {
|
|
|
294
285
|
// console.log("START LOADING");
|
|
295
286
|
if (this._rawBinary) {
|
|
296
287
|
if (!(this._rawBinary instanceof ArrayBuffer)) {
|
|
297
|
-
console.error("Invalid raw binary data"
|
|
288
|
+
console.error("Failed loading: Invalid raw binary data. Must be of type ArrayBuffer. " + (typeof this._rawBinary));
|
|
298
289
|
return null;
|
|
299
290
|
}
|
|
300
291
|
this._loading = getLoader().parseSync(context, this._rawBinary, this.url, null);
|
|
@@ -302,7 +293,7 @@ export class AssetReference {
|
|
|
302
293
|
}
|
|
303
294
|
else {
|
|
304
295
|
if (debug) console.log("Load async", this.url);
|
|
305
|
-
this._loading = getLoader().loadSync(context, this.
|
|
296
|
+
this._loading = getLoader().loadSync(context, this.url, this.url, null, prog => {
|
|
306
297
|
this.raiseProgressEvent(prog);
|
|
307
298
|
});
|
|
308
299
|
}
|
|
@@ -53,10 +53,12 @@ export class LightDataRegistry implements ILightDataRegistry {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
tryGetSkybox(sourceId?: SourceIdentifier | null): Texture | null {
|
|
56
|
+
if (debugLightmap) console.log("[Get Skybox]", sourceId, this._lightmaps)
|
|
56
57
|
return this.tryGet(sourceId, LightmapType.Skybox, 0);
|
|
57
58
|
}
|
|
58
59
|
|
|
59
60
|
tryGetReflection(sourceId?: SourceIdentifier | null): Texture | null {
|
|
61
|
+
if (debugLightmap) console.log("[Get Reflection]", sourceId, this._lightmaps)
|
|
60
62
|
return this.tryGet(sourceId, LightmapType.Reflection, 0);
|
|
61
63
|
}
|
|
62
64
|
|
|
@@ -66,9 +68,15 @@ export class LightDataRegistry implements ILightDataRegistry {
|
|
|
66
68
|
return null;
|
|
67
69
|
}
|
|
68
70
|
const entry = this._lightmaps.get(sourceId);
|
|
69
|
-
if (!entry)
|
|
71
|
+
if (!entry) {
|
|
72
|
+
if (debugLightmap) console.warn(`[Lighting] No ${LightmapType[type]} texture entry for`, sourceId);
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
70
75
|
const arr = entry.get(type);
|
|
71
|
-
if (arr === undefined)
|
|
76
|
+
if (arr === undefined) {
|
|
77
|
+
if (debugLightmap) console.warn(`[Lighting] No ${LightmapType[type]} texture for`, sourceId, "index", index);
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
72
80
|
if (!arr?.length || arr.length <= index) return null;
|
|
73
81
|
return arr[index];
|
|
74
82
|
}
|
|
@@ -23,6 +23,9 @@ export class LODsManager implements NEEDLE_progressive_plugin {
|
|
|
23
23
|
readonly context: Context;
|
|
24
24
|
private _lodsManager?: _LODsManager;
|
|
25
25
|
|
|
26
|
+
private _settings: Partial<Pick<_LODsManager, "skinnedMeshAutoUpdateBoundsInterval" | "targetTriangleDensity">> = {
|
|
27
|
+
}
|
|
28
|
+
|
|
26
29
|
/**
|
|
27
30
|
* The internal LODs manager. See @needle-tools/gltf-progressive for more information.
|
|
28
31
|
* @link https://npmjs.com/package/@needle-tools/gltf-progressive
|
|
@@ -31,24 +34,38 @@ export class LODsManager implements NEEDLE_progressive_plugin {
|
|
|
31
34
|
return this._lodsManager;
|
|
32
35
|
}
|
|
33
36
|
|
|
37
|
+
get skinnedMeshAutoUpdateBoundsInterval() {
|
|
38
|
+
return this._lodsManager?.skinnedMeshAutoUpdateBoundsInterval || this._settings.skinnedMeshAutoUpdateBoundsInterval || 0;
|
|
39
|
+
}
|
|
40
|
+
set skinnedMeshAutoUpdateBoundsInterval(value: number) {
|
|
41
|
+
this._settings.skinnedMeshAutoUpdateBoundsInterval = value;
|
|
42
|
+
this.applySettings();
|
|
43
|
+
}
|
|
44
|
+
|
|
34
45
|
/**
|
|
35
46
|
* The target triangle density is the desired max amount of triangles on screen when the mesh is filling the screen.
|
|
36
47
|
* @default 200_000
|
|
37
48
|
*/
|
|
38
49
|
get targetTriangleDensity() {
|
|
39
|
-
return this._lodsManager?.targetTriangleDensity
|
|
50
|
+
return this._lodsManager?.targetTriangleDensity || this._settings.targetTriangleDensity || 200_000; // default value
|
|
40
51
|
}
|
|
41
52
|
set targetTriangleDensity(value: number) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
this._lodsManager.targetTriangleDensity = value;
|
|
53
|
+
this._settings.targetTriangleDensity = value;
|
|
54
|
+
this.applySettings();
|
|
46
55
|
}
|
|
47
56
|
|
|
48
57
|
constructor(context: Context) {
|
|
49
58
|
this.context = context;
|
|
50
59
|
}
|
|
51
60
|
|
|
61
|
+
private applySettings() {
|
|
62
|
+
if(this._lodsManager) {
|
|
63
|
+
for(const key in this._settings) {
|
|
64
|
+
this._lodsManager[key] = this._settings[key];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
52
69
|
/** @internal */
|
|
53
70
|
setRenderer(renderer: WebGLRenderer) {
|
|
54
71
|
this._lodsManager?.disable();
|
|
@@ -56,6 +73,7 @@ export class LODsManager implements NEEDLE_progressive_plugin {
|
|
|
56
73
|
_LODsManager.addPlugin(this);
|
|
57
74
|
_LODsManager.debugDrawLine = Gizmos.DrawLine;
|
|
58
75
|
this._lodsManager = _LODsManager.get(renderer);
|
|
76
|
+
this.applySettings();
|
|
59
77
|
this._lodsManager.enable();
|
|
60
78
|
}
|
|
61
79
|
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
"use strict";var ze=Object.defineProperty;var Ae=i=>{throw TypeError(i)};var We=(i,e,t)=>e in i?ze(i,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):i[e]=t;var d=(i,e,t)=>We(i,typeof e!="symbol"?e+"":e,t),Pe=(i,e,t)=>e.has(i)||Ae("Cannot "+t);var m=(i,e,t)=>(Pe(i,e,"read from private field"),t?t.call(i):e.get(i)),H=(i,e,t)=>e.has(i)?Ae("Cannot add the same private member more than once"):e instanceof WeakSet?e.add(i):e.set(i,t),N=(i,e,t,r)=>(Pe(i,e,"write to private field"),r?r.call(i,t):e.set(i,t),t);const y=require("./three-B_hneGZr.umd.cjs"),Z=require("./three-examples-X3OadjXB.umd.cjs"),Xe="";globalThis.GLTF_PROGRESSIVE_VERSION=Xe;console.debug("[gltf-progressive] version -");let z="https://www.gstatic.com/draco/versioned/decoders/1.5.7/",j="https://www.gstatic.com/basis-universal/versioned/2021-04-15-ba1c3e4/";const qe=z,Ke=j,ke=new URL(z+"draco_decoder.js");ke.searchParams.append("range","true");fetch(ke,{method:"GET",headers:{Range:"bytes=0-1"}}).catch(i=>{console.debug(`Failed to fetch remote Draco decoder from ${z} (offline: ${typeof navigator<"u"?navigator.onLine:"unknown"})`),z===qe&&Ge("./include/draco/"),j===Ke&&Ie("./include/ktx2/")}).finally(()=>{$e()});function Ge(i){z=i,B&&B[we]!=z?(console.debug("Updating Draco decoder path to "+i),B[we]=z,B.setDecoderPath(z),B.preload()):console.debug("Setting Draco decoder path to "+i)}function Ie(i){j=i,$&&$.transcoderPath!=j?(console.debug("Updating KTX2 transcoder path to "+i),$.setTranscoderPath(j),$.init()):console.debug("Setting KTX2 transcoder path to "+i)}const we=Symbol("dracoDecoderPath");let B,he,$;function $e(){B||(B=new Z.DRACOLoader,B[we]=z,B.setDecoderPath(z),B.setDecoderConfig({type:"js"}),B.preload()),$||($=new Z.KTX2Loader,$.setTranscoderPath(j),$.init()),he||(he=Z.MeshoptDecoder)}function be(i){return $e(),i?$.detectSupport(i):i!==null&&console.warn("No renderer provided to detect ktx2 support - loading KTX2 textures might fail"),{dracoLoader:B,ktx2Loader:$,meshoptDecoder:he}}function Se(i){i.dracoLoader||i.setDRACOLoader(B),i.ktx2Loader||i.setKTX2Loader($),i.meshoptDecoder||i.setMeshoptDecoder(he)}const ve=new WeakMap;function Te(i,e){let t=ve.get(i);t?t=Object.assign(t,e):t=e,ve.set(i,t)}const me=Z.GLTFLoader.prototype.load;function Ye(...i){const e=ve.get(this);let t=i[0];const r=new URL(t,window.location.href);if(r.hostname.endsWith("needle.tools")){const s=(e==null?void 0:e.progressive)!==void 0?e.progressive:!0,o=e!=null&&e.usecase?e.usecase:"default";s?this.requestHeader.Accept=`*/*;progressive=allowed;usecase=${o}`:this.requestHeader.Accept=`*/*;usecase=${o}`,t=r.toString()}return i[0]=t,me==null?void 0:me.call(this,...i)}Z.GLTFLoader.prototype.load=Ye;le("debugprogressive");function le(i){if(typeof window>"u")return!1;const t=new URL(window.location.href).searchParams.get(i);return t==null||t==="0"||t==="false"?!1:t===""?!0:t}function He(i,e){if(e===void 0||e.startsWith("./")||e.startsWith("http")||i===void 0)return e;const t=i.lastIndexOf("/");if(t>=0){const r=i.substring(0,t+1);for(;r.endsWith("/")&&e.startsWith("/");)e=e.substring(1);return r+e}return e}let se;function Je(){return se!==void 0||(se=/iPhone|iPad|iPod|Android|IEMobile/i.test(navigator.userAgent),le("debugprogressive")&&console.log("[glTF Progressive]: isMobileDevice",se)),se}const Qe=typeof window>"u"&&typeof document>"u",Oe=Symbol("needle:raycast-mesh");function re(i){return(i==null?void 0:i[Oe])instanceof y.BufferGeometry?i[Oe]:null}function Ze(i,e){if((i.type==="Mesh"||i.type==="SkinnedMesh")&&!re(i)){const r=et(e);r.userData={isRaycastMesh:!0},i[Oe]=r}}function je(i=!0){if(i){if(oe)return;const e=oe=y.Mesh.prototype.raycast;y.Mesh.prototype.raycast=function(t,r){const n=this,s=re(n);let o;s&&n.isMesh&&(o=n.geometry,n.geometry=s),e.call(this,t,r),o&&(n.geometry=o)}}else{if(!oe)return;y.Mesh.prototype.raycast=oe,oe=null}}let oe=null;function et(i){const e=new y.BufferGeometry;for(const t in i.attributes)e.setAttribute(t,i.getAttribute(t));return e.setIndex(i.getIndex()),e}const Q=new Array,X="NEEDLE_progressive",x=le("debugprogressive"),xe=Symbol("needle-progressive-texture"),ie=new Map,_e=new Set;if(x){let i=function(){e+=1,console.log("Toggle LOD level",e,ie),ie.forEach((n,s)=>{for(const o of n.keys){const a=s[o];if(a!=null)if(a.isBufferGeometry===!0){const l=F.getMeshLODInformation(a),u=l?Math.min(e,l.lods.length):0;s["DEBUG:LOD"]=u,l&&(t=Math.max(t,l.lods.length-1))}else s.isMaterial===!0&&(s["DEBUG:LOD"]=e)}}),e>=t&&(e=-1)},e=-1,t=2,r=!1;window.addEventListener("keyup",n=>{n.key==="p"&&i(),n.key==="w"&&(r=!r,_e&&_e.forEach(s=>{s.name!="BackgroundCubeMaterial"&&s.glyphMap==null&&"wireframe"in s&&(s.wireframe=r)}))})}function Ee(i,e,t){var n;if(!x)return;ie.has(i)||ie.set(i,{keys:[],sourceId:t});const r=ie.get(i);((n=r==null?void 0:r.keys)==null?void 0:n.includes(e))==!1&&r.keys.push(e)}const D=class D{constructor(e,t){d(this,"parser");d(this,"url");d(this,"_isLoadingMesh");d(this,"loadMesh",e=>{var r,n;if(this._isLoadingMesh)return null;const t=(n=(r=this.parser.json.meshes[e])==null?void 0:r.extensions)==null?void 0:n[X];return t?(this._isLoadingMesh=!0,this.parser.getDependency("mesh",e).then(s=>{var o;return this._isLoadingMesh=!1,s&&D.registerMesh(this.url,t.guid,s,(o=t.lods)==null?void 0:o.length,void 0,t),s})):null});x&&console.log("Progressive extension registered for",t),this.parser=e,this.url=t}get name(){return X}static getMeshLODInformation(e){const t=this.getAssignedLODInformation(e);return t!=null&&t.key?this.lodInfos.get(t.key):null}static getMaterialMinMaxLODsCount(e,t){const r=this,n="LODS:minmax",s=e[n];if(s!=null)return s;if(t||(t={min_count:1/0,max_count:0,lods:[]}),Array.isArray(e)){for(const a of e)this.getMaterialMinMaxLODsCount(a,t);return e[n]=t,t}if(x==="verbose"&&console.log("getMaterialMinMaxLODsCount",e),e.type==="ShaderMaterial"||e.type==="RawShaderMaterial"){const a=e;for(const l of Object.keys(a.uniforms)){const u=a.uniforms[l].value;(u==null?void 0:u.isTexture)===!0&&o(u,t)}}else if(e.isMaterial)for(const a of Object.keys(e)){const l=e[a];(l==null?void 0:l.isTexture)===!0&&o(l,t)}return e[n]=t,t;function o(a,l){const u=r.getAssignedLODInformation(a);if(u){const c=r.lodInfos.get(u.key);if(c&&c.lods){l.min_count=Math.min(l.min_count,c.lods.length),l.max_count=Math.max(l.max_count,c.lods.length);for(let g=0;g<c.lods.length;g++){const p=c.lods[g];p.width&&(l.lods[g]=l.lods[g]||{min_height:1/0,max_height:0},l.lods[g].min_height=Math.min(l.lods[g].min_height,p.height),l.lods[g].max_height=Math.max(l.lods[g].max_height,p.height))}}}}}static hasLODLevelAvailable(e,t){var s;if(Array.isArray(e)){for(const o of e)if(this.hasLODLevelAvailable(o,t))return!0;return!1}if(e.isMaterial===!0){for(const o of Object.keys(e)){const a=e[o];if(a&&a.isTexture&&this.hasLODLevelAvailable(a,t))return!0}return!1}else if(e.isGroup===!0){for(const o of e.children)if(o.isMesh===!0&&this.hasLODLevelAvailable(o,t))return!0}let r,n;if(e.isMesh?r=e.geometry:(e.isBufferGeometry||e.isTexture)&&(r=e),r&&(s=r==null?void 0:r.userData)!=null&&s.LODS){const o=r.userData.LODS;if(n=this.lodInfos.get(o.key),t===void 0)return n!=null;if(n)return Array.isArray(n.lods)?t<n.lods.length:t===0}return!1}static assignMeshLOD(e,t){var r;if(!e)return Promise.resolve(null);if(e instanceof y.Mesh||e.isMesh===!0){const n=e.geometry,s=this.getAssignedLODInformation(n);if(!s)return Promise.resolve(null);for(const o of Q)(r=o.onBeforeGetLODMesh)==null||r.call(o,e,t);return e["LOD:requested level"]=t,D.getOrLoadLOD(n,t).then(o=>{if(Array.isArray(o)){const a=s.index||0;o=o[a]}return e["LOD:requested level"]===t&&(delete e["LOD:requested level"],o&&n!=o&&((o==null?void 0:o.isBufferGeometry)?(e.geometry=o,x&&Ee(e,"geometry",s.url)):x&&console.error("Invalid LOD geometry",o))),o}).catch(o=>(console.error("Error loading mesh LOD",e,o),null))}else x&&console.error("Invalid call to assignMeshLOD: Request mesh LOD but the object is not a mesh",e);return Promise.resolve(null)}static assignTextureLOD(e,t=0){if(!e)return Promise.resolve(null);if(e.isMesh===!0){const r=e;if(Array.isArray(r.material)){const n=new Array;for(const s of r.material){const o=this.assignTextureLOD(s,t);n.push(o)}return Promise.all(n).then(s=>{const o=new Array;for(const a of s)Array.isArray(a)&&o.push(...a);return o})}else return this.assignTextureLOD(r.material,t)}if(e.isMaterial===!0){const r=e,n=[],s=new Array;if(x&&_e.add(r),r.uniforms&&(r.isRawShaderMaterial||r.isShaderMaterial===!0)){const o=r;for(const a of Object.keys(o.uniforms)){const l=o.uniforms[a].value;if((l==null?void 0:l.isTexture)===!0){const u=this.assignTextureLODForSlot(l,t,r,a).then(c=>(c&&o.uniforms[a].value!=c&&(o.uniforms[a].value=c,o.uniformsNeedUpdate=!0),c));n.push(u),s.push(a)}}}else for(const o of Object.keys(r)){const a=r[o];if((a==null?void 0:a.isTexture)===!0){const l=this.assignTextureLODForSlot(a,t,r,o);n.push(l),s.push(o)}}return Promise.all(n).then(o=>{const a=new Array;for(let l=0;l<o.length;l++){const u=o[l],c=s[l];u&&u.isTexture===!0?a.push({material:r,slot:c,texture:u,level:t}):a.push({material:r,slot:c,texture:null,level:t})}return a})}if(e instanceof y.Texture||e.isTexture===!0){const r=e;return this.assignTextureLODForSlot(r,t,null,null)}return Promise.resolve(null)}static assignTextureLODForSlot(e,t,r,n){return(e==null?void 0:e.isTexture)!==!0?Promise.resolve(null):n==="glyphMap"?Promise.resolve(e):D.getOrLoadLOD(e,t).then(s=>{if(Array.isArray(s))return null;if((s==null?void 0:s.isTexture)===!0){if(s!=e){if(r&&n){const o=r[n];if(o&&!x){const a=this.getAssignedLODInformation(o);if(a&&(a==null?void 0:a.level)<t)return x==="verbose"&&console.warn("Assigned texture level is already higher: ",a.level,t,r,o,s),null}r[n]=s}if(x&&n&&r){const o=this.getAssignedLODInformation(e);o?Ee(r,n,o.url):console.warn("No LOD info for texture",e)}}return s}else x=="verbose"&&console.warn("No LOD found for",e,t);return null}).catch(s=>(console.error("Error loading LOD",e,s),null))}afterRoot(e){var t,r;return x&&console.log("AFTER",this.url,e),(t=this.parser.json.textures)==null||t.forEach((n,s)=>{var o;if(n!=null&&n.extensions){const a=n==null?void 0:n.extensions[X];if(a){if(!a.lods){x&&console.warn("Texture has no LODs",a);return}let l=!1;for(const u of this.parser.associations.keys())if(u.isTexture===!0){const c=this.parser.associations.get(u);(c==null?void 0:c.textures)===s&&(l=!0,D.registerTexture(this.url,u,(o=a.lods)==null?void 0:o.length,s,a))}l||this.parser.getDependency("texture",s).then(u=>{var c;u&&D.registerTexture(this.url,u,(c=a.lods)==null?void 0:c.length,s,a)})}}}),(r=this.parser.json.meshes)==null||r.forEach((n,s)=>{if(n!=null&&n.extensions){const o=n==null?void 0:n.extensions[X];if(o&&o.lods){for(const a of this.parser.associations.keys())if(a.isMesh){const l=this.parser.associations.get(a);(l==null?void 0:l.meshes)===s&&D.registerMesh(this.url,o.guid,a,o.lods.length,l.primitives,o)}}}}),null}static async getOrLoadLOD(e,t){var a,l,u,c;const r=x=="verbose",n=e.userData.LODS;if(!n)return null;const s=n==null?void 0:n.key;let o;if(e.isTexture===!0){const g=e;g.source&&g.source[xe]&&(o=g.source[xe])}if(o||(o=D.lodInfos.get(s)),o){if(t>0){let O=!1;const _=Array.isArray(o.lods);if(_&&t>=o.lods.length?O=!0:_||(O=!0),O)return this.lowresCache.get(s)}const g=Array.isArray(o.lods)?(a=o.lods[t])==null?void 0:a.path:o.lods;if(!g)return x&&!o["missing:uri"]&&(o["missing:uri"]=!0,console.warn("Missing uri for progressive asset for LOD "+t,o)),null;const p=He(n.url,g);if(p.endsWith(".glb")||p.endsWith(".gltf")){if(!o.guid)return console.warn("missing pointer for glb/gltf texture",o),null;const O=p+"_"+o.guid,_=this.previouslyLoaded.get(O);if(_!==void 0){r&&console.log(`LOD ${t} was already loading/loaded: ${O}`);let h=await _.catch(V=>(console.error(`Error loading LOD ${t} from ${p}
|
|
2
|
-
`,V),null)),R=!1;if(h==null||(h instanceof y.Texture&&e instanceof y.Texture?(l=h.image)!=null&&l.data||(u=h.source)!=null&&u.data?h=this.copySettings(e,h):(R=!0,this.previouslyLoaded.delete(O)):h instanceof y.BufferGeometry&&e instanceof y.BufferGeometry&&((c=h.attributes.position)!=null&&c.array||(R=!0,this.previouslyLoaded.delete(O)))),!R)return h}const M=o,U=new Promise(async(h,R)=>{const V=new Z.GLTFLoader;Se(V),x&&(await new Promise(T=>setTimeout(T,1e3)),r&&console.warn("Start loading (delayed) "+p,M.guid));let k=p;if(M&&Array.isArray(M.lods)){const T=M.lods[t];T.hash&&(k+="?v="+T.hash)}const P=await V.loadAsync(k).catch(T=>(console.error(`Error loading LOD ${t} from ${p}
|
|
3
|
-
`,T),null));if(!P)return null;const W=P.parser;r&&console.log("Loading finished "+p,M.guid);let S=0;if(P.parser.json.textures){let T=!1;for(const f of P.parser.json.textures){if(f!=null&&f.extensions){const L=f==null?void 0:f.extensions[X];if(L!=null&&L.guid&&L.guid===M.guid){T=!0;break}}S++}if(T){let f=await W.getDependency("texture",S);return f&&D.assignLODInformation(n.url,f,s,t,void 0,void 0),r&&console.log('change "'+e.name+'" → "'+f.name+'"',p,S,f,O),e instanceof y.Texture&&(f=this.copySettings(e,f)),f&&(f.guid=M.guid),h(f)}else x&&console.warn("Could not find texture with guid",M.guid,P.parser.json)}if(S=0,P.parser.json.meshes){let T=!1;for(const f of P.parser.json.meshes){if(f!=null&&f.extensions){const L=f==null?void 0:f.extensions[X];if(L!=null&&L.guid&&L.guid===M.guid){T=!0;break}}S++}if(T){const f=await W.getDependency("mesh",S),L=M;if(r&&console.log(`Loaded Mesh "${f.name}"`,p,S,f,O),f.isMesh===!0){const b=f.geometry;return D.assignLODInformation(n.url,b,s,t,void 0,L.density),h(b)}else{const b=new Array;for(let A=0;A<f.children.length;A++){const E=f.children[A];if(E.isMesh===!0){const Y=E.geometry;D.assignLODInformation(n.url,Y,s,t,A,L.density),b.push(Y)}}return h(b)}}else x&&console.warn("Could not find mesh with guid",M.guid,P.parser.json)}return h(null)});return this.previouslyLoaded.set(O,U),await U}else if(e instanceof y.Texture){r&&console.log("Load texture from uri: "+p);const _=await new y.TextureLoader().loadAsync(p);return _?(_.guid=o.guid,_.flipY=!1,_.needsUpdate=!0,_.colorSpace=e.colorSpace,r&&console.log(o,_)):x&&console.warn("failed loading",p),_}}else x&&console.warn(`Can not load LOD ${t}: no LOD info found for "${s}" ${e.name}`,e.type);return null}static assignLODInformation(e,t,r,n,s,o){if(!t)return;t.userData||(t.userData={});const a=new tt(e,r,n,s,o);t.userData.LODS=a}static getAssignedLODInformation(e){var t;return((t=e==null?void 0:e.userData)==null?void 0:t.LODS)||null}static copySettings(e,t){return t?(x&&console.warn(`Copy texture settings
|
|
4
|
-
`,e.uuid,`
|
|
5
|
-
`,t.uuid),t=t.clone(),t.offset=e.offset,t.repeat=e.repeat,t.colorSpace=e.colorSpace,t.magFilter=e.magFilter,t.minFilter=e.minFilter,t.wrapS=e.wrapS,t.wrapT=e.wrapT,t.flipY=e.flipY,t.anisotropy=e.anisotropy,t.mipmaps||(t.generateMipmaps=e.generateMipmaps),t):e}};d(D,"registerTexture",(e,t,r,n,s)=>{if(x&&console.log("> Progressive: register texture",n,t.name,t.uuid,t,s),!t){x&&console.error("gltf-progressive: Register texture without texture");return}t.source&&(t.source[xe]=s);const o=s.guid;D.assignLODInformation(e,t,o,r,n,void 0),D.lodInfos.set(o,s),D.lowresCache.set(o,t)}),d(D,"registerMesh",(e,t,r,n,s,o)=>{var u;x&&console.log("> Progressive: register mesh",s,r.name,o,r.uuid,r);const a=r.geometry;if(!a){x&&console.warn("gltf-progressive: Register mesh without geometry");return}a.userData||(a.userData={}),D.assignLODInformation(e,a,t,n,s,o.density),D.lodInfos.set(t,o);let l=D.lowresCache.get(t);l?l.push(r.geometry):l=[r.geometry],D.lowresCache.set(t,l),n>0&&!re(r)&&Ze(r,a);for(const c of Q)(u=c.onRegisteredNewMesh)==null||u.call(c,r,o)}),d(D,"lodInfos",new Map),d(D,"previouslyLoaded",new Map),d(D,"lowresCache",new Map);let F=D;class tt{constructor(e,t,r,n,s){d(this,"url");d(this,"key");d(this,"level");d(this,"index");d(this,"density");this.url=e,this.key=t,this.level=r,n!=null&&(this.index=n),s!=null&&(this.density=s)}}const G=le("debugprogressive"),rt=le("noprogressive"),De=Symbol("Needle:LODSManager"),Me=Symbol("Needle:LODState"),J=Symbol("Needle:CurrentLOD"),I={mesh_lod:-1,texture_lod:-1};var v,C,q,ge,ee,te,pe,K;let ae=(v=class{constructor(e,t){d(this,"context");d(this,"renderer");d(this,"projectionScreenMatrix",new y.Matrix4);d(this,"targetTriangleDensity",2e5);d(this,"updateInterval","auto");H(this,C,1);d(this,"pause",!1);d(this,"manual",!1);d(this,"_lodchangedlisteners",[]);H(this,q);H(this,ge,new y.Clock);H(this,ee,0);H(this,te,0);H(this,pe,0);H(this,K,0);d(this,"_fpsBuffer",[60,60,60,60,60]);d(this,"_sphere",new y.Sphere);d(this,"_tempBox",new y.Box3);d(this,"_tempBox2",new y.Box3);d(this,"tempMatrix",new y.Matrix4);d(this,"_tempWorldPosition",new y.Vector3);d(this,"_tempBoxSize",new y.Vector3);d(this,"_tempBox2Size",new y.Vector3);this.renderer=e,this.context={...t}}static getObjectLODState(e){return e[Me]}static addPlugin(e){Q.push(e)}static removePlugin(e){const t=Q.indexOf(e);t>=0&&Q.splice(t,1)}static get(e,t){if(e[De])return console.debug("[gltf-progressive] LODsManager already exists for this renderer"),e[De];const r=new v(e,{engine:"unknown",...t});return e[De]=r,r}get plugins(){return Q}addEventListener(e,t){e==="changed"&&this._lodchangedlisteners.push(t)}removeEventListener(e,t){if(e==="changed"){const r=this._lodchangedlisteners.indexOf(t);r>=0&&this._lodchangedlisteners.splice(r,1)}}enable(){if(m(this,q))return;console.debug("[gltf-progressive] Enabling LODsManager for renderer");let e=0;N(this,q,this.renderer.render);const t=this;be(this.renderer),this.renderer.render=function(r,n){const s=t.renderer.getRenderTarget();(s==null||"isXRRenderTarget"in s&&s.isXRRenderTarget)&&(e=0,N(t,ee,m(t,ee)+1),N(t,te,m(t,ge).getDelta()),N(t,pe,m(t,pe)+m(t,te)),t._fpsBuffer.shift(),t._fpsBuffer.push(1/m(t,te)),N(t,K,t._fpsBuffer.reduce((a,l)=>a+l)/t._fpsBuffer.length),G&&m(t,ee)%200===0&&console.log("FPS",Math.round(m(t,K)),"Interval:",m(t,C)));const o=e++;m(t,q).call(this,r,n),t.onAfterRender(r,n,o)}}disable(){m(this,q)&&(console.debug("[gltf-progressive] Disabling LODsManager for renderer"),this.renderer.render=m(this,q),N(this,q,void 0))}update(e,t){this.internalUpdate(e,t)}onAfterRender(e,t,r){if(this.pause)return;const s=this.renderer.renderLists.get(e,0).opaque;let o=!0;if(s.length===1){const a=s[0].material;(a.name==="EffectMaterial"||a.name==="CopyShader")&&(o=!1)}if((t.parent&&t.parent.type==="CubeCamera"||r>=1&&t.type==="OrthographicCamera")&&(o=!1),o){if(rt||(this.updateInterval==="auto"?m(this,K)<40&&m(this,C)<10?(N(this,C,m(this,C)+1),G&&console.warn("↓ Reducing LOD updates",m(this,C),m(this,K).toFixed(0))):m(this,K)>=60&&m(this,C)>1&&(N(this,C,m(this,C)-1),G&&console.warn("↑ Increasing LOD updates",m(this,C),m(this,K).toFixed(0))):N(this,C,this.updateInterval),m(this,C)>0&&m(this,ee)%m(this,C)!=0))return;this.internalUpdate(e,t)}}internalUpdate(e,t){var l,u;const r=this.renderer.renderLists.get(e,0),n=r.opaque;this.projectionScreenMatrix.multiplyMatrices(t.projectionMatrix,t.matrixWorldInverse);const s=this.targetTriangleDensity;for(const c of n){if(c.material&&(((l=c.geometry)==null?void 0:l.type)==="BoxGeometry"||((u=c.geometry)==null?void 0:u.type)==="BufferGeometry")&&(c.material.name==="SphericalGaussianBlur"||c.material.name=="BackgroundCubeMaterial"||c.material.name==="CubemapFromEquirect"||c.material.name==="EquirectangularToCubeUV")){G&&(c.material["NEEDLE_PROGRESSIVE:IGNORE-WARNING"]||(c.material["NEEDLE_PROGRESSIVE:IGNORE-WARNING"]=!0,console.warn("Ignoring skybox or BLIT object",c,c.material.name,c.material.type)));continue}switch(c.material.type){case"LineBasicMaterial":case"LineDashedMaterial":case"PointsMaterial":case"ShadowMaterial":case"MeshDistanceMaterial":case"MeshDepthMaterial":continue}if(G==="color"&&c.material&&!c.object.progressive_debug_color){c.object.progressive_debug_color=!0;const p=Math.random()*16777215,O=new y.MeshStandardMaterial({color:p});c.object.material=O}const g=c.object;(g instanceof y.Mesh||g.isMesh)&&this.updateLODs(e,t,g,s)}const o=r.transparent;for(const c of o){const g=c.object;(g instanceof y.Mesh||g.isMesh)&&this.updateLODs(e,t,g,s)}const a=r.transmissive;for(const c of a){const g=c.object;(g instanceof y.Mesh||g.isMesh)&&this.updateLODs(e,t,g,s)}}updateLODs(e,t,r,n){var a,l;r.userData||(r.userData={});let s=r[Me];if(s||(s=new st,r[Me]=s),s.frames++<2)return;for(const u of Q)(a=u.onBeforeUpdateLOD)==null||a.call(u,this.renderer,e,t,r);this.calculateLodLevel(t,r,s,n,I),I.mesh_lod=Math.round(I.mesh_lod),I.texture_lod=Math.round(I.texture_lod),I.mesh_lod>=0&&this.loadProgressiveMeshes(r,I.mesh_lod);let o=I.texture_lod;r.material&&o>=0&&this.loadProgressiveTextures(r.material,o);for(const u of Q)(l=u.onAfterUpdatedLOD)==null||l.call(u,this.renderer,e,t,r,I);s.lastLodLevel_Mesh=I.mesh_lod,s.lastLodLevel_Texture=I.texture_lod}loadProgressiveTextures(e,t){if(!e)return;if(Array.isArray(e)){for(const s of e)this.loadProgressiveTextures(s,t);return}let r=!1;(e[J]===void 0||t<e[J])&&(r=!0);const n=e["DEBUG:LOD"];n!=null&&(r=e[J]!=n,t=n),r&&(e[J]=t,F.assignTextureLOD(e,t).then(s=>{this._lodchangedlisteners.forEach(o=>o({type:"texture",level:t,object:e}))}))}loadProgressiveMeshes(e,t){if(!e)return Promise.resolve(null);let r=e[J]!==t;const n=e["DEBUG:LOD"];if(n!=null&&(r=e[J]!=n,t=n),r){e[J]=t;const s=e.geometry;return F.assignMeshLOD(e,t).then(o=>(o&&e[J]==t&&s!=e.geometry&&this._lodchangedlisteners.forEach(a=>a({type:"mesh",level:t,object:e})),o))}return Promise.resolve(null)}static isInside(e,t){const r=e.min,n=e.max,s=(r.x+n.x)*.5,o=(r.y+n.y)*.5;return this._tempPtInside.set(s,o,r.z).applyMatrix4(t).z<0}calculateLodLevel(e,t,r,n,s){var U;if(!t){s.mesh_lod=-1,s.texture_lod=-1;return}if(!e){s.mesh_lod=-1,s.texture_lod=-1;return}let a=10+1,l=!1;if(G&&t["DEBUG:LOD"]!=null)return t["DEBUG:LOD"];const u=F.getMeshLODInformation(t.geometry),c=u==null?void 0:u.lods,g=c&&c.length>0,p=F.getMaterialMinMaxLODsCount(t.material),O=(p==null?void 0:p.min_count)!=1/0&&p.min_count>0&&p.max_count>0;if(!g&&!O){s.mesh_lod=0,s.texture_lod=0;return}g||(l=!0,a=0);const _=this.renderer.domElement.clientHeight||this.renderer.domElement.height;let M=t.geometry.boundingBox;if(t.type==="SkinnedMesh"){const w=t;if(!w.boundingBox)w.computeBoundingBox();else if(r.frames%30===0){const h=re(w),R=w.geometry;h&&(w.geometry=h),w.computeBoundingBox(),w.geometry=R}M=w.boundingBox}if(M){const w=e;if(t.geometry.attributes.color&&t.geometry.attributes.color.count<100&&t.geometry.boundingSphere){this._sphere.copy(t.geometry.boundingSphere),this._sphere.applyMatrix4(t.matrixWorld);const f=e.getWorldPosition(this._tempWorldPosition);if(this._sphere.containsPoint(f)){s.mesh_lod=0,s.texture_lod=0;return}}if(this._tempBox.copy(M),this._tempBox.applyMatrix4(t.matrixWorld),w.isPerspectiveCamera&&v.isInside(this._tempBox,this.projectionScreenMatrix)){s.mesh_lod=0,s.texture_lod=0;return}if(this._tempBox.applyMatrix4(this.projectionScreenMatrix),this.renderer.xr.enabled&&w.isPerspectiveCamera&&w.fov>70){const f=this._tempBox.min,L=this._tempBox.max;let b=f.x,A=f.y,E=L.x,Y=L.y;const ce=2,ye=1.5,ue=(f.x+L.x)*.5,fe=(f.y+L.y)*.5;b=(b-ue)*ce+ue,A=(A-fe)*ce+fe,E=(E-ue)*ce+ue,Y=(Y-fe)*ce+fe;const Ve=b<0&&E>0?0:Math.min(Math.abs(f.x),Math.abs(L.x)),Ne=A<0&&Y>0?0:Math.min(Math.abs(f.y),Math.abs(L.y)),Le=Math.max(Ve,Ne);r.lastCentrality=(ye-Le)*(ye-Le)*(ye-Le)}else r.lastCentrality=1;const h=this._tempBox.getSize(this._tempBoxSize);h.multiplyScalar(.5),screen.availHeight>0&&_>0&&h.multiplyScalar(_/screen.availHeight),e.isPerspectiveCamera?h.x*=e.aspect:e.isOrthographicCamera;const R=e.matrixWorldInverse,V=this._tempBox2;V.copy(M),V.applyMatrix4(t.matrixWorld),V.applyMatrix4(R);const k=V.getSize(this._tempBox2Size),P=Math.max(k.x,k.y);if(Math.max(h.x,h.y)!=0&&P!=0&&(h.z=k.z/Math.max(k.x,k.y)*Math.max(h.x,h.y)),r.lastScreenCoverage=Math.max(h.x,h.y,h.z),r.lastScreenspaceVolume.copy(h),r.lastScreenCoverage*=r.lastCentrality,G&&v.debugDrawLine){const f=this.tempMatrix.copy(this.projectionScreenMatrix);f.invert();const L=v.corner0,b=v.corner1,A=v.corner2,E=v.corner3;L.copy(this._tempBox.min),b.copy(this._tempBox.max),b.x=L.x,A.copy(this._tempBox.max),A.y=L.y,E.copy(this._tempBox.max);const Y=(L.z+E.z)*.5;L.z=b.z=A.z=E.z=Y,L.applyMatrix4(f),b.applyMatrix4(f),A.applyMatrix4(f),E.applyMatrix4(f),v.debugDrawLine(L,b,255),v.debugDrawLine(L,A,255),v.debugDrawLine(b,E,255),v.debugDrawLine(A,E,255)}let S=999;if(c&&r.lastScreenCoverage>0){for(let f=0;f<c.length;f++)if(c[f].density/r.lastScreenCoverage<n){S=f;break}}S<a&&(a=S,l=!0)}if(l?s.mesh_lod=a:s.mesh_lod=r.lastLodLevel_Mesh,G&&s.mesh_lod!=r.lastLodLevel_Mesh){const h=c==null?void 0:c[s.mesh_lod];h&&console.log(`Mesh LOD changed: ${r.lastLodLevel_Mesh} → ${s.mesh_lod} (${h.density.toFixed(0)}) - ${t.name}`)}if(O){const w="saveData"in globalThis.navigator&&globalThis.navigator.saveData===!0;if(r.lastLodLevel_Texture<0){if(s.texture_lod=p.max_count-1,G){const h=p.lods[p.max_count-1];G&&console.log(`First Texture LOD ${s.texture_lod} (${h.max_height}px) - ${t.name}`)}}else{const h=r.lastScreenspaceVolume.x+r.lastScreenspaceVolume.y+r.lastScreenspaceVolume.z;let R=r.lastScreenCoverage*4;((U=this.context)==null?void 0:U.engine)==="model-viewer"&&(R*=1.5);const k=_/window.devicePixelRatio*R;let P=!1;for(let W=p.lods.length-1;W>=0;W--){let S=p.lods[W];if(!(w&&S.max_height>=2048)&&!(Je()&&S.max_height>4096)&&(S.max_height>k||!P&&W===0)){if(P=!0,s.texture_lod=W,s.texture_lod<r.lastLodLevel_Texture){const T=S.max_height;G&&console.log(`Texture LOD changed: ${r.lastLodLevel_Texture} → ${s.texture_lod} = ${T}px
|
|
6
|
-
Screensize: ${k.toFixed(0)}px, Coverage: ${(100*r.lastScreenCoverage).toFixed(2)}%, Volume ${h.toFixed(1)}
|
|
7
|
-
${t.name}`)}break}}}}else s.texture_lod=0}},C=new WeakMap,q=new WeakMap,ge=new WeakMap,ee=new WeakMap,te=new WeakMap,pe=new WeakMap,K=new WeakMap,d(v,"debugDrawLine"),d(v,"corner0",new y.Vector3),d(v,"corner1",new y.Vector3),d(v,"corner2",new y.Vector3),d(v,"corner3",new y.Vector3),d(v,"_tempPtInside",new y.Vector3),v);class st{constructor(){d(this,"frames",0);d(this,"lastLodLevel_Mesh",-1);d(this,"lastLodLevel_Texture",-1);d(this,"lastScreenCoverage",0);d(this,"lastScreenspaceVolume",new y.Vector3);d(this,"lastCentrality",0)}}const Ce=Symbol("NEEDLE_mesh_lod"),de=Symbol("NEEDLE_texture_lod");let ne=null;function Fe(){const i=ot();i&&(i.mapURLs(function(e){return Be(),e}),Be(),ne==null||ne.disconnect(),ne=new MutationObserver(e=>{e.forEach(t=>{t.addedNodes.forEach(r=>{r instanceof HTMLElement&&r.tagName.toLowerCase()==="model-viewer"&&Ue(r)})})}),ne.observe(document,{childList:!0,subtree:!0}))}function ot(){if(typeof customElements>"u")return null;const i=customElements.get("model-viewer");return i||(customElements.whenDefined("model-viewer").then(()=>{console.debug("[gltf-progressive] model-viewer defined"),Fe()}),null)}function Be(){if(typeof document>"u")return;document.querySelectorAll("model-viewer").forEach(e=>{Ue(e)})}const Re=new WeakSet;let nt=0;function Ue(i){if(!i||Re.has(i))return null;Re.add(i),console.debug("[gltf-progressive] found new model-viewer..."+ ++nt+`
|
|
8
|
-
`,i.getAttribute("src"));let e=null,t=null,r=null;for(let n=i;n!=null;n=Object.getPrototypeOf(n)){const s=Object.getOwnPropertySymbols(n),o=s.find(u=>u.toString()=="Symbol(renderer)"),a=s.find(u=>u.toString()=="Symbol(scene)"),l=s.find(u=>u.toString()=="Symbol(needsRender)");!e&&o!=null&&(e=i[o].threeRenderer),!t&&a!=null&&(t=i[a]),!r&&l!=null&&(r=i[l])}if(e&&t){let n=function(){if(r){let o=0,a=setInterval(()=>{if(o++>5){clearInterval(a);return}r==null||r.call(i)},300)}};console.debug("[gltf-progressive] setup model-viewer");const s=ae.get(e,{engine:"model-viewer"});return ae.addPlugin(new it),s.enable(),s.addEventListener("changed",()=>{r==null||r.call(i)}),i.addEventListener("model-visibility",o=>{o.detail.visible&&(r==null||r.call(i))}),i.addEventListener("load",()=>{n()}),()=>{s.disable()}}return null}class it{constructor(){d(this,"_didWarnAboutMissingUrl",!1)}onBeforeUpdateLOD(e,t,r,n){this.tryParseMeshLOD(t,n),this.tryParseTextureLOD(t,n)}getUrl(e){if(!e)return null;let t=e.getAttribute("src");return t||(t=e.src),t||(this._didWarnAboutMissingUrl||console.warn("No url found in modelviewer",e),this._didWarnAboutMissingUrl=!0),t}tryGetCurrentGLTF(e){return e._currentGLTF}tryGetCurrentModelViewer(e){return e.element}tryParseTextureLOD(e,t){if(t[de]==!0)return;t[de]=!0;const r=this.tryGetCurrentGLTF(e),n=this.tryGetCurrentModelViewer(e),s=this.getUrl(n);if(s&&r&&t.material){let o=function(l){var c,g,p;if(l[de]==!0)return;l[de]=!0,l.userData&&(l.userData.LOD=-1);const u=Object.keys(l);for(let O=0;O<u.length;O++){const _=u[O],M=l[_];if((M==null?void 0:M.isTexture)===!0){const U=(g=(c=M.userData)==null?void 0:c.associations)==null?void 0:g.textures;if(U==null)continue;const w=r.parser.json.textures[U];if(!w){console.warn("Texture data not found for texture index "+U);continue}if((p=w==null?void 0:w.extensions)!=null&&p[X]){const h=w.extensions[X];h&&s&&F.registerTexture(s,M,h.lods.length,U,h)}}}};const a=t.material;if(Array.isArray(a))for(const l of a)o(l);else o(a)}}tryParseMeshLOD(e,t){var o,a;if(t[Ce]==!0)return;t[Ce]=!0;const r=this.tryGetCurrentModelViewer(e),n=this.getUrl(r);if(!n)return;const s=(a=(o=t.userData)==null?void 0:o.gltfExtensions)==null?void 0:a[X];if(s&&n){const l=t.uuid;F.registerMesh(n,l,t,0,s.lods.length,s)}}}function at(i,e,t,r){be(e),Se(t),Te(t,{progressive:!0,...r==null?void 0:r.hints}),t.register(s=>new F(s,i));const n=ae.get(e);return(r==null?void 0:r.enableLODsManager)!==!1&&n.enable(),n}Fe();if(!Qe){const i={gltfProgressive:{useNeedleProgressive:at,LODsManager:ae,configureLoader:Te,getRaycastMesh:re,useRaycastMeshes:je}};if(!globalThis.Needle)globalThis.Needle=i;else for(const e in i)globalThis.Needle[e]=i[e]}exports.LODsManager=ae;exports.NEEDLE_progressive=F;exports.addDracoAndKTX2Loaders=Se;exports.configureLoader=Te;exports.createLoaders=be;exports.getRaycastMesh=re;exports.setDracoDecoderLocation=Ge;exports.setKTX2TranscoderLocation=Ie;
|