@loaders.gl/tile-converter 3.2.3 → 3.3.0-alpha.1
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-attributes-worker.js +3 -3
- package/dist/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/converter-cli.js +30 -7
- package/dist/converter.min.js +1 -1
- package/dist/dist.min.js +820 -517
- package/dist/es5/3d-tiles-attributes-worker.js +1 -1
- package/dist/es5/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/converter-cli.js +42 -12
- package/dist/es5/converter-cli.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +1 -1
- package/dist/es5/i3s-attributes-worker.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +135 -0
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +16 -10
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js +15 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +19 -15
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/lib/utils/write-queue.js +3 -5
- package/dist/es5/lib/utils/write-queue.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/converter-cli.js +37 -7
- package/dist/esm/converter-cli.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +1 -1
- package/dist/esm/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +117 -0
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +13 -8
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js +15 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +5 -1
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/lib/utils/write-queue.js +3 -5
- package/dist/esm/lib/utils/write-queue.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/esm/pgm-loader.js.map +1 -1
- package/dist/i3s-attributes-worker.js +3 -3
- package/dist/i3s-attributes-worker.js.map +3 -3
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +12 -0
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +127 -0
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +16 -11
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js +13 -0
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +4 -1
- package/dist/i3s-converter/types.d.ts +48 -0
- package/dist/i3s-converter/types.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +3 -4
- package/package.json +16 -16
- package/src/converter-cli.ts +33 -7
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +182 -0
- package/src/i3s-converter/helpers/geometry-converter.ts +26 -11
- package/src/i3s-converter/helpers/gltf-attributes.ts +15 -0
- package/src/i3s-converter/i3s-converter.ts +13 -6
- package/src/i3s-converter/types.ts +51 -0
- package/src/lib/utils/write-queue.ts +7 -5
|
@@ -8,7 +8,7 @@ exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
|
|
|
8
8
|
|
|
9
9
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
10
10
|
|
|
11
|
-
var VERSION = typeof "3.
|
|
11
|
+
var VERSION = typeof "3.3.0-alpha.1" !== 'undefined' ? "3.3.0-alpha.1" : 'latest';
|
|
12
12
|
var Tile3dAttributesWorker = {
|
|
13
13
|
id: '3d-tiles-attributes',
|
|
14
14
|
name: '3DTiles Attributes Worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/3d-tiles-attributes-worker.ts"],"names":["VERSION","Tile3dAttributesWorker","id","name","module","version","options","attributes","transform3DTilesAttributesOnWorker","i3sAttributesData","_typecheckI3SAttributesWorker"],"mappings":";;;;;;;;AAGA;;AAIA,IAAMA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../src/3d-tiles-attributes-worker.ts"],"names":["VERSION","Tile3dAttributesWorker","id","name","module","version","options","attributes","transform3DTilesAttributesOnWorker","i3sAttributesData","_typecheckI3SAttributesWorker"],"mappings":";;;;;;;;AAGA;;AAIA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAeO,IAAMC,sBAAsB,GAAG;AACpCC,EAAAA,EAAE,EAAE,qBADgC;AAEpCC,EAAAA,IAAI,EAAE,2BAF8B;AAGpCC,EAAAA,MAAM,EAAE,gBAH4B;AAIpCC,EAAAA,OAAO,EAAEL,OAJ2B;AAKpCM,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AADL;AAL2B,CAA/B;;;AAaA,SAASC,kCAAT,CACLC,iBADK,EAELH,OAFK,EAGiB;AACtB,SAAO,kCAAgBL,sBAAhB,EAAwCQ,iBAAxC,EAA2DH,OAA3D,CAAP;AACD;;AAEM,IAAMI,6BAA2C,GAAGT,sBAApD","sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {FeatureAttribute} from '@loaders.gl/i3s';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type Tile3DAttributesWorkerOptions = {\n featureAttributes: FeatureAttribute | null;\n source: string;\n};\n\nexport type I3SAttributesData = {\n tileContent: any;\n textureFormat: string;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const Tile3dAttributesWorker = {\n id: '3d-tiles-attributes',\n name: '3DTiles Attributes Worker',\n module: 'tile-converter',\n version: VERSION,\n options: {\n attributes: null\n }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transform3DTilesAttributesOnWorker(\n i3sAttributesData: I3SAttributesData,\n options: Tile3DAttributesWorkerOptions\n): Promise<ArrayBuffer> {\n return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = Tile3dAttributesWorker;\n"],"file":"3d-tiles-attributes-worker.js"}
|
|
@@ -27,7 +27,7 @@ function main() {
|
|
|
27
27
|
|
|
28
28
|
function _main() {
|
|
29
29
|
_main = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
|
|
30
|
-
var _process$argv, args, options, depthInstaller, validatedOptions;
|
|
30
|
+
var _process$argv, args, validatedOptionsArr, options, depthInstaller, validatedOptions;
|
|
31
31
|
|
|
32
32
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
33
33
|
while (1) {
|
|
@@ -39,10 +39,11 @@ function _main() {
|
|
|
39
39
|
printHelp();
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
|
|
42
|
+
validatedOptionsArr = validateOptionsWithEqual(args);
|
|
43
|
+
options = parseOptions(validatedOptionsArr);
|
|
43
44
|
|
|
44
45
|
if (!options.installDependencies) {
|
|
45
|
-
_context.next =
|
|
46
|
+
_context.next = 8;
|
|
46
47
|
break;
|
|
47
48
|
}
|
|
48
49
|
|
|
@@ -50,12 +51,12 @@ function _main() {
|
|
|
50
51
|
depthInstaller.install('deps');
|
|
51
52
|
return _context.abrupt("return");
|
|
52
53
|
|
|
53
|
-
case
|
|
54
|
+
case 8:
|
|
54
55
|
validatedOptions = validateOptions(options);
|
|
55
|
-
_context.next =
|
|
56
|
+
_context.next = 11;
|
|
56
57
|
return convert(validatedOptions);
|
|
57
58
|
|
|
58
|
-
case
|
|
59
|
+
case 11:
|
|
59
60
|
case "end":
|
|
60
61
|
return _context.stop();
|
|
61
62
|
}
|
|
@@ -195,6 +196,21 @@ function validateOptions(options) {
|
|
|
195
196
|
return options;
|
|
196
197
|
}
|
|
197
198
|
|
|
199
|
+
function validateOptionsWithEqual(args) {
|
|
200
|
+
return args.reduce(function (acc, curr) {
|
|
201
|
+
var equalSignIndex = curr.indexOf('=');
|
|
202
|
+
var beforeEqual = curr.slice(0, equalSignIndex);
|
|
203
|
+
var afterEqual = curr.slice(equalSignIndex + 1, curr.length);
|
|
204
|
+
var condition = curr.includes('=') && curr.startsWith('--') && afterEqual;
|
|
205
|
+
|
|
206
|
+
if (condition) {
|
|
207
|
+
return acc.concat(beforeEqual, afterEqual);
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
return acc.concat(curr);
|
|
211
|
+
}, []);
|
|
212
|
+
}
|
|
213
|
+
|
|
198
214
|
function parseOptions(args) {
|
|
199
215
|
var opts = {
|
|
200
216
|
output: 'data',
|
|
@@ -231,7 +247,7 @@ function parseOptions(args) {
|
|
|
231
247
|
break;
|
|
232
248
|
|
|
233
249
|
case '--slpk':
|
|
234
|
-
opts.slpk =
|
|
250
|
+
opts.slpk = getBooleanValue(index, args);
|
|
235
251
|
break;
|
|
236
252
|
|
|
237
253
|
case '--7zExe':
|
|
@@ -247,23 +263,23 @@ function parseOptions(args) {
|
|
|
247
263
|
break;
|
|
248
264
|
|
|
249
265
|
case '--no-draco':
|
|
250
|
-
opts.draco =
|
|
266
|
+
opts.draco = getBooleanValue(index, args);
|
|
251
267
|
break;
|
|
252
268
|
|
|
253
269
|
case '--validate':
|
|
254
|
-
opts.validate =
|
|
270
|
+
opts.validate = getBooleanValue(index, args);
|
|
255
271
|
break;
|
|
256
272
|
|
|
257
273
|
case '--install-dependencies':
|
|
258
|
-
opts.installDependencies =
|
|
274
|
+
opts.installDependencies = getBooleanValue(index, args);
|
|
259
275
|
break;
|
|
260
276
|
|
|
261
277
|
case '--generate-textures':
|
|
262
|
-
opts.generateTextures =
|
|
278
|
+
opts.generateTextures = getBooleanValue(index, args);
|
|
263
279
|
break;
|
|
264
280
|
|
|
265
281
|
case '--generate-bounding-volumes':
|
|
266
|
-
opts.generateBoundingVolumes =
|
|
282
|
+
opts.generateBoundingVolumes = getBooleanValue(index, args);
|
|
267
283
|
break;
|
|
268
284
|
|
|
269
285
|
case '--help':
|
|
@@ -303,4 +319,18 @@ function getIntegerValue(index, args) {
|
|
|
303
319
|
|
|
304
320
|
return NaN;
|
|
305
321
|
}
|
|
322
|
+
|
|
323
|
+
function getBooleanValue(index, args) {
|
|
324
|
+
var stringValue = getStringValue(index, args).toLowerCase().trim();
|
|
325
|
+
|
|
326
|
+
if (args[index] === '--no-draco' && !stringValue) {
|
|
327
|
+
return false;
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
if (!stringValue || stringValue === 'true') {
|
|
331
|
+
return true;
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
return false;
|
|
335
|
+
}
|
|
306
336
|
//# sourceMappingURL=converter-cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/converter-cli.ts"],"names":["TILESET_TYPE","I3S","_3DTILES","main","process","argv","args","length","printHelp","options","parseOptions","installDependencies","depthInstaller","DepsInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","Tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","I3SConverter","slpk","sevenZipExe","token","draco","generateTextures","generateBoundingVolumes","validate","mandatoryOptionsWithExceptions","exceptions","mandatoryOption","optionValue","isWrongInputType","Boolean","Object","values","includes","push","forEach","exeption","opts","cwd","arg","index","indexOf","getStringValue","getIntegerValue","warn","value","stringValue","result","Number","parseInt","isFinite","NaN"],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\nimport '@loaders.gl/polyfills';\nimport {join} from 'path';\nimport {I3SConverter, Tiles3DConverter} from '@loaders.gl/tile-converter';\nimport {DepsInstaller} from './deps-installer/deps-installer';\n\ntype TileConversionOptions = {\n /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n inputType?: string;\n /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n tileset?: string;\n /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n name?: string;\n /** Output folder. This folder will be created by converter if doesn't exist. It is relative to the converter path.\n * Default: \"data\" folder */\n output: string;\n /** 3DTiles->I3S only. location of 7z.exe archiver to create slpk on Windows OS, default: \"C:\\Program Files\\7-Zip\\7z.exe\" */\n sevenZipExe: string;\n /** location of the Earth Gravity Model (*.pgm) file to convert heights from ellipsoidal to gravity-related format,\n * default: \"./deps/egm2008-5.pgm\". A model file can be loaded from GeographicLib\n * https://geographiclib.sourceforge.io/html/geoid.html */\n egm: string;\n /** 3DTile->I3S only. Token for Cesium ION tileset authentication. */\n token?: string;\n /** 3DTiles->I3S only. Enable draco compression for geometry. Default: true */\n draco: boolean;\n /** Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is\n * implemented */\n installDependencies: boolean;\n /** 3DTile->I3S only. Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture\n * if only KTX2 is provided */\n generateTextures: boolean;\n /** 3DTile->I3S only. Will generate obb and mbs bounding volumes from geometry */\n generateBoundingVolumes: boolean;\n /** Validate the dataset during conversion. Validation messages will be posted in the console output */\n validate: boolean;\n /** Maximal depth of the hierarchical tiles tree traversal, default: infinite */\n maxDepth?: number;\n /** 3DTiles->I3S only. Whether the converter generates *.slpk (Scene Layer Package) I3S output file */\n slpk: boolean;\n};\n\n/* During validation we check that particular options are defined so they can't be undefined */\ntype ValidatedTileConversionOptions = TileConversionOptions & {\n /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n inputType: string;\n /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n tileset: string;\n /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n name: string;\n};\n\nconst TILESET_TYPE = {\n I3S: 'I3S',\n _3DTILES: '3DTILES'\n};\n\n/**\n * CLI entry\n * @returns\n */\nasync function main() {\n const [, , ...args] = process.argv;\n\n if (args.length === 0) {\n printHelp();\n }\n\n const options: TileConversionOptions = parseOptions(args);\n\n if (options.installDependencies) {\n const depthInstaller = new DepsInstaller();\n depthInstaller.install('deps');\n return;\n }\n\n const validatedOptions: ValidatedTileConversionOptions = validateOptions(options);\n\n await convert(validatedOptions);\n}\n\nmain().catch((error) => {\n console.log(error);\n process.exit(1); // eslint-disable-line\n});\n\n/**\n * Output for `npx tile-converter --help`\n */\nfunction printHelp(): void {\n console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');\n console.log(\n '--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is implemented]'\n );\n console.log(\n '--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]'\n );\n console.log('--name [Tileset name]');\n console.log('--output [Output folder, default: \"data\" folder]');\n console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');\n console.log(\n '--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]'\n );\n console.log('--input-type [tileset input type: I3S or 3DTILES]');\n console.log(\n '--7zExe [location of 7z.exe archiver to create slpk on Windows, default: \"C:\\\\Program Files\\\\7-Zip\\\\7z.exe\"]'\n );\n console.log(\n '--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\"'\n );\n console.log('--token [Token for Cesium ION tilesets authentication]');\n console.log('--no-draco [Disable draco compression for geometry]');\n console.log(\n '--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]'\n );\n console.log(\n '--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]'\n );\n console.log('--validate [Enable validation]');\n process.exit(0); // eslint-disable-line\n}\n\n/**\n * Run conversion process\n * @param options validated tile-converter options\n */\nasync function convert(options: ValidatedTileConversionOptions) {\n console.log(`------------------------------------------------`); // eslint-disable-line\n console.log(`Starting conversion of ${options.inputType}`); // eslint-disable-line\n console.log(`------------------------------------------------`); // eslint-disable-line\n const inputType = options.inputType.toUpperCase();\n switch (inputType) {\n case TILESET_TYPE.I3S:\n const tiles3DConverter = new Tiles3DConverter();\n tiles3DConverter.convert({\n inputUrl: options.tileset,\n outputPath: options.output,\n tilesetName: options.name,\n maxDepth: options.maxDepth,\n egmFilePath: options.egm\n });\n break;\n case TILESET_TYPE._3DTILES:\n const converter = new I3SConverter();\n await converter.convert({\n inputUrl: options.tileset,\n outputPath: options.output,\n tilesetName: options.name,\n maxDepth: options.maxDepth,\n slpk: options.slpk,\n sevenZipExe: options.sevenZipExe,\n egmFilePath: options.egm,\n token: options.token,\n draco: options.draco,\n generateTextures: options.generateTextures,\n generateBoundingVolumes: options.generateBoundingVolumes,\n validate: options.validate\n });\n break;\n default:\n printHelp();\n }\n}\n\n// OPTIONS\n/**\n * Validate input options of the CLI command\n * @param options - input options of the CLI command\n * @returns validated options\n */\nfunction validateOptions(options: TileConversionOptions): ValidatedTileConversionOptions {\n const mandatoryOptionsWithExceptions: {\n [key: string]: () => void;\n } = {\n name: () => console.log('Missed: --name [Tileset name]'),\n output: () => console.log('Missed: --output [Output path name]'),\n sevenZipExe: () => console.log('Missed: --7zExe [7z archiver executable path]'),\n egm: () => console.log('Missed: --egm [*.pgm earth gravity model file path]'),\n tileset: () => console.log('Missed: --tileset [tileset.json file]'),\n inputType: () =>\n console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]')\n };\n const exceptions: (() => void)[] = [];\n for (const mandatoryOption in mandatoryOptionsWithExceptions) {\n const optionValue = options[mandatoryOption];\n const isWrongInputType =\n Boolean(optionValue) &&\n mandatoryOption === 'inputType' &&\n !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());\n\n if (!optionValue || isWrongInputType) {\n exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);\n }\n }\n if (exceptions.length) {\n exceptions.forEach((exeption) => exeption());\n process.exit(0); // eslint-disable-line\n }\n return <ValidatedTileConversionOptions>options;\n}\n\n/**\n * Parse option from the cli arguments array\n * @param args\n * @returns\n */\nfunction parseOptions(args: string[]): TileConversionOptions {\n const opts: TileConversionOptions = {\n output: 'data',\n sevenZipExe: 'C:\\\\Program Files\\\\7-Zip\\\\7z.exe',\n egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),\n draco: true,\n installDependencies: false,\n generateTextures: false,\n generateBoundingVolumes: false,\n validate: false,\n slpk: false\n };\n\n // eslint-disable-next-line complexity\n args.forEach((arg, index) => {\n if (arg.indexOf('--') === 0) {\n switch (arg) {\n case '--input-type':\n opts.inputType = getStringValue(index, args);\n break;\n case '--tileset':\n opts.tileset = getStringValue(index, args);\n break;\n case '--name':\n opts.name = getStringValue(index, args);\n break;\n case '--output':\n opts.output = getStringValue(index, args);\n break;\n case '--max-depth':\n opts.maxDepth = getIntegerValue(index, args);\n break;\n case '--slpk':\n opts.slpk = true;\n break;\n case '--7zExe':\n opts.sevenZipExe = getStringValue(index, args);\n break;\n case '--egm':\n opts.egm = getStringValue(index, args);\n break;\n case '--token':\n opts.token = getStringValue(index, args);\n break;\n case '--no-draco':\n opts.draco = false;\n break;\n case '--validate':\n opts.validate = true;\n break;\n case '--install-dependencies':\n opts.installDependencies = true;\n break;\n case '--generate-textures':\n opts.generateTextures = true;\n break;\n case '--generate-bounding-volumes':\n opts.generateBoundingVolumes = true;\n break;\n case '--help':\n printHelp();\n break;\n default:\n console.warn(`Unknown option ${arg}`);\n process.exit(0); // eslint-disable-line\n }\n }\n });\n return opts;\n}\n\n/**\n * Get string option value from cli arguments\n * @param index - option's name index in the argument's array.\n * The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - string value of the option\n */\nfunction getStringValue(index: number, args: string[]): string {\n if (index + 1 >= args.length) {\n return '';\n }\n const value = args[index + 1];\n if (value.indexOf('--') === 0) {\n return '';\n }\n return value;\n}\n\n/**\n * Get integer option value from cli arguments\n * @param index - option's name index in the argument's array\n * The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - number value of the option\n */\nfunction getIntegerValue(index: number, args: string[]): number {\n const stringValue: string = getStringValue(index, args);\n const result: number = Number.parseInt(stringValue);\n if (isFinite(result)) {\n return result;\n }\n return NaN;\n}\n"],"file":"converter-cli.js"}
|
|
1
|
+
{"version":3,"sources":["../../src/converter-cli.ts"],"names":["TILESET_TYPE","I3S","_3DTILES","main","process","argv","args","length","printHelp","validatedOptionsArr","validateOptionsWithEqual","options","parseOptions","installDependencies","depthInstaller","DepsInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","Tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","I3SConverter","slpk","sevenZipExe","token","draco","generateTextures","generateBoundingVolumes","validate","mandatoryOptionsWithExceptions","exceptions","mandatoryOption","optionValue","isWrongInputType","Boolean","Object","values","includes","push","forEach","exeption","reduce","acc","curr","equalSignIndex","indexOf","beforeEqual","slice","afterEqual","condition","startsWith","concat","opts","cwd","arg","index","getStringValue","getIntegerValue","getBooleanValue","warn","value","stringValue","result","Number","parseInt","isFinite","NaN","toLowerCase","trim"],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\nimport '@loaders.gl/polyfills';\nimport {join} from 'path';\nimport {I3SConverter, Tiles3DConverter} from '@loaders.gl/tile-converter';\nimport {DepsInstaller} from './deps-installer/deps-installer';\n\ntype TileConversionOptions = {\n /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n inputType?: string;\n /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n tileset?: string;\n /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n name?: string;\n /** Output folder. This folder will be created by converter if doesn't exist. It is relative to the converter path.\n * Default: \"data\" folder */\n output: string;\n /** 3DTiles->I3S only. location of 7z.exe archiver to create slpk on Windows OS, default: \"C:\\Program Files\\7-Zip\\7z.exe\" */\n sevenZipExe: string;\n /** location of the Earth Gravity Model (*.pgm) file to convert heights from ellipsoidal to gravity-related format,\n * default: \"./deps/egm2008-5.pgm\". A model file can be loaded from GeographicLib\n * https://geographiclib.sourceforge.io/html/geoid.html */\n egm: string;\n /** 3DTile->I3S only. Token for Cesium ION tileset authentication. */\n token?: string;\n /** 3DTiles->I3S only. Enable draco compression for geometry. Default: true */\n draco: boolean;\n /** Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is\n * implemented */\n installDependencies: boolean;\n /** 3DTile->I3S only. Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture\n * if only KTX2 is provided */\n generateTextures: boolean;\n /** 3DTile->I3S only. Will generate obb and mbs bounding volumes from geometry */\n generateBoundingVolumes: boolean;\n /** Validate the dataset during conversion. Validation messages will be posted in the console output */\n validate: boolean;\n /** Maximal depth of the hierarchical tiles tree traversal, default: infinite */\n maxDepth?: number;\n /** 3DTiles->I3S only. Whether the converter generates *.slpk (Scene Layer Package) I3S output file */\n slpk: boolean;\n};\n\n/* During validation we check that particular options are defined so they can't be undefined */\ntype ValidatedTileConversionOptions = TileConversionOptions & {\n /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n inputType: string;\n /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n tileset: string;\n /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n name: string;\n};\n\nconst TILESET_TYPE = {\n I3S: 'I3S',\n _3DTILES: '3DTILES'\n};\n\n/**\n * CLI entry\n * @returns\n */\nasync function main() {\n const [, , ...args] = process.argv;\n\n if (args.length === 0) {\n printHelp();\n }\n\n const validatedOptionsArr = validateOptionsWithEqual(args);\n\n const options: TileConversionOptions = parseOptions(validatedOptionsArr);\n\n if (options.installDependencies) {\n const depthInstaller = new DepsInstaller();\n depthInstaller.install('deps');\n return;\n }\n\n const validatedOptions: ValidatedTileConversionOptions = validateOptions(options);\n\n await convert(validatedOptions);\n}\n\nmain().catch((error) => {\n console.log(error);\n process.exit(1); // eslint-disable-line\n});\n\n/**\n * Output for `npx tile-converter --help`\n */\nfunction printHelp(): void {\n console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');\n console.log(\n '--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is implemented]'\n );\n console.log(\n '--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]'\n );\n console.log('--name [Tileset name]');\n console.log('--output [Output folder, default: \"data\" folder]');\n console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');\n console.log(\n '--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]'\n );\n console.log('--input-type [tileset input type: I3S or 3DTILES]');\n console.log(\n '--7zExe [location of 7z.exe archiver to create slpk on Windows, default: \"C:\\\\Program Files\\\\7-Zip\\\\7z.exe\"]'\n );\n console.log(\n '--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\"'\n );\n console.log('--token [Token for Cesium ION tilesets authentication]');\n console.log('--no-draco [Disable draco compression for geometry]');\n console.log(\n '--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]'\n );\n console.log(\n '--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]'\n );\n console.log('--validate [Enable validation]');\n process.exit(0); // eslint-disable-line\n}\n\n/**\n * Run conversion process\n * @param options validated tile-converter options\n */\nasync function convert(options: ValidatedTileConversionOptions) {\n console.log(`------------------------------------------------`); // eslint-disable-line\n console.log(`Starting conversion of ${options.inputType}`); // eslint-disable-line\n console.log(`------------------------------------------------`); // eslint-disable-line\n const inputType = options.inputType.toUpperCase();\n switch (inputType) {\n case TILESET_TYPE.I3S:\n const tiles3DConverter = new Tiles3DConverter();\n tiles3DConverter.convert({\n inputUrl: options.tileset,\n outputPath: options.output,\n tilesetName: options.name,\n maxDepth: options.maxDepth,\n egmFilePath: options.egm\n });\n break;\n case TILESET_TYPE._3DTILES:\n const converter = new I3SConverter();\n await converter.convert({\n inputUrl: options.tileset,\n outputPath: options.output,\n tilesetName: options.name,\n maxDepth: options.maxDepth,\n slpk: options.slpk,\n sevenZipExe: options.sevenZipExe,\n egmFilePath: options.egm,\n token: options.token,\n draco: options.draco,\n generateTextures: options.generateTextures,\n generateBoundingVolumes: options.generateBoundingVolumes,\n validate: options.validate\n });\n break;\n default:\n printHelp();\n }\n}\n\n// OPTIONS\n/**\n * Validate input options of the CLI command\n * @param options - input options of the CLI command\n * @returns validated options\n */\nfunction validateOptions(options: TileConversionOptions): ValidatedTileConversionOptions {\n const mandatoryOptionsWithExceptions: {\n [key: string]: () => void;\n } = {\n name: () => console.log('Missed: --name [Tileset name]'),\n output: () => console.log('Missed: --output [Output path name]'),\n sevenZipExe: () => console.log('Missed: --7zExe [7z archiver executable path]'),\n egm: () => console.log('Missed: --egm [*.pgm earth gravity model file path]'),\n tileset: () => console.log('Missed: --tileset [tileset.json file]'),\n inputType: () =>\n console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]')\n };\n const exceptions: (() => void)[] = [];\n for (const mandatoryOption in mandatoryOptionsWithExceptions) {\n const optionValue = options[mandatoryOption];\n const isWrongInputType =\n Boolean(optionValue) &&\n mandatoryOption === 'inputType' &&\n !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());\n\n if (!optionValue || isWrongInputType) {\n exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);\n }\n }\n if (exceptions.length) {\n exceptions.forEach((exeption) => exeption());\n process.exit(0); // eslint-disable-line\n }\n return <ValidatedTileConversionOptions>options;\n}\n\nfunction validateOptionsWithEqual(args: string[]): string[] {\n return args.reduce((acc: string[], curr) => {\n const equalSignIndex = curr.indexOf('=');\n const beforeEqual = curr.slice(0, equalSignIndex);\n const afterEqual = curr.slice(equalSignIndex + 1, curr.length);\n const condition = curr.includes('=') && curr.startsWith('--') && afterEqual;\n if (condition) {\n return acc.concat(beforeEqual, afterEqual);\n }\n return acc.concat(curr);\n }, []);\n}\n\n/**\n * Parse option from the cli arguments array\n * @param args\n * @returns\n */\nfunction parseOptions(args: string[]): TileConversionOptions {\n const opts: TileConversionOptions = {\n output: 'data',\n sevenZipExe: 'C:\\\\Program Files\\\\7-Zip\\\\7z.exe',\n egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),\n draco: true,\n installDependencies: false,\n generateTextures: false,\n generateBoundingVolumes: false,\n validate: false,\n slpk: false\n };\n\n // eslint-disable-next-line complexity\n args.forEach((arg, index) => {\n if (arg.indexOf('--') === 0) {\n switch (arg) {\n case '--input-type':\n opts.inputType = getStringValue(index, args);\n break;\n case '--tileset':\n opts.tileset = getStringValue(index, args);\n break;\n case '--name':\n opts.name = getStringValue(index, args);\n break;\n case '--output':\n opts.output = getStringValue(index, args);\n break;\n case '--max-depth':\n opts.maxDepth = getIntegerValue(index, args);\n break;\n case '--slpk':\n opts.slpk = getBooleanValue(index, args);\n break;\n case '--7zExe':\n opts.sevenZipExe = getStringValue(index, args);\n break;\n case '--egm':\n opts.egm = getStringValue(index, args);\n break;\n case '--token':\n opts.token = getStringValue(index, args);\n break;\n case '--no-draco':\n opts.draco = getBooleanValue(index, args);\n break;\n case '--validate':\n opts.validate = getBooleanValue(index, args);\n break;\n case '--install-dependencies':\n opts.installDependencies = getBooleanValue(index, args);\n break;\n case '--generate-textures':\n opts.generateTextures = getBooleanValue(index, args);\n break;\n case '--generate-bounding-volumes':\n opts.generateBoundingVolumes = getBooleanValue(index, args);\n break;\n case '--help':\n printHelp();\n break;\n default:\n console.warn(`Unknown option ${arg}`);\n process.exit(0); // eslint-disable-line\n }\n }\n });\n return opts;\n}\n\n/**\n * Get string option value from cli arguments\n * @param index - option's name index in the argument's array.\n * The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - string value of the option\n */\nfunction getStringValue(index: number, args: string[]): string {\n if (index + 1 >= args.length) {\n return '';\n }\n const value = args[index + 1];\n if (value.indexOf('--') === 0) {\n return '';\n }\n return value;\n}\n\n/**\n * Get integer option value from cli arguments\n * @param index - option's name index in the argument's array\n * The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - number value of the option\n */\nfunction getIntegerValue(index: number, args: string[]): number {\n const stringValue: string = getStringValue(index, args);\n const result: number = Number.parseInt(stringValue);\n if (isFinite(result)) {\n return result;\n }\n return NaN;\n}\n\nfunction getBooleanValue(index: number, args: string[]): boolean {\n const stringValue: string = getStringValue(index, args).toLowerCase().trim();\n if (args[index] === '--no-draco' && !stringValue) {\n return false;\n }\n if (!stringValue || stringValue === 'true') {\n return true;\n }\n return false;\n}\n"],"file":"converter-cli.js"}
|
|
@@ -8,7 +8,7 @@ exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
|
|
|
8
8
|
|
|
9
9
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
10
10
|
|
|
11
|
-
var VERSION = typeof "3.
|
|
11
|
+
var VERSION = typeof "3.3.0-alpha.1" !== 'undefined' ? "3.3.0-alpha.1" : 'latest';
|
|
12
12
|
var I3SAttributesWorker = {
|
|
13
13
|
id: 'i3s-attributes',
|
|
14
14
|
name: 'I3S Attributes Worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/i3s-attributes-worker.ts"],"names":["VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"mappings":";;;;;;;;AAIA;;AAIA,IAAMA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../src/i3s-attributes-worker.ts"],"names":["VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"mappings":";;;;;;;;AAIA;;AAIA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAiBO,IAAMC,mBAAmB,GAAG;AACjCC,EAAAA,EAAE,EAAE,gBAD6B;AAEjCC,EAAAA,IAAI,EAAE,uBAF2B;AAGjCC,EAAAA,MAAM,EAAE,gBAHyB;AAIjCC,EAAAA,OAAO,EAAEL,OAJwB;AAKjCM,EAAAA,OAAO,EAAE;AACPC,IAAAA,qBAAqB,EAAE;AADhB;AALwB,CAA5B;;;AAaA,SAASC,8BAAT,CACLC,cADK,EAELH,OAFK,EAGsC;AAC3C,SAAO,kCAAgBL,mBAAhB,EAAqCQ,cAArC,EAAqDH,OAArD,CAAP;AACD;;AAEM,IAAMI,6BAA2C,GAAGT,mBAApD","sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {ConvertedAttributes} from './i3s-converter/types';\nimport type {Matrix4, Vector3} from '@math.gl/core';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type I3SAttributesWorkerOptions = {\n useCartesianPositions: boolean;\n source: string;\n};\n\nexport type B3DMAttributesData = {\n gltfMaterials?: {id: string}[];\n nodes: any;\n cartographicOrigin: Vector3;\n cartesianModelMatrix: Matrix4;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const I3SAttributesWorker = {\n id: 'i3s-attributes',\n name: 'I3S Attributes Worker',\n module: 'tile-converter',\n version: VERSION,\n options: {\n useCartesianPositions: false\n }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transformI3SAttributesOnWorker(\n attributesData: B3DMAttributesData,\n options: I3SAttributesWorkerOptions\n): Promise<Map<string, ConvertedAttributes>> {\n return processOnWorker(I3SAttributesWorker, attributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = I3SAttributesWorker;\n"],"file":"i3s-attributes-worker.js"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.handleBatchIdsExtensions = handleBatchIdsExtensions;
|
|
9
|
+
|
|
10
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
+
|
|
12
|
+
var EXT_MESH_FEATURES = 'EXT_mesh_features';
|
|
13
|
+
var EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
14
|
+
|
|
15
|
+
function handleBatchIdsExtensions(attributes, primitive, images) {
|
|
16
|
+
var extensions = primitive === null || primitive === void 0 ? void 0 : primitive.extensions;
|
|
17
|
+
|
|
18
|
+
if (!extensions) {
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
for (var _i = 0, _Object$entries = Object.entries(extensions || {}); _i < _Object$entries.length; _i++) {
|
|
23
|
+
var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
|
|
24
|
+
extensionName = _Object$entries$_i[0],
|
|
25
|
+
extensionData = _Object$entries$_i[1];
|
|
26
|
+
|
|
27
|
+
switch (extensionName) {
|
|
28
|
+
case EXT_FEATURE_METADATA:
|
|
29
|
+
return handleExtFeatureMetadataExtension(attributes, extensionData, images);
|
|
30
|
+
|
|
31
|
+
case EXT_MESH_FEATURES:
|
|
32
|
+
console.warn('EXT_mesh_features extension is not supported yet');
|
|
33
|
+
return [];
|
|
34
|
+
|
|
35
|
+
default:
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
return [];
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, images) {
|
|
44
|
+
var _extFeatureMetadata$f, _featureIdAttribute$f, _featureIdAttribute$f2, _featureIdAttribute$f3;
|
|
45
|
+
|
|
46
|
+
var featureIdAttribute = extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : (_extFeatureMetadata$f = extFeatureMetadata.featureIdAttributes) === null || _extFeatureMetadata$f === void 0 ? void 0 : _extFeatureMetadata$f[0];
|
|
47
|
+
|
|
48
|
+
if (featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f !== void 0 && _featureIdAttribute$f.attribute) {
|
|
49
|
+
var batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];
|
|
50
|
+
return batchIdsAttribute.value;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
if (featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f2 = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f2 !== void 0 && _featureIdAttribute$f2.hasOwnProperty('constant') && featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f3 = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f3 !== void 0 && _featureIdAttribute$f3.hasOwnProperty('divisor')) {
|
|
54
|
+
var _attributes$POSITIONS;
|
|
55
|
+
|
|
56
|
+
var featuresCount = (attributes === null || attributes === void 0 ? void 0 : (_attributes$POSITIONS = attributes.POSITIONS) === null || _attributes$POSITIONS === void 0 ? void 0 : _attributes$POSITIONS.value.length) / 3 || 0;
|
|
57
|
+
return generateImplicitFeatureIds(featuresCount, featureIdAttribute.featureIds.constant, featureIdAttribute.featureIds.divisor);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
var featureIdTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures[0]);
|
|
61
|
+
|
|
62
|
+
if (featureIdTexture) {
|
|
63
|
+
var textureCoordinates = attributes.TEXCOORD_0.value;
|
|
64
|
+
return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return [];
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function generateImplicitFeatureIds(featuresCount) {
|
|
71
|
+
var constant = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
72
|
+
var divisor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
73
|
+
var featureIds = [];
|
|
74
|
+
|
|
75
|
+
if (divisor > 0) {
|
|
76
|
+
var currentValue = constant;
|
|
77
|
+
var devisorCounter = divisor;
|
|
78
|
+
|
|
79
|
+
for (var index = 0; index < featuresCount; index++) {
|
|
80
|
+
featureIds.push(currentValue);
|
|
81
|
+
devisorCounter -= 1;
|
|
82
|
+
|
|
83
|
+
if (devisorCounter === 0) {
|
|
84
|
+
currentValue++;
|
|
85
|
+
devisorCounter = divisor;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
} else {
|
|
89
|
+
featureIds = Array(featuresCount).fill(constant, 0, featuresCount);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
return featureIds;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images) {
|
|
96
|
+
var _featureIdTexture$fea, _featureIdTexture$fea2, _featureIdTexture$fea3;
|
|
97
|
+
|
|
98
|
+
var CHANNELS_MAP = {
|
|
99
|
+
r: 0,
|
|
100
|
+
g: 1,
|
|
101
|
+
b: 2,
|
|
102
|
+
a: 3
|
|
103
|
+
};
|
|
104
|
+
var textureIndex = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea = featureIdTexture.featureIds) === null || _featureIdTexture$fea === void 0 ? void 0 : (_featureIdTexture$fea2 = _featureIdTexture$fea.texture) === null || _featureIdTexture$fea2 === void 0 ? void 0 : _featureIdTexture$fea2.index;
|
|
105
|
+
var featureChannel = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea3 = featureIdTexture.featureIds) === null || _featureIdTexture$fea3 === void 0 ? void 0 : _featureIdTexture$fea3.channels;
|
|
106
|
+
|
|
107
|
+
if (!featureChannel || textureIndex === undefined) {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
var image = images[textureIndex];
|
|
112
|
+
var batchIds = [];
|
|
113
|
+
var channels = CHANNELS_MAP[featureChannel];
|
|
114
|
+
|
|
115
|
+
if (!image.compressed) {
|
|
116
|
+
for (var index = 0; index < textureCoordinates.length; index += 2) {
|
|
117
|
+
var u = textureCoordinates[index];
|
|
118
|
+
var v = textureCoordinates[index + 1];
|
|
119
|
+
var tx = Math.min(emod(u) * image.width | 0, image.width - 1);
|
|
120
|
+
var ty = Math.min(emod(v) * image.height | 0, image.height - 1);
|
|
121
|
+
var offset = (ty * image.width + tx) * image.components + channels;
|
|
122
|
+
var batchId = new Uint8Array(image.data)[offset];
|
|
123
|
+
batchIds.push(batchId);
|
|
124
|
+
}
|
|
125
|
+
} else {
|
|
126
|
+
console.warn("Can't get batch Ids from ".concat(image.mimeType, " compressed texture"));
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
return batchIds;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
function emod(n) {
|
|
133
|
+
return (n % 1 + 1) % 1;
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=batch-ids-extensions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":["EXT_MESH_FEATURES","EXT_FEATURE_METADATA","handleBatchIdsExtensions","attributes","primitive","images","extensions","Object","entries","extensionName","extensionData","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","textureCoordinates","TEXCOORD_0","generateBatchIdsFromTexture","currentValue","devisorCounter","index","push","Array","fill","CHANNELS_MAP","r","g","b","a","textureIndex","texture","featureChannel","channels","undefined","image","batchIds","compressed","u","v","tx","Math","min","emod","width","ty","height","offset","components","batchId","Uint8Array","data","mimeType","n"],"mappings":"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","sourcesContent":["import type {GLTFAccessorPostprocessed} from 'modules/gltf/src/lib/types/gltf-types';\nimport type {Image, MeshPrimitive} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';\nimport type {ExtFeatureMetadata, ExtFeatureMetadataAttribute} from '../types';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes\n * @param primitive\n * @param textures\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: MeshPrimitive,\n images: Image[]\n): number[] {\n const extensions = primitive?.extensions;\n\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as ExtFeatureMetadata,\n images\n );\n case EXT_MESH_FEATURES:\n console.warn('EXT_mesh_features extension is not supported yet');\n return [];\n default:\n return [];\n }\n }\n\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: ExtFeatureMetadata,\n images: Image[]\n): number[] {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureCoordinates = attributes.TEXCOORD_0.value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: ExtFeatureMetadataAttribute,\n textureCoordinates: Float32Array,\n images: Image[]\n) {\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (!image.compressed) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image.mimeType} compressed texture`);\n }\n\n return batchIds;\n}\n\n/**\n * Handle UVs if they are out of range [0,1].\n * @param n\n * @param m\n */\nfunction emod(n: number): number {\n return ((n % 1) + 1) % 1;\n}\n"],"file":"batch-ids-extensions.js"}
|
|
@@ -32,6 +32,8 @@ var _coordinateConverter = require("./coordinate-converter");
|
|
|
32
32
|
|
|
33
33
|
var _gltfAttributes = require("./gltf-attributes");
|
|
34
34
|
|
|
35
|
+
var _batchIdsExtensions = require("./batch-ids-extensions");
|
|
36
|
+
|
|
35
37
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
36
38
|
|
|
37
39
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
@@ -421,17 +423,18 @@ function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesM
|
|
|
421
423
|
var matrix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
|
|
422
424
|
var transformationMatrix = getCompositeTransformationMatrix(node, matrix);
|
|
423
425
|
var mesh = node.mesh;
|
|
426
|
+
var images = node.images;
|
|
424
427
|
|
|
425
428
|
if (mesh) {
|
|
426
|
-
convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
|
|
429
|
+
convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
|
|
427
430
|
}
|
|
428
431
|
|
|
429
432
|
convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
|
|
430
433
|
}
|
|
431
434
|
|
|
432
|
-
function convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap) {
|
|
433
|
-
var useCartesianPositions = arguments.length >
|
|
434
|
-
var matrix = arguments.length >
|
|
435
|
+
function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap) {
|
|
436
|
+
var useCartesianPositions = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
437
|
+
var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
|
|
435
438
|
|
|
436
439
|
var _iterator3 = _createForOfIteratorHelper(mesh.primitives),
|
|
437
440
|
_step3;
|
|
@@ -477,7 +480,7 @@ function convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesM
|
|
|
477
480
|
outputAttributes.texCoords = (0, _loaderUtils.concatenateTypedArrays)(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, (_primitive$indices3 = primitive.indices) === null || _primitive$indices3 === void 0 ? void 0 : _primitive$indices3.value));
|
|
478
481
|
outputAttributes.colors = (0, _loaderUtils.concatenateTypedArrays)(outputAttributes.colors, flattenColors(attributes.COLOR_0, (_primitive$indices4 = primitive.indices) === null || _primitive$indices4 === void 0 ? void 0 : _primitive$indices4.value));
|
|
479
482
|
outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
|
|
480
|
-
outputAttributes.featureIndicesGroups.push(flattenBatchIds(
|
|
483
|
+
outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
|
|
481
484
|
}
|
|
482
485
|
} catch (err) {
|
|
483
486
|
_iterator3.e(err);
|
|
@@ -602,19 +605,22 @@ function flattenBatchIds(batchedIds, indices) {
|
|
|
602
605
|
return newBatchIds;
|
|
603
606
|
}
|
|
604
607
|
|
|
605
|
-
function
|
|
606
|
-
var batchIds =
|
|
608
|
+
function getBatchIds(attributes, primitive, images) {
|
|
609
|
+
var batchIds = (0, _batchIdsExtensions.handleBatchIdsExtensions)(attributes, primitive, images);
|
|
610
|
+
|
|
611
|
+
if (batchIds.length) {
|
|
612
|
+
return batchIds;
|
|
613
|
+
}
|
|
607
614
|
|
|
608
615
|
for (var index = 0; index < BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES.length; index++) {
|
|
609
616
|
var possibleBatchIdAttributeName = BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES[index];
|
|
610
617
|
|
|
611
618
|
if (attributes[possibleBatchIdAttributeName] && attributes[possibleBatchIdAttributeName].value) {
|
|
612
|
-
|
|
613
|
-
break;
|
|
619
|
+
return attributes[possibleBatchIdAttributeName].value;
|
|
614
620
|
}
|
|
615
621
|
}
|
|
616
622
|
|
|
617
|
-
return
|
|
623
|
+
return [];
|
|
618
624
|
}
|
|
619
625
|
|
|
620
626
|
function convertMaterials() {
|