@needle-tools/engine 2.26.1-pre → 2.27.0-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 +8 -0
- package/dist/needle-engine.js +3 -3
- package/dist/needle-engine.js.map +3 -3
- package/dist/needle-engine.min.js +3 -3
- package/dist/needle-engine.min.js.map +3 -3
- package/lib/engine/engine_serialization_builtin_serializer.js +15 -4
- package/lib/engine/engine_serialization_builtin_serializer.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_techniques_webgl.js +1 -1
- package/lib/engine/extensions/NEEDLE_techniques_webgl.js.map +1 -1
- package/lib/engine/extensions/extension_utils.js +6 -6
- package/lib/engine/extensions/extension_utils.js.map +1 -1
- package/lib/engine-components/AvatarLoader.js +1 -1
- package/lib/engine-components/AvatarLoader.js.map +1 -1
- package/lib/engine-components/ui/BaseUIComponent.js +8 -5
- package/lib/engine-components/ui/BaseUIComponent.js.map +1 -1
- package/lib/engine-components/ui/Image.js +4 -0
- package/lib/engine-components/ui/Image.js.map +1 -1
- package/lib/engine-components/ui/RectTransform.js +1 -1
- package/lib/engine-components/ui/RectTransform.js.map +1 -1
- package/package.json +1 -1
- package/src/engine/engine_serialization_builtin_serializer.ts +15 -3
- package/src/engine/extensions/NEEDLE_techniques_webgl.ts +1 -1
- package/src/engine/extensions/extension_utils.ts +6 -6
- package/src/engine-components/AvatarLoader.ts +1 -1
- package/src/engine-components/ui/BaseUIComponent.ts +12 -5
- package/src/engine-components/ui/Image.ts +4 -0
- package/src/engine-components/ui/RectTransform.ts +1 -1
|
@@ -134,13 +134,24 @@ class ComponentSerializer extends TypeSerializer {
|
|
|
134
134
|
return undefined;
|
|
135
135
|
}
|
|
136
136
|
findObjectForGuid(guid, root) {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
137
|
+
// recursively search root
|
|
138
|
+
// need to check the root object too
|
|
139
|
+
if (root["guid"] === guid)
|
|
140
|
+
return root;
|
|
141
|
+
const res = GameObject.foreachComponent(root, (c) => {
|
|
140
142
|
if (c.guid === guid)
|
|
141
143
|
return c;
|
|
142
144
|
return undefined;
|
|
143
|
-
});
|
|
145
|
+
}, false);
|
|
146
|
+
if (res !== undefined)
|
|
147
|
+
return res;
|
|
148
|
+
// if not found, search in children
|
|
149
|
+
for (let i = 0; i < root.children.length; i++) {
|
|
150
|
+
const child = root.children[i];
|
|
151
|
+
const res = this.findObjectForGuid(guid, child);
|
|
152
|
+
if (res)
|
|
153
|
+
return res;
|
|
154
|
+
}
|
|
144
155
|
}
|
|
145
156
|
}
|
|
146
157
|
export const componentSerializer = new ComponentSerializer();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_serialization_builtin_serializer.js","sourceRoot":"","sources":["../../../engine/engine_serialization_builtin_serializer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"engine_serialization_builtin_serializer.js","sourceRoot":"","sources":["../../../engine/engine_serialization_builtin_serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -335,7 +335,7 @@ export class NEEDLE_techniques_webgl {
|
|
|
335
335
|
for (const key in materialExtension.values) {
|
|
336
336
|
const val = materialExtension.values[key];
|
|
337
337
|
if (typeof val === "string") {
|
|
338
|
-
if (val.startsWith("textures/")) {
|
|
338
|
+
if (val.startsWith("/textures/")) {
|
|
339
339
|
const indexString = val.substring(9);
|
|
340
340
|
const texIndex = Number.parseInt(indexString);
|
|
341
341
|
if (texIndex >= 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NEEDLE_techniques_webgl.js","sourceRoot":"","sources":["../../../../engine/extensions/NEEDLE_techniques_webgl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"NEEDLE_techniques_webgl.js","sourceRoot":"","sources":["../../../../engine/extensions/NEEDLE_techniques_webgl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { debugExtension } from "../engine_default_parameters";
|
|
2
2
|
import { getParam } from "../engine_utils";
|
|
3
3
|
const debug = getParam("debugresolvedependencies");
|
|
4
|
+
const rootExtensionPrefix = "/extensions/";
|
|
4
5
|
const defaultDependencies = [
|
|
5
|
-
{ prefix: "nodes/", dependencyName: "node" },
|
|
6
|
-
{ prefix: "meshes/", dependencyName: "mesh" },
|
|
7
|
-
{ prefix: "materials/", dependencyName: "material" },
|
|
8
|
-
{ prefix: "textures/", dependencyName: "texture" },
|
|
9
|
-
{ prefix: "animations/", dependencyName: "animation" }
|
|
6
|
+
{ prefix: "/nodes/", dependencyName: "node" },
|
|
7
|
+
{ prefix: "/meshes/", dependencyName: "mesh" },
|
|
8
|
+
{ prefix: "/materials/", dependencyName: "material" },
|
|
9
|
+
{ prefix: "/textures/", dependencyName: "texture" },
|
|
10
|
+
{ prefix: "/animations/", dependencyName: "animation" }
|
|
10
11
|
];
|
|
11
12
|
export async function resolveReferences(parser, obj) {
|
|
12
13
|
if (debug)
|
|
@@ -85,7 +86,6 @@ function internalResolve(paths, parser, obj, promises) {
|
|
|
85
86
|
tryResolveDependency(paths, parser, obj, promises);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
|
-
const rootExtensionPrefix = "extensions/";
|
|
89
89
|
function resolveExtension(parser, str) {
|
|
90
90
|
if (parser && parser.plugins && typeof str === "string" && str.startsWith(rootExtensionPrefix)) {
|
|
91
91
|
let name = str.substring(rootExtensionPrefix.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension_utils.js","sourceRoot":"","sources":["../../../../engine/extensions/extension_utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,KAAK,GAAG,QAAQ,CAAC,0BAA0B,CAAC,CAAC;AAOnD,MAAM,mBAAmB,GAAG;IACxB,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"extension_utils.js","sourceRoot":"","sources":["../../../../engine/extensions/extension_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export class AvatarModel {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
export class AvatarLoader {
|
|
30
|
-
avatarRegistryUrl = null;
|
|
30
|
+
avatarRegistryUrl = null;
|
|
31
31
|
// private loader: GLTFLoader | null;
|
|
32
32
|
// private avatarModelCache: Map<string, AvatarModel | null> = new Map<string, AvatarModel | null>();
|
|
33
33
|
async getOrCreateNewAvatarInstance(context, avatarId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvatarLoader.js","sourceRoot":"","sources":["../../../engine-components/AvatarLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,wBAAwB,CAAA;AAC/C,OAAO,KAAK,MAAM,MAAM,0CAA0C,CAAC;AACnE,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE5C,MAAM,OAAO,WAAW;IACpB,IAAI,CAAiB;IACrB,IAAI,CAAiB;IACrB,QAAQ,CAAwB;IAChC,SAAS,CAAwB;IAGjC,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IACzD,CAAC;IAED,YAAY,IAAoB,EAAE,IAAoB,EAAE,QAA+B,EAAE,SAAgC;QACrH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,6CAA6C;QAC7C,iDAAiD;QACjD,kDAAkD;IACtD,CAAC;CACJ;AAED,MAAM,OAAO,YAAY;IAEJ,iBAAiB,GAAkB,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"AvatarLoader.js","sourceRoot":"","sources":["../../../engine-components/AvatarLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,18 +51,21 @@ export class BaseUIComponent extends Behaviour {
|
|
|
51
51
|
console.warn(`Component \"${this.name}\" doesn't have a UI parent anywhere. Do you have a UI element outside a Canvas?`, this);
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
// console.trace(container);
|
|
55
54
|
container.name = this.name + " (" + (this.constructor.name ?? "UI") + ")";
|
|
56
55
|
container.autoLayout = this._parentComponent.controlsChildLayout;
|
|
57
56
|
container.shadowComponentOwner = this;
|
|
58
|
-
|
|
57
|
+
// TODO: raycastTarget doesnt work anymore -> i think we need to set the gameObject layer and then check in the raycaster if the shadowComponentOwner is on the correct layer?!
|
|
58
|
+
// const raycastTarget = (this as unknown as IGraphic).raycastTarget;
|
|
59
|
+
// this.gameObject.layers.set(2)
|
|
59
60
|
// TODO: only traverse our own hierarchy, we can stop if we find another owner
|
|
60
61
|
container.traverse(c => {
|
|
61
|
-
if (c.shadowComponentOwner === undefined)
|
|
62
|
+
if (c.shadowComponentOwner === undefined) {
|
|
62
63
|
c.shadowComponentOwner = this;
|
|
63
|
-
if (raycastTarget === false) {
|
|
64
|
-
c.layers.set(2);
|
|
65
64
|
}
|
|
65
|
+
// // this makes text not render anymore when enabled again
|
|
66
|
+
// if (raycastTarget === false) {
|
|
67
|
+
// c.layers.set(2);
|
|
68
|
+
// }
|
|
66
69
|
});
|
|
67
70
|
if (this.Root?.gameObject === this.gameObject) {
|
|
68
71
|
this.gameObject.add(container);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseUIComponent.js","sourceRoot":"","sources":["../../../../engine-components/ui/BaseUIComponent.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,WAAW,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAY,MAAM,OAAO,CAAC;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,WAAW,CAAC;AAEvC,yFAAyF;AAGzF,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG;IAC1C,GAAG;QACC,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,GAAG,CAAC,KAAK;QACL,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC9B,CAAC;CACJ,CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAE1C,MAAM,KAAK,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9D,SAAS;QACL,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,eAAe,GAA6B,IAAI,CAAC;IAEzC,oBAAoB,GAAG,IAAI,CAAC;IACpC,IAAI,mBAAmB,KAAc,OAAO,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACxE,IAAI,mBAAmB,CAAC,GAAY;QAChC,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;QAChC,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,YAAY;YACX,IAAI,CAAC,eAA+C,CAAC,UAAU,GAAG,GAAG,CAAC;SAC1E;IACL,CAAC;IAEO,KAAK,GAA4B,SAAS,CAAC;IACnD,IAAc,IAAI;QACd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;SAClF;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,oCAAoC;IAC1B,gBAAgB,GAA4B,SAAS,CAAC;IAEhE,QAAQ;QACJ,KAAK,CAAC,QAAQ,EAAE,CAAC;IACrB,CAAC;IAED,YAAY;IACF,kBAAkB,CAAC,SAAc,EAAE,MAAwB;QAEjE,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,4GAA4G;QAC5G,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAC5E,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,oBAAoB,CAAC,UAAW,EAAE,eAAe,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,kFAAkF,EAAE,IAAI,CAAC,CAAC;YAC/H,OAAO;SACV;QAED,
|
|
1
|
+
{"version":3,"file":"BaseUIComponent.js","sourceRoot":"","sources":["../../../../engine-components/ui/BaseUIComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,10 @@ export class Image extends MaskableGraphic {
|
|
|
23
23
|
case "Background":
|
|
24
24
|
return true;
|
|
25
25
|
}
|
|
26
|
+
// this is a hack/workaround for production builds where the name of the sprite is missing
|
|
27
|
+
// need to remove this!!!!
|
|
28
|
+
if (this.sprite?.texture?.image?.width === 32 && this.sprite?.texture?.image?.height === 32)
|
|
29
|
+
return true;
|
|
26
30
|
return false;
|
|
27
31
|
}
|
|
28
32
|
onBeforeCreate(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../engine-components/ui/Image.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,MAAM;IAER,OAAO,CAAiB;IAExB,IAAI,CAAqC;CAC5C;AAHG;IADC,aAAa,CAAC,OAAO,CAAC;uCACC;AAK5B,MAAM,OAAO,KAAM,SAAQ,eAAe;IAGtC,MAAM,CAAU;IAER,eAAe;QACnB,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YAChC,KAAK,sBAAsB,CAAC;YAC5B,KAAK,UAAU,CAAC;YAChB,KAAK,YAAY;gBACb,OAAO,IAAI,CAAC;SACnB;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,cAAc,CAAC,IAAS;QAC9B,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE;YACxB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACtC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;SACzB;IACL,CAAC;IAES,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,eAAe,EAAE;YAAE,OAAO;QACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../engine-components/ui/Image.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,MAAM;IAER,OAAO,CAAiB;IAExB,IAAI,CAAqC;CAC5C;AAHG;IADC,aAAa,CAAC,OAAO,CAAC;uCACC;AAK5B,MAAM,OAAO,KAAM,SAAQ,eAAe;IAGtC,MAAM,CAAU;IAER,eAAe;QACnB,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YAChC,KAAK,sBAAsB,CAAC;YAC5B,KAAK,UAAU,CAAC;YAChB,KAAK,YAAY;gBACb,OAAO,IAAI,CAAC;SACnB;QACD,0FAA0F;QAC1F,0BAA0B;QAC1B,IAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,EAAE;YACtF,OAAO,IAAI,CAAC;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,cAAc,CAAC,IAAS;QAC9B,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE;YACxB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACtC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;SACzB;IACL,CAAC;IAES,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,eAAe,EAAE;YAAE,OAAO;QACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACJ;AA9BG;IADC,aAAa,CAAC,MAAM,CAAC;qCACN;AAgCpB,MAAM,OAAO,QAAS,SAAQ,eAAe;IAEzC,WAAW,CAAW;IAEZ,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,qBAAqB;QACrB,0BAA0B;QAC1B,qCAAqC;QACrC,2CAA2C;QAC3C,IAAI;QACJ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACtC,CAAC;CACJ;AAXG;IADC,aAAa,CAAC,OAAO,CAAC;6CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectTransform.js","sourceRoot":"","sources":["../../../../engine-components/ui/RectTransform.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,KAAK,WAAW,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAS,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;AAElC,MAAM,OAAO,IAAI;IACb,KAAK,CAAU;IACf,MAAM,CAAU;CACnB;AAED,MAAM,OAAO,IAAI;IACb,CAAC,CAAU;IACX,CAAC,CAAU;IACX,KAAK,CAAU;IACf,MAAM,CAAU;CACnB;AAED,MAAM,OAAO,aAAc,SAAQ,eAAe;IAE9C,MAAM,GAAW,IAAI,CAAC;IAEtB,2BAA2B;IAC3B,oBAAoB;IAEpB,IAAI,WAAW,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtD,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACrD,IAAI,KAAK,KAAoB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpD,iBAAiB,CAAW;IACpC,IAAY,gBAAgB;QACxB,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,OAAO,EAAE,CAAC;QACpE,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAGD,IAAI,CAAQ;IAEZ,SAAS,CAAiB;IAE1B,kBAAkB,CAAiB;IAEnC,KAAK,CAAiB;IAEd,UAAU,CAAW;IACrB,SAAS,CAAY;IACrB,qBAAqB,GAAY,KAAK,CAAC;IAE/C,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;QAAA,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEhC,mEAAmE;QACnE,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,OAAO,EAAE,CAAC;QACpE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,QAAQ;QACJ,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"RectTransform.js","sourceRoot":"","sources":["../../../../engine-components/ui/RectTransform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@needle-tools/engine",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.27.0-pre",
|
|
4
4
|
"description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
|
|
5
5
|
"main": "dist/needle-engine.js",
|
|
6
6
|
"module": "lib/needle-engine.js",
|
|
@@ -146,11 +146,23 @@ class ComponentSerializer extends TypeSerializer {
|
|
|
146
146
|
}
|
|
147
147
|
|
|
148
148
|
findObjectForGuid(guid: string, root: THREE.Object3D): any {
|
|
149
|
-
|
|
150
|
-
|
|
149
|
+
// recursively search root
|
|
150
|
+
// need to check the root object too
|
|
151
|
+
if (root["guid"] === guid) return root;
|
|
152
|
+
|
|
153
|
+
const res = GameObject.foreachComponent(root, (c) => {
|
|
151
154
|
if (c.guid === guid) return c;
|
|
152
155
|
return undefined;
|
|
153
|
-
});
|
|
156
|
+
}, false);
|
|
157
|
+
if (res !== undefined)
|
|
158
|
+
return res;
|
|
159
|
+
|
|
160
|
+
// if not found, search in children
|
|
161
|
+
for (let i = 0; i < root.children.length; i++) {
|
|
162
|
+
const child = root.children[i];
|
|
163
|
+
const res = this.findObjectForGuid(guid, child);
|
|
164
|
+
if (res) return res;
|
|
165
|
+
}
|
|
154
166
|
}
|
|
155
167
|
}
|
|
156
168
|
export const componentSerializer = new ComponentSerializer();
|
|
@@ -392,7 +392,7 @@ export class NEEDLE_techniques_webgl implements GLTFLoaderPlugin {
|
|
|
392
392
|
for (const key in materialExtension.values) {
|
|
393
393
|
const val = materialExtension.values[key];
|
|
394
394
|
if (typeof val === "string") {
|
|
395
|
-
if (val.startsWith("textures/")) {
|
|
395
|
+
if (val.startsWith("/textures/")) {
|
|
396
396
|
const indexString = val.substring(9);
|
|
397
397
|
const texIndex = Number.parseInt(indexString);
|
|
398
398
|
if (texIndex >= 0) {
|
|
@@ -10,12 +10,13 @@ declare type DependencyInfo = {
|
|
|
10
10
|
dependencyName: string,
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
+
const rootExtensionPrefix = "/extensions/";
|
|
13
14
|
const defaultDependencies = [
|
|
14
|
-
{ prefix: "nodes/", dependencyName: "node" },
|
|
15
|
-
{ prefix: "meshes/", dependencyName: "mesh" },
|
|
16
|
-
{ prefix: "materials/", dependencyName: "material" },
|
|
17
|
-
{ prefix: "textures/", dependencyName: "texture" },
|
|
18
|
-
{ prefix: "animations/", dependencyName: "animation" }
|
|
15
|
+
{ prefix: "/nodes/", dependencyName: "node" },
|
|
16
|
+
{ prefix: "/meshes/", dependencyName: "mesh" },
|
|
17
|
+
{ prefix: "/materials/", dependencyName: "material" },
|
|
18
|
+
{ prefix: "/textures/", dependencyName: "texture" },
|
|
19
|
+
{ prefix: "/animations/", dependencyName: "animation" }
|
|
19
20
|
]
|
|
20
21
|
|
|
21
22
|
export async function resolveReferences(parser: GLTFParser, obj) {
|
|
@@ -93,7 +94,6 @@ function internalResolve(paths: DependencyInfo[], parser: GLTFParser, obj, promi
|
|
|
93
94
|
}
|
|
94
95
|
|
|
95
96
|
|
|
96
|
-
const rootExtensionPrefix = "extensions/";
|
|
97
97
|
function resolveExtension(parser: GLTFParser, str): Promise<void> | null {
|
|
98
98
|
if (parser && parser.plugins && typeof str === "string" && str.startsWith(rootExtensionPrefix)) {
|
|
99
99
|
let name = str.substring(rootExtensionPrefix.length);
|
|
@@ -35,7 +35,7 @@ export class AvatarModel {
|
|
|
35
35
|
|
|
36
36
|
export class AvatarLoader {
|
|
37
37
|
|
|
38
|
-
private readonly avatarRegistryUrl: string | null = null
|
|
38
|
+
private readonly avatarRegistryUrl: string | null = null;
|
|
39
39
|
// private loader: GLTFLoader | null;
|
|
40
40
|
// private avatarModelCache: Map<string, AvatarModel | null> = new Map<string, AvatarModel | null>();
|
|
41
41
|
|
|
@@ -67,19 +67,26 @@ export class BaseUIComponent extends Behaviour {
|
|
|
67
67
|
return;
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
// console.trace(container);
|
|
71
70
|
container.name = this.name + " (" + (this.constructor.name ?? "UI") + ")";
|
|
72
71
|
container.autoLayout = this._parentComponent.controlsChildLayout;
|
|
73
72
|
container.shadowComponentOwner = this;
|
|
74
|
-
|
|
73
|
+
|
|
74
|
+
// TODO: raycastTarget doesnt work anymore -> i think we need to set the gameObject layer and then check in the raycaster if the shadowComponentOwner is on the correct layer?!
|
|
75
|
+
// const raycastTarget = (this as unknown as IGraphic).raycastTarget;
|
|
76
|
+
// this.gameObject.layers.set(2)
|
|
77
|
+
|
|
78
|
+
|
|
75
79
|
// TODO: only traverse our own hierarchy, we can stop if we find another owner
|
|
76
80
|
container.traverse(c => {
|
|
77
|
-
if (c.shadowComponentOwner === undefined)
|
|
81
|
+
if (c.shadowComponentOwner === undefined) {
|
|
78
82
|
c.shadowComponentOwner = this;
|
|
79
|
-
if (raycastTarget === false) {
|
|
80
|
-
c.layers.set(2);
|
|
81
83
|
}
|
|
84
|
+
// // this makes text not render anymore when enabled again
|
|
85
|
+
// if (raycastTarget === false) {
|
|
86
|
+
// c.layers.set(2);
|
|
87
|
+
// }
|
|
82
88
|
})
|
|
89
|
+
|
|
83
90
|
if (this.Root?.gameObject === this.gameObject) {
|
|
84
91
|
this.gameObject.add(container);
|
|
85
92
|
}
|
|
@@ -22,6 +22,10 @@ export class Image extends MaskableGraphic {
|
|
|
22
22
|
case "Background":
|
|
23
23
|
return true;
|
|
24
24
|
}
|
|
25
|
+
// this is a hack/workaround for production builds where the name of the sprite is missing
|
|
26
|
+
// need to remove this!!!!
|
|
27
|
+
if(this.sprite?.texture?.image?.width === 32 && this.sprite?.texture?.image?.height === 32)
|
|
28
|
+
return true;
|
|
25
29
|
return false;
|
|
26
30
|
}
|
|
27
31
|
|