@loaders.gl/tile-converter 3.2.7 → 3.3.0-alpha.3
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 +1105 -621
- 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 +146 -0
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/feature-attributes.js +60 -0
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +39 -7
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +177 -59
- 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 +50 -51
- 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 +128 -0
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/feature-attributes.js +34 -0
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js +23 -7
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +145 -38
- 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 +21 -27
- 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 +138 -0
- package/dist/i3s-converter/helpers/feature-attributes.d.ts +24 -0
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/feature-attributes.js +55 -0
- package/dist/i3s-converter/helpers/geometry-attributes.js +26 -7
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +9 -2
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +140 -44
- 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 +7 -14
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +44 -35
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +3 -4
- package/package.json +15 -15
- package/src/converter-cli.ts +33 -7
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +199 -0
- package/src/i3s-converter/helpers/feature-attributes.ts +65 -0
- package/src/i3s-converter/helpers/geometry-attributes.ts +30 -7
- package/src/i3s-converter/helpers/geometry-converter.ts +187 -48
- package/src/i3s-converter/helpers/gltf-attributes.ts +15 -0
- package/src/i3s-converter/i3s-converter.ts +38 -41
- package/src/lib/utils/write-queue.ts +7 -5
|
@@ -14,7 +14,8 @@ async function main() {
|
|
|
14
14
|
printHelp();
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
const
|
|
17
|
+
const validatedOptionsArr = validateOptionsWithEqual(args);
|
|
18
|
+
const options = parseOptions(validatedOptionsArr);
|
|
18
19
|
|
|
19
20
|
if (options.installDependencies) {
|
|
20
21
|
const depthInstaller = new DepsInstaller();
|
|
@@ -119,6 +120,21 @@ function validateOptions(options) {
|
|
|
119
120
|
return options;
|
|
120
121
|
}
|
|
121
122
|
|
|
123
|
+
function validateOptionsWithEqual(args) {
|
|
124
|
+
return args.reduce((acc, curr) => {
|
|
125
|
+
const equalSignIndex = curr.indexOf('=');
|
|
126
|
+
const beforeEqual = curr.slice(0, equalSignIndex);
|
|
127
|
+
const afterEqual = curr.slice(equalSignIndex + 1, curr.length);
|
|
128
|
+
const condition = curr.includes('=') && curr.startsWith('--') && afterEqual;
|
|
129
|
+
|
|
130
|
+
if (condition) {
|
|
131
|
+
return acc.concat(beforeEqual, afterEqual);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return acc.concat(curr);
|
|
135
|
+
}, []);
|
|
136
|
+
}
|
|
137
|
+
|
|
122
138
|
function parseOptions(args) {
|
|
123
139
|
const opts = {
|
|
124
140
|
output: 'data',
|
|
@@ -155,7 +171,7 @@ function parseOptions(args) {
|
|
|
155
171
|
break;
|
|
156
172
|
|
|
157
173
|
case '--slpk':
|
|
158
|
-
opts.slpk =
|
|
174
|
+
opts.slpk = getBooleanValue(index, args);
|
|
159
175
|
break;
|
|
160
176
|
|
|
161
177
|
case '--7zExe':
|
|
@@ -171,23 +187,23 @@ function parseOptions(args) {
|
|
|
171
187
|
break;
|
|
172
188
|
|
|
173
189
|
case '--no-draco':
|
|
174
|
-
opts.draco =
|
|
190
|
+
opts.draco = getBooleanValue(index, args);
|
|
175
191
|
break;
|
|
176
192
|
|
|
177
193
|
case '--validate':
|
|
178
|
-
opts.validate =
|
|
194
|
+
opts.validate = getBooleanValue(index, args);
|
|
179
195
|
break;
|
|
180
196
|
|
|
181
197
|
case '--install-dependencies':
|
|
182
|
-
opts.installDependencies =
|
|
198
|
+
opts.installDependencies = getBooleanValue(index, args);
|
|
183
199
|
break;
|
|
184
200
|
|
|
185
201
|
case '--generate-textures':
|
|
186
|
-
opts.generateTextures =
|
|
202
|
+
opts.generateTextures = getBooleanValue(index, args);
|
|
187
203
|
break;
|
|
188
204
|
|
|
189
205
|
case '--generate-bounding-volumes':
|
|
190
|
-
opts.generateBoundingVolumes =
|
|
206
|
+
opts.generateBoundingVolumes = getBooleanValue(index, args);
|
|
191
207
|
break;
|
|
192
208
|
|
|
193
209
|
case '--help':
|
|
@@ -227,4 +243,18 @@ function getIntegerValue(index, args) {
|
|
|
227
243
|
|
|
228
244
|
return NaN;
|
|
229
245
|
}
|
|
246
|
+
|
|
247
|
+
function getBooleanValue(index, args) {
|
|
248
|
+
const stringValue = getStringValue(index, args).toLowerCase().trim();
|
|
249
|
+
|
|
250
|
+
if (args[index] === '--no-draco' && !stringValue) {
|
|
251
|
+
return false;
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
if (!stringValue || stringValue === 'true') {
|
|
255
|
+
return true;
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
return false;
|
|
259
|
+
}
|
|
230
260
|
//# sourceMappingURL=converter-cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/converter-cli.ts"],"names":["join","I3SConverter","Tiles3DConverter","DepsInstaller","TILESET_TYPE","I3S","_3DTILES","main","args","process","argv","length","printHelp","options","parseOptions","installDependencies","depthInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","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":["join","I3SConverter","Tiles3DConverter","DepsInstaller","TILESET_TYPE","I3S","_3DTILES","main","args","process","argv","length","printHelp","validatedOptionsArr","validateOptionsWithEqual","options","parseOptions","installDependencies","depthInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.
|
|
2
|
+
const VERSION = typeof "3.3.0-alpha.3" !== 'undefined' ? "3.3.0-alpha.3" : 'latest';
|
|
3
3
|
export const I3SAttributesWorker = {
|
|
4
4
|
id: 'i3s-attributes',
|
|
5
5
|
name: 'I3S Attributes Worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/i3s-attributes-worker.ts"],"names":["processOnWorker","VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"mappings":"AAIA,SAAQA,eAAR,QAA8B,0BAA9B;AAIA,MAAMC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../src/i3s-attributes-worker.ts"],"names":["processOnWorker","VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","_typecheckI3SAttributesWorker"],"mappings":"AAIA,SAAQA,eAAR,QAA8B,0BAA9B;AAIA,MAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAiBA,OAAO,MAAMC,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;AAaP,OAAO,SAASC,8BAAT,CACLC,cADK,EAELH,OAFK,EAGsC;AAC3C,SAAOP,eAAe,CAACE,mBAAD,EAAsBQ,cAAtB,EAAsCH,OAAtC,CAAtB;AACD;AAED,OAAO,MAAMI,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,128 @@
|
|
|
1
|
+
const EXT_MESH_FEATURES = 'EXT_mesh_features';
|
|
2
|
+
const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
3
|
+
export function handleBatchIdsExtensions(attributes, primitive, images) {
|
|
4
|
+
const extensions = primitive === null || primitive === void 0 ? void 0 : primitive.extensions;
|
|
5
|
+
|
|
6
|
+
if (!extensions) {
|
|
7
|
+
return [];
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
for (const [extensionName, extensionData] of Object.entries(extensions || {})) {
|
|
11
|
+
switch (extensionName) {
|
|
12
|
+
case EXT_FEATURE_METADATA:
|
|
13
|
+
return handleExtFeatureMetadataExtension(attributes, extensionData, images);
|
|
14
|
+
|
|
15
|
+
case EXT_MESH_FEATURES:
|
|
16
|
+
console.warn('EXT_mesh_features extension is not supported yet');
|
|
17
|
+
return [];
|
|
18
|
+
|
|
19
|
+
default:
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return [];
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, images) {
|
|
28
|
+
var _extFeatureMetadata$f, _featureIdAttribute$f, _featureIdAttribute$f2, _featureIdAttribute$f3;
|
|
29
|
+
|
|
30
|
+
const featureIdAttribute = extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : (_extFeatureMetadata$f = extFeatureMetadata.featureIdAttributes) === null || _extFeatureMetadata$f === void 0 ? void 0 : _extFeatureMetadata$f[0];
|
|
31
|
+
|
|
32
|
+
if (featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f !== void 0 && _featureIdAttribute$f.attribute) {
|
|
33
|
+
const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];
|
|
34
|
+
return batchIdsAttribute.value;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
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')) {
|
|
38
|
+
var _attributes$POSITIONS;
|
|
39
|
+
|
|
40
|
+
const 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;
|
|
41
|
+
return generateImplicitFeatureIds(featuresCount, featureIdAttribute.featureIds.constant, featureIdAttribute.featureIds.divisor);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const featureIdTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures[0]);
|
|
45
|
+
|
|
46
|
+
if (featureIdTexture) {
|
|
47
|
+
var _featureIdTexture$fea, _featureIdTexture$fea2;
|
|
48
|
+
|
|
49
|
+
const textureAttributeIndex = (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.texCoord) || 0;
|
|
50
|
+
const textCoordAttribute = "TEXCOORD_".concat(textureAttributeIndex);
|
|
51
|
+
const textureCoordinates = attributes[textCoordAttribute].value;
|
|
52
|
+
return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const featureTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureTextures[0]);
|
|
56
|
+
|
|
57
|
+
if (featureTexture) {
|
|
58
|
+
console.warn("EXT_feature_metadata doesn't yet support featureTextures in primitive");
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
return [];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function generateImplicitFeatureIds(featuresCount, constant = 0, divisor = 0) {
|
|
66
|
+
let featureIds = [];
|
|
67
|
+
|
|
68
|
+
if (divisor > 0) {
|
|
69
|
+
let currentValue = constant;
|
|
70
|
+
let devisorCounter = divisor;
|
|
71
|
+
|
|
72
|
+
for (let index = 0; index < featuresCount; index++) {
|
|
73
|
+
featureIds.push(currentValue);
|
|
74
|
+
devisorCounter -= 1;
|
|
75
|
+
|
|
76
|
+
if (devisorCounter === 0) {
|
|
77
|
+
currentValue++;
|
|
78
|
+
devisorCounter = divisor;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
} else {
|
|
82
|
+
featureIds = Array(featuresCount).fill(constant, 0, featuresCount);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
return featureIds;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images) {
|
|
89
|
+
var _featureIdTexture$fea3, _featureIdTexture$fea4, _featureIdTexture$fea5;
|
|
90
|
+
|
|
91
|
+
const CHANNELS_MAP = {
|
|
92
|
+
r: 0,
|
|
93
|
+
g: 1,
|
|
94
|
+
b: 2,
|
|
95
|
+
a: 3
|
|
96
|
+
};
|
|
97
|
+
const textureIndex = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea3 = featureIdTexture.featureIds) === null || _featureIdTexture$fea3 === void 0 ? void 0 : (_featureIdTexture$fea4 = _featureIdTexture$fea3.texture) === null || _featureIdTexture$fea4 === void 0 ? void 0 : _featureIdTexture$fea4.index;
|
|
98
|
+
const featureChannel = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea5 = featureIdTexture.featureIds) === null || _featureIdTexture$fea5 === void 0 ? void 0 : _featureIdTexture$fea5.channels;
|
|
99
|
+
|
|
100
|
+
if (!featureChannel || textureIndex === undefined) {
|
|
101
|
+
return [];
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
const image = images[textureIndex];
|
|
105
|
+
const batchIds = [];
|
|
106
|
+
const channels = CHANNELS_MAP[featureChannel];
|
|
107
|
+
|
|
108
|
+
if (!image.compressed) {
|
|
109
|
+
for (let index = 0; index < textureCoordinates.length; index += 2) {
|
|
110
|
+
const u = textureCoordinates[index];
|
|
111
|
+
const v = textureCoordinates[index + 1];
|
|
112
|
+
const tx = Math.min(emod(u) * image.width | 0, image.width - 1);
|
|
113
|
+
const ty = Math.min(emod(v) * image.height | 0, image.height - 1);
|
|
114
|
+
const offset = (ty * image.width + tx) * image.components + channels;
|
|
115
|
+
const batchId = new Uint8Array(image.data)[offset];
|
|
116
|
+
batchIds.push(batchId);
|
|
117
|
+
}
|
|
118
|
+
} else {
|
|
119
|
+
console.warn("Can't get batch Ids from ".concat(image.mimeType, " compressed texture"));
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
return batchIds;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function emod(n) {
|
|
126
|
+
return (n % 1 + 1) % 1;
|
|
127
|
+
}
|
|
128
|
+
//# 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","extensionName","extensionData","Object","entries","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","textureAttributeIndex","texture","texCoord","textCoordAttribute","textureCoordinates","generateBatchIdsFromTexture","featureTexture","featureTextures","currentValue","devisorCounter","index","push","Array","fill","CHANNELS_MAP","r","g","b","a","textureIndex","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 {\n GLTF_EXT_feature_metadata_attribute,\n GLTF_EXT_feature_metadata_primitive\n} from 'modules/gltf/src/lib/types/gltf-json-schema';\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 GLTF_EXT_feature_metadata_primitive,\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: GLTF_EXT_feature_metadata_primitive,\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 textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;\n const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;\n const textureCoordinates = attributes[textCoordAttribute].value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.\n const featureTexture =\n extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];\n\n /**\n * TODO need to get batchIds from root extension\n */\n if (featureTexture) {\n console.warn(\"EXT_feature_metadata doesn't yet support featureTextures in primitive\");\n return [];\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: GLTF_EXT_feature_metadata_attribute,\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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
|
|
2
|
+
const resultPropertyTable = {};
|
|
3
|
+
|
|
4
|
+
for (const propertyName in propertyTable) {
|
|
5
|
+
const properties = propertyTable[propertyName];
|
|
6
|
+
resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
return resultPropertyTable;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function getPropertiesByFeatureIds(properties, featureIds) {
|
|
13
|
+
const resultProperties = [];
|
|
14
|
+
|
|
15
|
+
for (const featureId of featureIds) {
|
|
16
|
+
const property = properties[featureId] || null;
|
|
17
|
+
resultProperties.push(property);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
return resultProperties;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function checkPropertiesLength(featureIds, propertyTable) {
|
|
24
|
+
let needFlatten = false;
|
|
25
|
+
|
|
26
|
+
for (const attribute of Object.values(propertyTable)) {
|
|
27
|
+
if (featureIds.length !== attribute.length) {
|
|
28
|
+
needFlatten = true;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return needFlatten;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=feature-attributes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureId","property","push","checkPropertiesLength","needFlatten","attribute","Object","values","length"],"mappings":"AAeA,OAAO,SAASA,gCAAT,CACLC,UADK,EAELC,aAFK,EAGa;AAClB,QAAMC,mBAAqC,GAAG,EAA9C;;AACA,OAAK,MAAMC,YAAX,IAA2BF,aAA3B,EAA0C;AACxC,UAAMG,UAAU,GAAGH,aAAa,CAACE,YAAD,CAAhC;AACAD,IAAAA,mBAAmB,CAACC,YAAD,CAAnB,GAAoCE,yBAAyB,CAACD,UAAD,EAAaJ,UAAb,CAA7D;AACD;;AAED,SAAOE,mBAAP;AACD;;AAOD,SAASG,yBAAT,CAAmCD,UAAnC,EAAsDJ,UAAtD,EAAmF;AACjF,QAAMM,gBAAqB,GAAG,EAA9B;;AAEA,OAAK,MAAMC,SAAX,IAAwBP,UAAxB,EAAoC;AAClC,UAAMQ,QAAQ,GAAGJ,UAAU,CAACG,SAAD,CAAV,IAAyB,IAA1C;AACAD,IAAAA,gBAAgB,CAACG,IAAjB,CAAsBD,QAAtB;AACD;;AAED,SAAOF,gBAAP;AACD;;AASD,OAAO,SAASI,qBAAT,CACLV,UADK,EAELC,aAFK,EAGI;AACT,MAAIU,WAAW,GAAG,KAAlB;;AAEA,OAAK,MAAMC,SAAX,IAAwBC,MAAM,CAACC,MAAP,CAAcb,aAAd,CAAxB,EAAsD;AACpD,QAAID,UAAU,CAACe,MAAX,KAAsBH,SAAS,CAACG,MAApC,EAA4C;AAC1CJ,MAAAA,WAAW,GAAG,IAAd;AACD;AACF;;AAED,SAAOA,WAAP;AACD","sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\n\n/**\n * Takes attributes from property table based on featureIds.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n * OBJECTID: [0, 1, 5]\n * component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n * OBJECTID: [0, 1, 5]\n * component: ['Windows', 'Frames', 'null']\n * @param featureIds\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n featureIds: number[],\n propertyTable: FeatureTableJson\n): FeatureTableJson {\n const resultPropertyTable: FeatureTableJson = {};\n for (const propertyName in propertyTable) {\n const properties = propertyTable[propertyName];\n resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);\n }\n\n return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIds\n */\nfunction getPropertiesByFeatureIds(properties: any[], featureIds: number[]): any[] {\n const resultProperties: any = [];\n\n for (const featureId of featureIds) {\n const property = properties[featureId] || null;\n resultProperties.push(property);\n }\n\n return resultProperties;\n}\n\n/**\n * Check that all attributes in propertyTable have the same length as FeatureIds.\n * If there are differencies between lengths we should flatten property table based on exiesting featureIds.\n * @param featureIds\n * @param propertyTable\n * @returns\n */\nexport function checkPropertiesLength(\n featureIds: number[],\n propertyTable: FeatureTableJson\n): boolean {\n let needFlatten = false;\n\n for (const attribute of Object.values(propertyTable)) {\n if (featureIds.length !== attribute.length) {\n needFlatten = true;\n }\n }\n\n return needFlatten;\n}\n"],"file":"feature-attributes.js"}
|
|
@@ -35,28 +35,30 @@ export function generateAttributes(attributes) {
|
|
|
35
35
|
function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
36
36
|
let rangeIndex = 1;
|
|
37
37
|
let featureIndex = 1;
|
|
38
|
-
let currentFeatureId = featureIndices
|
|
38
|
+
let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));
|
|
39
39
|
const faceRangeList = [];
|
|
40
40
|
const featureIds = [];
|
|
41
41
|
const uniqueFeatureIds = [currentFeatureId];
|
|
42
42
|
faceRangeList[0] = 0;
|
|
43
43
|
featureIds[0] = currentFeatureId;
|
|
44
44
|
|
|
45
|
-
for (let index =
|
|
46
|
-
|
|
45
|
+
for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {
|
|
46
|
+
const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));
|
|
47
|
+
|
|
48
|
+
if (currentFeatureId !== newFeatureId) {
|
|
47
49
|
faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;
|
|
48
50
|
faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;
|
|
49
|
-
featureIds[featureIndex] =
|
|
51
|
+
featureIds[featureIndex] = newFeatureId;
|
|
50
52
|
|
|
51
|
-
if (!uniqueFeatureIds.includes(
|
|
52
|
-
uniqueFeatureIds.push(
|
|
53
|
+
if (!uniqueFeatureIds.includes(newFeatureId)) {
|
|
54
|
+
uniqueFeatureIds.push(newFeatureId);
|
|
53
55
|
}
|
|
54
56
|
|
|
55
57
|
rangeIndex += 2;
|
|
56
58
|
featureIndex += 1;
|
|
57
59
|
}
|
|
58
60
|
|
|
59
|
-
currentFeatureId =
|
|
61
|
+
currentFeatureId = newFeatureId;
|
|
60
62
|
}
|
|
61
63
|
|
|
62
64
|
faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
|
|
@@ -69,6 +71,20 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
|
69
71
|
};
|
|
70
72
|
}
|
|
71
73
|
|
|
74
|
+
function getFrequentValue(values) {
|
|
75
|
+
const map = {};
|
|
76
|
+
let mostFrequentValue = values[0];
|
|
77
|
+
let maxCount = 1;
|
|
78
|
+
|
|
79
|
+
for (const value of values) {
|
|
80
|
+
map[value] = (map[value] || 0) + 1;
|
|
81
|
+
maxCount = maxCount > map[value] ? maxCount : map[value];
|
|
82
|
+
mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
return mostFrequentValue;
|
|
86
|
+
}
|
|
87
|
+
|
|
72
88
|
function makeAttributeObjects(attributes) {
|
|
73
89
|
const {
|
|
74
90
|
featureIds,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.ts"],"names":["concatenateTypedArrays","VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","data","calculateFaceRangesAndFeaturesCount","attributeObjects","makeAttributeObjects","unifiedAttributeObjectsByFeatureIds","unifyObjectsByFeatureId","groupedAttributes","groupAttributesAndRangesByFeatureId","rangeIndex","featureIndex","currentFeatureId","faceRangeList","uniqueFeatureIds","index","includes","push","groupedData","positionsList","Float32Array","normalsList","colorsList","Uint8Array","texCoordsList","faceRangeIndex","startIndex","endIndex","positionsCount","getSliceAttributeCount","normalsCount","colorsCount","texCoordsCount","featureId","slice","sort","first","second","attributeName","colorsPerVertex","texCoordsPerVertex","trianglesCount","vertexCount","sortedData","uniqueObjects","currentObject","existedObject","find","obj","unifiedObjects","firstAttributeObject","range","objIndex","sum","currentAttributesObject","groupedObject"],"mappings":"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","sourcesContent":["import type {GeometryAttributes, ConvertedAttributes, GroupedByFeatureIdAttributes} from '../types';\nimport {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nconst VALUES_PER_VERTEX = 3;\nconst POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;\n\n/**\n * Generate geometry attributes with faceRange and featureCount\n * @param attributes\n * @returns attirbutes with featureCount, featureIds and changed faceRange.\n */\nexport function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes {\n const {positions, normals, texCoords, colors, featureIndices} = attributes;\n const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n\n if (!featureIndices.length) {\n return {\n faceRange: new Uint32Array([0, triangleCount - 1]),\n featureIds: [0],\n featureCount: 1,\n positions,\n normals,\n texCoords,\n colors\n };\n }\n\n const data = calculateFaceRangesAndFeaturesCount(featureIndices);\n const attributeObjects = makeAttributeObjects({...data, ...attributes});\n const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n const groupedAttributes = groupAttributesAndRangesByFeatureId(\n unifiedAttributeObjectsByFeatureIds,\n data.featureCount\n );\n return groupedAttributes;\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param featureIndices\n * @returns Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {\n faceRange: Uint32Array;\n featureCount: number;\n featureIds: number[];\n} {\n let rangeIndex = 1;\n let featureIndex = 1;\n let currentFeatureId = featureIndices[0];\n const faceRangeList: any[] = [];\n const featureIds: any[] = [];\n const uniqueFeatureIds = [currentFeatureId];\n\n faceRangeList[0] = 0;\n featureIds[0] = currentFeatureId;\n\n for (let index = 1; index < featureIndices.length; index++) {\n if (currentFeatureId !== featureIndices[index]) {\n faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;\n faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;\n featureIds[featureIndex] = featureIndices[index];\n\n if (!uniqueFeatureIds.includes(featureIndices[index])) {\n uniqueFeatureIds.push(featureIndices[index]);\n }\n\n rangeIndex += 2;\n featureIndex += 1;\n }\n currentFeatureId = featureIndices[index];\n }\n\n faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;\n\n const faceRange = new Uint32Array(faceRangeList);\n const featureCount = uniqueFeatureIds.length;\n\n return {faceRange, featureCount, featureIds};\n}\n\n/**\n * Generate list of attribute object grouped by feature ids.\n * @param attributes\n * @returns sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureIdAttributes[] {\n const {\n featureIds,\n positions,\n normals,\n colors,\n texCoords,\n faceRange = new Uint32Array(0)\n } = attributes;\n const groupedData: GroupedByFeatureIdAttributes[] = [];\n\n let positionsList = new Float32Array(positions);\n let normalsList = new Float32Array(normals);\n let colorsList = new Uint8Array(colors);\n let texCoordsList = new Float32Array(texCoords);\n\n let faceRangeIndex = 0;\n\n for (let index = 0; index < featureIds.length; index++) {\n const startIndex = faceRange[index + faceRangeIndex];\n const endIndex = faceRange[index + faceRangeIndex + 1];\n\n const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);\n const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);\n const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);\n const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);\n\n groupedData.push({\n featureId: featureIds[index],\n positions: positionsList.slice(0, positionsCount),\n normals: normalsList.slice(0, normalsCount),\n colors: colorsList.slice(0, colorsCount),\n texCoords: texCoordsList.slice(0, texCoordsCount)\n });\n\n positionsList = positionsList.slice(positionsCount);\n normalsList = normalsList.slice(normalsCount);\n colorsList = colorsList.slice(colorsCount);\n texCoordsList = texCoordsList.slice(texCoordsCount);\n\n faceRangeIndex += 1;\n }\n\n return groupedData.sort((first, second) => first.featureId - second.featureId);\n}\n\n/**\n * Generate sliced count for generating attribute objects depends on attribute name and range.\n * @param attributeName\n * @param startIndex\n * @param endIndex\n * @returns sliced count\n */\nfunction getSliceAttributeCount(\n attributeName: string,\n startIndex: number,\n endIndex: number\n): number {\n const colorsPerVertex = 4;\n const texCoordsPerVertex = 2;\n\n const trianglesCount = endIndex - startIndex + 1;\n const vertexCount = trianglesCount * 3;\n\n switch (attributeName) {\n case 'positions':\n case 'normals':\n return trianglesCount * POSITIONS_AND_NORMALS_PER_TRIANGLE;\n case 'colors':\n return vertexCount * colorsPerVertex;\n case 'texCoords':\n return vertexCount * texCoordsPerVertex;\n default:\n return 0;\n }\n}\n\n/**\n * Generates unique object list depends on feature ids and concantenate their attributes.\n * @param sortedData\n * @returns unique list of objects\n */\nfunction unifyObjectsByFeatureId(\n sortedData: GroupedByFeatureIdAttributes[]\n): GroupedByFeatureIdAttributes[] {\n const uniqueObjects: GroupedByFeatureIdAttributes[] = [];\n\n for (let index = 0; index < sortedData.length; index++) {\n const currentObject = sortedData[index];\n const existedObject = uniqueObjects.find((obj) => obj.featureId === currentObject.featureId);\n\n if (existedObject) {\n existedObject.positions = concatenateTypedArrays(\n existedObject.positions,\n currentObject.positions\n );\n existedObject.normals = concatenateTypedArrays(existedObject.normals, currentObject.normals);\n existedObject.colors = concatenateTypedArrays(existedObject.colors, currentObject.colors);\n existedObject.texCoords = concatenateTypedArrays(\n existedObject.texCoords,\n currentObject.texCoords\n );\n } else {\n uniqueObjects.push(currentObject);\n }\n }\n\n return uniqueObjects;\n}\n\n/**\n * Generates attribute objects with new faceRange and reordered attributes.\n * @param unifiedObjects\n * @returns generated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(\n unifiedObjects: GroupedByFeatureIdAttributes[],\n featureCount: number\n): GeometryAttributes {\n const firstAttributeObject = unifiedObjects[0];\n const featureIds = [firstAttributeObject.featureId || 0];\n\n let positions = new Float32Array(firstAttributeObject.positions);\n let normals = new Float32Array(firstAttributeObject.normals);\n let colors = new Uint8Array(firstAttributeObject.colors);\n let texCoords = new Float32Array(firstAttributeObject.texCoords);\n const range = [0];\n\n let objIndex = 0;\n let sum = 0;\n\n for (let index = 1; index < unifiedObjects.length; index++) {\n const currentAttributesObject = unifiedObjects[index];\n featureIds.push(currentAttributesObject.featureId || 0);\n\n positions = concatenateTypedArrays(positions, currentAttributesObject.positions);\n normals = concatenateTypedArrays(normals, currentAttributesObject.normals);\n colors = concatenateTypedArrays(colors, currentAttributesObject.colors);\n texCoords = concatenateTypedArrays(texCoords, currentAttributesObject.texCoords);\n\n const groupedObject = unifiedObjects[objIndex];\n range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);\n range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);\n\n sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n objIndex += 1;\n }\n\n range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);\n\n const faceRange = new Uint32Array(range);\n return {faceRange, featureIds, positions, normals, colors, texCoords, featureCount};\n}\n"],"file":"geometry-attributes.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.ts"],"names":["concatenateTypedArrays","VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","data","calculateFaceRangesAndFeaturesCount","attributeObjects","makeAttributeObjects","unifiedAttributeObjectsByFeatureIds","unifyObjectsByFeatureId","groupedAttributes","groupAttributesAndRangesByFeatureId","rangeIndex","featureIndex","currentFeatureId","getFrequentValue","slice","faceRangeList","uniqueFeatureIds","index","newFeatureId","includes","push","values","map","mostFrequentValue","maxCount","value","groupedData","positionsList","Float32Array","normalsList","colorsList","Uint8Array","texCoordsList","faceRangeIndex","startIndex","endIndex","positionsCount","getSliceAttributeCount","normalsCount","colorsCount","texCoordsCount","featureId","sort","first","second","attributeName","colorsPerVertex","texCoordsPerVertex","trianglesCount","vertexCount","sortedData","uniqueObjects","currentObject","existedObject","find","obj","unifiedObjects","firstAttributeObject","range","objIndex","sum","currentAttributesObject","groupedObject"],"mappings":"AACA,SAAQA,sBAAR,QAAqC,0BAArC;AAEA,MAAMC,iBAAiB,GAAG,CAA1B;AACA,MAAMC,kCAAkC,GAAG,CAA3C;AAOA,OAAO,SAASC,kBAAT,CAA4BC,UAA5B,EAAiF;AACtF,QAAM;AAACC,IAAAA,SAAD;AAAYC,IAAAA,OAAZ;AAAqBC,IAAAA,SAArB;AAAgCC,IAAAA,MAAhC;AAAwCC,IAAAA;AAAxC,MAA0DL,UAAhE;AACA,QAAMM,aAAa,GAAGL,SAAS,CAACM,MAAV,GAAmBT,kCAAzC;;AAEA,MAAI,CAACO,cAAc,CAACE,MAApB,EAA4B;AAC1B,WAAO;AACLC,MAAAA,SAAS,EAAE,IAAIC,WAAJ,CAAgB,CAAC,CAAD,EAAIH,aAAa,GAAG,CAApB,CAAhB,CADN;AAELI,MAAAA,UAAU,EAAE,CAAC,CAAD,CAFP;AAGLC,MAAAA,YAAY,EAAE,CAHT;AAILV,MAAAA,SAJK;AAKLC,MAAAA,OALK;AAMLC,MAAAA,SANK;AAOLC,MAAAA;AAPK,KAAP;AASD;;AAED,QAAMQ,IAAI,GAAGC,mCAAmC,CAACR,cAAD,CAAhD;AACA,QAAMS,gBAAgB,GAAGC,oBAAoB,CAAC,EAAC,GAAGH,IAAJ;AAAU,OAAGZ;AAAb,GAAD,CAA7C;AACA,QAAMgB,mCAAmC,GAAGC,uBAAuB,CAACH,gBAAD,CAAnE;AACA,QAAMI,iBAAiB,GAAGC,mCAAmC,CAC3DH,mCAD2D,EAE3DJ,IAAI,CAACD,YAFsD,CAA7D;AAIA,SAAOO,iBAAP;AACD;;AAOD,SAASL,mCAAT,CAA6CR,cAA7C,EAIE;AACA,MAAIe,UAAU,GAAG,CAAjB;AACA,MAAIC,YAAY,GAAG,CAAnB;AACA,MAAIC,gBAAgB,GAAGC,gBAAgB,CAAClB,cAAc,CAACmB,KAAf,CAAqB,CAArB,EAAwB3B,iBAAxB,CAAD,CAAvC;AACA,QAAM4B,aAAoB,GAAG,EAA7B;AACA,QAAMf,UAAiB,GAAG,EAA1B;AACA,QAAMgB,gBAAgB,GAAG,CAACJ,gBAAD,CAAzB;AAEAG,EAAAA,aAAa,CAAC,CAAD,CAAb,GAAmB,CAAnB;AACAf,EAAAA,UAAU,CAAC,CAAD,CAAV,GAAgBY,gBAAhB;;AAEA,OAAK,IAAIK,KAAK,GAAG9B,iBAAjB,EAAoC8B,KAAK,GAAGtB,cAAc,CAACE,MAA3D,EAAmEoB,KAAK,IAAI9B,iBAA5E,EAA+F;AAC7F,UAAM+B,YAAY,GAAGL,gBAAgB,CAAClB,cAAc,CAACmB,KAAf,CAAqBG,KAArB,EAA4BA,KAAK,GAAG9B,iBAApC,CAAD,CAArC;;AACA,QAAIyB,gBAAgB,KAAKM,YAAzB,EAAuC;AACrCH,MAAAA,aAAa,CAACL,UAAD,CAAb,GAA4BO,KAAK,GAAG9B,iBAAR,GAA4B,CAAxD;AACA4B,MAAAA,aAAa,CAACL,UAAU,GAAG,CAAd,CAAb,GAAgCO,KAAK,GAAG9B,iBAAxC;AACAa,MAAAA,UAAU,CAACW,YAAD,CAAV,GAA2BO,YAA3B;;AAEA,UAAI,CAACF,gBAAgB,CAACG,QAAjB,CAA0BD,YAA1B,CAAL,EAA8C;AAC5CF,QAAAA,gBAAgB,CAACI,IAAjB,CAAsBF,YAAtB;AACD;;AAEDR,MAAAA,UAAU,IAAI,CAAd;AACAC,MAAAA,YAAY,IAAI,CAAhB;AACD;;AACDC,IAAAA,gBAAgB,GAAGM,YAAnB;AACD;;AAEDH,EAAAA,aAAa,CAACL,UAAD,CAAb,GAA4Bf,cAAc,CAACE,MAAf,GAAwBV,iBAAxB,GAA4C,CAAxE;AAEA,QAAMW,SAAS,GAAG,IAAIC,WAAJ,CAAgBgB,aAAhB,CAAlB;AACA,QAAMd,YAAY,GAAGe,gBAAgB,CAACnB,MAAtC;AAEA,SAAO;AAACC,IAAAA,SAAD;AAAYG,IAAAA,YAAZ;AAA0BD,IAAAA;AAA1B,GAAP;AACD;;AAMD,SAASa,gBAAT,CAA0BQ,MAA1B,EAAoD;AAClD,QAAMC,GAA4B,GAAG,EAArC;AAEA,MAAIC,iBAAiB,GAAGF,MAAM,CAAC,CAAD,CAA9B;AACA,MAAIG,QAAQ,GAAG,CAAf;;AAEA,OAAK,MAAMC,KAAX,IAAoBJ,MAApB,EAA4B;AAE1BC,IAAAA,GAAG,CAACG,KAAD,CAAH,GAAa,CAACH,GAAG,CAACG,KAAD,CAAH,IAAc,CAAf,IAAoB,CAAjC;AAEAD,IAAAA,QAAQ,GAAGA,QAAQ,GAAGF,GAAG,CAACG,KAAD,CAAd,GAAwBD,QAAxB,GAAmCF,GAAG,CAACG,KAAD,CAAjD;AAEAF,IAAAA,iBAAiB,GAAGC,QAAQ,GAAGF,GAAG,CAACG,KAAD,CAAd,GAAwBF,iBAAxB,GAA4CE,KAAhE;AACD;;AAED,SAAOF,iBAAP;AACD;;AAOD,SAASlB,oBAAT,CAA8Bf,UAA9B,EAA8F;AAC5F,QAAM;AACJU,IAAAA,UADI;AAEJT,IAAAA,SAFI;AAGJC,IAAAA,OAHI;AAIJE,IAAAA,MAJI;AAKJD,IAAAA,SALI;AAMJK,IAAAA,SAAS,GAAG,IAAIC,WAAJ,CAAgB,CAAhB;AANR,MAOFT,UAPJ;AAQA,QAAMoC,WAA2C,GAAG,EAApD;AAEA,MAAIC,aAAa,GAAG,IAAIC,YAAJ,CAAiBrC,SAAjB,CAApB;AACA,MAAIsC,WAAW,GAAG,IAAID,YAAJ,CAAiBpC,OAAjB,CAAlB;AACA,MAAIsC,UAAU,GAAG,IAAIC,UAAJ,CAAerC,MAAf,CAAjB;AACA,MAAIsC,aAAa,GAAG,IAAIJ,YAAJ,CAAiBnC,SAAjB,CAApB;AAEA,MAAIwC,cAAc,GAAG,CAArB;;AAEA,OAAK,IAAIhB,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGjB,UAAU,CAACH,MAAvC,EAA+CoB,KAAK,EAApD,EAAwD;AACtD,UAAMiB,UAAU,GAAGpC,SAAS,CAACmB,KAAK,GAAGgB,cAAT,CAA5B;AACA,UAAME,QAAQ,GAAGrC,SAAS,CAACmB,KAAK,GAAGgB,cAAR,GAAyB,CAA1B,CAA1B;AAEA,UAAMG,cAAc,GAAGC,sBAAsB,CAAC,WAAD,EAAcH,UAAd,EAA0BC,QAA1B,CAA7C;AACA,UAAMG,YAAY,GAAGD,sBAAsB,CAAC,SAAD,EAAYH,UAAZ,EAAwBC,QAAxB,CAA3C;AACA,UAAMI,WAAW,GAAGF,sBAAsB,CAAC,QAAD,EAAWH,UAAX,EAAuBC,QAAvB,CAA1C;AACA,UAAMK,cAAc,GAAGH,sBAAsB,CAAC,WAAD,EAAcH,UAAd,EAA0BC,QAA1B,CAA7C;AAEAT,IAAAA,WAAW,CAACN,IAAZ,CAAiB;AACfqB,MAAAA,SAAS,EAAEzC,UAAU,CAACiB,KAAD,CADN;AAEf1B,MAAAA,SAAS,EAAEoC,aAAa,CAACb,KAAd,CAAoB,CAApB,EAAuBsB,cAAvB,CAFI;AAGf5C,MAAAA,OAAO,EAAEqC,WAAW,CAACf,KAAZ,CAAkB,CAAlB,EAAqBwB,YAArB,CAHM;AAIf5C,MAAAA,MAAM,EAAEoC,UAAU,CAAChB,KAAX,CAAiB,CAAjB,EAAoByB,WAApB,CAJO;AAKf9C,MAAAA,SAAS,EAAEuC,aAAa,CAAClB,KAAd,CAAoB,CAApB,EAAuB0B,cAAvB;AALI,KAAjB;AAQAb,IAAAA,aAAa,GAAGA,aAAa,CAACb,KAAd,CAAoBsB,cAApB,CAAhB;AACAP,IAAAA,WAAW,GAAGA,WAAW,CAACf,KAAZ,CAAkBwB,YAAlB,CAAd;AACAR,IAAAA,UAAU,GAAGA,UAAU,CAAChB,KAAX,CAAiByB,WAAjB,CAAb;AACAP,IAAAA,aAAa,GAAGA,aAAa,CAAClB,KAAd,CAAoB0B,cAApB,CAAhB;AAEAP,IAAAA,cAAc,IAAI,CAAlB;AACD;;AAED,SAAOP,WAAW,CAACgB,IAAZ,CAAiB,CAACC,KAAD,EAAQC,MAAR,KAAmBD,KAAK,CAACF,SAAN,GAAkBG,MAAM,CAACH,SAA7D,CAAP;AACD;;AASD,SAASJ,sBAAT,CACEQ,aADF,EAEEX,UAFF,EAGEC,QAHF,EAIU;AACR,QAAMW,eAAe,GAAG,CAAxB;AACA,QAAMC,kBAAkB,GAAG,CAA3B;AAEA,QAAMC,cAAc,GAAGb,QAAQ,GAAGD,UAAX,GAAwB,CAA/C;AACA,QAAMe,WAAW,GAAGD,cAAc,GAAG,CAArC;;AAEA,UAAQH,aAAR;AACE,SAAK,WAAL;AACA,SAAK,SAAL;AACE,aAAOG,cAAc,GAAG5D,kCAAxB;;AACF,SAAK,QAAL;AACE,aAAO6D,WAAW,GAAGH,eAArB;;AACF,SAAK,WAAL;AACE,aAAOG,WAAW,GAAGF,kBAArB;;AACF;AACE,aAAO,CAAP;AATJ;AAWD;;AAOD,SAASxC,uBAAT,CACE2C,UADF,EAEkC;AAChC,QAAMC,aAA6C,GAAG,EAAtD;;AAEA,OAAK,IAAIlC,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGiC,UAAU,CAACrD,MAAvC,EAA+CoB,KAAK,EAApD,EAAwD;AACtD,UAAMmC,aAAa,GAAGF,UAAU,CAACjC,KAAD,CAAhC;AACA,UAAMoC,aAAa,GAAGF,aAAa,CAACG,IAAd,CAAoBC,GAAD,IAASA,GAAG,CAACd,SAAJ,KAAkBW,aAAa,CAACX,SAA5D,CAAtB;;AAEA,QAAIY,aAAJ,EAAmB;AACjBA,MAAAA,aAAa,CAAC9D,SAAd,GAA0BL,sBAAsB,CAC9CmE,aAAa,CAAC9D,SADgC,EAE9C6D,aAAa,CAAC7D,SAFgC,CAAhD;AAIA8D,MAAAA,aAAa,CAAC7D,OAAd,GAAwBN,sBAAsB,CAACmE,aAAa,CAAC7D,OAAf,EAAwB4D,aAAa,CAAC5D,OAAtC,CAA9C;AACA6D,MAAAA,aAAa,CAAC3D,MAAd,GAAuBR,sBAAsB,CAACmE,aAAa,CAAC3D,MAAf,EAAuB0D,aAAa,CAAC1D,MAArC,CAA7C;AACA2D,MAAAA,aAAa,CAAC5D,SAAd,GAA0BP,sBAAsB,CAC9CmE,aAAa,CAAC5D,SADgC,EAE9C2D,aAAa,CAAC3D,SAFgC,CAAhD;AAID,KAXD,MAWO;AACL0D,MAAAA,aAAa,CAAC/B,IAAd,CAAmBgC,aAAnB;AACD;AACF;;AAED,SAAOD,aAAP;AACD;;AAOD,SAAS1C,mCAAT,CACE+C,cADF,EAEEvD,YAFF,EAGsB;AACpB,QAAMwD,oBAAoB,GAAGD,cAAc,CAAC,CAAD,CAA3C;AACA,QAAMxD,UAAU,GAAG,CAACyD,oBAAoB,CAAChB,SAArB,IAAkC,CAAnC,CAAnB;AAEA,MAAIlD,SAAS,GAAG,IAAIqC,YAAJ,CAAiB6B,oBAAoB,CAAClE,SAAtC,CAAhB;AACA,MAAIC,OAAO,GAAG,IAAIoC,YAAJ,CAAiB6B,oBAAoB,CAACjE,OAAtC,CAAd;AACA,MAAIE,MAAM,GAAG,IAAIqC,UAAJ,CAAe0B,oBAAoB,CAAC/D,MAApC,CAAb;AACA,MAAID,SAAS,GAAG,IAAImC,YAAJ,CAAiB6B,oBAAoB,CAAChE,SAAtC,CAAhB;AACA,QAAMiE,KAAK,GAAG,CAAC,CAAD,CAAd;AAEA,MAAIC,QAAQ,GAAG,CAAf;AACA,MAAIC,GAAG,GAAG,CAAV;;AAEA,OAAK,IAAI3C,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGuC,cAAc,CAAC3D,MAA3C,EAAmDoB,KAAK,EAAxD,EAA4D;AAC1D,UAAM4C,uBAAuB,GAAGL,cAAc,CAACvC,KAAD,CAA9C;AACAjB,IAAAA,UAAU,CAACoB,IAAX,CAAgByC,uBAAuB,CAACpB,SAAxB,IAAqC,CAArD;AAEAlD,IAAAA,SAAS,GAAGL,sBAAsB,CAACK,SAAD,EAAYsE,uBAAuB,CAACtE,SAApC,CAAlC;AACAC,IAAAA,OAAO,GAAGN,sBAAsB,CAACM,OAAD,EAAUqE,uBAAuB,CAACrE,OAAlC,CAAhC;AACAE,IAAAA,MAAM,GAAGR,sBAAsB,CAACQ,MAAD,EAASmE,uBAAuB,CAACnE,MAAjC,CAA/B;AACAD,IAAAA,SAAS,GAAGP,sBAAsB,CAACO,SAAD,EAAYoE,uBAAuB,CAACpE,SAApC,CAAlC;AAEA,UAAMqE,aAAa,GAAGN,cAAc,CAACG,QAAD,CAApC;AACAD,IAAAA,KAAK,CAACtC,IAAN,CAAW0C,aAAa,CAACvE,SAAd,CAAwBM,MAAxB,GAAiCT,kCAAjC,GAAsE,CAAtE,GAA0EwE,GAArF;AACAF,IAAAA,KAAK,CAACtC,IAAN,CAAW0C,aAAa,CAACvE,SAAd,CAAwBM,MAAxB,GAAiCT,kCAAjC,GAAsEwE,GAAjF;AAEAA,IAAAA,GAAG,IAAIE,aAAa,CAACvE,SAAd,CAAwBM,MAAxB,GAAiCT,kCAAxC;AACAuE,IAAAA,QAAQ,IAAI,CAAZ;AACD;;AAEDD,EAAAA,KAAK,CAACtC,IAAN,CAAW7B,SAAS,CAACM,MAAV,GAAmBT,kCAAnB,GAAwD,CAAnE;AAEA,QAAMU,SAAS,GAAG,IAAIC,WAAJ,CAAgB2D,KAAhB,CAAlB;AACA,SAAO;AAAC5D,IAAAA,SAAD;AAAYE,IAAAA,UAAZ;AAAwBT,IAAAA,SAAxB;AAAmCC,IAAAA,OAAnC;AAA4CE,IAAAA,MAA5C;AAAoDD,IAAAA,SAApD;AAA+DQ,IAAAA;AAA/D,GAAP;AACD","sourcesContent":["import type {GeometryAttributes, ConvertedAttributes, GroupedByFeatureIdAttributes} from '../types';\nimport {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nconst VALUES_PER_VERTEX = 3;\nconst POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;\n\n/**\n * Generate geometry attributes with faceRange and featureCount\n * @param attributes\n * @returns attirbutes with featureCount, featureIds and changed faceRange.\n */\nexport function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes {\n const {positions, normals, texCoords, colors, featureIndices} = attributes;\n const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n\n if (!featureIndices.length) {\n return {\n faceRange: new Uint32Array([0, triangleCount - 1]),\n featureIds: [0],\n featureCount: 1,\n positions,\n normals,\n texCoords,\n colors\n };\n }\n\n const data = calculateFaceRangesAndFeaturesCount(featureIndices);\n const attributeObjects = makeAttributeObjects({...data, ...attributes});\n const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n const groupedAttributes = groupAttributesAndRangesByFeatureId(\n unifiedAttributeObjectsByFeatureIds,\n data.featureCount\n );\n return groupedAttributes;\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param featureIndices\n * @returns Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {\n faceRange: Uint32Array;\n featureCount: number;\n featureIds: number[];\n} {\n let rangeIndex = 1;\n let featureIndex = 1;\n let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));\n const faceRangeList: any[] = [];\n const featureIds: any[] = [];\n const uniqueFeatureIds = [currentFeatureId];\n\n faceRangeList[0] = 0;\n featureIds[0] = currentFeatureId;\n\n for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {\n const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));\n if (currentFeatureId !== newFeatureId) {\n faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;\n faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;\n featureIds[featureIndex] = newFeatureId;\n\n if (!uniqueFeatureIds.includes(newFeatureId)) {\n uniqueFeatureIds.push(newFeatureId);\n }\n\n rangeIndex += 2;\n featureIndex += 1;\n }\n currentFeatureId = newFeatureId;\n }\n\n faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;\n\n const faceRange = new Uint32Array(faceRangeList);\n const featureCount = uniqueFeatureIds.length;\n\n return {faceRange, featureCount, featureIds};\n}\n\n/**\n * Find most frequent value to avoid situation where one vertex can be part of multiple features (objects).\n * @param values\n */\nfunction getFrequentValue(values: number[]): number {\n const map: {[key: number]: number} = {};\n\n let mostFrequentValue = values[0];\n let maxCount = 1;\n\n for (const value of values) {\n // Save item and it's frequency count to the map.\n map[value] = (map[value] || 0) + 1;\n // Find max count of frequency.\n maxCount = maxCount > map[value] ? maxCount : map[value];\n // Find the most frequent value.\n mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;\n }\n\n return mostFrequentValue;\n}\n\n/**\n * Generate list of attribute object grouped by feature ids.\n * @param attributes\n * @returns sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureIdAttributes[] {\n const {\n featureIds,\n positions,\n normals,\n colors,\n texCoords,\n faceRange = new Uint32Array(0)\n } = attributes;\n const groupedData: GroupedByFeatureIdAttributes[] = [];\n\n let positionsList = new Float32Array(positions);\n let normalsList = new Float32Array(normals);\n let colorsList = new Uint8Array(colors);\n let texCoordsList = new Float32Array(texCoords);\n\n let faceRangeIndex = 0;\n\n for (let index = 0; index < featureIds.length; index++) {\n const startIndex = faceRange[index + faceRangeIndex];\n const endIndex = faceRange[index + faceRangeIndex + 1];\n\n const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);\n const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);\n const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);\n const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);\n\n groupedData.push({\n featureId: featureIds[index],\n positions: positionsList.slice(0, positionsCount),\n normals: normalsList.slice(0, normalsCount),\n colors: colorsList.slice(0, colorsCount),\n texCoords: texCoordsList.slice(0, texCoordsCount)\n });\n\n positionsList = positionsList.slice(positionsCount);\n normalsList = normalsList.slice(normalsCount);\n colorsList = colorsList.slice(colorsCount);\n texCoordsList = texCoordsList.slice(texCoordsCount);\n\n faceRangeIndex += 1;\n }\n\n return groupedData.sort((first, second) => first.featureId - second.featureId);\n}\n\n/**\n * Generate sliced count for generating attribute objects depends on attribute name and range.\n * @param attributeName\n * @param startIndex\n * @param endIndex\n * @returns sliced count\n */\nfunction getSliceAttributeCount(\n attributeName: string,\n startIndex: number,\n endIndex: number\n): number {\n const colorsPerVertex = 4;\n const texCoordsPerVertex = 2;\n\n const trianglesCount = endIndex - startIndex + 1;\n const vertexCount = trianglesCount * 3;\n\n switch (attributeName) {\n case 'positions':\n case 'normals':\n return trianglesCount * POSITIONS_AND_NORMALS_PER_TRIANGLE;\n case 'colors':\n return vertexCount * colorsPerVertex;\n case 'texCoords':\n return vertexCount * texCoordsPerVertex;\n default:\n return 0;\n }\n}\n\n/**\n * Generates unique object list depends on feature ids and concantenate their attributes.\n * @param sortedData\n * @returns unique list of objects\n */\nfunction unifyObjectsByFeatureId(\n sortedData: GroupedByFeatureIdAttributes[]\n): GroupedByFeatureIdAttributes[] {\n const uniqueObjects: GroupedByFeatureIdAttributes[] = [];\n\n for (let index = 0; index < sortedData.length; index++) {\n const currentObject = sortedData[index];\n const existedObject = uniqueObjects.find((obj) => obj.featureId === currentObject.featureId);\n\n if (existedObject) {\n existedObject.positions = concatenateTypedArrays(\n existedObject.positions,\n currentObject.positions\n );\n existedObject.normals = concatenateTypedArrays(existedObject.normals, currentObject.normals);\n existedObject.colors = concatenateTypedArrays(existedObject.colors, currentObject.colors);\n existedObject.texCoords = concatenateTypedArrays(\n existedObject.texCoords,\n currentObject.texCoords\n );\n } else {\n uniqueObjects.push(currentObject);\n }\n }\n\n return uniqueObjects;\n}\n\n/**\n * Generates attribute objects with new faceRange and reordered attributes.\n * @param unifiedObjects\n * @returns generated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(\n unifiedObjects: GroupedByFeatureIdAttributes[],\n featureCount: number\n): GeometryAttributes {\n const firstAttributeObject = unifiedObjects[0];\n const featureIds = [firstAttributeObject.featureId || 0];\n\n let positions = new Float32Array(firstAttributeObject.positions);\n let normals = new Float32Array(firstAttributeObject.normals);\n let colors = new Uint8Array(firstAttributeObject.colors);\n let texCoords = new Float32Array(firstAttributeObject.texCoords);\n const range = [0];\n\n let objIndex = 0;\n let sum = 0;\n\n for (let index = 1; index < unifiedObjects.length; index++) {\n const currentAttributesObject = unifiedObjects[index];\n featureIds.push(currentAttributesObject.featureId || 0);\n\n positions = concatenateTypedArrays(positions, currentAttributesObject.positions);\n normals = concatenateTypedArrays(normals, currentAttributesObject.normals);\n colors = concatenateTypedArrays(colors, currentAttributesObject.colors);\n texCoords = concatenateTypedArrays(texCoords, currentAttributesObject.texCoords);\n\n const groupedObject = unifiedObjects[objIndex];\n range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);\n range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);\n\n sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n objIndex += 1;\n }\n\n range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);\n\n const faceRange = new Uint32Array(range);\n return {faceRange, featureIds, positions, normals, colors, texCoords, featureCount};\n}\n"],"file":"geometry-attributes.js"}
|