@needle-tools/engine 3.16.5 → 3.17.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/CHANGELOG.md +3 -0
- package/dist/needle-engine.js +2639 -2638
- package/dist/needle-engine.light.js +2528 -2527
- package/dist/needle-engine.light.min.js +121 -121
- package/dist/needle-engine.light.umd.cjs +180 -180
- package/dist/needle-engine.min.js +122 -122
- package/dist/needle-engine.umd.cjs +142 -142
- package/lib/engine/extensions/NEEDLE_lightmaps.js +7 -2
- package/lib/engine/extensions/NEEDLE_lightmaps.js.map +1 -1
- package/lib/engine-components/NestedGltf.js +2 -0
- package/lib/engine-components/NestedGltf.js.map +1 -1
- package/package.json +1 -1
- package/src/engine/extensions/NEEDLE_lightmaps.ts +7 -2
- package/src/engine-components/NestedGltf.ts +1 -0
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { LinearSRGBColorSpace, SRGBColorSpace, TextureLoader } from "three";
|
|
2
2
|
import { resolveReferences } from "./extension_utils.js";
|
|
3
|
-
import { getParam, resolveUrl } from "../engine_utils.js";
|
|
3
|
+
import { getParam, PromiseAllWithErrors, resolveUrl } from "../engine_utils.js";
|
|
4
4
|
import { EXRLoader } from "three/examples/jsm/loaders/EXRLoader.js";
|
|
5
5
|
import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader.js";
|
|
6
|
+
import { isDevEnvironment } from "../debug/debug.js";
|
|
6
7
|
// the lightmap extension is aimed to also export export skyboxes and custom reflection maps
|
|
7
8
|
// should we rename it?
|
|
8
9
|
// should we split it into multiple extensions?
|
|
@@ -69,7 +70,11 @@ export class NEEDLE_lightmaps {
|
|
|
69
70
|
dependencies.push(res);
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
|
-
await
|
|
73
|
+
const results = await PromiseAllWithErrors(dependencies);
|
|
74
|
+
if (results?.anyFailed) {
|
|
75
|
+
if (isDevEnvironment())
|
|
76
|
+
console.error("Failed to load lightmap extension", results);
|
|
77
|
+
}
|
|
73
78
|
res();
|
|
74
79
|
});
|
|
75
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NEEDLE_lightmaps.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_lightmaps.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,oBAAoB,EAAE,cAAc,EAAyB,aAAa,EAAE,MAAM,OAAO,CAAC;AAG7I,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"NEEDLE_lightmaps.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_lightmaps.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,8 @@ export class NestedGltf extends Behaviour {
|
|
|
37
37
|
if (debug)
|
|
38
38
|
console.log("Load nested:", this.filePath?.uri ?? this.filePath, this.gameObject.position);
|
|
39
39
|
const res = await this.filePath?.instantiate?.call(this.filePath, opts);
|
|
40
|
+
if (debug)
|
|
41
|
+
console.log("Nested loaded:", this.filePath?.uri ?? this.filePath, res);
|
|
40
42
|
if (res) {
|
|
41
43
|
res.matrixAutoUpdate = false;
|
|
42
44
|
res.matrix.identity();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NestedGltf.js","sourceRoot":"","sources":["../../src/engine-components/NestedGltf.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NestedGltf.js","sourceRoot":"","sources":["../../src/engine-components/NestedGltf.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": "3.
|
|
3
|
+
"version": "3.17.0",
|
|
4
4
|
"description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in",
|
|
5
5
|
"main": "dist/needle-engine.umd.cjs",
|
|
6
6
|
"type": "module",
|
|
@@ -3,9 +3,10 @@ import { FloatType, HalfFloatType, LinearEncoding, LinearSRGBColorSpace, SRGBCol
|
|
|
3
3
|
import { GLTF, GLTFLoaderPlugin, GLTFParser } from "three/examples/jsm/loaders/GLTFLoader.js";
|
|
4
4
|
import { SourceIdentifier } from "../engine_types.js";
|
|
5
5
|
import { resolveReferences } from "./extension_utils.js";
|
|
6
|
-
import { getParam, resolveUrl } from "../engine_utils.js";
|
|
6
|
+
import { getParam, PromiseAllWithErrors, resolveUrl } from "../engine_utils.js";
|
|
7
7
|
import { EXRLoader } from "three/examples/jsm/loaders/EXRLoader.js";
|
|
8
8
|
import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader.js";
|
|
9
|
+
import { isDevEnvironment } from "../debug/debug.js";
|
|
9
10
|
|
|
10
11
|
// the lightmap extension is aimed to also export export skyboxes and custom reflection maps
|
|
11
12
|
// should we rename it?
|
|
@@ -89,7 +90,11 @@ export class NEEDLE_lightmaps implements GLTFLoaderPlugin {
|
|
|
89
90
|
if (res) dependencies.push(res);
|
|
90
91
|
}
|
|
91
92
|
}
|
|
92
|
-
await
|
|
93
|
+
const results = await PromiseAllWithErrors(dependencies);
|
|
94
|
+
if (results?.anyFailed) {
|
|
95
|
+
if (isDevEnvironment())
|
|
96
|
+
console.error("Failed to load lightmap extension", results);
|
|
97
|
+
}
|
|
93
98
|
res();
|
|
94
99
|
});
|
|
95
100
|
}
|
|
@@ -36,6 +36,7 @@ export class NestedGltf extends Behaviour {
|
|
|
36
36
|
const matrix = this.gameObject.matrix;
|
|
37
37
|
if (debug) console.log("Load nested:", this.filePath?.uri ?? this.filePath, this.gameObject.position);
|
|
38
38
|
const res = await this.filePath?.instantiate?.call(this.filePath, opts);
|
|
39
|
+
if(debug) console.log("Nested loaded:", this.filePath?.uri ?? this.filePath, res);
|
|
39
40
|
if (res) {
|
|
40
41
|
res.matrixAutoUpdate = false;
|
|
41
42
|
res.matrix.identity();
|