babylonjs-editor-cli 5.4.1 → 5.4.2-alpha.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/build/index.node.js +50 -50
- package/build/package.json +1 -1
- package/build/src/index.mjs +8 -2
- package/build/src/index.mjs.map +1 -1
- package/build/src/pack/assets/assets.mjs.map +1 -1
- package/build/src/pack/assets/collect.mjs +0 -28
- package/build/src/pack/assets/collect.mjs.map +1 -1
- package/build/src/pack/assets/ktx.mjs +43 -8
- package/build/src/pack/assets/ktx.mjs.map +1 -1
- package/build/src/pack/assets/process.mjs.map +1 -1
- package/build/src/pack/geometry.mjs +102 -6
- package/build/src/pack/geometry.mjs.map +1 -1
- package/build/src/pack/pack.mjs +1 -0
- package/build/src/pack/pack.mjs.map +1 -1
- package/build/src/pack/scene.mjs +103 -41
- package/build/src/pack/scene.mjs.map +1 -1
- package/build/src/pack/scripts.mjs +3 -1
- package/build/src/pack/scripts.mjs.map +1 -1
- package/declaration/src/pack/assets/assets.d.mts +3 -0
- package/declaration/src/pack/assets/collect.d.mts +0 -1
- package/declaration/src/pack/assets/ktx.d.mts +4 -1
- package/declaration/src/pack/assets/process.d.mts +3 -0
- package/declaration/src/pack/geometry.d.mts +16 -0
- package/declaration/src/pack/pack.d.mts +2 -0
- package/declaration/src/pack/scene.d.mts +2 -0
- package/package.json +1 -1
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "babylonjs-editor-cli",
|
|
3
|
-
"version": "5.4.
|
|
3
|
+
"version": "5.4.2-alpha.0",
|
|
4
4
|
"description": "Babylon.js Editor CLI is a command line interface to help you package your scenes made using the Babylon.js Editor",
|
|
5
5
|
"productName": "Babylon.js Editor CLI",
|
|
6
6
|
"scripts": {
|
package/build/src/index.mjs
CHANGED
|
@@ -14,8 +14,11 @@ program
|
|
|
14
14
|
.command("pack")
|
|
15
15
|
.description("Packs the project located in the specified directory. Current directory is used by default.")
|
|
16
16
|
.argument("[projectDir]", "The root directory of the project to package", process.cwd())
|
|
17
|
-
.
|
|
17
|
+
.option("--merge-geometries", "Optimize the loading process of geometries by merging them into a single file.", false)
|
|
18
|
+
.option("--merge-decals", "Try to optimize draw calls count by merging decals which share the same material into a single mesh and geometry.", false)
|
|
19
|
+
.action((projectDir, options) => {
|
|
18
20
|
pack(projectDir, {
|
|
21
|
+
...options,
|
|
19
22
|
optimize: true,
|
|
20
23
|
});
|
|
21
24
|
});
|
|
@@ -23,8 +26,11 @@ program
|
|
|
23
26
|
.command("s3")
|
|
24
27
|
.description("Packs and deploys the project located in the specified directory into a S3 bucket. Current directory is used by default.")
|
|
25
28
|
.argument("[projectDir]", "The root directory of the project to package and deploy into a S3 bucket.", process.cwd())
|
|
26
|
-
.
|
|
29
|
+
.option("--merge-geometries", "Optimize the loading process of geometries by merging them into a single file.", false)
|
|
30
|
+
.option("--merge-decals", "Try to optimize draw calls count by merging decals which share the same material into a single mesh and geometry.", false)
|
|
31
|
+
.action((projectDir, options) => {
|
|
27
32
|
s3(projectDir, {
|
|
33
|
+
...options,
|
|
28
34
|
optimize: true,
|
|
29
35
|
});
|
|
30
36
|
});
|
package/build/src/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/index.mts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACL,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,IAAI,CAAC,uBAAuB,CAAC;KAC7B,WAAW,CAAC,oHAAoH,CAAC;KACjI,MAAM,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;AAEnD,OAAO;KACL,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,6FAA6F,CAAC;KAC1G,QAAQ,CAAC,cAAc,EAAE,8CAA8C,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KACvF,MAAM,CAAC,CAAC,UAAkB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/index.mts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACL,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,IAAI,CAAC,uBAAuB,CAAC;KAC7B,WAAW,CAAC,oHAAoH,CAAC;KACjI,MAAM,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;AAEnD,OAAO;KACL,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,6FAA6F,CAAC;KAC1G,QAAQ,CAAC,cAAc,EAAE,8CAA8C,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KACvF,MAAM,CAAC,oBAAoB,EAAE,gFAAgF,EAAE,KAAK,CAAC;KACrH,MAAM,CAAC,gBAAgB,EAAE,mHAAmH,EAAE,KAAK,CAAC;KACpJ,MAAM,CAAC,CAAC,UAAkB,EAAE,OAA2D,EAAE,EAAE;IAC3F,IAAI,CAAC,UAAU,EAAE;QAChB,GAAG,OAAO;QACV,QAAQ,EAAE,IAAI;KACd,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEJ,OAAO;KACL,OAAO,CAAC,IAAI,CAAC;KACb,WAAW,CAAC,0HAA0H,CAAC;KACvI,QAAQ,CAAC,cAAc,EAAE,2EAA2E,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KACpH,MAAM,CAAC,oBAAoB,EAAE,gFAAgF,EAAE,KAAK,CAAC;KACrH,MAAM,CAAC,gBAAgB,EAAE,mHAAmH,EAAE,KAAK,CAAC;KACpJ,MAAM,CAAC,CAAC,UAAkB,EAAE,OAA2D,EAAE,EAAE;IAC3F,EAAE,CAAC,UAAU,EAAE;QACd,GAAG,OAAO;QACV,QAAQ,EAAE,IAAI;KACd,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEJ,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/assets.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"assets.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/assets.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAiBjD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA6B;IAC/D,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE;QACvE,KAAK,EAAE,IAAI;QACX,MAAM,EAAE;YACP,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ;SACpD;KACD,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,SAAS,SAAS,4BAA4B,CAAC,CAAC;IAE5D,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;IAChC,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,QAAQ,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5B,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACrB,CAAC;QAED,IAAI,OAAO,CAAC,iBAAiB,EAAE,UAAU,EAAE,CAAC;YAC3C,MAAM;QACP,CAAC;QAED,QAAQ,CAAC,IAAI,CACZ,IAAI,OAAO,CAAO,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,gBAAgB,CAAC,IAAI,EAAE;gBAC5B,GAAG,OAAO;aACV,CAAC,CAAC;YAEH,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC;YAE5C,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -7,34 +7,6 @@ import { supportedExtensions, supportedImagesExtensions } from "./process.mjs";
|
|
|
7
7
|
import { allKtxFormats, getCompressedTextureFilename, ktxSupportedextensions } from "./ktx.mjs";
|
|
8
8
|
const binaryGeometryExtension = ".babylonbinarymeshdata";
|
|
9
9
|
const collectedSupportedExtensions = [...supportedExtensions, binaryGeometryExtension];
|
|
10
|
-
export function traverseAndReplaceInSceneObject(scene, callback) {
|
|
11
|
-
function recursivelyCollect(root) {
|
|
12
|
-
for (const thing in root) {
|
|
13
|
-
if (!root.hasOwnProperty(thing)) {
|
|
14
|
-
continue;
|
|
15
|
-
}
|
|
16
|
-
const value = root[thing];
|
|
17
|
-
if (typeof value === "string") {
|
|
18
|
-
const extension = extname(value).toLowerCase();
|
|
19
|
-
if (extension && collectedSupportedExtensions.includes(extension)) {
|
|
20
|
-
const newValue = callback(thing, value);
|
|
21
|
-
if (newValue !== undefined) {
|
|
22
|
-
root[thing] = newValue;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
else if (typeof value === "object") {
|
|
27
|
-
if (Array.isArray(value)) {
|
|
28
|
-
value.forEach((v) => recursivelyCollect(v));
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
recursivelyCollect(value);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
recursivelyCollect(scene);
|
|
37
|
-
}
|
|
38
10
|
async function _checkKtxSupportForTexture(value, publicDir, result) {
|
|
39
11
|
for (const format of allKtxFormats) {
|
|
40
12
|
const compressedTexturePath = join(publicDir, getCompressedTextureFilename(value, format));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/collect.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAEhG,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;AACzD,MAAM,4BAA4B,GAAa,CAAC,GAAG,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;AAEjG,
|
|
1
|
+
{"version":3,"file":"collect.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/collect.mts"],"names":[],"mappings":"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"}
|
|
@@ -15,15 +15,49 @@ export const ktxSupportedextensions = [".png", ".jpg", ".jpeg", ".bmp"];
|
|
|
15
15
|
export function getCompressedTextureFilename(path, format) {
|
|
16
16
|
return `${path.substring(0, path.lastIndexOf("."))}${format}`;
|
|
17
17
|
}
|
|
18
|
+
const qualityDictionary = {
|
|
19
|
+
"very-fast": {
|
|
20
|
+
"-astc.ktx": "astcveryfast",
|
|
21
|
+
"-pvrtc.ktx": "pvrtcfastest",
|
|
22
|
+
"-etc1.ktx": "etcfast",
|
|
23
|
+
"-etc2.ktx": "etcfast",
|
|
24
|
+
},
|
|
25
|
+
fast: {
|
|
26
|
+
"-astc.ktx": "astcfast",
|
|
27
|
+
"-pvrtc.ktx": "pvrtcfast",
|
|
28
|
+
"-etc1.ktx": "etcfast",
|
|
29
|
+
"-etc2.ktx": "etcfast",
|
|
30
|
+
},
|
|
31
|
+
normal: {
|
|
32
|
+
"-astc.ktx": "astcmedium",
|
|
33
|
+
"-pvrtc.ktx": "pvrtcnormal",
|
|
34
|
+
"-etc1.ktx": "etcnormal",
|
|
35
|
+
"-etc2.ktx": "etcnormal",
|
|
36
|
+
},
|
|
37
|
+
high: {
|
|
38
|
+
"-astc.ktx": "astcexhaustive",
|
|
39
|
+
"-pvrtc.ktx": "pvrtcbest",
|
|
40
|
+
"-etc1.ktx": "etcslow",
|
|
41
|
+
"-etc2.ktx": "etcslow",
|
|
42
|
+
},
|
|
43
|
+
};
|
|
18
44
|
export async function compressFileToKtx(absolutePath, options) {
|
|
19
45
|
if (options.format) {
|
|
20
46
|
await compressFileToKtxFormat(absolutePath, options);
|
|
21
47
|
}
|
|
22
48
|
else {
|
|
23
|
-
await Promise.all(allKtxFormats.map((f) =>
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
49
|
+
await Promise.all(allKtxFormats.map(async (f) => {
|
|
50
|
+
if (f === "-etc2.ktx" && !options.compressedEtc2Enabled) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (f === "-pvrtc.ktx" && !options.compressedPvrtcEnabled) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
return compressFileToKtxFormat(absolutePath, {
|
|
57
|
+
...options,
|
|
58
|
+
format: f,
|
|
59
|
+
});
|
|
60
|
+
}));
|
|
27
61
|
}
|
|
28
62
|
}
|
|
29
63
|
export async function compressFileToKtxFormat(absolutePath, options) {
|
|
@@ -59,22 +93,23 @@ export async function compressFileToKtxFormat(absolutePath, options) {
|
|
|
59
93
|
if (!pvrTexToolAbsolutePath) {
|
|
60
94
|
return null;
|
|
61
95
|
}
|
|
96
|
+
const quality = options.compressedTextureQuality ?? "very-fast";
|
|
62
97
|
let command = null;
|
|
63
98
|
switch (options.format) {
|
|
64
99
|
case "-astc.ktx":
|
|
65
|
-
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ASTC_8x8,UBN,lRGB -q
|
|
100
|
+
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ASTC_8x8,UBN,lRGB -q ${qualityDictionary[quality]["-astc.ktx"]} -o "${options.destinationFolder}"`;
|
|
66
101
|
break;
|
|
67
102
|
case "-dxt.ktx":
|
|
68
103
|
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB ${hasAlpha ? "-l" : ""} -f ${hasAlpha ? "BC3" : "BC1"},UBN,lRGB -o "${options.destinationFolder}"`;
|
|
69
104
|
break;
|
|
70
105
|
case "-pvrtc.ktx":
|
|
71
|
-
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -square + -m -dither -ics lRGB ${hasAlpha ? "-l" : ""} -f ${hasAlpha ? "PVRTCI_2BPP_RGBA" : "PVRTCI_2BPP_RGB"},UBN,lRGB -q
|
|
106
|
+
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -square + -m -dither -ics lRGB ${hasAlpha ? "-l" : ""} -f ${hasAlpha ? "PVRTCI_2BPP_RGBA" : "PVRTCI_2BPP_RGB"},UBN,lRGB -q ${qualityDictionary[quality]["-pvrtc.ktx"]} -o "${options.destinationFolder}"`;
|
|
72
107
|
break;
|
|
73
108
|
case "-etc1.ktx":
|
|
74
|
-
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ETC1,UBN,lRGB -q
|
|
109
|
+
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ETC1,UBN,lRGB -q ${qualityDictionary[quality]["-etc1.ktx"]} -o "${options.destinationFolder}"`;
|
|
75
110
|
break;
|
|
76
111
|
case "-etc2.ktx":
|
|
77
|
-
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ${hasAlpha ? "ETC2_RGBA" : "ETC2_RGB"},UBN,lRGB -q
|
|
112
|
+
command = `"${pvrTexToolAbsolutePath}" -i "${absolutePath}" -flip y -pot + -m -dither -ics lRGB -f ${hasAlpha ? "ETC2_RGBA" : "ETC2_RGB"},UBN,lRGB -q ${qualityDictionary[quality]["-etc2.ktx"]} -o "${options.destinationFolder}"`;
|
|
78
113
|
break;
|
|
79
114
|
}
|
|
80
115
|
if (!command) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ktx.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/ktx.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAI7D,MAAM,CAAC,MAAM,aAAa,GAAmB,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAE/G,MAAM,CAAC,MAAM,sBAAsB,GAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAElF;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAAY,EAAE,MAAoB;IAC9E,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC;AAC/D,CAAC;
|
|
1
|
+
{"version":3,"file":"ktx.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/ktx.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/process.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAE7E,MAAM,CAAC,MAAM,yBAAyB,GAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9F,MAAM,CAAC,MAAM,+BAA+B,GAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,wBAAwB,GAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,uBAAuB,GAAa,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACnH,MAAM,CAAC,MAAM,uBAAuB,GAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,mBAAmB,GAAa;IAC5C,GAAG,yBAAyB;IAC5B,GAAG,+BAA+B;IAClC,GAAG,wBAAwB;IAC3B,GAAG,uBAAuB;IAC1B,GAAG,uBAAuB;CAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"process.mjs","sourceRoot":"","sources":["../../../../src/pack/assets/process.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { join } from "node:path/posix";
|
|
2
2
|
import fs from "fs-extra";
|
|
3
3
|
export async function createGeometryFiles(options) {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
if (!options.mergeGeometries) {
|
|
5
|
+
await fs.ensureDir(join(options.publicDir, options.sceneName));
|
|
6
|
+
await Promise.all(options.geometryFiles.map(async (file) => {
|
|
7
|
+
const destination = join(options.publicDir, options.sceneName, file);
|
|
8
|
+
await fs.copyFile(join(options.sceneFile, "geometries", file), destination);
|
|
9
|
+
options.exportedAssets.push(destination);
|
|
10
|
+
}));
|
|
11
|
+
}
|
|
10
12
|
if (options.babylonjsEditorToolsVersion >= "5.2.6") {
|
|
11
13
|
await fs.ensureDir(join(options.publicDir, options.sceneName, "morphTargets"));
|
|
12
14
|
await Promise.all(options.directories.morphTargetFiles.map(async (file) => {
|
|
@@ -16,4 +18,98 @@ export async function createGeometryFiles(options) {
|
|
|
16
18
|
}));
|
|
17
19
|
}
|
|
18
20
|
}
|
|
21
|
+
export function configureMeshBinaryInfo(mesh, geometriesOffset) {
|
|
22
|
+
if (!mesh._binaryInfo) {
|
|
23
|
+
return {
|
|
24
|
+
offset: 0,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
let offset = 0;
|
|
28
|
+
if (mesh._binaryInfo.positionsAttrDesc) {
|
|
29
|
+
mesh._binaryInfo.positionsAttrDesc.offset += geometriesOffset;
|
|
30
|
+
offset += mesh._binaryInfo.positionsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
31
|
+
}
|
|
32
|
+
if (mesh._binaryInfo.normalsAttrDesc) {
|
|
33
|
+
mesh._binaryInfo.normalsAttrDesc.offset += geometriesOffset;
|
|
34
|
+
offset += mesh._binaryInfo.normalsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
35
|
+
}
|
|
36
|
+
if (mesh._binaryInfo.uvsAttrDesc) {
|
|
37
|
+
mesh._binaryInfo.uvsAttrDesc.offset += geometriesOffset;
|
|
38
|
+
offset += mesh._binaryInfo.uvsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
39
|
+
}
|
|
40
|
+
if (mesh._binaryInfo.uvs2AttrDesc) {
|
|
41
|
+
mesh._binaryInfo.uvs2AttrDesc.offset += geometriesOffset;
|
|
42
|
+
offset += mesh._binaryInfo.uvs2AttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
43
|
+
}
|
|
44
|
+
if (mesh._binaryInfo.tangetsAttrDesc) {
|
|
45
|
+
mesh._binaryInfo.tangetsAttrDesc.offset += geometriesOffset;
|
|
46
|
+
offset += mesh._binaryInfo.tangetsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
47
|
+
}
|
|
48
|
+
if (mesh._binaryInfo.colorsAttrDesc) {
|
|
49
|
+
mesh._binaryInfo.colorsAttrDesc.offset += geometriesOffset;
|
|
50
|
+
offset += mesh._binaryInfo.colorsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
51
|
+
}
|
|
52
|
+
if (mesh._binaryInfo.matricesIndicesAttrDesc) {
|
|
53
|
+
mesh._binaryInfo.matricesIndicesAttrDesc.offset += geometriesOffset;
|
|
54
|
+
offset += mesh._binaryInfo.matricesIndicesAttrDesc.count * Uint32Array.BYTES_PER_ELEMENT;
|
|
55
|
+
}
|
|
56
|
+
if (mesh._binaryInfo.matricesWeightsAttrDesc) {
|
|
57
|
+
mesh._binaryInfo.matricesWeightsAttrDesc.offset += geometriesOffset;
|
|
58
|
+
offset += mesh._binaryInfo.matricesWeightsAttrDesc.count * Float32Array.BYTES_PER_ELEMENT;
|
|
59
|
+
}
|
|
60
|
+
if (mesh._binaryInfo.indicesAttrDesc) {
|
|
61
|
+
mesh._binaryInfo.indicesAttrDesc.offset += geometriesOffset;
|
|
62
|
+
offset += mesh._binaryInfo.indicesAttrDesc.count * Uint32Array.BYTES_PER_ELEMENT;
|
|
63
|
+
}
|
|
64
|
+
if (mesh._binaryInfo.subMeshesAttrDesc) {
|
|
65
|
+
mesh._binaryInfo.subMeshesAttrDesc.offset += geometriesOffset;
|
|
66
|
+
offset += mesh._binaryInfo.subMeshesAttrDesc.count * 5 * Uint32Array.BYTES_PER_ELEMENT;
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
offset,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
export function getGeometryBuffers(binaryInfo, buffer) {
|
|
73
|
+
const result = {};
|
|
74
|
+
if (binaryInfo.positionsAttrDesc) {
|
|
75
|
+
result.positions = new Float32Array(buffer.buffer, binaryInfo.positionsAttrDesc.offset, binaryInfo.positionsAttrDesc.count);
|
|
76
|
+
}
|
|
77
|
+
if (binaryInfo.normalsAttrDesc) {
|
|
78
|
+
result.normals = new Float32Array(buffer.buffer, binaryInfo.normalsAttrDesc.offset, binaryInfo.normalsAttrDesc.count);
|
|
79
|
+
}
|
|
80
|
+
if (binaryInfo.tangetsAttrDesc) {
|
|
81
|
+
result.tangents = new Float32Array(buffer.buffer, binaryInfo.tangetsAttrDesc.offset, binaryInfo.tangetsAttrDesc.count);
|
|
82
|
+
}
|
|
83
|
+
if (binaryInfo.uvsAttrDesc) {
|
|
84
|
+
result.uvs = new Float32Array(buffer.buffer, binaryInfo.uvsAttrDesc.offset, binaryInfo.uvsAttrDesc.count);
|
|
85
|
+
}
|
|
86
|
+
if (binaryInfo.uvs2AttrDesc) {
|
|
87
|
+
result.uvs2 = new Float32Array(buffer.buffer, binaryInfo.uvs2AttrDesc.offset, binaryInfo.uvs2AttrDesc.count);
|
|
88
|
+
}
|
|
89
|
+
if (binaryInfo.colorsAttrDesc) {
|
|
90
|
+
result.colors = new Float32Array(buffer.buffer, binaryInfo.colorsAttrDesc.offset, binaryInfo.colorsAttrDesc.count);
|
|
91
|
+
}
|
|
92
|
+
if (binaryInfo.matricesIndicesAttrDesc) {
|
|
93
|
+
const matricesIndices = new Uint32Array(buffer.buffer, binaryInfo.matricesIndicesAttrDesc.offset, binaryInfo.matricesIndicesAttrDesc.count);
|
|
94
|
+
const floatIndices = [];
|
|
95
|
+
for (let i = 0; i < matricesIndices.length; i++) {
|
|
96
|
+
const index = matricesIndices[i];
|
|
97
|
+
floatIndices.push(index & 0x000000ff);
|
|
98
|
+
floatIndices.push((index & 0x0000ff00) >> 8);
|
|
99
|
+
floatIndices.push((index & 0x00ff0000) >> 16);
|
|
100
|
+
floatIndices.push((index >> 24) & 0xff); // & 0xFF to convert to v + 256 if v < 0
|
|
101
|
+
}
|
|
102
|
+
result.matricesIndices = new Uint32Array(floatIndices);
|
|
103
|
+
}
|
|
104
|
+
if (binaryInfo.matricesWeightsAttrDesc) {
|
|
105
|
+
result.matricesWeights = new Float32Array(buffer.buffer, binaryInfo.matricesWeightsAttrDesc.offset, binaryInfo.matricesWeightsAttrDesc.count);
|
|
106
|
+
}
|
|
107
|
+
if (binaryInfo.indicesAttrDesc) {
|
|
108
|
+
result.indices = new Uint32Array(buffer.buffer, binaryInfo.indicesAttrDesc.offset, binaryInfo.indicesAttrDesc.count);
|
|
109
|
+
}
|
|
110
|
+
if (binaryInfo.subMeshesAttrDesc) {
|
|
111
|
+
result.subMeshes = new Int32Array(buffer.buffer, binaryInfo.subMeshesAttrDesc.offset, binaryInfo.subMeshesAttrDesc.count * 5);
|
|
112
|
+
}
|
|
113
|
+
return result;
|
|
114
|
+
}
|
|
19
115
|
//# sourceMappingURL=geometry.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geometry.mjs","sourceRoot":"","sources":["../../../src/pack/geometry.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"geometry.mjs","sourceRoot":"","sources":["../../../src/pack/geometry.mts"],"names":[],"mappings":"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"}
|
package/build/src/pack/pack.mjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack.mjs","sourceRoot":"","sources":["../../../src/pack/pack.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"pack.mjs","sourceRoot":"","sources":["../../../src/pack/pack.mts"],"names":[],"mappings":"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"}
|
package/build/src/pack/scene.mjs
CHANGED
|
@@ -2,10 +2,11 @@ import { join, basename, extname } from "node:path/posix";
|
|
|
2
2
|
import fs, { pathExists } from "fs-extra";
|
|
3
3
|
import { isSameArray } from "../tools/array.mjs";
|
|
4
4
|
import { compressFileToKtx } from "./assets/ktx.mjs";
|
|
5
|
+
import { collectUsedAssetsForScene } from "./assets/collect.mjs";
|
|
5
6
|
import { extractNodeMaterialTextures } from "./assets/material.mjs";
|
|
6
7
|
import { getExtractedTextureOutputPath } from "./assets/texture.mjs";
|
|
7
|
-
import { collectUsedAssetsForScene, traverseAndReplaceInSceneObject } from "./assets/collect.mjs";
|
|
8
8
|
import { extractNodeParticleSystemSetTextures, extractParticleSystemTextures } from "./assets/particle-system.mjs";
|
|
9
|
+
import { configureMeshBinaryInfo } from "./geometry.mjs";
|
|
9
10
|
export async function createBabylonScene(options) {
|
|
10
11
|
const lights = [];
|
|
11
12
|
const meshes = [];
|
|
@@ -17,17 +18,32 @@ export async function createBabylonScene(options) {
|
|
|
17
18
|
const particleSystems = [];
|
|
18
19
|
const shadowGenerators = [];
|
|
19
20
|
const morphTargetManagers = [];
|
|
21
|
+
let geometriesOffset = 0;
|
|
22
|
+
let geometriesPath = null;
|
|
23
|
+
const collectedGeometries = [];
|
|
20
24
|
// Merged decals
|
|
21
25
|
let mergedDecalsIds = [];
|
|
22
26
|
const mergedDecalsPath = join(options.sceneFile, "decals.json");
|
|
23
|
-
if (await pathExists(mergedDecalsPath)) {
|
|
27
|
+
if (options.mergeDecals && (await pathExists(mergedDecalsPath))) {
|
|
24
28
|
const mergedDecals = await fs.readJSON(mergedDecalsPath, {
|
|
25
29
|
encoding: "utf-8",
|
|
26
30
|
});
|
|
27
|
-
mergedDecals.
|
|
28
|
-
|
|
31
|
+
await Promise.all(mergedDecals.map(async (mesh) => {
|
|
32
|
+
if (mesh.delayLoadingFile) {
|
|
33
|
+
collectedGeometries.push({
|
|
34
|
+
mesh,
|
|
35
|
+
buffer: await fs.readFile(join(options.sceneFile, "geometries", basename(mesh.delayLoadingFile))),
|
|
36
|
+
});
|
|
37
|
+
if (options.mergeGeometries) {
|
|
38
|
+
geometriesPath ??= join(options.sceneName, basename(mesh.delayLoadingFile));
|
|
39
|
+
mesh.delayLoadingFile = geometriesPath;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
mesh.delayLoadingFile = join(options.sceneName, basename(mesh.delayLoadingFile));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
29
45
|
meshes.push(mesh);
|
|
30
|
-
});
|
|
46
|
+
}));
|
|
31
47
|
mergedDecalsIds = mergedDecals.map((m) => m.metadata?.mergedMeshesIds ?? []).flat();
|
|
32
48
|
}
|
|
33
49
|
// Meshes
|
|
@@ -37,8 +53,21 @@ export async function createBabylonScene(options) {
|
|
|
37
53
|
if (mesh.metadata?.doNotSerialize) {
|
|
38
54
|
return null;
|
|
39
55
|
}
|
|
56
|
+
const isDecal = mesh.metadata?.decal && options.mergeDecals && mergedDecalsIds.includes(mesh.id);
|
|
40
57
|
if (mesh.delayLoadingFile) {
|
|
41
|
-
|
|
58
|
+
if (!isDecal) {
|
|
59
|
+
collectedGeometries.push({
|
|
60
|
+
mesh,
|
|
61
|
+
buffer: await fs.readFile(join(options.sceneFile, "geometries", basename(mesh.delayLoadingFile))),
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
if (options.mergeGeometries) {
|
|
65
|
+
geometriesPath ??= join(options.sceneName, basename(mesh.delayLoadingFile));
|
|
66
|
+
mesh.delayLoadingFile = geometriesPath;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
mesh.delayLoadingFile = join(options.sceneName, basename(mesh.delayLoadingFile));
|
|
70
|
+
}
|
|
42
71
|
}
|
|
43
72
|
if (mesh.metadata?.parentId) {
|
|
44
73
|
mesh.parentId = mesh.metadata.parentId;
|
|
@@ -80,7 +109,17 @@ export async function createBabylonScene(options) {
|
|
|
80
109
|
const lodData = await fs.readJSON(join(options.sceneFile, "lods", lodFile));
|
|
81
110
|
const lodMesh = lodData.meshes[0];
|
|
82
111
|
if (lodMesh.delayLoadingFile) {
|
|
83
|
-
|
|
112
|
+
collectedGeometries.push({
|
|
113
|
+
mesh: lodMesh,
|
|
114
|
+
buffer: await fs.readFile(join(options.sceneFile, "geometries", basename(lodMesh.delayLoadingFile))),
|
|
115
|
+
});
|
|
116
|
+
if (options.mergeGeometries) {
|
|
117
|
+
geometriesPath ??= join(options.sceneName, basename(lodMesh.delayLoadingFile));
|
|
118
|
+
lodMesh.delayLoadingFile = geometriesPath;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
lodMesh.delayLoadingFile = join(options.sceneName, basename(lodMesh.delayLoadingFile));
|
|
122
|
+
}
|
|
84
123
|
}
|
|
85
124
|
if (data.basePoseMatrix) {
|
|
86
125
|
lodMesh.basePoseMatrix = data.basePoseMatrix;
|
|
@@ -96,7 +135,7 @@ export async function createBabylonScene(options) {
|
|
|
96
135
|
mesh.lodDistances.push(lodData.distanceOrScreenCoverage);
|
|
97
136
|
});
|
|
98
137
|
}
|
|
99
|
-
if (
|
|
138
|
+
if (isDecal) {
|
|
100
139
|
return {
|
|
101
140
|
lodMeshes,
|
|
102
141
|
effectiveMaterials,
|
|
@@ -425,50 +464,73 @@ export async function createBabylonScene(options) {
|
|
|
425
464
|
const usedFiles = await collectUsedAssetsForScene(scene, options.publicDir);
|
|
426
465
|
usedFiles.push(`${options.sceneName}.babylon`);
|
|
427
466
|
const geometryFiles = usedFiles.filter((file) => extname(file).toLowerCase() === ".babylonbinarymeshdata").map((file) => basename(file));
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
const
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
467
|
+
const sameArrays = new Map();
|
|
468
|
+
for (let i = 0, iLen = collectedGeometries.length; i < iLen; ++i) {
|
|
469
|
+
const a = collectedGeometries[i];
|
|
470
|
+
for (let j = i + 1, jLen = collectedGeometries.length; j < jLen; ++j) {
|
|
471
|
+
const b = collectedGeometries[j];
|
|
472
|
+
if (isSameArray(a.buffer, b.buffer)) {
|
|
473
|
+
// Search for existing mesh
|
|
474
|
+
let foundMesh = false;
|
|
475
|
+
for (const [, meshes] of sameArrays.entries()) {
|
|
476
|
+
if (meshes.includes(b.mesh)) {
|
|
477
|
+
foundMesh = true;
|
|
478
|
+
break;
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
if (foundMesh) {
|
|
482
|
+
continue;
|
|
483
|
+
}
|
|
484
|
+
if (!sameArrays.has(a.buffer)) {
|
|
485
|
+
sameArrays.set(a.buffer, [a.mesh]);
|
|
442
486
|
}
|
|
443
|
-
sameArrays
|
|
487
|
+
sameArrays.get(a.buffer).push(b.mesh);
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
}
|
|
491
|
+
const finalGeometryBuffers = [];
|
|
492
|
+
if (options.mergeGeometries) {
|
|
493
|
+
for (const data of collectedGeometries) {
|
|
494
|
+
if (sameArrays.has(data.buffer)) {
|
|
495
|
+
continue;
|
|
444
496
|
}
|
|
497
|
+
const configuredBinaryInfo = configureMeshBinaryInfo(data.mesh, geometriesOffset);
|
|
498
|
+
geometriesOffset += configuredBinaryInfo.offset;
|
|
499
|
+
finalGeometryBuffers.push(data.buffer);
|
|
445
500
|
}
|
|
446
501
|
}
|
|
447
502
|
let reusedGeometriesCount = 0;
|
|
448
|
-
for (const
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
if (
|
|
452
|
-
const
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
}
|
|
456
|
-
const geometryFilesIndex = geometryFiles.indexOf(basename(value));
|
|
457
|
-
if (geometryFilesIndex !== -1) {
|
|
458
|
-
geometryFiles.splice(geometryFilesIndex, 1);
|
|
459
|
-
}
|
|
460
|
-
++reusedGeometriesCount;
|
|
461
|
-
return join(options.sceneName, sourceGeometryId);
|
|
503
|
+
for (const [buffer, meshes] of sameArrays.entries()) {
|
|
504
|
+
reusedGeometriesCount += meshes.length;
|
|
505
|
+
if (meshes.length > 0) {
|
|
506
|
+
if (options.mergeGeometries) {
|
|
507
|
+
const configuredBinaryInfo = configureMeshBinaryInfo(meshes[0], geometriesOffset);
|
|
508
|
+
geometriesOffset += configuredBinaryInfo.offset;
|
|
509
|
+
finalGeometryBuffers.push(buffer);
|
|
462
510
|
}
|
|
463
|
-
|
|
511
|
+
const binaryInfo = meshes[0]._binaryInfo;
|
|
512
|
+
for (let i = 1, len = meshes.length; i < len; ++i) {
|
|
513
|
+
meshes[i]._binaryInfo = binaryInfo;
|
|
514
|
+
meshes[i].delayLoadingFile = meshes[0].delayLoadingFile;
|
|
515
|
+
}
|
|
516
|
+
}
|
|
464
517
|
}
|
|
465
518
|
// Write final scene file.
|
|
466
|
-
const
|
|
467
|
-
await fs.writeJSON(
|
|
519
|
+
const sceneDestination = join(options.publicDir, `${options.sceneName}.babylon`);
|
|
520
|
+
await fs.writeJSON(sceneDestination, scene, {
|
|
468
521
|
encoding: "utf-8",
|
|
469
522
|
// spaces: "\t", // Useful for debug
|
|
470
523
|
});
|
|
471
|
-
options.exportedAssets.push(
|
|
524
|
+
options.exportedAssets.push(sceneDestination);
|
|
525
|
+
// Write final geometry file
|
|
526
|
+
if (geometriesPath) {
|
|
527
|
+
const totalLength = finalGeometryBuffers.reduce((acc, buffer) => acc + buffer.length, 0);
|
|
528
|
+
const geometriesFolder = join(options.publicDir, options.sceneName);
|
|
529
|
+
await fs.ensureDir(geometriesFolder);
|
|
530
|
+
const geometriesDestination = join(geometriesFolder, basename(geometriesPath));
|
|
531
|
+
await fs.writeFile(geometriesDestination, Buffer.concat(finalGeometryBuffers, totalLength));
|
|
532
|
+
options.exportedAssets.push(geometriesDestination);
|
|
533
|
+
}
|
|
472
534
|
// Write manifest
|
|
473
535
|
if (options.optimize) {
|
|
474
536
|
const manifestDestination = join(options.publicDir, `${options.sceneName}.babylon.manifest`);
|