@needle-tools/engine 5.0.0 → 5.1.0-experimental.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components.needle.json +1 -1
- package/dist/generateMeshBVH.worker-DT9A2Hrc.js +1 -0
- package/dist/gltf-progressive-3BwW4ETO.min.js +10 -0
- package/dist/gltf-progressive-ByD1UX0A.umd.cjs +10 -0
- package/dist/{gltf-progressive-Cl167Vjx.js → gltf-progressive-DwWaVr0o.js} +412 -394
- package/dist/gltf-progressive.worker-DpfUjn1n.js +3 -0
- package/dist/{materialx-qPScBWhj.min.js → materialx-9KHBidZa.min.js} +1 -1
- package/dist/{materialx-4ApD6Vz5.js → materialx-BBDu8W5P.js} +1 -1
- package/dist/{materialx-D0XUnhBY.umd.cjs → materialx-hLP3E8AA.umd.cjs} +2 -2
- package/dist/{needle-engine.bundle-BAYLGumK.umd.cjs → needle-engine.bundle-BOAJ6UPK.umd.cjs} +123 -123
- package/dist/{needle-engine.bundle-CoEvMwYM.min.js → needle-engine.bundle-CVsBkUR2.min.js} +110 -110
- package/dist/{needle-engine.bundle-BDIyvCV6.js → needle-engine.bundle-TgPY0fGG.js} +2143 -2088
- package/dist/needle-engine.d.ts +80 -22
- package/dist/needle-engine.js +480 -476
- package/dist/needle-engine.min.js +1 -1
- package/dist/needle-engine.umd.cjs +1 -1
- package/dist/{postprocessing-B_9sKVU7.min.js → postprocessing-BZfyAdCY.min.js} +1 -1
- package/dist/{postprocessing-WDc9WwI3.js → postprocessing-CXlA3QA6.js} +1 -1
- package/dist/{postprocessing-B2wb6pzI.umd.cjs → postprocessing-Dwy7Hz_T.umd.cjs} +38 -38
- package/dist/three-examples.js +4760 -3641
- package/dist/three-examples.min.js +17 -35
- package/dist/three-examples.umd.cjs +16 -34
- package/dist/three.js +48533 -28562
- package/dist/three.min.js +716 -502
- package/dist/three.umd.cjs +720 -506
- package/dist/{vendor-CntUvmJu.umd.cjs → vendor-BI4TX0aC.umd.cjs} +9 -9
- package/dist/{vendor-DPbfJJ4d.min.js → vendor-BgzAK9of.min.js} +1 -1
- package/dist/{vendor-vHLk8sXu.js → vendor-CwL-uvVy.js} +1 -1
- package/lib/engine/engine_animation.js +1 -1
- package/lib/engine/engine_animation.js.map +1 -1
- package/lib/engine/engine_audio.js.map +1 -1
- package/lib/engine/engine_context.js +3 -6
- package/lib/engine/engine_context.js.map +1 -1
- package/lib/engine/engine_create_objects.js +0 -1
- package/lib/engine/engine_create_objects.js.map +1 -1
- package/lib/engine/engine_element.d.ts +113 -0
- package/lib/engine/engine_element.js +833 -0
- package/lib/engine/engine_element.js.map +1 -0
- package/lib/engine/engine_element_attributes.d.ts +72 -0
- package/lib/engine/engine_element_attributes.js +2 -0
- package/lib/engine/engine_element_attributes.js.map +1 -0
- package/lib/engine/engine_element_extras.d.ts +6 -0
- package/lib/engine/engine_element_extras.js +14 -0
- package/lib/engine/engine_element_extras.js.map +1 -0
- package/lib/engine/engine_element_loading.d.ts +44 -0
- package/lib/engine/engine_element_loading.js +350 -0
- package/lib/engine/engine_element_loading.js.map +1 -0
- package/lib/engine/engine_element_overlay.d.ts +21 -0
- package/lib/engine/engine_element_overlay.js +167 -0
- package/lib/engine/engine_element_overlay.js.map +1 -0
- package/lib/engine/engine_license.js.map +1 -1
- package/lib/engine/engine_pmrem.js +2 -2
- package/lib/engine/engine_pmrem.js.map +1 -1
- package/lib/engine/engine_scenetools.d.ts +62 -0
- package/lib/engine/engine_scenetools.js +337 -0
- package/lib/engine/engine_scenetools.js.map +1 -0
- package/lib/engine/engine_serialization_builtin_serializer.d.ts +1 -1
- package/lib/engine/engine_test_utils.d.ts +39 -0
- package/lib/engine/engine_test_utils.js +84 -0
- package/lib/engine/engine_test_utils.js.map +1 -0
- package/lib/engine/engine_three_utils.js.map +1 -1
- package/lib/engine/engine_time.js +4 -3
- package/lib/engine/engine_time.js.map +1 -1
- package/lib/engine/engine_ui.d.ts +25 -0
- package/lib/engine/engine_ui.dummy_canvas.d.ts +2 -0
- package/lib/engine/engine_ui.dummy_canvas.js +55 -0
- package/lib/engine/engine_ui.dummy_canvas.js.map +1 -0
- package/lib/engine/engine_ui.js +168 -0
- package/lib/engine/engine_ui.js.map +1 -0
- package/lib/engine/extensions/NEEDLE_lightmaps.js +2 -2
- package/lib/engine/extensions/NEEDLE_lightmaps.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_pmrem.d.ts +1 -1
- package/lib/engine/webcomponents/icons.js +3 -2
- package/lib/engine/webcomponents/icons.js.map +1 -1
- package/lib/engine/webcomponents/needle-engine.attributes.d.ts +69 -0
- package/lib/engine/webcomponents/needle-engine.attributes.js +2 -0
- package/lib/engine/webcomponents/needle-engine.attributes.js.map +1 -0
- package/lib/engine-components/AudioSource.js +1 -1
- package/lib/engine-components/AudioSource.js.map +1 -1
- package/lib/engine-components/Light.d.ts +3 -0
- package/lib/engine-components/Light.js +39 -31
- package/lib/engine-components/Light.js.map +1 -1
- package/lib/engine-components/OrbitControls.js +2 -1
- package/lib/engine-components/OrbitControls.js.map +1 -1
- package/lib/engine-components/SpriteRenderer.d.ts +1 -1
- package/lib/engine-components/VideoPlayer.d.ts +1 -1
- package/lib/engine-components/export/usdz/ThreeUSDZExporter.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/Animation.js +1 -0
- package/lib/engine-components/export/usdz/extensions/Animation.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/behavior/BehaviourComponents.d.ts +1 -1
- package/lib/engine-components/export/usdz/extensions/behavior/BehaviourComponents.js.map +1 -1
- package/lib/engine-components/particlesystem/ParticleSystem.d.ts +1 -1
- package/lib/engine-components/postprocessing/Effects/Tonemapping.utils.d.ts +1 -1
- package/lib/engine-components/postprocessing/PostProcessingHandler.js.map +1 -1
- package/lib/engine-components/timeline/TimelineTracks.js.map +1 -1
- package/lib/engine-components/ui/BaseUIComponent_Uikit.d.ts +54 -0
- package/lib/engine-components/ui/BaseUIComponent_Uikit.js +114 -0
- package/lib/engine-components/ui/BaseUIComponent_Uikit.js.map +1 -0
- package/lib/engine-components/ui/BaseUikitComponent.d.ts +54 -0
- package/lib/engine-components/ui/BaseUikitComponent.js +114 -0
- package/lib/engine-components/ui/BaseUikitComponent.js.map +1 -0
- package/lib/engine-components/ui/Button.legacy.d.ts +68 -0
- package/lib/engine-components/ui/Button.legacy.js +320 -0
- package/lib/engine-components/ui/Button.legacy.js.map +1 -0
- package/lib/engine-components/ui/ButtonUikit.d.ts +51 -0
- package/lib/engine-components/ui/ButtonUikit.js +187 -0
- package/lib/engine-components/ui/ButtonUikit.js.map +1 -0
- package/lib/engine-components/ui/Canvas.js +2 -2
- package/lib/engine-components/ui/Canvas.js.map +1 -1
- package/lib/engine-components/ui/Canvas.legacy.d.ts +76 -0
- package/lib/engine-components/ui/Canvas.legacy.js +409 -0
- package/lib/engine-components/ui/Canvas.legacy.js.map +1 -0
- package/lib/engine-components/ui/CanvasUikit.d.ts +68 -0
- package/lib/engine-components/ui/CanvasUikit.js +289 -0
- package/lib/engine-components/ui/CanvasUikit.js.map +1 -0
- package/lib/engine-components/ui/Graphic.d.ts +3 -3
- package/lib/engine-components/ui/Graphic.js +6 -2
- package/lib/engine-components/ui/Graphic.js.map +1 -1
- package/lib/engine-components/ui/Graphic.legacy.d.ts +55 -0
- package/lib/engine-components/ui/Graphic.legacy.js +268 -0
- package/lib/engine-components/ui/Graphic.legacy.js.map +1 -0
- package/lib/engine-components/ui/GraphicUikit.d.ts +21 -0
- package/lib/engine-components/ui/GraphicUikit.js +65 -0
- package/lib/engine-components/ui/GraphicUikit.js.map +1 -0
- package/lib/engine-components/ui/Image.js.map +1 -1
- package/lib/engine-components/ui/Image.legacy.d.ts +39 -0
- package/lib/engine-components/ui/Image.legacy.js +121 -0
- package/lib/engine-components/ui/Image.legacy.js.map +1 -0
- package/lib/engine-components/ui/ImageUikit.d.ts +22 -0
- package/lib/engine-components/ui/ImageUikit.js +97 -0
- package/lib/engine-components/ui/ImageUikit.js.map +1 -0
- package/lib/engine-components/ui/RenderMode.d.ts +14 -0
- package/lib/engine-components/ui/RenderMode.js +16 -0
- package/lib/engine-components/ui/RenderMode.js.map +1 -0
- package/lib/engine-components/ui/Text.d.ts +64 -11
- package/lib/engine-components/ui/Text.js +154 -45
- package/lib/engine-components/ui/Text.js.map +1 -1
- package/lib/engine-components/ui/Text.legacy.d.ts +81 -0
- package/lib/engine-components/ui/Text.legacy.js +548 -0
- package/lib/engine-components/ui/Text.legacy.js.map +1 -0
- package/lib/engine-components/ui/TextUikit.d.ts +42 -0
- package/lib/engine-components/ui/TextUikit.js +164 -0
- package/lib/engine-components/ui/TextUikit.js.map +1 -0
- package/lib/engine-components/ui/index.d.ts +1 -0
- package/lib/engine-components/ui/index.js +1 -0
- package/lib/engine-components/ui/index.js.map +1 -1
- package/lib/engine-components/webxr/WebARCameraBackground.d.ts +1 -1
- 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/package.json +4 -4
- package/plugins/common/buildinfo.d.ts +6 -0
- package/plugins/vite/ai.d.ts +7 -8
- package/plugins/vite/ai.js +95 -20
- package/plugins/vite/alias.js +6 -0
- package/plugins/vite/dependencies.js +7 -0
- package/src/engine/engine_animation.ts +1 -1
- package/src/engine/engine_audio.ts +1 -1
- package/src/engine/engine_context.ts +3 -6
- package/src/engine/engine_create_objects.ts +0 -1
- package/src/engine/engine_license.ts +0 -2
- package/src/engine/engine_pmrem.ts +3 -3
- package/src/engine/engine_three_utils.ts +2 -2
- package/src/engine/engine_time.ts +4 -3
- package/src/engine/extensions/NEEDLE_lightmaps.ts +3 -3
- package/src/engine/webcomponents/icons.ts +3 -2
- package/src/engine-components/AudioSource.ts +1 -1
- package/src/engine-components/Light.ts +39 -31
- package/src/engine-components/OrbitControls.ts +2 -2
- package/src/engine-components/export/usdz/ThreeUSDZExporter.ts +2 -2
- package/src/engine-components/export/usdz/extensions/Animation.ts +6 -5
- package/src/engine-components/export/usdz/extensions/behavior/BehaviourComponents.ts +1 -1
- package/src/engine-components/postprocessing/PostProcessingHandler.ts +3 -3
- package/src/engine-components/timeline/TimelineTracks.ts +2 -2
- package/src/engine-components/ui/Canvas.ts +2 -2
- package/src/engine-components/ui/Graphic.ts +7 -3
- package/src/engine-components/ui/Image.ts +1 -1
- package/src/engine-components/ui/Text.ts +170 -52
- package/src/engine-components/ui/index.ts +2 -1
- package/dist/generateMeshBVH.worker-DiCnZlf3.js +0 -21
- package/dist/gltf-progressive-BryRjllq.min.js +0 -10
- package/dist/gltf-progressive-DJBMx-zB.umd.cjs +0 -10
- package/dist/gltf-progressive.worker-BqODMeeW.js +0 -23
|
@@ -0,0 +1,289 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { Matrix4 } from "three";
|
|
8
|
+
import { Container, Fullscreen, reversePainterSortStable } from "@pmndrs/uikit";
|
|
9
|
+
import { serializable } from "../../engine/engine_serialization_decorator.js";
|
|
10
|
+
import { delayForFrames, getParam } from "../../engine/engine_utils.js";
|
|
11
|
+
import { onUpdate } from "../../engine/engine_lifecycle_api.js";
|
|
12
|
+
import { Camera } from "../Camera.js";
|
|
13
|
+
import { Behaviour } from "../Component.js";
|
|
14
|
+
import { RenderMode } from "./Canvas.js";
|
|
15
|
+
const debugLayout = getParam("debuguilayout");
|
|
16
|
+
/**
|
|
17
|
+
* Modern Canvas implementation using pmndrs/uikit.
|
|
18
|
+
* This is the new default Canvas component that replaces the three-mesh-ui based implementation.
|
|
19
|
+
*
|
|
20
|
+
* @summary Root component for UI elements using pmndrs/uikit
|
|
21
|
+
* @category User Interface
|
|
22
|
+
* @group Components
|
|
23
|
+
*/
|
|
24
|
+
export class CanvasUikit extends Behaviour {
|
|
25
|
+
_uikitRoot = null;
|
|
26
|
+
_previousParent = null;
|
|
27
|
+
_lastMatrixWorld = null;
|
|
28
|
+
get isCanvas() {
|
|
29
|
+
return true;
|
|
30
|
+
}
|
|
31
|
+
get screenspace() {
|
|
32
|
+
return this.renderMode !== RenderMode.WorldSpace;
|
|
33
|
+
}
|
|
34
|
+
set renderOnTop(val) {
|
|
35
|
+
if (val === this._renderOnTop)
|
|
36
|
+
return;
|
|
37
|
+
this._renderOnTop = val;
|
|
38
|
+
this.onRenderSettingsChanged();
|
|
39
|
+
}
|
|
40
|
+
get renderOnTop() {
|
|
41
|
+
if (this._renderOnTop !== undefined)
|
|
42
|
+
return this._renderOnTop;
|
|
43
|
+
if (this.screenspace) {
|
|
44
|
+
if (this._renderMode === RenderMode.ScreenSpaceOverlay)
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
_renderOnTop;
|
|
50
|
+
set depthWrite(val) {
|
|
51
|
+
if (this._depthWrite === val)
|
|
52
|
+
return;
|
|
53
|
+
this._depthWrite = val;
|
|
54
|
+
this.onRenderSettingsChanged();
|
|
55
|
+
}
|
|
56
|
+
get depthWrite() { return this._depthWrite; }
|
|
57
|
+
_depthWrite = false;
|
|
58
|
+
set doubleSided(val) {
|
|
59
|
+
if (this._doubleSided === val)
|
|
60
|
+
return;
|
|
61
|
+
this._doubleSided = val;
|
|
62
|
+
this.onRenderSettingsChanged();
|
|
63
|
+
}
|
|
64
|
+
get doubleSided() { return this._doubleSided; }
|
|
65
|
+
_doubleSided = true;
|
|
66
|
+
set castShadows(val) {
|
|
67
|
+
if (this._castShadows === val)
|
|
68
|
+
return;
|
|
69
|
+
this._castShadows = val;
|
|
70
|
+
this.onRenderSettingsChanged();
|
|
71
|
+
}
|
|
72
|
+
get castShadows() { return this._castShadows; }
|
|
73
|
+
_castShadows = false;
|
|
74
|
+
set receiveShadows(val) {
|
|
75
|
+
if (this._receiveShadows === val)
|
|
76
|
+
return;
|
|
77
|
+
this._receiveShadows = val;
|
|
78
|
+
this.onRenderSettingsChanged();
|
|
79
|
+
}
|
|
80
|
+
get receiveShadows() { return this._receiveShadows; }
|
|
81
|
+
_receiveShadows = false;
|
|
82
|
+
get renderMode() {
|
|
83
|
+
return this._renderMode;
|
|
84
|
+
}
|
|
85
|
+
set renderMode(val) {
|
|
86
|
+
if (this._renderMode === val)
|
|
87
|
+
return;
|
|
88
|
+
this._renderMode = val;
|
|
89
|
+
this.createUikitRoot();
|
|
90
|
+
}
|
|
91
|
+
_renderMode = RenderMode.WorldSpace;
|
|
92
|
+
get scaleFactor() {
|
|
93
|
+
return this._scaleFactor;
|
|
94
|
+
}
|
|
95
|
+
set scaleFactor(val) {
|
|
96
|
+
this._scaleFactor = val;
|
|
97
|
+
}
|
|
98
|
+
_scaleFactor = 1;
|
|
99
|
+
worldCamera;
|
|
100
|
+
planeDistance = 10;
|
|
101
|
+
pixelSize = 0.01;
|
|
102
|
+
_receivers = [];
|
|
103
|
+
_updateUnsubscribe;
|
|
104
|
+
registerEventReceiver(receiver) {
|
|
105
|
+
this._receivers.push(receiver);
|
|
106
|
+
}
|
|
107
|
+
unregisterEventReceiver(receiver) {
|
|
108
|
+
const index = this._receivers.indexOf(receiver);
|
|
109
|
+
if (index !== -1) {
|
|
110
|
+
this._receivers.splice(index, 1);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
awake() {
|
|
114
|
+
this._previousParent = this.gameObject.parent;
|
|
115
|
+
if (debugLayout)
|
|
116
|
+
console.log("CanvasUikit.Awake()", this._previousParent?.name + "/" + this.gameObject.name);
|
|
117
|
+
// Enable renderer settings for uikit
|
|
118
|
+
this.context.renderer.localClippingEnabled = true;
|
|
119
|
+
this.context.renderer.setTransparentSort(reversePainterSortStable);
|
|
120
|
+
}
|
|
121
|
+
start() {
|
|
122
|
+
this.createUikitRoot();
|
|
123
|
+
}
|
|
124
|
+
onEnable() {
|
|
125
|
+
super.onEnable();
|
|
126
|
+
this._lastMatrixWorld = new Matrix4();
|
|
127
|
+
this.createUikitRoot();
|
|
128
|
+
document.addEventListener("resize", this._boundOnRenderSettingsChanged);
|
|
129
|
+
// Register update callback for uikit
|
|
130
|
+
this._updateUnsubscribe = onUpdate(() => {
|
|
131
|
+
this.updateUikit();
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
onDisable() {
|
|
135
|
+
super.onDisable();
|
|
136
|
+
document.removeEventListener("resize", this._boundOnRenderSettingsChanged);
|
|
137
|
+
// Unregister update callback
|
|
138
|
+
if (this._updateUnsubscribe) {
|
|
139
|
+
this._updateUnsubscribe();
|
|
140
|
+
this._updateUnsubscribe = undefined;
|
|
141
|
+
}
|
|
142
|
+
// Clean up uikit root
|
|
143
|
+
if (this._uikitRoot) {
|
|
144
|
+
this._uikitRoot.removeFromParent();
|
|
145
|
+
this._uikitRoot = null;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
async onEnterXR(args) {
|
|
149
|
+
if (this.screenspace) {
|
|
150
|
+
if (args.xr.isVR || args.xr.isPassThrough) {
|
|
151
|
+
this.gameObject.visible = false;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
this.gameObject.visible = false;
|
|
156
|
+
await delayForFrames(1).then(() => {
|
|
157
|
+
this.gameObject.visible = true;
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
onLeaveXR(args) {
|
|
162
|
+
if (this.screenspace) {
|
|
163
|
+
if (args.xr.isVR || args.xr.isPassThrough) {
|
|
164
|
+
this.gameObject.visible = true;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
_boundOnRenderSettingsChanged = this.onRenderSettingsChanged.bind(this);
|
|
169
|
+
createUikitRoot() {
|
|
170
|
+
// Clean up existing root
|
|
171
|
+
if (this._uikitRoot) {
|
|
172
|
+
this._uikitRoot.removeFromParent();
|
|
173
|
+
this._uikitRoot = null;
|
|
174
|
+
}
|
|
175
|
+
const properties = {
|
|
176
|
+
flexDirection: "column",
|
|
177
|
+
};
|
|
178
|
+
// Create appropriate uikit root based on render mode
|
|
179
|
+
switch (this._renderMode) {
|
|
180
|
+
case RenderMode.ScreenSpaceOverlay:
|
|
181
|
+
case RenderMode.ScreenSpaceCamera:
|
|
182
|
+
// Use Fullscreen for screenspace rendering
|
|
183
|
+
const camera = this._renderMode === RenderMode.ScreenSpaceCamera && this.worldCamera
|
|
184
|
+
? this.worldCamera
|
|
185
|
+
: this.context.mainCameraComponent;
|
|
186
|
+
if (!camera) {
|
|
187
|
+
console.warn("CanvasUikit: No camera available for screenspace mode");
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
this._uikitRoot = new Fullscreen(this.context.renderer, {
|
|
191
|
+
...properties,
|
|
192
|
+
distanceToCamera: this.planeDistance > 0 ? this.planeDistance : undefined,
|
|
193
|
+
});
|
|
194
|
+
break;
|
|
195
|
+
case RenderMode.WorldSpace:
|
|
196
|
+
default:
|
|
197
|
+
// Use Container for worldspace rendering
|
|
198
|
+
this._uikitRoot = new Container({
|
|
199
|
+
...properties,
|
|
200
|
+
pixelSize: this.pixelSize,
|
|
201
|
+
});
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
204
|
+
// Add to scene
|
|
205
|
+
this.gameObject.add(this._uikitRoot);
|
|
206
|
+
if (debugLayout) {
|
|
207
|
+
console.log("Created uikit root:", this._renderMode, this._uikitRoot);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
updateUikit() {
|
|
211
|
+
if (!this._uikitRoot)
|
|
212
|
+
return;
|
|
213
|
+
// Update uikit (required every frame)
|
|
214
|
+
this._uikitRoot.update(this.context.time.deltaTime);
|
|
215
|
+
// Invoke before render events
|
|
216
|
+
for (const receiver of this._receivers) {
|
|
217
|
+
receiver.onBeforeCanvasRender?.(this);
|
|
218
|
+
}
|
|
219
|
+
// Track matrix changes for layout updates
|
|
220
|
+
if (this._lastMatrixWorld) {
|
|
221
|
+
const matrixWorldChanged = !this._lastMatrixWorld.equals(this.gameObject.matrixWorld);
|
|
222
|
+
if (matrixWorldChanged && debugLayout) {
|
|
223
|
+
console.log("Canvas matrix changed", this.context.time.frameCount, this.name);
|
|
224
|
+
}
|
|
225
|
+
this._lastMatrixWorld.copy(this.gameObject.matrixWorld);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
onRenderSettingsChanged() {
|
|
229
|
+
// Settings changed, may need to recreate root
|
|
230
|
+
if (debugLayout) {
|
|
231
|
+
console.log("CanvasUikit render settings changed");
|
|
232
|
+
}
|
|
233
|
+
// For now, just update material settings if needed
|
|
234
|
+
// TODO: Apply depthWrite, doubleSided, castShadows, receiveShadows to uikit materials
|
|
235
|
+
}
|
|
236
|
+
/**
|
|
237
|
+
* Get the uikit root container.
|
|
238
|
+
* Use this to add uikit UI elements to the canvas.
|
|
239
|
+
*/
|
|
240
|
+
get uikitRoot() {
|
|
241
|
+
return this._uikitRoot;
|
|
242
|
+
}
|
|
243
|
+
// ICanvas compatibility methods
|
|
244
|
+
// These are here for compatibility with the old Canvas interface
|
|
245
|
+
// TODO: Remove these once RectTransform is migrated
|
|
246
|
+
registerTransform(_rt) {
|
|
247
|
+
console.warn("CanvasUikit.registerTransform is deprecated - uikit handles layout automatically");
|
|
248
|
+
}
|
|
249
|
+
unregisterTransform(_rt) {
|
|
250
|
+
// No-op for uikit
|
|
251
|
+
}
|
|
252
|
+
registerLayoutGroup(_group) {
|
|
253
|
+
console.warn("CanvasUikit.registerLayoutGroup is deprecated - uikit handles layout automatically");
|
|
254
|
+
}
|
|
255
|
+
unregisterLayoutGroup(_group) {
|
|
256
|
+
// No-op for uikit
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
__decorate([
|
|
260
|
+
serializable()
|
|
261
|
+
], CanvasUikit.prototype, "renderOnTop", null);
|
|
262
|
+
__decorate([
|
|
263
|
+
serializable()
|
|
264
|
+
], CanvasUikit.prototype, "depthWrite", null);
|
|
265
|
+
__decorate([
|
|
266
|
+
serializable()
|
|
267
|
+
], CanvasUikit.prototype, "doubleSided", null);
|
|
268
|
+
__decorate([
|
|
269
|
+
serializable()
|
|
270
|
+
], CanvasUikit.prototype, "castShadows", null);
|
|
271
|
+
__decorate([
|
|
272
|
+
serializable()
|
|
273
|
+
], CanvasUikit.prototype, "receiveShadows", null);
|
|
274
|
+
__decorate([
|
|
275
|
+
serializable()
|
|
276
|
+
], CanvasUikit.prototype, "renderMode", null);
|
|
277
|
+
__decorate([
|
|
278
|
+
serializable()
|
|
279
|
+
], CanvasUikit.prototype, "scaleFactor", null);
|
|
280
|
+
__decorate([
|
|
281
|
+
serializable(Camera)
|
|
282
|
+
], CanvasUikit.prototype, "worldCamera", void 0);
|
|
283
|
+
__decorate([
|
|
284
|
+
serializable()
|
|
285
|
+
], CanvasUikit.prototype, "planeDistance", void 0);
|
|
286
|
+
__decorate([
|
|
287
|
+
serializable()
|
|
288
|
+
], CanvasUikit.prototype, "pixelSize", void 0);
|
|
289
|
+
//# sourceMappingURL=CanvasUikit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CanvasUikit.js","sourceRoot":"","sources":["../../../src/engine-components/ui/CanvasUikit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Texture } from 'three';
|
|
1
|
+
import { Color, Texture } from 'three';
|
|
2
2
|
import * as ThreeMeshUI from 'three-mesh-ui';
|
|
3
3
|
import type { Options } from 'three-mesh-ui/build/types/core/elements/MeshUIBaseElement.js';
|
|
4
4
|
import { ComponentInit } from '../../engine/engine_types.js';
|
|
@@ -14,7 +14,8 @@ import { RectTransform } from './RectTransform.js';
|
|
|
14
14
|
export declare class Graphic extends BaseUIComponent implements IGraphic, IRectTransformChangedReceiver {
|
|
15
15
|
get isGraphic(): boolean;
|
|
16
16
|
get color(): RGBAColor;
|
|
17
|
-
set color(col: RGBAColor);
|
|
17
|
+
set color(col: RGBAColor | Color);
|
|
18
|
+
private _color;
|
|
18
19
|
private _alphaFactor;
|
|
19
20
|
setAlphaFactor(factor: number): void;
|
|
20
21
|
get alphaFactor(): number;
|
|
@@ -23,7 +24,6 @@ export declare class Graphic extends BaseUIComponent implements IGraphic, IRectT
|
|
|
23
24
|
private get m_Color();
|
|
24
25
|
raycastTarget: boolean;
|
|
25
26
|
protected uiObject: ThreeMeshUI.Block | null;
|
|
26
|
-
private _color;
|
|
27
27
|
private _rect;
|
|
28
28
|
private _stateManager;
|
|
29
29
|
protected get rectTransform(): RectTransform;
|
|
@@ -33,7 +33,11 @@ export class Graphic extends BaseUIComponent {
|
|
|
33
33
|
return this._color;
|
|
34
34
|
}
|
|
35
35
|
set color(col) {
|
|
36
|
-
const changed = !this._color
|
|
36
|
+
const changed = !this._color
|
|
37
|
+
|| this._color.r !== col.r
|
|
38
|
+
|| this._color.g !== col.g
|
|
39
|
+
|| this._color.b !== col.b
|
|
40
|
+
|| ("alpha" in col ? this._color.alpha !== col.alpha : this._color.alpha !== 1);
|
|
37
41
|
if (!changed)
|
|
38
42
|
return;
|
|
39
43
|
if (!this._color) {
|
|
@@ -42,6 +46,7 @@ export class Graphic extends BaseUIComponent {
|
|
|
42
46
|
this._color.copy(col);
|
|
43
47
|
this.onColorChanged();
|
|
44
48
|
}
|
|
49
|
+
_color = null;
|
|
45
50
|
_alphaFactor = 1;
|
|
46
51
|
setAlphaFactor(factor) {
|
|
47
52
|
this._alphaFactor = factor;
|
|
@@ -80,7 +85,6 @@ export class Graphic extends BaseUIComponent {
|
|
|
80
85
|
}
|
|
81
86
|
raycastTarget = true;
|
|
82
87
|
uiObject = null;
|
|
83
|
-
_color = null;
|
|
84
88
|
_rect = null;
|
|
85
89
|
_stateManager = null;
|
|
86
90
|
get rectTransform() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Graphic.js","sourceRoot":"","sources":["../../../src/engine-components/ui/Graphic.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAA4B,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvF,OAAO,mBAAmB,MAAM,gEAAgE,CAAA;AAEhG,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAErD,MAAM,iBAAiB,GAAqG;IACxH,eAAe,EAAE,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC,iBAAiB,EAAE,CAAC;IACpB,WAAW,EAAE,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/B,aAAa,EAAE,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,MAAM,OAAO,OAAQ,SAAQ,eAAe;IAExC,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC;IAGhC,IAAI,KAAK;QACL,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Graphic.js","sourceRoot":"","sources":["../../../src/engine-components/ui/Graphic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { Texture } from 'three';
|
|
2
|
+
import * as ThreeMeshUI from 'three-mesh-ui';
|
|
3
|
+
import type { Options } from 'three-mesh-ui/build/types/core/elements/MeshUIBaseElement.js';
|
|
4
|
+
import { ComponentInit } from '../../engine/engine_types.js';
|
|
5
|
+
import { RGBAColor } from "../../engine/js-extensions/index.js";
|
|
6
|
+
import { BaseUIComponent } from "./BaseUIComponent.js";
|
|
7
|
+
import { type IGraphic, type IRectTransformChangedReceiver } from './Interfaces.js';
|
|
8
|
+
import { RectTransform } from './RectTransform.js';
|
|
9
|
+
/**
|
|
10
|
+
* @category User Interface
|
|
11
|
+
* @group Components
|
|
12
|
+
*/
|
|
13
|
+
export declare class Graphic extends BaseUIComponent implements IGraphic, IRectTransformChangedReceiver {
|
|
14
|
+
get isGraphic(): boolean;
|
|
15
|
+
get color(): RGBAColor;
|
|
16
|
+
set color(col: RGBAColor);
|
|
17
|
+
private _alphaFactor;
|
|
18
|
+
setAlphaFactor(factor: number): void;
|
|
19
|
+
get alphaFactor(): number;
|
|
20
|
+
private sRGBColor;
|
|
21
|
+
protected onColorChanged(): void;
|
|
22
|
+
private get m_Color();
|
|
23
|
+
raycastTarget: boolean;
|
|
24
|
+
protected uiObject: ThreeMeshUI.Block | null;
|
|
25
|
+
private _color;
|
|
26
|
+
private _rect;
|
|
27
|
+
private _stateManager;
|
|
28
|
+
protected get rectTransform(): RectTransform;
|
|
29
|
+
onParentRectTransformChanged(): void;
|
|
30
|
+
__internalNewInstanceCreated(init: ComponentInit<this>): this;
|
|
31
|
+
setState(state: string): void;
|
|
32
|
+
setupState(state: object): void;
|
|
33
|
+
setOptions(opts: Options): void;
|
|
34
|
+
awake(): void;
|
|
35
|
+
onEnable(): void;
|
|
36
|
+
onDisable(): void;
|
|
37
|
+
private _currentlyCreatingPanel;
|
|
38
|
+
protected makePanel(): void;
|
|
39
|
+
protected onBeforeCreate(_opts: any): void;
|
|
40
|
+
protected onCreate(opts: any): void;
|
|
41
|
+
protected onAfterCreated(): void;
|
|
42
|
+
private applyEffects;
|
|
43
|
+
/** used internally to ensure textures assigned to UI use linear encoding */
|
|
44
|
+
static textureCache: Map<Texture, Texture>;
|
|
45
|
+
protected setTexture(tex: Texture | null | undefined): Promise<void>;
|
|
46
|
+
protected onAfterAddedToScene(): void;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* @category User Interface
|
|
50
|
+
* @group Components
|
|
51
|
+
*/
|
|
52
|
+
export declare class MaskableGraphic extends Graphic {
|
|
53
|
+
private _flippedObject;
|
|
54
|
+
protected onAfterCreated(): void;
|
|
55
|
+
}
|