@needle-tools/engine 2.24.0-pre → 2.25.1-pre
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 +10 -0
- package/dist/needle-engine.d.ts +11 -4
- package/dist/needle-engine.js +359 -359
- package/dist/needle-engine.js.map +3 -3
- package/dist/needle-engine.min.js +43 -43
- package/dist/needle-engine.min.js.map +3 -3
- package/lib/engine/debug/error_overlay.js +5 -1
- package/lib/engine/debug/error_overlay.js.map +1 -1
- package/lib/engine/engine_element.d.ts +4 -2
- package/lib/engine/engine_element.js +76 -57
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_element_overlay.d.ts +4 -2
- package/lib/engine/engine_element_overlay.js +17 -4
- package/lib/engine/engine_element_overlay.js.map +1 -1
- package/lib/engine/engine_loaders.d.ts +3 -0
- package/lib/engine/engine_loaders.js +33 -0
- package/lib/engine/engine_loaders.js.map +1 -1
- package/lib/engine/engine_setup.js +2 -1
- package/lib/engine/engine_setup.js.map +1 -1
- package/lib/engine-components/DropListener.js +1 -1
- package/lib/engine-components/DropListener.js.map +1 -1
- package/lib/engine-components/timeline/TimelineTracks.js +30 -13
- package/lib/engine-components/timeline/TimelineTracks.js.map +1 -1
- package/lib/needle-engine.js +7 -0
- package/lib/needle-engine.js.map +1 -1
- package/package.json +3 -3
- package/src/engine/debug/error_overlay.ts +5 -1
- package/src/engine/engine_element.ts +71 -60
- package/src/engine/engine_element_overlay.ts +19 -3
- package/src/engine/engine_loaders.ts +32 -1
- package/src/engine/engine_setup.ts +2 -1
- package/src/engine/extensions/EXT_texture_exr.js +1 -0
- package/src/engine-components/DropListener.ts +1 -1
- package/src/engine-components/timeline/TimelineTracks.ts +29 -13
- package/src/needle-engine.ts +8 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getParam } from "../engine_utils";
|
|
2
2
|
import { isLocalNetwork } from "../engine_networking_utils";
|
|
3
3
|
import { Context } from "../engine_setup";
|
|
4
|
+
import { arContainerClassName } from "../engine_element_overlay";
|
|
4
5
|
const debug = getParam("debugdebug");
|
|
5
6
|
const hide = getParam("noerrors");
|
|
6
7
|
const errorContainer = new Map();
|
|
@@ -37,7 +38,8 @@ function handleLog(type, message, _file, _line) {
|
|
|
37
38
|
if (Array.isArray(message)) {
|
|
38
39
|
message = message.join(" ");
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
+
const container = context.domElement;
|
|
42
|
+
appendErrorMessageToDomElement(container, message);
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
function getLocation(err) {
|
|
@@ -56,6 +58,8 @@ function getErrorContainer(domElement) {
|
|
|
56
58
|
}
|
|
57
59
|
else {
|
|
58
60
|
const container = document.createElement("div");
|
|
61
|
+
container.classList.add(arContainerClassName);
|
|
62
|
+
container.classList.add("desktop");
|
|
59
63
|
container.style.position = "absolute";
|
|
60
64
|
container.style.top = "0";
|
|
61
65
|
container.style.left = "0";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error_overlay.js","sourceRoot":"","sources":["../../../../engine/debug/error_overlay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"error_overlay.js","sourceRoot":"","sources":["../../../../engine/debug/error_overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,12 @@ export declare class EngineElement extends HTMLElement {
|
|
|
3
3
|
get loadingProgress01(): number;
|
|
4
4
|
get loadingFinished(): boolean;
|
|
5
5
|
getContext(): Promise<Context>;
|
|
6
|
+
get Context(): Context | null;
|
|
6
7
|
/**@obsolete use GameObject */
|
|
7
8
|
private gameObject;
|
|
8
9
|
private GameObject;
|
|
9
|
-
private
|
|
10
|
-
private
|
|
10
|
+
private _context;
|
|
11
|
+
private _overlay_ar;
|
|
11
12
|
private _loadingProgress01;
|
|
12
13
|
private _watcher?;
|
|
13
14
|
private _loadingView?;
|
|
@@ -29,4 +30,5 @@ export declare class EngineElement extends HTMLElement {
|
|
|
29
30
|
private onSetupDesktop;
|
|
30
31
|
private setupElementsForMode;
|
|
31
32
|
private foreachHtmlElement;
|
|
33
|
+
private onBeforeBeginLoading;
|
|
32
34
|
}
|
|
@@ -4,7 +4,9 @@ import { GameObject } from "../engine-components/Component";
|
|
|
4
4
|
import { loadSync } from "./engine_scenetools";
|
|
5
5
|
import { processNewScripts } from "./engine_mainloop_utils";
|
|
6
6
|
import { calculateProgress01, EngineLoadingView } from "./engine_element_loading";
|
|
7
|
-
import { delay } from "./engine_utils";
|
|
7
|
+
import { delay, getParam } from "./engine_utils";
|
|
8
|
+
import { setDracoDecoderPath, setDracoDecoderType, setKtx2TranscoderPath } from "./engine_loaders";
|
|
9
|
+
const debug = getParam("debugwebcomponent");
|
|
8
10
|
class EngineElementSourceFileWatcher {
|
|
9
11
|
id;
|
|
10
12
|
context;
|
|
@@ -61,31 +63,32 @@ export class EngineElement extends HTMLElement {
|
|
|
61
63
|
get loadingFinished() { return this.loadingProgress01 > .999; }
|
|
62
64
|
getContext() {
|
|
63
65
|
return new Promise((res, _rej) => {
|
|
64
|
-
if (this.
|
|
65
|
-
res(this.
|
|
66
|
+
if (this._context && this.loadingFinished) {
|
|
67
|
+
res(this._context);
|
|
66
68
|
}
|
|
67
69
|
else {
|
|
68
70
|
const cb = () => {
|
|
69
71
|
this.removeEventListener("loadfinished", cb);
|
|
70
|
-
if (this.
|
|
71
|
-
res(this.
|
|
72
|
+
if (this._context && this.loadingFinished) {
|
|
73
|
+
res(this._context);
|
|
72
74
|
}
|
|
73
75
|
};
|
|
74
76
|
this.addEventListener("loadfinished", cb);
|
|
75
77
|
}
|
|
76
78
|
});
|
|
77
79
|
}
|
|
80
|
+
get Context() { return this._context; }
|
|
78
81
|
/**@obsolete use GameObject */
|
|
79
82
|
gameObject = GameObject; // used to access static methods from regular js
|
|
80
83
|
GameObject = GameObject;
|
|
81
|
-
|
|
82
|
-
|
|
84
|
+
_context = null;
|
|
85
|
+
_overlay_ar;
|
|
83
86
|
_loadingProgress01 = 0;
|
|
84
87
|
_watcher;
|
|
85
88
|
_loadingView;
|
|
86
89
|
constructor() {
|
|
87
90
|
super();
|
|
88
|
-
this.
|
|
91
|
+
this._overlay_ar = new AROverlayHandler();
|
|
89
92
|
}
|
|
90
93
|
async connectedCallback() {
|
|
91
94
|
this.onSetupDesktop();
|
|
@@ -104,8 +107,8 @@ export class EngineElement extends HTMLElement {
|
|
|
104
107
|
if (srcAttributeValue)
|
|
105
108
|
src = srcAttributeValue;
|
|
106
109
|
const alias = this.getAttribute("alias");
|
|
107
|
-
this.
|
|
108
|
-
this._watcher = new EngineElementSourceFileWatcher(this.getAttribute("id") ?? alias ?? "", this.
|
|
110
|
+
this._context = new Context({ name: src, domElement: this, alias: alias });
|
|
111
|
+
this._watcher = new EngineElementSourceFileWatcher(this.getAttribute("id") ?? alias ?? "", this._context);
|
|
109
112
|
if (src && src.length > 0) {
|
|
110
113
|
// try to get the load function
|
|
111
114
|
// HACK: if no explicit glb is assigned we have to wait for the codegen function to be available
|
|
@@ -139,7 +142,7 @@ export class EngineElement extends HTMLElement {
|
|
|
139
142
|
// default loading can be overriden by calling preventDefault in the onload start event
|
|
140
143
|
const useDefaultLoading = this.dispatchEvent(new CustomEvent("loadstart", {
|
|
141
144
|
detail: {
|
|
142
|
-
context: this.
|
|
145
|
+
context: this._context,
|
|
143
146
|
alias: alias
|
|
144
147
|
},
|
|
145
148
|
cancelable: true
|
|
@@ -155,7 +158,7 @@ export class EngineElement extends HTMLElement {
|
|
|
155
158
|
this._loadingView?.onLoadingUpdate(progress, message);
|
|
156
159
|
this.dispatchEvent(new CustomEvent("progress", {
|
|
157
160
|
detail: {
|
|
158
|
-
context: this.
|
|
161
|
+
context: this._context,
|
|
159
162
|
name: progress.name,
|
|
160
163
|
progress: progress.progress,
|
|
161
164
|
index: progress.index,
|
|
@@ -164,7 +167,8 @@ export class EngineElement extends HTMLElement {
|
|
|
164
167
|
}
|
|
165
168
|
}));
|
|
166
169
|
};
|
|
167
|
-
|
|
170
|
+
this.onBeforeBeginLoading();
|
|
171
|
+
await this._context.onCreate(fn, { progress: loadingCallback });
|
|
168
172
|
const file = srcFile();
|
|
169
173
|
if (file) {
|
|
170
174
|
// only if we didnt load this file here already
|
|
@@ -179,7 +183,7 @@ export class EngineElement extends HTMLElement {
|
|
|
179
183
|
console.log("Needle Engine: finished loading", alias ?? "");
|
|
180
184
|
this.dispatchEvent(new CustomEvent("loadfinished", {
|
|
181
185
|
detail: {
|
|
182
|
-
context: this.
|
|
186
|
+
context: this._context,
|
|
183
187
|
src: alias ?? src
|
|
184
188
|
}
|
|
185
189
|
}));
|
|
@@ -195,12 +199,12 @@ export class EngineElement extends HTMLElement {
|
|
|
195
199
|
}
|
|
196
200
|
}
|
|
197
201
|
disconnectedCallback() {
|
|
198
|
-
if (this.
|
|
199
|
-
this.
|
|
202
|
+
if (this._context) {
|
|
203
|
+
this._context.onDestroy();
|
|
200
204
|
}
|
|
201
205
|
}
|
|
202
206
|
static get observedAttributes() {
|
|
203
|
-
return ["src", "loadfinished"];
|
|
207
|
+
return ["src", "loadstart", "progress", "loadfinished", "dracoDecoderPath", "dracoDecoderType", "ktx2DecoderPath"];
|
|
204
208
|
}
|
|
205
209
|
attributeChangedCallback(name, _oldValue, newValue) {
|
|
206
210
|
// console.log(name, oldValue, newValue);
|
|
@@ -208,11 +212,34 @@ export class EngineElement extends HTMLElement {
|
|
|
208
212
|
case "src":
|
|
209
213
|
this._watcher?.onSourceChanged(newValue);
|
|
210
214
|
break;
|
|
215
|
+
case "loadstart":
|
|
216
|
+
case "progress":
|
|
211
217
|
case "loadfinished":
|
|
212
218
|
if (typeof newValue === "string" && newValue.length > 0) {
|
|
213
|
-
|
|
219
|
+
if (debug)
|
|
220
|
+
console.log(name + " attribute changed", newValue);
|
|
221
|
+
this.registerEventFromAttribute(name, newValue);
|
|
214
222
|
}
|
|
215
223
|
break;
|
|
224
|
+
case "dracoDecoderPath":
|
|
225
|
+
if (debug)
|
|
226
|
+
console.log("dracoDecoderPath", newValue);
|
|
227
|
+
setDracoDecoderPath(newValue);
|
|
228
|
+
break;
|
|
229
|
+
case "dracoDecoderType":
|
|
230
|
+
if (newValue === "wasm" || newValue === "js") {
|
|
231
|
+
if (debug)
|
|
232
|
+
console.log("dracoDecoderType", newValue);
|
|
233
|
+
setDracoDecoderType(newValue);
|
|
234
|
+
}
|
|
235
|
+
else
|
|
236
|
+
console.error("Invalid dracoDecoderType", newValue, "expected js or wasm");
|
|
237
|
+
break;
|
|
238
|
+
case "ktx2DecoderPath":
|
|
239
|
+
if (debug)
|
|
240
|
+
console.log("ktx2DecoderPath", newValue);
|
|
241
|
+
setKtx2TranscoderPath(newValue);
|
|
242
|
+
break;
|
|
216
243
|
}
|
|
217
244
|
}
|
|
218
245
|
registerEventFromAttribute(eventName, code) {
|
|
@@ -221,12 +248,12 @@ export class EngineElement extends HTMLElement {
|
|
|
221
248
|
const fn = (0, eval)(code);
|
|
222
249
|
// const fn = new Function(newValue);
|
|
223
250
|
if (typeof fn === "function") {
|
|
224
|
-
this.addEventListener(eventName, evt => fn?.call(globalThis, this.
|
|
251
|
+
this.addEventListener(eventName, evt => fn?.call(globalThis, this._context, evt));
|
|
225
252
|
}
|
|
226
253
|
}
|
|
227
254
|
}
|
|
228
255
|
getAROverlayContainer() {
|
|
229
|
-
return this.
|
|
256
|
+
return this._overlay_ar.findOrCreateARContainer(this);
|
|
230
257
|
;
|
|
231
258
|
}
|
|
232
259
|
getVROverlayContainer() {
|
|
@@ -239,51 +266,22 @@ export class EngineElement extends HTMLElement {
|
|
|
239
266
|
}
|
|
240
267
|
onEnterAR(session, overlayContainer) {
|
|
241
268
|
this.onSetupAR();
|
|
242
|
-
this.
|
|
243
|
-
this.dispatchEvent(new CustomEvent("enter-ar", { detail: { session: session, context: this.
|
|
269
|
+
this._overlay_ar.onBegin(this._context, overlayContainer, session);
|
|
270
|
+
this.dispatchEvent(new CustomEvent("enter-ar", { detail: { session: session, context: this._context, htmlContainer: this._overlay_ar?.ARContainer } }));
|
|
244
271
|
}
|
|
245
272
|
onExitAR(session) {
|
|
246
|
-
this.
|
|
273
|
+
this._overlay_ar.onEnd(this._context);
|
|
247
274
|
this.onSetupDesktop();
|
|
248
|
-
this.dispatchEvent(new CustomEvent("exit-ar", { detail: { session: session, context: this.
|
|
275
|
+
this.dispatchEvent(new CustomEvent("exit-ar", { detail: { session: session, context: this._context, htmlContainer: this._overlay_ar?.ARContainer } }));
|
|
249
276
|
}
|
|
250
277
|
onEnterVR(session) {
|
|
251
278
|
this.onSetupVR();
|
|
252
|
-
this.dispatchEvent(new CustomEvent("enter-vr", { detail: { session: session, context: this.
|
|
279
|
+
this.dispatchEvent(new CustomEvent("enter-vr", { detail: { session: session, context: this._context } }));
|
|
253
280
|
}
|
|
254
281
|
onExitVR(session) {
|
|
255
282
|
this.onSetupDesktop();
|
|
256
|
-
this.dispatchEvent(new CustomEvent("exit-vr", { detail: { session: session, context: this.
|
|
283
|
+
this.dispatchEvent(new CustomEvent("exit-vr", { detail: { session: session, context: this._context } }));
|
|
257
284
|
}
|
|
258
|
-
// private _loadingElement: HTMLElement | null = null;
|
|
259
|
-
// private onLoadingBegin() {
|
|
260
|
-
// for (let i = 0; i < this.children.length; i++) {
|
|
261
|
-
// const el = this.children[i] as HTMLElement;
|
|
262
|
-
// if (el.classList.contains("loading")) {
|
|
263
|
-
// this._loadingElement = el;
|
|
264
|
-
// this._loadingElement.style.display = "flex";
|
|
265
|
-
// return;
|
|
266
|
-
// }
|
|
267
|
-
// }
|
|
268
|
-
// this._loadingElement = document.createElement("div");
|
|
269
|
-
// this._loadingElement.classList.add("loading");
|
|
270
|
-
// this._loadingElement.style.color = "white";
|
|
271
|
-
// this.appendChild(this._loadingElement);
|
|
272
|
-
// }
|
|
273
|
-
// private onLoadingCallback(callback: LoadingProgressArgs) {
|
|
274
|
-
// // console.log(callback.name, callback.progress.loaded / callback.progress.total, callback.index + "/" + callback.count);
|
|
275
|
-
// const total = callback.index / callback.count + (callback.progress.loaded / callback.progress.total) / callback.count;
|
|
276
|
-
// this.loadingProgress = total;
|
|
277
|
-
// const percent = (total * 100).toFixed(0) + "%";
|
|
278
|
-
// if (this._loadingElement)
|
|
279
|
-
// this._loadingElement.textContent = percent;
|
|
280
|
-
// }
|
|
281
|
-
// private onLoadingFinished() {
|
|
282
|
-
// if (this._loadingElement) {
|
|
283
|
-
// this._loadingElement.style.display = "none";
|
|
284
|
-
// }
|
|
285
|
-
// this.dispatchEvent(new Event("loading-finished"));
|
|
286
|
-
// }
|
|
287
285
|
onElementsChanged() {
|
|
288
286
|
}
|
|
289
287
|
onSetupAR() {
|
|
@@ -302,7 +300,7 @@ export class EngineElement extends HTMLElement {
|
|
|
302
300
|
this.foreachHtmlElement(ch => this.setupElementsForMode(ch, "desktop"));
|
|
303
301
|
}
|
|
304
302
|
setupElementsForMode(el, currentSessionType, _session = null) {
|
|
305
|
-
if (el === this.
|
|
303
|
+
if (el === this._context?.renderer.domElement)
|
|
306
304
|
return;
|
|
307
305
|
if (el.id === "VRButton" || el.id === "ARButton")
|
|
308
306
|
return;
|
|
@@ -316,7 +314,8 @@ export class EngineElement extends HTMLElement {
|
|
|
316
314
|
const classList = el.classList;
|
|
317
315
|
if (classList.contains(currentSessionType)) {
|
|
318
316
|
el.style.visibility = "visible";
|
|
319
|
-
el.style.display
|
|
317
|
+
if (el.style.display === "none")
|
|
318
|
+
el.style.display = "block";
|
|
320
319
|
}
|
|
321
320
|
else {
|
|
322
321
|
// only modify style for elements that have a known class (e.g. marked as vr ar desktop)
|
|
@@ -335,6 +334,26 @@ export class EngineElement extends HTMLElement {
|
|
|
335
334
|
cb(ch);
|
|
336
335
|
}
|
|
337
336
|
}
|
|
337
|
+
onBeforeBeginLoading() {
|
|
338
|
+
const customDracoDecoderPath = this.getAttribute("dracoDecoderPath");
|
|
339
|
+
if (customDracoDecoderPath) {
|
|
340
|
+
if (debug)
|
|
341
|
+
console.log("using custom draco decoder path", customDracoDecoderPath);
|
|
342
|
+
setDracoDecoderPath(customDracoDecoderPath);
|
|
343
|
+
}
|
|
344
|
+
const customDracoDecoderType = this.getAttribute("dracoDecoderType");
|
|
345
|
+
if (customDracoDecoderType) {
|
|
346
|
+
if (debug)
|
|
347
|
+
console.log("using custom draco decoder type", customDracoDecoderType);
|
|
348
|
+
setDracoDecoderType(customDracoDecoderType);
|
|
349
|
+
}
|
|
350
|
+
const customKtx2DecoderPath = this.getAttribute("ktx2DecoderPath");
|
|
351
|
+
if (customKtx2DecoderPath) {
|
|
352
|
+
if (debug)
|
|
353
|
+
console.log("using custom ktx2 decoder path", customKtx2DecoderPath);
|
|
354
|
+
setKtx2TranscoderPath(customKtx2DecoderPath);
|
|
355
|
+
}
|
|
356
|
+
}
|
|
338
357
|
}
|
|
339
358
|
window.customElements.define(htmlTagName, EngineElement);
|
|
340
359
|
//# sourceMappingURL=engine_element.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_element.js","sourceRoot":"","sources":["../../../engine/engine_element.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"engine_element.js","sourceRoot":"","sources":["../../../engine/engine_element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Context } from "./engine_setup";
|
|
1
2
|
export declare const arContainerClassName = "ar";
|
|
2
3
|
export declare const quitARClassName = "quit-ar";
|
|
3
4
|
export declare class AROverlayHandler {
|
|
@@ -8,9 +9,10 @@ export declare class AROverlayHandler {
|
|
|
8
9
|
currentSession: THREE.XRSession | null;
|
|
9
10
|
registeredCloseEventElements: Element[];
|
|
10
11
|
private _createdAROnlyElements;
|
|
12
|
+
private _reparentedObjects;
|
|
11
13
|
requestEndAR(): void;
|
|
12
|
-
onBegin(overlayContainer: HTMLElement, session: THREE.XRSession): void;
|
|
13
|
-
onEnd(): void;
|
|
14
|
+
onBegin(context: Context, overlayContainer: HTMLElement, session: THREE.XRSession): void;
|
|
15
|
+
onEnd(_context: Context): void;
|
|
14
16
|
findOrCreateARContainer(element: HTMLElement): HTMLElement;
|
|
15
17
|
private onRequestedEndAR;
|
|
16
18
|
private createFallbackCloseARButton;
|
|
@@ -11,14 +11,22 @@ export class AROverlayHandler {
|
|
|
11
11
|
currentSession = null;
|
|
12
12
|
registeredCloseEventElements = [];
|
|
13
13
|
_createdAROnlyElements = [];
|
|
14
|
+
_reparentedObjects = [];
|
|
14
15
|
requestEndAR() {
|
|
15
16
|
this.onRequestedEndAR();
|
|
16
17
|
}
|
|
17
|
-
onBegin(overlayContainer, session) {
|
|
18
|
+
onBegin(context, overlayContainer, session) {
|
|
18
19
|
this.currentSession = session;
|
|
19
20
|
this.arContainer = overlayContainer;
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
const arElements = context.domElement.querySelectorAll(`.${arContainerClassName}`);
|
|
22
|
+
arElements.forEach(el => {
|
|
23
|
+
if (!el)
|
|
24
|
+
return;
|
|
25
|
+
if (el === this.arContainer)
|
|
26
|
+
return;
|
|
27
|
+
this._reparentedObjects.push({ el: el, previousParent: el.parentElement });
|
|
28
|
+
this.arContainer?.appendChild(el);
|
|
29
|
+
});
|
|
22
30
|
const quit_Elements = overlayContainer.getElementsByClassName(quitARClassName);
|
|
23
31
|
if (!quit_Elements || quit_Elements.length <= 0) {
|
|
24
32
|
console.warn("Missing quit AR elements");
|
|
@@ -34,7 +42,7 @@ export class AROverlayHandler {
|
|
|
34
42
|
}
|
|
35
43
|
}
|
|
36
44
|
}
|
|
37
|
-
onEnd() {
|
|
45
|
+
onEnd(_context) {
|
|
38
46
|
// if (this.arContainer)
|
|
39
47
|
// this.arContainer.classList.remove("ar-session-active");
|
|
40
48
|
for (const created of this._createdAROnlyElements) {
|
|
@@ -42,6 +50,11 @@ export class AROverlayHandler {
|
|
|
42
50
|
created.remove();
|
|
43
51
|
}
|
|
44
52
|
}
|
|
53
|
+
for (const prev of this._reparentedObjects) {
|
|
54
|
+
const el = prev.el;
|
|
55
|
+
prev.previousParent?.appendChild(el);
|
|
56
|
+
}
|
|
57
|
+
this._reparentedObjects.length = 0;
|
|
45
58
|
}
|
|
46
59
|
findOrCreateARContainer(element) {
|
|
47
60
|
if (element.classList.contains(arContainerClassName)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_element_overlay.js","sourceRoot":"","sources":["../../../engine/engine_element_overlay.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"engine_element_overlay.js","sourceRoot":"","sources":["../../../engine/engine_element_overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import { Context } from "./engine_setup";
|
|
2
2
|
import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
|
|
3
|
+
export declare function setDracoDecoderPath(path: string | undefined): void;
|
|
4
|
+
export declare function setDracoDecoderType(type: string | undefined): void;
|
|
5
|
+
export declare function setKtx2TranscoderPath(path: string): void;
|
|
3
6
|
export declare function addDracoAndKTX2Loaders(loader: GLTFLoader, context: Context): void;
|
|
@@ -1,16 +1,49 @@
|
|
|
1
1
|
import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
|
|
2
2
|
import { KTX2Loader } from 'three/examples/jsm/loaders/KTX2Loader.js';
|
|
3
|
+
import { getParam } from "./engine_utils";
|
|
4
|
+
const debug = getParam("debugdecoders");
|
|
3
5
|
let dracoLoader;
|
|
4
6
|
let ktx2Loader;
|
|
7
|
+
export function setDracoDecoderPath(path) {
|
|
8
|
+
if (path !== undefined && typeof path === "string") {
|
|
9
|
+
if (!dracoLoader)
|
|
10
|
+
dracoLoader = new DRACOLoader();
|
|
11
|
+
if (debug)
|
|
12
|
+
console.log("Setting draco decoder path to", path);
|
|
13
|
+
dracoLoader.setDecoderPath(path);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export function setDracoDecoderType(type) {
|
|
17
|
+
if (type !== undefined && typeof type === "string") {
|
|
18
|
+
if (!dracoLoader)
|
|
19
|
+
dracoLoader = new DRACOLoader();
|
|
20
|
+
if (debug)
|
|
21
|
+
console.log("Setting draco decoder type to", type);
|
|
22
|
+
dracoLoader.setDecoderConfig({ type: type });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export function setKtx2TranscoderPath(path) {
|
|
26
|
+
if (path !== undefined && typeof path === "string") {
|
|
27
|
+
if (!ktx2Loader)
|
|
28
|
+
ktx2Loader = new KTX2Loader();
|
|
29
|
+
if (debug)
|
|
30
|
+
console.log("Setting ktx2 transcoder path to", path);
|
|
31
|
+
ktx2Loader.setTranscoderPath(path);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
5
34
|
export function addDracoAndKTX2Loaders(loader, context) {
|
|
6
35
|
if (!dracoLoader) {
|
|
7
36
|
dracoLoader = new DRACOLoader();
|
|
8
37
|
dracoLoader.setDecoderPath('./include/draco/');
|
|
9
38
|
dracoLoader.setDecoderConfig({ type: 'js' });
|
|
39
|
+
if (debug)
|
|
40
|
+
console.log("Setting draco decoder path to", './include/draco/');
|
|
10
41
|
}
|
|
11
42
|
if (!ktx2Loader) {
|
|
12
43
|
ktx2Loader = new KTX2Loader();
|
|
13
44
|
ktx2Loader.setTranscoderPath('./include/ktx2/');
|
|
45
|
+
if (debug)
|
|
46
|
+
console.log("Setting ktx2 transcoder path to", './include/ktx2/');
|
|
14
47
|
if (context.renderer)
|
|
15
48
|
ktx2Loader.detectSupport(context.renderer);
|
|
16
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_loaders.js","sourceRoot":"","sources":["../../../engine/engine_loaders.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"engine_loaders.js","sourceRoot":"","sources":["../../../engine/engine_loaders.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;AAExC,IAAI,WAAwB,CAAC;AAC7B,IAAI,UAAsB,CAAC;AAE3B,MAAM,UAAU,mBAAmB,CAAC,IAAwB;IACxD,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAChD,IAAI,CAAC,WAAW;YACZ,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QACpC,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;QAC9D,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;KACpC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAwB;IACxD,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAChD,IAAI,CAAC,WAAW;YACZ,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QACpC,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;QAC9D,WAAW,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;KAChD;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAC9C,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAChD,IAAI,CAAC,UAAU;YACX,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QAClC,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,IAAI,CAAC,CAAC;QAChE,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;KACtC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAkB,EAAE,OAAgB;IACvE,IAAI,CAAC,WAAW,EAAE;QACd,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,WAAW,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QAC/C,WAAW,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,IAAG,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAAC;KAC9E;IACD,IAAI,CAAC,UAAU,EAAE;QACb,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,UAAU,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAChD,IAAG,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,iBAAiB,CAAC,CAAC;QAC5E,IAAI,OAAO,CAAC,QAAQ;YAChB,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KAClD;IAED,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACnC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -515,7 +515,8 @@ export class Context {
|
|
|
515
515
|
const evts = this.coroutines[evt];
|
|
516
516
|
for (let i = 0; i < evts.length; i++) {
|
|
517
517
|
const evt = evts[i];
|
|
518
|
-
|
|
518
|
+
const remove = !evt.comp || evt.comp.destroyed || !evt.main || evt.comp["enabled"] === false;
|
|
519
|
+
if (remove) {
|
|
519
520
|
evts.splice(i, 1);
|
|
520
521
|
--i;
|
|
521
522
|
continue;
|