@needle-tools/engine 2.53.0-pre → 2.54.2-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 +27 -0
- package/dist/needle-engine.d.ts +2417 -2230
- package/dist/needle-engine.js +425 -425
- package/dist/needle-engine.js.map +4 -4
- package/dist/needle-engine.min.js +49 -49
- package/dist/needle-engine.min.js.map +4 -4
- package/dist/needle-engine.tsbuildinfo +1 -0
- package/lib/engine/codegen/register_types.d.ts +1 -0
- package/lib/engine/codegen/register_types.js +346 -0
- package/lib/engine/codegen/register_types.js.map +1 -0
- package/lib/engine/debug/debug.d.ts +1 -0
- package/lib/engine/debug/debug.js +4 -0
- package/lib/engine/debug/debug.js.map +1 -1
- package/lib/engine/debug/debug_console.js +2 -1
- package/lib/engine/debug/debug_console.js.map +1 -1
- package/lib/engine/debug/debug_overlay.js +3 -1
- package/lib/engine/debug/debug_overlay.js.map +1 -1
- package/lib/engine/engine_default_parameters.d.ts +2 -2
- package/lib/engine/engine_element.js +4 -2
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_element_loading.d.ts +1 -0
- package/lib/engine/engine_element_loading.js +17 -6
- package/lib/engine/engine_element_loading.js.map +1 -1
- package/lib/engine/engine_element_overlay.js +4 -2
- package/lib/engine/engine_element_overlay.js.map +1 -1
- package/lib/engine/engine_fileloader.d.ts +3 -0
- package/lib/engine/engine_fileloader.js +8 -0
- package/lib/engine/engine_fileloader.js.map +1 -0
- package/lib/engine/engine_generic_utils.d.ts +1 -0
- package/lib/engine/engine_generic_utils.js +14 -0
- package/lib/engine/engine_generic_utils.js.map +1 -0
- package/lib/engine/engine_input.js +4 -0
- package/lib/engine/engine_input.js.map +1 -1
- package/lib/engine/engine_networking_websocket.d.ts +1 -0
- package/lib/engine/engine_networking_websocket.js +1 -1
- package/lib/engine/engine_networking_websocket.js.map +1 -1
- package/lib/engine/engine_serialization_builtin_serializer.js +6 -3
- package/lib/engine/engine_serialization_builtin_serializer.js.map +1 -1
- package/lib/engine/engine_utils.d.ts +1 -1
- package/lib/engine/engine_utils.js +3 -0
- package/lib/engine/engine_utils.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_components.d.ts +1 -1
- package/lib/engine/extensions/NEEDLE_progressive.d.ts +22 -0
- package/lib/engine/extensions/NEEDLE_progressive.js +172 -44
- package/lib/engine/extensions/NEEDLE_progressive.js.map +1 -1
- package/lib/engine-components/GroundProjection.d.ts +2 -1
- package/lib/engine-components/GroundProjection.js +19 -12
- package/lib/engine-components/GroundProjection.js.map +1 -1
- package/lib/engine-components/ParticleSystemModules.d.ts +1 -1
- package/lib/engine-components/ParticleSystemModules.js +48 -44
- package/lib/engine-components/ParticleSystemModules.js.map +1 -1
- package/lib/engine-components/ReflectionProbe.d.ts +1 -1
- package/lib/engine-components/Renderer.d.ts +1 -1
- package/lib/engine-components/Renderer.js +3 -8
- package/lib/engine-components/Renderer.js.map +1 -1
- package/lib/engine-components/Volume.js +8 -1
- package/lib/engine-components/Volume.js.map +1 -1
- package/lib/engine-components/WebXR.d.ts +2 -2
- package/lib/engine-components/WebXRAvatar.d.ts +1 -1
- package/lib/engine-components/codegen/components.d.ts +99 -99
- package/lib/engine-components/codegen/components.js +99 -99
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/export/usdz/USDZExporter.d.ts +1 -0
- package/lib/engine-components/export/usdz/USDZExporter.js +17 -1
- package/lib/engine-components/export/usdz/USDZExporter.js.map +1 -1
- package/lib/engine-components/ui/Button.js +30 -0
- package/lib/engine-components/ui/Button.js.map +1 -1
- package/lib/engine-components/ui/InputField.d.ts +2 -0
- package/lib/engine-components/ui/InputField.js +23 -1
- package/lib/engine-components/ui/InputField.js.map +1 -1
- package/lib/engine-components/ui/Utils.d.ts +2 -0
- package/lib/engine-components/ui/Utils.js +10 -9
- package/lib/engine-components/ui/Utils.js.map +1 -1
- package/lib/engine-components-experimental/Presentation.d.ts +6 -0
- package/lib/engine-components-experimental/Presentation.js +11 -0
- package/lib/engine-components-experimental/Presentation.js.map +1 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.d.ts +18 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.js +175 -0
- package/lib/engine-components-experimental/annotation/LineDrawer.js.map +1 -0
- package/lib/engine-components-experimental/annotation/LinesManager.d.ts +54 -0
- package/lib/engine-components-experimental/annotation/LinesManager.js +155 -0
- package/lib/engine-components-experimental/annotation/LinesManager.js.map +1 -0
- package/lib/engine-components-experimental/networking/PlayerSync.d.ts +26 -0
- package/lib/engine-components-experimental/networking/PlayerSync.js +121 -0
- package/lib/engine-components-experimental/networking/PlayerSync.js.map +1 -0
- package/lib/engine-schemes/vec2.d.ts +10 -0
- package/lib/engine-schemes/vec2.js +26 -0
- package/lib/engine-schemes/vec2.js.map +1 -0
- package/lib/include/three/ARButton.d.ts +3 -0
- package/lib/include/three/ARButton.js +158 -0
- package/lib/include/three/ARButton.js.map +1 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.d.ts +6 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.js +46 -0
- package/lib/include/three/EXT_mesh_gpu_instancing_exporter.js.map +1 -0
- package/lib/include/three/VRButton.d.ts +5 -0
- package/lib/include/three/VRButton.js +122 -0
- package/lib/include/three/VRButton.js.map +1 -0
- package/lib/tsconfig.tsbuildinfo +1 -0
- package/package.json +1 -1
- package/src/engine/codegen/register_types.js +214 -214
- package/src/engine/debug/debug.ts +5 -0
- package/src/engine/debug/debug_console.ts +3 -2
- package/src/engine/debug/debug_overlay.ts +3 -1
- package/src/engine/engine_element.ts +4 -2
- package/src/engine/engine_element_loading.ts +13 -6
- package/src/engine/engine_element_overlay.ts +4 -2
- package/src/engine/engine_input.ts +4 -0
- package/src/engine/engine_networking_websocket.ts +3 -1
- package/src/engine/engine_serialization_builtin_serializer.ts +8 -5
- package/src/engine/engine_utils.ts +3 -1
- package/src/engine/extensions/NEEDLE_progressive.ts +185 -43
- package/src/engine-components/GroundProjection.ts +18 -12
- package/src/engine-components/ParticleSystemModules.ts +50 -47
- package/src/engine-components/Renderer.ts +5 -9
- package/src/engine-components/Volume.ts +8 -1
- package/src/engine-components/WebXR.ts +2 -2
- package/src/engine-components/codegen/components.ts +99 -99
- package/src/engine-components/export/usdz/USDZExporter.ts +19 -2
- package/src/engine-components/ui/Button.ts +8 -8
- package/src/engine-components/ui/InputField.ts +25 -2
- package/src/engine-components/ui/Utils.ts +12 -11
- package/src/engine-components-experimental/annotation/LineDrawer.ts +10 -7
- package/src/engine-components-experimental/annotation/LinesManager.ts +6 -6
- package/src/engine-components-experimental/networking/PlayerSync.ts +1 -1
- package/lib/engine/engine_caching.d.ts +0 -0
- package/lib/engine/engine_caching.js +0 -2
- package/lib/engine/engine_caching.js.map +0 -1
- package/lib/engine/tests/simulate_avatars.d.ts +0 -0
- package/lib/engine/tests/simulate_avatars.js +0 -3
- package/lib/engine/tests/simulate_avatars.js.map +0 -1
- package/lib/engine-components/NavMesh.d.ts +0 -0
- package/lib/engine-components/NavMesh.js +0 -101
- package/lib/engine-components/NavMesh.js.map +0 -1
- package/lib/engine-components/ParticleSystemBehaviours.d.ts +0 -0
- package/lib/engine-components/ParticleSystemBehaviours.js +0 -2
- package/lib/engine-components/ParticleSystemBehaviours.js.map +0 -1
- package/lib/engine-components/SpringJoint.d.ts +0 -0
- package/lib/engine-components/SpringJoint.js +0 -43
- package/lib/engine-components/SpringJoint.js.map +0 -1
- package/lib/engine-components/ui/CanvasScaler.d.ts +0 -0
- package/lib/engine-components/ui/CanvasScaler.js +0 -17
- package/lib/engine-components/ui/CanvasScaler.js.map +0 -1
- package/src/engine/dist/engine_three_utils.js +0 -279
- package/src/engine/engine_caching.ts +0 -0
- package/src/engine/tests/simulate_avatars.ts +0 -2
- package/src/engine-components/NavMesh.ts +0 -117
- package/src/engine-components/ParticleSystemBehaviours.ts +0 -0
- package/src/engine-components/SpringJoint.ts +0 -45
- package/src/engine-components/ui/CanvasScaler.ts +0 -21
|
@@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { delay, getParam, isiOS, isMobileDevice, isSafari } from "../../../engine/engine_utils";
|
|
8
8
|
import { Object3D } from "three";
|
|
9
|
+
import * as THREE from "three";
|
|
9
10
|
import { USDZExporter as ThreeUSDZExporter } from "three/examples/jsm/exporters/USDZExporter";
|
|
10
11
|
import { AnimationExtension } from "./extensions/Animation";
|
|
11
12
|
import { ensureQuicklookLinkIsCreated } from "./utils/quicklook";
|
|
@@ -16,6 +17,7 @@ import { WebXR } from "../../WebXR";
|
|
|
16
17
|
import { serializable } from "../../../engine/engine_serialization";
|
|
17
18
|
import { showBalloonWarning } from "../../../engine/debug/debug";
|
|
18
19
|
import { Context } from "../../../engine/engine_setup";
|
|
20
|
+
import { WebARSessionRoot } from "../../WebARSessionRoot";
|
|
19
21
|
const debug = getParam("debugusdz");
|
|
20
22
|
export class USDZExporter extends Behaviour {
|
|
21
23
|
objectToExport;
|
|
@@ -23,6 +25,7 @@ export class USDZExporter extends Behaviour {
|
|
|
23
25
|
extensions = [];
|
|
24
26
|
link;
|
|
25
27
|
webxr;
|
|
28
|
+
webARSessionRoot;
|
|
26
29
|
start() {
|
|
27
30
|
if (debug) {
|
|
28
31
|
window.addEventListener("keydown", (evt) => {
|
|
@@ -50,6 +53,7 @@ export class USDZExporter extends Behaviour {
|
|
|
50
53
|
const safari = isSafari();
|
|
51
54
|
if (debug || (ios && safari)) {
|
|
52
55
|
this.createQuicklookButton();
|
|
56
|
+
this.webARSessionRoot = GameObject.findObjectOfType(WebARSessionRoot) ?? undefined;
|
|
53
57
|
this.lastCallback = this.quicklookCallback.bind(this);
|
|
54
58
|
this.link = ensureQuicklookLinkIsCreated(this.context);
|
|
55
59
|
this.link.addEventListener('message', this.lastCallback);
|
|
@@ -61,6 +65,15 @@ export class USDZExporter extends Behaviour {
|
|
|
61
65
|
async exportAsync() {
|
|
62
66
|
if (!this.objectToExport)
|
|
63
67
|
return;
|
|
68
|
+
// make sure we apply the AR scale
|
|
69
|
+
if (this.webARSessionRoot) {
|
|
70
|
+
const scene = this.webARSessionRoot.gameObject;
|
|
71
|
+
const scale = 1 / this.webARSessionRoot.arScale;
|
|
72
|
+
scene.matrix.makeScale(scale, scale, scale);
|
|
73
|
+
if (this.webARSessionRoot.invertForward) {
|
|
74
|
+
scene.matrix.multiply(new THREE.Matrix4().makeRotationY(Math.PI));
|
|
75
|
+
}
|
|
76
|
+
}
|
|
64
77
|
const exporter = new ThreeUSDZExporter();
|
|
65
78
|
const extensions = [...this.extensions];
|
|
66
79
|
// collect animators and their clips
|
|
@@ -68,7 +81,7 @@ export class USDZExporter extends Behaviour {
|
|
|
68
81
|
extensions.push(animExt);
|
|
69
82
|
if (this.autoExportAnimations)
|
|
70
83
|
registerAnimatorsImplictly(this.objectToExport, animExt);
|
|
71
|
-
const eventArgs = { self: this, exporter: exporter, extensions: extensions };
|
|
84
|
+
const eventArgs = { self: this, exporter: exporter, extensions: extensions, object: this.objectToExport };
|
|
72
85
|
this.dispatchEvent(new CustomEvent("before-export", { detail: eventArgs }));
|
|
73
86
|
let name = "needle";
|
|
74
87
|
if (debug)
|
|
@@ -78,6 +91,7 @@ export class USDZExporter extends Behaviour {
|
|
|
78
91
|
//@ts-ignore
|
|
79
92
|
const arraybuffer = await exporter.parse(this.objectToExport, extensions);
|
|
80
93
|
const blob = new Blob([arraybuffer], { type: 'application/octet-stream' });
|
|
94
|
+
this.dispatchEvent(new CustomEvent("after-export", { detail: eventArgs }));
|
|
81
95
|
// second file: USDA (without assets)
|
|
82
96
|
//@ts-ignore
|
|
83
97
|
// const usda = exporter.lastUsda;
|
|
@@ -141,6 +155,7 @@ export class USDZExporter extends Behaviour {
|
|
|
141
155
|
this.exportAsync();
|
|
142
156
|
});
|
|
143
157
|
this.webxr.ARButton.classList.add("quicklook-ar-button");
|
|
158
|
+
this.dispatchEvent(new CustomEvent("created-button", { detail: this.webxr.ARButton }));
|
|
144
159
|
}
|
|
145
160
|
// create a button if WebXR didnt create one yet
|
|
146
161
|
else {
|
|
@@ -160,6 +175,7 @@ export class USDZExporter extends Behaviour {
|
|
|
160
175
|
button.classList.add('webxr-button');
|
|
161
176
|
button.classList.add("quicklook-ar-button");
|
|
162
177
|
container.appendChild(button);
|
|
178
|
+
this.dispatchEvent(new CustomEvent("created-button", { detail: button }));
|
|
163
179
|
}
|
|
164
180
|
}
|
|
165
181
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"USDZExporter.js","sourceRoot":"","sources":["../../../../../engine-components/export/usdz/USDZExporter.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAS,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"USDZExporter.js","sourceRoot":"","sources":["../../../../../engine-components/export/usdz/USDZExporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,36 @@ export var Transition;
|
|
|
34
34
|
/// </summary>
|
|
35
35
|
Transition[Transition["Animation"] = 3] = "Animation";
|
|
36
36
|
})(Transition || (Transition = {}));
|
|
37
|
+
class ButtonColors {
|
|
38
|
+
colorMultiplier;
|
|
39
|
+
disabledColor;
|
|
40
|
+
fadeDuration;
|
|
41
|
+
highlightedColor;
|
|
42
|
+
normalColor;
|
|
43
|
+
pressedColor;
|
|
44
|
+
selectedColor;
|
|
45
|
+
}
|
|
46
|
+
__decorate([
|
|
47
|
+
serializable()
|
|
48
|
+
], ButtonColors.prototype, "colorMultiplier", void 0);
|
|
49
|
+
__decorate([
|
|
50
|
+
serializable(RGBAColor)
|
|
51
|
+
], ButtonColors.prototype, "disabledColor", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
serializable()
|
|
54
|
+
], ButtonColors.prototype, "fadeDuration", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
serializable(RGBAColor)
|
|
57
|
+
], ButtonColors.prototype, "highlightedColor", void 0);
|
|
58
|
+
__decorate([
|
|
59
|
+
serializable(RGBAColor)
|
|
60
|
+
], ButtonColors.prototype, "normalColor", void 0);
|
|
61
|
+
__decorate([
|
|
62
|
+
serializable(RGBAColor)
|
|
63
|
+
], ButtonColors.prototype, "pressedColor", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
serializable(RGBAColor)
|
|
66
|
+
], ButtonColors.prototype, "selectedColor", void 0);
|
|
37
67
|
export class Button extends Behaviour {
|
|
38
68
|
onClick;
|
|
39
69
|
_isHovered = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../engine-components/ui/Button.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAEtC,aAAa;AACb,oCAAoC;AACpC,cAAc;AACd,MAAM,CAAN,IAAY,UAiBX;AAjBD,WAAY,UAAU;IAClB,aAAa;IACb,kBAAkB;IAClB,cAAc;IACd,2CAAI,CAAA;IACJ,aAAa;IACb,iCAAiC;IACjC,cAAc;IACd,qDAAS,CAAA;IACT,aAAa;IACb,iCAAiC;IACjC,cAAc;IACd,uDAAU,CAAA;IACV,aAAa;IACb,gCAAgC;IAChC,cAAc;IACd,qDAAS,CAAA;AACb,CAAC,EAjBW,UAAU,KAAV,UAAU,QAiBrB;
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../engine-components/ui/Button.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare class InputField extends Behaviour implements IPointerEventHandle
|
|
|
12
12
|
private static activeTime;
|
|
13
13
|
private static htmlField;
|
|
14
14
|
private inputEventFn;
|
|
15
|
+
private _iosEventFn;
|
|
15
16
|
start(): void;
|
|
16
17
|
onEnable(): void;
|
|
17
18
|
onDisable(): void;
|
|
@@ -22,4 +23,5 @@ export declare class InputField extends Behaviour implements IPointerEventHandle
|
|
|
22
23
|
private onInput;
|
|
23
24
|
private setTextFromInputField;
|
|
24
25
|
private selectInputField;
|
|
26
|
+
private processInputOniOS;
|
|
25
27
|
}
|
|
@@ -8,8 +8,9 @@ import { Behaviour, GameObject } from "../Component";
|
|
|
8
8
|
import { FrameEvent } from "../../engine/engine_setup";
|
|
9
9
|
import { serializable } from "../../engine/engine_serialization_decorator";
|
|
10
10
|
import { Text } from "./Text";
|
|
11
|
-
import { getParam } from "../../engine/engine_utils";
|
|
11
|
+
import { getParam, isiOS } from "../../engine/engine_utils";
|
|
12
12
|
import { EventList } from "../EventList";
|
|
13
|
+
import { tryGetUIComponent } from "./Utils";
|
|
13
14
|
const debug = getParam("debuginputfield");
|
|
14
15
|
export class InputField extends Behaviour {
|
|
15
16
|
get text() {
|
|
@@ -26,6 +27,7 @@ export class InputField extends Behaviour {
|
|
|
26
27
|
static activeTime = -1;
|
|
27
28
|
static htmlField = null;
|
|
28
29
|
inputEventFn;
|
|
30
|
+
_iosEventFn;
|
|
29
31
|
start() {
|
|
30
32
|
if (debug)
|
|
31
33
|
console.log(this.name, this);
|
|
@@ -33,6 +35,7 @@ export class InputField extends Behaviour {
|
|
|
33
35
|
onEnable() {
|
|
34
36
|
if (!InputField.htmlField) {
|
|
35
37
|
InputField.htmlField = document.createElement("input");
|
|
38
|
+
InputField.htmlField.style.caretColor = "transparent";
|
|
36
39
|
InputField.htmlField.classList.add("ar");
|
|
37
40
|
document.body.appendChild(InputField.htmlField);
|
|
38
41
|
}
|
|
@@ -45,12 +48,19 @@ export class InputField extends Behaviour {
|
|
|
45
48
|
if (this.placeholder && this.textComponent?.text.length) {
|
|
46
49
|
GameObject.setActive(this.placeholder.gameObject, false);
|
|
47
50
|
}
|
|
51
|
+
if (isiOS()) {
|
|
52
|
+
this._iosEventFn = this.processInputOniOS.bind(this);
|
|
53
|
+
window.addEventListener("touchend", this._iosEventFn);
|
|
54
|
+
}
|
|
48
55
|
}
|
|
49
56
|
onDisable() {
|
|
50
57
|
// InputField.htmlField?.removeEventListener("input", this.mobileInputEventListener);
|
|
51
58
|
InputField.htmlField?.removeEventListener("keyup", this.inputEventFn);
|
|
52
59
|
// InputField.htmlField?.removeEventListener("change", this.inputEventFn);
|
|
53
60
|
this.onDeselected();
|
|
61
|
+
if (this._iosEventFn) {
|
|
62
|
+
window.removeEventListener("touchend", this._iosEventFn);
|
|
63
|
+
}
|
|
54
64
|
}
|
|
55
65
|
onPointerClick(_args) {
|
|
56
66
|
if (debug)
|
|
@@ -163,6 +173,18 @@ export class InputField extends Behaviour {
|
|
|
163
173
|
InputField.htmlField.focus();
|
|
164
174
|
}
|
|
165
175
|
}
|
|
176
|
+
processInputOniOS() {
|
|
177
|
+
// focus() on safari ios doesnt open the keyboard when not processed from dom event
|
|
178
|
+
// so we try in a touch end event if this is hit
|
|
179
|
+
const hits = this.context.physics.raycast();
|
|
180
|
+
if (!hits.length)
|
|
181
|
+
return;
|
|
182
|
+
const hit = hits[0];
|
|
183
|
+
const obj = hit.object;
|
|
184
|
+
const component = tryGetUIComponent(obj);
|
|
185
|
+
if (component?.gameObject === this.gameObject || component?.gameObject.parent === this.gameObject)
|
|
186
|
+
this.selectInputField();
|
|
187
|
+
}
|
|
166
188
|
}
|
|
167
189
|
__decorate([
|
|
168
190
|
serializable(Text)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputField.js","sourceRoot":"","sources":["../../../../engine-components/ui/InputField.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"InputField.js","sourceRoot":"","sources":["../../../../engine-components/ui/InputField.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { FrameEvent } from "../../engine/engine_setup";
|
|
2
2
|
import { Behaviour } from "../Component";
|
|
3
|
+
import { BaseUIComponent } from "./BaseUIComponent";
|
|
4
|
+
export declare function tryGetUIComponent(obj: THREE.Object3D): BaseUIComponent | null;
|
|
3
5
|
export declare function isUIObject(obj: THREE.Object3D): boolean;
|
|
4
6
|
export type RenderSettings = {
|
|
5
7
|
renderOnTop?: boolean;
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { FrontSide, DoubleSide } from "three";
|
|
2
2
|
import { FrameEvent } from "../../engine/engine_setup";
|
|
3
3
|
import { $shadowDomOwner } from "./BaseUIComponent";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
4
|
+
export function tryGetUIComponent(obj) {
|
|
5
|
+
const owner = obj[$shadowDomOwner];
|
|
6
|
+
if (owner) {
|
|
7
|
+
return owner;
|
|
8
|
+
}
|
|
9
|
+
if (obj.parent) {
|
|
10
|
+
return tryGetUIComponent(obj.parent);
|
|
11
|
+
}
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
13
14
|
export function isUIObject(obj) {
|
|
14
15
|
return obj["isUI"] === true || typeof obj[$shadowDomOwner] === "object";
|
|
15
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../../engine-components/ui/Utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAiC,MAAM,OAAO,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../../engine-components/ui/Utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Behaviour } from "../engine-components/Component";
|
|
2
|
+
import { KeyCode } from "../engine/engine_input";
|
|
3
|
+
export class PresentationMode extends Behaviour {
|
|
4
|
+
toggleKey = KeyCode.KEY_P;
|
|
5
|
+
update() {
|
|
6
|
+
if (this.context.input.isKeyDown(KeyCode.KEY_P)) {
|
|
7
|
+
this.context.domElement.classList.toggle("presentation-mode");
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=Presentation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Presentation.js","sourceRoot":"","sources":["../../../engine-components-experimental/Presentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAE3C,SAAS,GAAa,OAAO,CAAC,KAAK,CAAC;IAEpC,MAAM;QACF,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;SACjE;IACL,CAAC;CACJ"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Behaviour } from "../../engine-components/Component";
|
|
2
|
+
import * as THREE from 'three';
|
|
3
|
+
import { LinesManager } from "./LinesManager";
|
|
4
|
+
export declare class LinesDrawer extends Behaviour {
|
|
5
|
+
lines: LinesManager;
|
|
6
|
+
colliders?: THREE.Object3D[];
|
|
7
|
+
alignToSurface: boolean;
|
|
8
|
+
addToPaintedObject: boolean;
|
|
9
|
+
private orbit?;
|
|
10
|
+
start(): void;
|
|
11
|
+
private _states;
|
|
12
|
+
update(): void;
|
|
13
|
+
private updateLine;
|
|
14
|
+
private _raycastOptions;
|
|
15
|
+
private static _raycaster;
|
|
16
|
+
private getHit;
|
|
17
|
+
private createRandomMaterial;
|
|
18
|
+
}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { Behaviour, GameObject } from "../../engine-components/Component";
|
|
2
|
+
import { OrbitControls } from "../../engine-components/OrbitControls";
|
|
3
|
+
import * as THREE from 'three';
|
|
4
|
+
import { Raycaster, Vector3 } from "three";
|
|
5
|
+
import { RaycastOptions } from "../../engine/engine_physics";
|
|
6
|
+
import { LinesManager } from "./LinesManager";
|
|
7
|
+
import { Mathf } from "../../engine/engine_math";
|
|
8
|
+
import { getWorldPosition } from "../../engine/engine_three_utils";
|
|
9
|
+
import { MeshLineMaterial } from 'three.meshline';
|
|
10
|
+
import { KeyCode } from "../../engine/engine_input";
|
|
11
|
+
import { PlayerColor } from "../../engine-components/PlayerColor";
|
|
12
|
+
import { ControllerEvents, WebXRController } from "../../engine-components/WebXRController";
|
|
13
|
+
class LineState {
|
|
14
|
+
isDrawing;
|
|
15
|
+
lastHit;
|
|
16
|
+
currentHandle;
|
|
17
|
+
maxDistance;
|
|
18
|
+
prevDistance;
|
|
19
|
+
lastParent;
|
|
20
|
+
constructor() {
|
|
21
|
+
this.isDrawing = false;
|
|
22
|
+
this.lastHit = new Vector3();
|
|
23
|
+
this.currentHandle = null;
|
|
24
|
+
this.maxDistance = 0;
|
|
25
|
+
this.prevDistance = 0;
|
|
26
|
+
this.lastParent = null;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export class LinesDrawer extends Behaviour {
|
|
30
|
+
lines;
|
|
31
|
+
colliders;
|
|
32
|
+
alignToSurface = true;
|
|
33
|
+
addToPaintedObject = true;
|
|
34
|
+
orbit;
|
|
35
|
+
start() {
|
|
36
|
+
if (!this.lines) {
|
|
37
|
+
this.lines = GameObject.getComponent(this.gameObject, LinesManager);
|
|
38
|
+
if (!this.lines)
|
|
39
|
+
this.lines = GameObject.addNewComponent(this.gameObject, LinesManager);
|
|
40
|
+
}
|
|
41
|
+
this.orbit = GameObject.findObjectOfType(OrbitControls, this.context) ?? undefined;
|
|
42
|
+
this._states["mouse"] = new LineState();
|
|
43
|
+
const xrControllerSelected = {};
|
|
44
|
+
WebXRController.addEventListener(ControllerEvents.SelectStart, (ctrl, _) => {
|
|
45
|
+
xrControllerSelected[ctrl.controller.uuid] = true;
|
|
46
|
+
});
|
|
47
|
+
WebXRController.addEventListener(ControllerEvents.Update, (ctrl, _) => {
|
|
48
|
+
if (xrControllerSelected[ctrl.controller.uuid] === true) {
|
|
49
|
+
const ray = ctrl.getRay();
|
|
50
|
+
this.updateLine(ctrl.controller.uuid, ray, true, false, false);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
WebXRController.addEventListener(ControllerEvents.SelectEnd, (ctrl, _) => {
|
|
54
|
+
xrControllerSelected[ctrl.controller.uuid] = false;
|
|
55
|
+
const ray = ctrl.getRay();
|
|
56
|
+
this.updateLine(ctrl.controller.uuid, ray, true, true, false);
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
_states = {};
|
|
60
|
+
update() {
|
|
61
|
+
if (this.orbit && this._states["mouse"]) {
|
|
62
|
+
if (this.orbit)
|
|
63
|
+
this.orbit.enabled = !this._states["mouse"].isDrawing;
|
|
64
|
+
}
|
|
65
|
+
if (!this.context.mainCamera)
|
|
66
|
+
return;
|
|
67
|
+
const multi = this.context.input.getPointerPressedCount() > 1;
|
|
68
|
+
const sp = this.context.input.getPointerPositionRC(0);
|
|
69
|
+
if (!sp)
|
|
70
|
+
return;
|
|
71
|
+
LinesDrawer._raycaster.setFromCamera(sp, this.context.mainCamera);
|
|
72
|
+
const ray = LinesDrawer._raycaster.ray;
|
|
73
|
+
this.updateLine("mouse", ray, this.context.input.getPointerPressed(0), this.context.input.getPointerUp(0), multi || this.context.input.isKeyPressed(KeyCode.ALT));
|
|
74
|
+
}
|
|
75
|
+
updateLine(id, ray, active, finish, cancel = false) {
|
|
76
|
+
let state = this._states[id];
|
|
77
|
+
if (!state) {
|
|
78
|
+
this._states[id] = new LineState();
|
|
79
|
+
state = this._states[id];
|
|
80
|
+
}
|
|
81
|
+
if (finish) {
|
|
82
|
+
state.isDrawing = false;
|
|
83
|
+
if (state.currentHandle) {
|
|
84
|
+
// this.sendLineUpdate();
|
|
85
|
+
this.lines.endLine(state.currentHandle);
|
|
86
|
+
state.currentHandle = null;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
else if (active) {
|
|
90
|
+
if (cancel) {
|
|
91
|
+
return state;
|
|
92
|
+
}
|
|
93
|
+
const hit = this.getHit(ray);
|
|
94
|
+
let pt = null;
|
|
95
|
+
let prev = state.prevDistance;
|
|
96
|
+
if (hit) {
|
|
97
|
+
if (!state.currentHandle) {
|
|
98
|
+
state.maxDistance = hit.distance;
|
|
99
|
+
}
|
|
100
|
+
pt = hit.point;
|
|
101
|
+
if (hit.face)
|
|
102
|
+
pt.add(hit.face.normal.multiplyScalar(0.01));
|
|
103
|
+
state.prevDistance = hit.distance;
|
|
104
|
+
}
|
|
105
|
+
else if (state.maxDistance > 0) {
|
|
106
|
+
let dist = state.maxDistance;
|
|
107
|
+
// if we start drawing in thin air:
|
|
108
|
+
if (!state.currentHandle && state.lastHit) {
|
|
109
|
+
const wp = getWorldPosition(this.context.mainCamera);
|
|
110
|
+
dist = state.lastHit.distanceTo(wp);
|
|
111
|
+
}
|
|
112
|
+
pt = ray.origin.add(ray.direction.multiplyScalar(state.maxDistance));
|
|
113
|
+
state.prevDistance = state.maxDistance;
|
|
114
|
+
}
|
|
115
|
+
if (pt) {
|
|
116
|
+
if (!state.currentHandle) {
|
|
117
|
+
let parent = state.lastParent ?? this.gameObject;
|
|
118
|
+
if (this.addToPaintedObject && hit)
|
|
119
|
+
parent = hit.object;
|
|
120
|
+
state.lastParent = parent;
|
|
121
|
+
state.currentHandle = this.lines.startLine(parent, { material: this.createRandomMaterial() });
|
|
122
|
+
}
|
|
123
|
+
if (this.alignToSurface) {
|
|
124
|
+
if (state.prevDistance > state.maxDistance || Math.abs(prev - state.prevDistance) > 0.2) {
|
|
125
|
+
const newDistance = state.maxDistance;
|
|
126
|
+
// if (state.maxDistance === 0) state.maxDistance = newDistance;
|
|
127
|
+
// const camPos = getWorldPosition(this.context.mainCamera);
|
|
128
|
+
pt = ray.origin.add(ray.direction.multiplyScalar(newDistance));
|
|
129
|
+
// pt = camPos.add(dir.multiplyScalar(newDistance));
|
|
130
|
+
state.prevDistance = newDistance;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (state.lastHit && state.lastHit.distanceTo(pt) < state.prevDistance * .01) {
|
|
134
|
+
return state;
|
|
135
|
+
}
|
|
136
|
+
this.lines.updateLine(state.currentHandle, { point: pt });
|
|
137
|
+
state.lastHit.copy(pt);
|
|
138
|
+
}
|
|
139
|
+
state.isDrawing = state.currentHandle !== null;
|
|
140
|
+
}
|
|
141
|
+
return state;
|
|
142
|
+
}
|
|
143
|
+
_raycastOptions = new RaycastOptions();
|
|
144
|
+
static _raycaster = new Raycaster();
|
|
145
|
+
getHit(ray) {
|
|
146
|
+
if (!this.colliders || this.colliders.length === 0) {
|
|
147
|
+
this.colliders = [this.gameObject];
|
|
148
|
+
}
|
|
149
|
+
this._raycastOptions.targets = this.colliders;
|
|
150
|
+
this._raycastOptions.ray = ray;
|
|
151
|
+
const hits = this.context.physics.raycast(this._raycastOptions);
|
|
152
|
+
if (hits.length > 0) {
|
|
153
|
+
for (const hit of hits) {
|
|
154
|
+
if (!GameObject.isActiveInHierarchy(hit.object)) {
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
return hit;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
createRandomMaterial() {
|
|
163
|
+
let col;
|
|
164
|
+
if (this.context.connection.connectionId)
|
|
165
|
+
col = PlayerColor.colorFromHashCode(PlayerColor.hashCode(this.context.connection.connectionId));
|
|
166
|
+
else
|
|
167
|
+
col = new THREE.Color("hsl(" + (Math.random() * 100).toFixed(0) + ", 80%, 30%)");
|
|
168
|
+
// const col = new THREE.Color("hsl(0, 100%, 50%)");
|
|
169
|
+
return new MeshLineMaterial({
|
|
170
|
+
color: col,
|
|
171
|
+
lineWidth: Mathf.lerp(0.005, 0.01, Math.random()),
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=LineDrawer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LineDrawer.js","sourceRoot":"","sources":["../../../../engine-components-experimental/annotation/LineDrawer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAY,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,SAAS;IACX,SAAS,CAAU;IACnB,OAAO,CAAU;IACjB,aAAa,CAAoB;IACjC,WAAW,CAAS;IACpB,YAAY,CAAS;IACrB,UAAU,CAAwB;IAElC;QACI,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;CACJ;AAED,MAAM,OAAO,WAAY,SAAQ,SAAS;IAEtC,KAAK,CAAgB;IACrB,SAAS,CAAoB;IAC7B,cAAc,GAAY,IAAI,CAAC;IAC/B,kBAAkB,GAAY,IAAI,CAAC;IAE3B,KAAK,CAAiB;IAE9B,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAE,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,KAAK;gBACX,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,SAAS,EAAE,CAAC;QAGxC,MAAM,oBAAoB,GAA+B,EAAE,CAAC;QAE5D,eAAe,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACvE,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,eAAe,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YAClE,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gBACrD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;aAClE;QACL,CAAC,CAAC,CAAC;QACH,eAAe,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACrE,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YACnD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,OAAO,GAAgC,EAAE,CAAC;IAElD,MAAM;QACF,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACrC,IAAI,IAAI,CAAC,KAAK;gBAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC;SACzE;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU;YAAE,OAAO;QAErC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;QAC9D,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EACvC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAC5F,CAAC;IACN,CAAC;IAEO,UAAU,CAAC,EAAU,EAAE,GAAc,EAAE,MAAe,EAAE,MAAe,EAAE,SAAkB,KAAK;QACpG,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,EAAE,CAAC;YACnC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC5B;QAED,IAAI,MAAM,EAAE;YACR,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,IAAI,KAAK,CAAC,aAAa,EAAE;gBACrB,yBAAyB;gBACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBACxC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;aAC9B;SACJ;aACI,IAAI,MAAM,EAAE;YACb,IAAI,MAAM,EAAE;gBACR,OAAO,KAAK,CAAC;aAChB;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,EAAE,GAAyB,IAAI,CAAC;YACpC,IAAI,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC;YAC9B,IAAI,GAAG,EAAE;gBACL,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;oBACtB,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAC;iBACpC;gBACD,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;gBACf,IAAI,GAAG,CAAC,IAAI;oBACR,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjD,KAAK,CAAC,YAAY,GAAG,GAAG,CAAC,QAAQ,CAAC;aACrC;iBACI,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE;gBAC5B,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;gBAC7B,mCAAmC;gBACnC,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,OAAO,EAAE;oBACvC,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,CAAC;oBACtD,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;iBACvC;gBACD,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;gBACrE,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC;aAC1C;YAED,IAAI,EAAE,EAAE;gBACJ,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;oBACtB,IAAI,MAAM,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,UAA4B,CAAC;oBACnE,IAAI,IAAI,CAAC,kBAAkB,IAAI,GAAG;wBAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;oBACxD,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC;oBAC1B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;iBACjG;gBAED,IAAI,IAAI,CAAC,cAAc,EAAE;oBACrB,IAAI,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE;wBACrF,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;wBACtC,gEAAgE;wBAChE,4DAA4D;wBAC5D,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;wBAC/D,oDAAoD;wBACpD,KAAK,CAAC,YAAY,GAAG,WAAW,CAAC;qBACpC;iBACJ;gBACD,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,YAAY,GAAG,GAAG,EAAE;oBAC1E,OAAO,KAAK,CAAC;iBAChB;gBACD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1D,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC1B;YAED,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC;SAClD;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;IACvC,MAAM,CAAC,UAAU,GAAc,IAAI,SAAS,EAAE,CAAC;IAE/C,MAAM,CAAC,GAAc;QACzB,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACtC;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9C,IAAI,CAAC,eAAe,CAAC,GAAG,GAAG,GAAG,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACpB,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAC7C,SAAS;iBACZ;gBACD,OAAO,GAAG,CAAC;aACd;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,oBAAoB;QACxB,IAAI,GAAU,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY;YACpC,GAAG,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;;YAEhG,GAAG,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;QACrF,oDAAoD;QAEpD,OAAO,IAAI,gBAAgB,CAAC;YACxB,KAAK,EAAE,GAAG;YACV,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;SACpD,CAAC,CAAC;IACP,CAAC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { Behaviour } from "../../engine-components/Component";
|
|
2
|
+
import * as THREE from 'three';
|
|
3
|
+
import { Color, Material } from "three";
|
|
4
|
+
import { MeshLine, MeshLineMaterial } from 'three.meshline';
|
|
5
|
+
export declare type LineOptions = {
|
|
6
|
+
material?: Material;
|
|
7
|
+
options?: LineMaterialOptions;
|
|
8
|
+
};
|
|
9
|
+
export declare type LineMaterialOptions = {
|
|
10
|
+
map?: THREE.Texture;
|
|
11
|
+
useMap?: number;
|
|
12
|
+
alphaMap?: THREE.Texture;
|
|
13
|
+
color?: Color;
|
|
14
|
+
opacity?: number;
|
|
15
|
+
lineWidth?: number;
|
|
16
|
+
};
|
|
17
|
+
export declare class LineInstanceHandler {
|
|
18
|
+
id: number;
|
|
19
|
+
points: Array<any>;
|
|
20
|
+
line: MeshLine;
|
|
21
|
+
material?: MeshLineMaterial;
|
|
22
|
+
mesh?: THREE.Mesh;
|
|
23
|
+
constructor(owner: THREE.Object3D, options?: LineOptions);
|
|
24
|
+
private static wp;
|
|
25
|
+
appendPoint(vec: Vec3): Vec3;
|
|
26
|
+
private defaultLineMaterial;
|
|
27
|
+
}
|
|
28
|
+
declare type Vec3 = {
|
|
29
|
+
x: number;
|
|
30
|
+
y: number;
|
|
31
|
+
z: number;
|
|
32
|
+
};
|
|
33
|
+
export declare type LineHandle = {
|
|
34
|
+
id: number;
|
|
35
|
+
};
|
|
36
|
+
declare type UpdateLineArgs = {
|
|
37
|
+
point: Vec3;
|
|
38
|
+
};
|
|
39
|
+
export declare class LinesManager extends Behaviour {
|
|
40
|
+
startLine(parent?: THREE.Object3D, options?: LineOptions): LineHandle;
|
|
41
|
+
updateLine(handle: LineHandle, args: UpdateLineArgs): void;
|
|
42
|
+
endLine(handle: LineHandle, send?: boolean): LineInstanceHandler | undefined;
|
|
43
|
+
getLine(handle: LineHandle): LineInstanceHandler | undefined;
|
|
44
|
+
private finished;
|
|
45
|
+
private inFlight;
|
|
46
|
+
private buffer;
|
|
47
|
+
private freeBuffer;
|
|
48
|
+
awake(): void;
|
|
49
|
+
private onEnsureLine;
|
|
50
|
+
private internalStartLine;
|
|
51
|
+
private sendLineStart;
|
|
52
|
+
private sendLineUpdate;
|
|
53
|
+
}
|
|
54
|
+
export {};
|