@loaders.gl/tile-converter 4.2.0-alpha.4 → 4.2.0-alpha.6
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/dist/3d-tiles-converter/3d-tiles-converter.d.ts +4 -4
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +349 -293
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +261 -200
- package/dist/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +14 -5
- package/dist/3d-tiles-converter/helpers/load-i3s.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.js +83 -77
- package/dist/3d-tiles-converter/helpers/texture-atlas.js +44 -21
- package/dist/3d-tiles-converter/json-templates/tileset.js +32 -33
- package/dist/constants.js +0 -1
- package/dist/converter-cli.js +257 -234
- package/dist/converter.min.cjs +95 -105
- package/dist/deps-installer/deps-installer.d.ts.map +1 -1
- package/dist/deps-installer/deps-installer.js +78 -59
- package/dist/i3s-converter/helpers/attribute-metadata-info.js +210 -153
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +146 -103
- package/dist/i3s-converter/helpers/coordinate-converter.js +100 -65
- package/dist/i3s-converter/helpers/create-scene-server-path.js +14 -9
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/feature-attributes.js +170 -105
- package/dist/i3s-converter/helpers/geometry-attributes.d.ts +1 -1
- package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-attributes.js +205 -212
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +17 -3
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +1189 -830
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js +109 -97
- package/dist/i3s-converter/helpers/load-3d-tiles.js +103 -66
- package/dist/i3s-converter/helpers/node-debug.js +98 -54
- package/dist/i3s-converter/helpers/node-index-document.d.ts +11 -4
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +255 -177
- package/dist/i3s-converter/helpers/node-pages.d.ts +1 -1
- package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-pages.js +299 -193
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts +1 -1
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.js +92 -60
- package/dist/i3s-converter/helpers/progress.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/progress.js +139 -83
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts +9 -2
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/tileset-traversal.js +33 -13
- package/dist/i3s-converter/i3s-converter.d.ts +7 -7
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +1165 -895
- package/dist/i3s-converter/json-templates/geometry-definitions.js +70 -79
- package/dist/i3s-converter/json-templates/layers.js +120 -121
- package/dist/i3s-converter/json-templates/metadata.js +19 -20
- package/dist/i3s-converter/json-templates/node.js +73 -71
- package/dist/i3s-converter/json-templates/scene-server.js +25 -26
- package/dist/i3s-converter/json-templates/shared-resources.js +107 -108
- package/dist/i3s-converter/json-templates/store.js +96 -94
- package/dist/i3s-converter/types.js +35 -23
- package/dist/i3s-server/app.js +15 -12
- package/dist/i3s-server/bin/i3s-server.min.cjs +69 -69
- package/dist/i3s-server/bin/www.js +16 -7
- package/dist/i3s-server/controllers/index-controller.js +18 -15
- package/dist/i3s-server/controllers/slpk-controller.d.ts.map +1 -1
- package/dist/i3s-server/controllers/slpk-controller.js +24 -11
- package/dist/i3s-server/routes/index.js +13 -9
- package/dist/i3s-server/routes/slpk-router.d.ts.map +1 -1
- package/dist/i3s-server/routes/slpk-router.js +26 -19
- package/dist/i3s-server/utils/create-scene-server.js +15 -10
- package/dist/i3s-server/utils/server-utils.d.ts.map +1 -1
- package/dist/i3s-server/utils/server-utils.js +52 -32
- package/dist/index.cjs +616 -967
- package/dist/index.cjs.map +7 -0
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -1
- package/dist/lib/json-schemas/conversion-dump-json-schema.js +243 -421
- package/dist/lib/utils/cli-utils.d.ts.map +1 -1
- package/dist/lib/utils/cli-utils.js +65 -36
- package/dist/lib/utils/compress-util.js +20 -15
- package/dist/lib/utils/conversion-dump.d.ts +10 -2
- package/dist/lib/utils/conversion-dump.d.ts.map +1 -1
- package/dist/lib/utils/conversion-dump.js +242 -197
- package/dist/lib/utils/file-utils.d.ts +1 -1
- package/dist/lib/utils/file-utils.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.js +120 -74
- package/dist/lib/utils/geometry-utils.js +13 -7
- package/dist/lib/utils/lod-conversion-utils.js +65 -33
- package/dist/lib/utils/queue.js +12 -13
- package/dist/lib/utils/statistic-utills.d.ts +6 -23
- package/dist/lib/utils/statistic-utills.d.ts.map +1 -1
- package/dist/lib/utils/statistic-utills.js +58 -55
- package/dist/lib/utils/write-queue.d.ts +2 -2
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +72 -86
- package/dist/pgm-loader.js +17 -13
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
- package/dist/slpk-extractor/slpk-extractor.js +60 -50
- package/dist/slpk-extractor-cli.d.ts.map +1 -1
- package/dist/slpk-extractor-cli.js +90 -59
- package/dist/slpk-extractor.min.cjs +1 -1
- package/package.json +27 -26
- package/src/3d-tiles-converter/3d-tiles-converter.ts +21 -10
- package/src/3d-tiles-converter/helpers/b3dm-converter.ts +1 -0
- package/src/3d-tiles-converter/helpers/load-i3s.ts +3 -27
- package/src/converter-cli.ts +4 -2
- package/src/deps-installer/deps-installer.ts +7 -0
- package/src/i3s-converter/helpers/attribute-metadata-info.ts +1 -1
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +3 -1
- package/src/i3s-converter/helpers/coordinate-converter.ts +2 -2
- package/src/i3s-converter/helpers/feature-attributes.ts +5 -2
- package/src/i3s-converter/helpers/geometry-attributes.ts +6 -5
- package/src/i3s-converter/helpers/geometry-converter.ts +118 -72
- package/src/i3s-converter/helpers/gltf-attributes.ts +12 -13
- package/src/i3s-converter/helpers/node-index-document.ts +18 -10
- package/src/i3s-converter/helpers/node-pages.ts +27 -29
- package/src/i3s-converter/helpers/preprocess-3d-tiles.ts +1 -0
- package/src/i3s-converter/helpers/progress.ts +1 -0
- package/src/i3s-converter/helpers/tileset-traversal.ts +22 -13
- package/src/i3s-converter/i3s-converter.ts +173 -114
- package/src/i3s-converter/json-templates/node.ts +1 -1
- package/src/i3s-server/bin/www.ts +6 -4
- package/src/i3s-server/controllers/slpk-controller.ts +4 -2
- package/src/i3s-server/routes/index.ts +10 -7
- package/src/i3s-server/routes/slpk-router.ts +22 -16
- package/src/i3s-server/utils/server-utils.ts +6 -4
- package/src/lib/utils/cli-utils.ts +2 -0
- package/src/lib/utils/conversion-dump.ts +35 -20
- package/src/lib/utils/file-utils.ts +11 -11
- package/src/lib/utils/statistic-utills.ts +5 -6
- package/src/lib/utils/write-queue.ts +2 -2
- package/src/slpk-extractor/slpk-extractor.ts +2 -1
- package/src/slpk-extractor-cli.ts +16 -8
- package/dist/3d-tiles-converter/3d-tiles-converter.js.map +0 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js.map +0 -1
- package/dist/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +0 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.js.map +0 -1
- package/dist/3d-tiles-converter/helpers/texture-atlas.js.map +0 -1
- package/dist/3d-tiles-converter/json-templates/tileset.js.map +0 -1
- package/dist/constants.js.map +0 -1
- package/dist/converter-cli.js.map +0 -1
- package/dist/deps-installer/deps-installer.js.map +0 -1
- package/dist/i3s-converter/helpers/attribute-metadata-info.js.map +0 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js.map +0 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js.map +0 -1
- package/dist/i3s-converter/helpers/create-scene-server-path.js.map +0 -1
- package/dist/i3s-converter/helpers/feature-attributes.js.map +0 -1
- package/dist/i3s-converter/helpers/geometry-attributes.js.map +0 -1
- package/dist/i3s-converter/helpers/geometry-converter.js.map +0 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js.map +0 -1
- package/dist/i3s-converter/helpers/load-3d-tiles.js.map +0 -1
- package/dist/i3s-converter/helpers/node-debug.js.map +0 -1
- package/dist/i3s-converter/helpers/node-index-document.js.map +0 -1
- package/dist/i3s-converter/helpers/node-pages.js.map +0 -1
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.js.map +0 -1
- package/dist/i3s-converter/helpers/progress.js.map +0 -1
- package/dist/i3s-converter/helpers/tileset-traversal.js.map +0 -1
- package/dist/i3s-converter/i3s-converter.js.map +0 -1
- package/dist/i3s-converter/json-templates/geometry-definitions.js.map +0 -1
- package/dist/i3s-converter/json-templates/layers.js.map +0 -1
- package/dist/i3s-converter/json-templates/metadata.js.map +0 -1
- package/dist/i3s-converter/json-templates/node.js.map +0 -1
- package/dist/i3s-converter/json-templates/scene-server.js.map +0 -1
- package/dist/i3s-converter/json-templates/shared-resources.js.map +0 -1
- package/dist/i3s-converter/json-templates/store.js.map +0 -1
- package/dist/i3s-converter/types.js.map +0 -1
- package/dist/i3s-server/README.md +0 -63
- package/dist/i3s-server/app.js.map +0 -1
- package/dist/i3s-server/bin/www.js.map +0 -1
- package/dist/i3s-server/certs/cert.pem +0 -19
- package/dist/i3s-server/certs/key.pem +0 -27
- package/dist/i3s-server/controllers/index-controller.js.map +0 -1
- package/dist/i3s-server/controllers/slpk-controller.js.map +0 -1
- package/dist/i3s-server/routes/index.js.map +0 -1
- package/dist/i3s-server/routes/slpk-router.js.map +0 -1
- package/dist/i3s-server/utils/create-scene-server.js.map +0 -1
- package/dist/i3s-server/utils/server-utils.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/lib/json-schemas/conversion-dump-json-schema.js.map +0 -1
- package/dist/lib/utils/cli-utils.js.map +0 -1
- package/dist/lib/utils/compress-util.js.map +0 -1
- package/dist/lib/utils/conversion-dump.js.map +0 -1
- package/dist/lib/utils/file-utils.js.map +0 -1
- package/dist/lib/utils/geometry-utils.js.map +0 -1
- package/dist/lib/utils/lod-conversion-utils.js.map +0 -1
- package/dist/lib/utils/queue.js.map +0 -1
- package/dist/lib/utils/statistic-utills.js.map +0 -1
- package/dist/lib/utils/write-queue.js.map +0 -1
- package/dist/pgm-loader.js.map +0 -1
- package/dist/slpk-extractor/slpk-extractor.js.map +0 -1
- package/dist/slpk-extractor-cli.js.map +0 -1
- package/src/lib/utils/statistic-utills.d.ts +0 -25
package/dist/converter-cli.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
1
2
|
import '@loaders.gl/polyfills';
|
|
2
3
|
import { join } from 'path';
|
|
3
4
|
import inquirer from 'inquirer';
|
|
@@ -6,255 +7,277 @@ import { DepsInstaller } from "./deps-installer/deps-installer.js";
|
|
|
6
7
|
import { getBooleanValue, getIntegerValue, getStringValue, getURLValue, validateOptionsWithEqual } from "./lib/utils/cli-utils.js";
|
|
7
8
|
import { addOneFile, composeHashFile, makeZipCDHeaderIterator } from '@loaders.gl/zip';
|
|
8
9
|
import { FileHandleFile } from '@loaders.gl/loader-utils';
|
|
10
|
+
// @ts-ignore
|
|
9
11
|
import { copyFile } from 'node:fs/promises';
|
|
10
12
|
const TILESET_TYPE = {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
I3S: 'I3S',
|
|
14
|
+
_3DTILES: '3DTILES'
|
|
13
15
|
};
|
|
16
|
+
/**
|
|
17
|
+
* CLI entry
|
|
18
|
+
* @returns
|
|
19
|
+
*/
|
|
20
|
+
// eslint-disable-next-line max-statements
|
|
14
21
|
async function main() {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
if (options.addHash) {
|
|
27
|
-
const validatedOptions = validateOptions(options, true);
|
|
28
|
-
let finalPath = validatedOptions.tileset;
|
|
29
|
-
if (!options.quiet) {
|
|
30
|
-
if (validatedOptions.output === 'data') {
|
|
31
|
-
const nameWithoutExt = validatedOptions.tileset.substring(0, validatedOptions.tileset.length - 5);
|
|
32
|
-
const result = await inquirer.prompt([{
|
|
33
|
-
name: 'isNewFileRequired',
|
|
34
|
-
type: 'list',
|
|
35
|
-
message: 'What would you like to do?',
|
|
36
|
-
choices: [{
|
|
37
|
-
name: 'Add hash file to the current SLPK file',
|
|
38
|
-
value: false
|
|
39
|
-
}, {
|
|
40
|
-
name: `Create a new file ${nameWithoutExt}-hash.slpk with hash file inside`,
|
|
41
|
-
value: true
|
|
42
|
-
}]
|
|
43
|
-
}]);
|
|
44
|
-
if (result.isNewFileRequired) {
|
|
45
|
-
finalPath = `${nameWithoutExt}-hash.slpk`;
|
|
46
|
-
}
|
|
47
|
-
} else {
|
|
48
|
-
finalPath = validatedOptions.output;
|
|
49
|
-
}
|
|
22
|
+
const [, , ...args] = process.argv;
|
|
23
|
+
if (args.length === 0) {
|
|
24
|
+
printHelp();
|
|
25
|
+
}
|
|
26
|
+
const validatedOptionsArr = validateOptionsWithEqual(args);
|
|
27
|
+
const options = parseOptions(validatedOptionsArr);
|
|
28
|
+
if (options.installDependencies) {
|
|
29
|
+
const depthInstaller = new DepsInstaller();
|
|
30
|
+
depthInstaller.install('deps');
|
|
31
|
+
return;
|
|
50
32
|
}
|
|
51
|
-
if (
|
|
52
|
-
|
|
33
|
+
if (options.addHash) {
|
|
34
|
+
const validatedOptions = validateOptions(options, true);
|
|
35
|
+
let finalPath = validatedOptions.tileset;
|
|
36
|
+
if (!options.quiet) {
|
|
37
|
+
if (validatedOptions.output === 'data') {
|
|
38
|
+
const nameWithoutExt = validatedOptions.tileset.substring(0, validatedOptions.tileset.length - 5);
|
|
39
|
+
const result = await inquirer.prompt([
|
|
40
|
+
{
|
|
41
|
+
name: 'isNewFileRequired',
|
|
42
|
+
type: 'list',
|
|
43
|
+
message: 'What would you like to do?',
|
|
44
|
+
choices: [
|
|
45
|
+
{
|
|
46
|
+
name: 'Add hash file to the current SLPK file',
|
|
47
|
+
value: false
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
name: `Create a new file ${nameWithoutExt}-hash.slpk with hash file inside`,
|
|
51
|
+
value: true
|
|
52
|
+
}
|
|
53
|
+
]
|
|
54
|
+
}
|
|
55
|
+
]);
|
|
56
|
+
if (result.isNewFileRequired) {
|
|
57
|
+
finalPath = `${nameWithoutExt}-hash.slpk`;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
finalPath = validatedOptions.output;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
if (finalPath !== validatedOptions.tileset) {
|
|
65
|
+
await copyFile(validatedOptions.tileset, finalPath);
|
|
66
|
+
}
|
|
67
|
+
const hashTable = await composeHashFile(makeZipCDHeaderIterator(new FileHandleFile(finalPath)));
|
|
68
|
+
await addOneFile(finalPath, hashTable, '@specialIndexFileHASH128@');
|
|
69
|
+
return;
|
|
53
70
|
}
|
|
54
|
-
const
|
|
55
|
-
await
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
const validatedOptions = validateOptions(options);
|
|
59
|
-
await convert(validatedOptions);
|
|
71
|
+
const validatedOptions = validateOptions(options);
|
|
72
|
+
await convert(validatedOptions);
|
|
60
73
|
}
|
|
61
|
-
main().catch(error => {
|
|
62
|
-
|
|
63
|
-
|
|
74
|
+
main().catch((error) => {
|
|
75
|
+
console.log(error);
|
|
76
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
64
77
|
});
|
|
78
|
+
/**
|
|
79
|
+
* Output for `npx tile-converter --help`
|
|
80
|
+
*/
|
|
65
81
|
function printHelp() {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');
|
|
83
|
+
console.log('--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now "*.pgm" file installation is implemented]');
|
|
84
|
+
console.log('--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]');
|
|
85
|
+
console.log('--name [Tileset name]');
|
|
86
|
+
console.log('--output [Output folder, default: "data" folder]');
|
|
87
|
+
console.log('--instant-node-writing [Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed]');
|
|
88
|
+
console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
|
|
89
|
+
console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
|
|
90
|
+
console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
|
|
91
|
+
console.log('--input-type [tileset input type: I3S or 3DTILES]');
|
|
92
|
+
console.log('--7zExe [location of 7z.exe archiver to create slpk on Windows, default: "C:\\Program Files\\7-Zip\\7z.exe"]');
|
|
93
|
+
console.log('--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"');
|
|
94
|
+
console.log('--token [Token for Cesium ION tilesets authentication]');
|
|
95
|
+
console.log('--no-draco [Disable draco compression for geometry]');
|
|
96
|
+
console.log('--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]');
|
|
97
|
+
console.log('--generate-bounding-volumes [Generate obb and mbs bounding volumes from geometry]');
|
|
98
|
+
console.log('--analyze [Analyze the input tileset content without conversion, default: false]');
|
|
99
|
+
console.log('--metadata-class [One of the list of feature metadata classes, detected by converter on "analyze" stage, default: not set]');
|
|
100
|
+
console.log('--validate [Enable validation]');
|
|
101
|
+
console.log('--quiet [Skip all prompts that stop conversion and wait for a user input: default: false]');
|
|
102
|
+
process.exit(0); // eslint-disable-line
|
|
87
103
|
}
|
|
104
|
+
/**
|
|
105
|
+
* Run conversion process
|
|
106
|
+
* @param options validated tile-converter options
|
|
107
|
+
*/
|
|
88
108
|
async function convert(options) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
109
|
+
console.log(`------------------------------------------------`); // eslint-disable-line
|
|
110
|
+
console.log(`Starting conversion of ${options.inputType}`); // eslint-disable-line
|
|
111
|
+
console.log(`------------------------------------------------`); // eslint-disable-line
|
|
112
|
+
const inputType = options.inputType.toUpperCase();
|
|
113
|
+
switch (inputType) {
|
|
114
|
+
case TILESET_TYPE.I3S:
|
|
115
|
+
const tiles3DConverter = new Tiles3DConverter();
|
|
116
|
+
await tiles3DConverter.convert({
|
|
117
|
+
inputUrl: options.tileset,
|
|
118
|
+
outputPath: options.output,
|
|
119
|
+
tilesetName: options.name,
|
|
120
|
+
maxDepth: options.maxDepth,
|
|
121
|
+
egmFilePath: options.egm,
|
|
122
|
+
analyze: options.analyze,
|
|
123
|
+
inquirer: options.quiet ? undefined : inquirer
|
|
124
|
+
});
|
|
125
|
+
break;
|
|
126
|
+
case TILESET_TYPE._3DTILES:
|
|
127
|
+
const converter = new I3SConverter();
|
|
128
|
+
await converter.convert({
|
|
129
|
+
inputUrl: options.tileset,
|
|
130
|
+
outputPath: options.output,
|
|
131
|
+
tilesetName: options.name,
|
|
132
|
+
maxDepth: options.maxDepth,
|
|
133
|
+
slpk: options.slpk,
|
|
134
|
+
sevenZipExe: options.sevenZipExe,
|
|
135
|
+
egmFilePath: options.egm,
|
|
136
|
+
token: options.token,
|
|
137
|
+
draco: options.draco,
|
|
138
|
+
mergeMaterials: options.mergeMaterials,
|
|
139
|
+
generateTextures: options.generateTextures,
|
|
140
|
+
generateBoundingVolumes: options.generateBoundingVolumes,
|
|
141
|
+
validate: options.validate,
|
|
142
|
+
instantNodeWriting: options.instantNodeWriting,
|
|
143
|
+
metadataClass: options.metadataClass,
|
|
144
|
+
analyze: options.analyze,
|
|
145
|
+
inquirer: options.quiet ? undefined : inquirer
|
|
146
|
+
});
|
|
147
|
+
break;
|
|
148
|
+
default:
|
|
149
|
+
printHelp();
|
|
150
|
+
}
|
|
131
151
|
}
|
|
152
|
+
// OPTIONS
|
|
153
|
+
/**
|
|
154
|
+
* Validate input options of the CLI command
|
|
155
|
+
* @param options - input options of the CLI command
|
|
156
|
+
* @returns validated options
|
|
157
|
+
*/
|
|
132
158
|
function validateOptions(options, addHash) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
159
|
+
const mandatoryOptionsWithExceptions = {
|
|
160
|
+
name: {
|
|
161
|
+
getMessage: () => console.log('Missed: --name [Tileset name]'),
|
|
162
|
+
condition: (value) => addHash || Boolean(value) || Boolean(options.analyze)
|
|
163
|
+
},
|
|
164
|
+
output: { getMessage: () => console.log('Missed: --output [Output path name]') },
|
|
165
|
+
sevenZipExe: { getMessage: () => console.log('Missed: --7zExe [7z archiver executable path]') },
|
|
166
|
+
egm: { getMessage: () => console.log('Missed: --egm [*.pgm earth gravity model file path]') },
|
|
167
|
+
tileset: { getMessage: () => console.log('Missed: --tileset [tileset.json file]') },
|
|
168
|
+
inputType: {
|
|
169
|
+
getMessage: () => console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]'),
|
|
170
|
+
condition: (value) => addHash || (Boolean(value) && Object.values(TILESET_TYPE).includes(value.toUpperCase()))
|
|
171
|
+
}
|
|
172
|
+
};
|
|
173
|
+
const exceptions = [];
|
|
174
|
+
for (const mandatoryOption in mandatoryOptionsWithExceptions) {
|
|
175
|
+
const optionValue = options[mandatoryOption];
|
|
176
|
+
const conditionFunc = mandatoryOptionsWithExceptions[mandatoryOption].condition;
|
|
177
|
+
const testValue = conditionFunc ? conditionFunc(optionValue) : optionValue;
|
|
178
|
+
if (!testValue) {
|
|
179
|
+
exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption].getMessage);
|
|
180
|
+
}
|
|
153
181
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
const optionValue = options[mandatoryOption];
|
|
158
|
-
const conditionFunc = mandatoryOptionsWithExceptions[mandatoryOption].condition;
|
|
159
|
-
const testValue = conditionFunc ? conditionFunc(optionValue) : optionValue;
|
|
160
|
-
if (!testValue) {
|
|
161
|
-
exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption].getMessage);
|
|
182
|
+
if (exceptions.length) {
|
|
183
|
+
exceptions.forEach((exeption) => exeption());
|
|
184
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
162
185
|
}
|
|
163
|
-
|
|
164
|
-
if (exceptions.length) {
|
|
165
|
-
exceptions.forEach(exeption => exeption());
|
|
166
|
-
process.exit(1);
|
|
167
|
-
}
|
|
168
|
-
return options;
|
|
186
|
+
return options;
|
|
169
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* Parse option from the cli arguments array
|
|
190
|
+
* @param args
|
|
191
|
+
* @returns
|
|
192
|
+
*/
|
|
170
193
|
function parseOptions(args) {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
194
|
+
const opts = {
|
|
195
|
+
output: 'data',
|
|
196
|
+
instantNodeWriting: false,
|
|
197
|
+
mergeMaterials: true,
|
|
198
|
+
sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
|
|
199
|
+
egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
|
|
200
|
+
draco: true,
|
|
201
|
+
installDependencies: false,
|
|
202
|
+
generateTextures: false,
|
|
203
|
+
generateBoundingVolumes: false,
|
|
204
|
+
validate: false,
|
|
205
|
+
slpk: false,
|
|
206
|
+
addHash: false,
|
|
207
|
+
quiet: false
|
|
208
|
+
};
|
|
209
|
+
// eslint-disable-next-line complexity
|
|
210
|
+
args.forEach((arg, index) => {
|
|
211
|
+
if (arg.indexOf('--') === 0) {
|
|
212
|
+
switch (arg) {
|
|
213
|
+
case '--input-type':
|
|
214
|
+
opts.inputType = getStringValue(index, args);
|
|
215
|
+
break;
|
|
216
|
+
case '--tileset':
|
|
217
|
+
opts.tileset = getURLValue(index, args);
|
|
218
|
+
break;
|
|
219
|
+
case '--name':
|
|
220
|
+
opts.name = getStringValue(index, args);
|
|
221
|
+
break;
|
|
222
|
+
case '--output':
|
|
223
|
+
opts.output = getStringValue(index, args);
|
|
224
|
+
break;
|
|
225
|
+
case '--instant-node-writing':
|
|
226
|
+
opts.instantNodeWriting = getBooleanValue(index, args);
|
|
227
|
+
break;
|
|
228
|
+
case '--split-nodes':
|
|
229
|
+
opts.mergeMaterials = getBooleanValue(index, args);
|
|
230
|
+
break;
|
|
231
|
+
case '--max-depth':
|
|
232
|
+
opts.maxDepth = getIntegerValue(index, args);
|
|
233
|
+
break;
|
|
234
|
+
case '--slpk':
|
|
235
|
+
opts.slpk = getBooleanValue(index, args);
|
|
236
|
+
break;
|
|
237
|
+
case '--add-hash':
|
|
238
|
+
opts.addHash = getBooleanValue(index, args);
|
|
239
|
+
break;
|
|
240
|
+
case '--7zExe':
|
|
241
|
+
opts.sevenZipExe = getStringValue(index, args);
|
|
242
|
+
break;
|
|
243
|
+
case '--egm':
|
|
244
|
+
opts.egm = getStringValue(index, args);
|
|
245
|
+
break;
|
|
246
|
+
case '--token':
|
|
247
|
+
opts.token = getStringValue(index, args);
|
|
248
|
+
break;
|
|
249
|
+
case '--no-draco':
|
|
250
|
+
opts.draco = getBooleanValue(index, args);
|
|
251
|
+
break;
|
|
252
|
+
case '--validate':
|
|
253
|
+
opts.validate = getBooleanValue(index, args);
|
|
254
|
+
break;
|
|
255
|
+
case '--install-dependencies':
|
|
256
|
+
opts.installDependencies = getBooleanValue(index, args);
|
|
257
|
+
break;
|
|
258
|
+
case '--generate-textures':
|
|
259
|
+
opts.generateTextures = getBooleanValue(index, args);
|
|
260
|
+
break;
|
|
261
|
+
case '--generate-bounding-volumes':
|
|
262
|
+
opts.generateBoundingVolumes = getBooleanValue(index, args);
|
|
263
|
+
break;
|
|
264
|
+
case '--analyze':
|
|
265
|
+
opts.analyze = getBooleanValue(index, args);
|
|
266
|
+
break;
|
|
267
|
+
case '--quiet':
|
|
268
|
+
opts.quiet = getBooleanValue(index, args);
|
|
269
|
+
break;
|
|
270
|
+
case '--metadata-class':
|
|
271
|
+
opts.metadataClass = getStringValue(index, args);
|
|
272
|
+
break;
|
|
273
|
+
case '--help':
|
|
274
|
+
printHelp();
|
|
275
|
+
break;
|
|
276
|
+
default:
|
|
277
|
+
console.warn(`Unknown option ${arg}`);
|
|
278
|
+
process.exit(0); // eslint-disable-line
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
});
|
|
282
|
+
return opts;
|
|
259
283
|
}
|
|
260
|
-
//# sourceMappingURL=converter-cli.js.map
|