@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.10
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.d.ts +3 -3
- package/dist/3d-tiles-attributes-worker.d.ts.map +1 -1
- package/dist/3d-tiles-attributes-worker.js +2 -3
- package/dist/3d-tiles-attributes-worker.js.map +3 -3
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts +8 -0
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +57 -43
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts +5 -5
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +21 -17
- package/dist/converter-cli.js +29 -4
- package/dist/converter.min.js +24 -21
- package/dist/deps-installer/deps-installer.d.ts +5 -1
- package/dist/deps-installer/deps-installer.d.ts.map +1 -1
- package/dist/deps-installer/deps-installer.js +29 -1
- package/dist/dist.min.js +61034 -64112
- package/dist/es5/3d-tiles-attributes-worker.js +4 -7
- package/dist/es5/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +125 -210
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +53 -85
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +0 -8
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js +0 -5
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js +0 -6
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/constants.js.map +1 -1
- package/dist/es5/converter-cli.js +25 -58
- package/dist/es5/converter-cli.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +73 -28
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +3 -6
- package/dist/es5/i3s-attributes-worker.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +18 -29
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +8 -25
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +0 -11
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/feature-attributes.js +184 -0
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +60 -51
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +504 -350
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js +57 -57
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-debug.js +4 -23
- package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-index-document.js +507 -0
- package/dist/es5/i3s-converter/helpers/node-index-document.js.map +1 -0
- package/dist/es5/i3s-converter/helpers/node-pages.js +478 -168
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +794 -1125
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/geometry-definitions.js +107 -0
- package/dist/es5/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
- package/dist/es5/i3s-converter/json-templates/layers.js +2 -107
- package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/metadata.js +0 -2
- package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/node.js +2 -12
- package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/scene-server.js +0 -2
- package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +9 -32
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/es5/i3s-converter/types.js.map +1 -1
- package/dist/es5/i3s-server/app.js +0 -5
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/controllers/index-controller.js +0 -16
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +1 -10
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/index.js +0 -3
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/utils/compress-util.js +19 -74
- package/dist/es5/lib/utils/compress-util.js.map +1 -1
- package/dist/es5/lib/utils/file-utils.js +103 -47
- package/dist/es5/lib/utils/file-utils.js.map +1 -1
- package/dist/es5/lib/utils/lod-conversion-utils.js +0 -7
- package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/es5/lib/utils/queue.js +0 -14
- package/dist/es5/lib/utils/queue.js.map +1 -1
- package/dist/es5/lib/utils/statistic-utills.js +1 -46
- package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
- package/dist/es5/lib/utils/write-queue.js +86 -87
- package/dist/es5/lib/utils/write-queue.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -8
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/es5/workers/3d-tiles-attributes-worker.js +2 -9
- package/dist/es5/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/workers/i3s-attributes-worker.js +2 -10
- package/dist/es5/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +4 -2
- package/dist/esm/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +60 -77
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +29 -50
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +1 -0
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +1 -4
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js +0 -3
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/converter-cli.js +26 -43
- package/dist/esm/converter-cli.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +30 -4
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +3 -1
- package/dist/esm/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +20 -24
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js +11 -12
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js +1 -0
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/feature-attributes.js +158 -0
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js +39 -33
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +286 -192
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js +59 -48
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +3 -13
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-index-document.js +197 -0
- package/dist/esm/i3s-converter/helpers/node-index-document.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/node-pages.js +161 -87
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +235 -508
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/geometry-definitions.js +89 -0
- package/dist/esm/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
- package/dist/esm/i3s-converter/json-templates/layers.js +2 -95
- package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/node.js +0 -4
- package/dist/esm/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +3 -15
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/esm/i3s-converter/types.js.map +1 -1
- package/dist/esm/i3s-server/app.js +0 -5
- package/dist/esm/i3s-server/app.js.map +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js +0 -5
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/i3s-server/routes/index.js +0 -3
- package/dist/esm/i3s-server/routes/index.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/utils/compress-util.js +19 -12
- package/dist/esm/lib/utils/compress-util.js.map +1 -1
- package/dist/esm/lib/utils/file-utils.js +54 -11
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/lod-conversion-utils.js +2 -6
- package/dist/esm/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/esm/lib/utils/queue.js +0 -4
- package/dist/esm/lib/utils/queue.js.map +1 -1
- package/dist/esm/lib/utils/statistic-utills.js +0 -11
- package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
- package/dist/esm/lib/utils/write-queue.js +29 -28
- package/dist/esm/lib/utils/write-queue.js.map +1 -1
- package/dist/esm/pgm-loader.js +3 -1
- package/dist/esm/pgm-loader.js.map +1 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js +4 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/workers/i3s-attributes-worker.js +4 -1
- package/dist/esm/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/i3s-attributes-worker.d.ts +7 -3
- package/dist/i3s-attributes-worker.d.ts.map +1 -1
- package/dist/i3s-attributes-worker.js +2 -3
- package/dist/i3s-attributes-worker.js.map +3 -3
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +5 -6
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +18 -4
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts +2 -2
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +8 -6
- package/dist/i3s-converter/helpers/feature-attributes.d.ts +56 -0
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/feature-attributes.js +216 -0
- package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-attributes.js +42 -17
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +18 -6
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +337 -92
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js +51 -32
- package/dist/i3s-converter/helpers/node-index-document.d.ts +91 -0
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -0
- package/dist/i3s-converter/helpers/node-index-document.js +242 -0
- package/dist/i3s-converter/helpers/node-pages.d.ts +81 -42
- package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-pages.js +200 -92
- package/dist/i3s-converter/i3s-converter.d.ts +52 -108
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +234 -420
- package/dist/i3s-converter/json-templates/geometry-definitions.d.ts +7 -0
- package/dist/i3s-converter/json-templates/geometry-definitions.d.ts.map +1 -0
- package/dist/i3s-converter/json-templates/geometry-definitions.js +87 -0
- package/dist/i3s-converter/json-templates/layers.d.ts +1 -30
- package/dist/i3s-converter/json-templates/layers.d.ts.map +1 -1
- package/dist/i3s-converter/json-templates/layers.js +2 -86
- package/dist/i3s-converter/json-templates/shared-resources.js +3 -3
- package/dist/i3s-converter/types.d.ts +37 -55
- package/dist/i3s-converter/types.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.d.ts +17 -1
- package/dist/lib/utils/file-utils.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.js +64 -7
- package/dist/lib/utils/write-queue.d.ts +19 -2
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +26 -7
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/pgm-loader.js +2 -1
- package/dist/workers/3d-tiles-attributes-worker.js +1 -1
- package/dist/workers/i3s-attributes-worker.js +1 -1
- package/package.json +18 -16
- package/src/3d-tiles-attributes-worker.ts +1 -1
- package/src/3d-tiles-converter/3d-tiles-converter.ts +71 -55
- package/src/3d-tiles-converter/helpers/b3dm-converter.ts +25 -18
- package/src/converter-cli.ts +38 -4
- package/src/deps-installer/deps-installer.ts +38 -2
- package/src/i3s-attributes-worker.ts +5 -1
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +38 -14
- package/src/i3s-converter/helpers/coordinate-converter.ts +10 -8
- package/src/i3s-converter/helpers/feature-attributes.ts +247 -0
- package/src/i3s-converter/helpers/geometry-attributes.ts +46 -18
- package/src/i3s-converter/helpers/geometry-converter.ts +405 -108
- package/src/i3s-converter/helpers/gltf-attributes.ts +55 -35
- package/src/i3s-converter/helpers/node-index-document.ts +306 -0
- package/src/i3s-converter/helpers/node-pages.ts +222 -109
- package/src/i3s-converter/i3s-converter.ts +279 -499
- package/src/i3s-converter/json-templates/geometry-definitions.ts +83 -0
- package/src/i3s-converter/json-templates/layers.ts +2 -91
- package/src/i3s-converter/json-templates/shared-resources.ts +3 -3
- package/src/i3s-converter/types.ts +31 -51
- package/src/lib/utils/file-utils.ts +62 -7
- package/src/lib/utils/write-queue.ts +43 -10
- package/src/pgm-loader.ts +2 -2
- package/src/workers/3d-tiles-attributes-worker.ts +1 -1
- package/src/workers/i3s-attributes-worker.ts +2 -1
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { concatenateTypedArrays } from '@loaders.gl/loader-utils';
|
|
2
2
|
const VALUES_PER_VERTEX = 3;
|
|
3
3
|
const POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;
|
|
4
|
+
|
|
4
5
|
export function generateAttributes(attributes) {
|
|
5
6
|
const {
|
|
6
7
|
positions,
|
|
7
8
|
normals,
|
|
8
9
|
texCoords,
|
|
9
10
|
colors,
|
|
11
|
+
uvRegions,
|
|
10
12
|
featureIndices
|
|
11
13
|
} = attributes;
|
|
12
14
|
const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
13
|
-
|
|
14
15
|
if (!featureIndices.length) {
|
|
15
16
|
return {
|
|
16
17
|
faceRange: new Uint32Array([0, triangleCount - 1]),
|
|
@@ -19,12 +20,13 @@ export function generateAttributes(attributes) {
|
|
|
19
20
|
positions,
|
|
20
21
|
normals,
|
|
21
22
|
texCoords,
|
|
22
|
-
colors
|
|
23
|
+
colors,
|
|
24
|
+
uvRegions
|
|
23
25
|
};
|
|
24
26
|
}
|
|
25
|
-
|
|
26
27
|
const data = calculateFaceRangesAndFeaturesCount(featureIndices);
|
|
27
|
-
const attributeObjects = makeAttributeObjects({
|
|
28
|
+
const attributeObjects = makeAttributeObjects({
|
|
29
|
+
...data,
|
|
28
30
|
...attributes
|
|
29
31
|
});
|
|
30
32
|
const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);
|
|
@@ -35,30 +37,26 @@ export function generateAttributes(attributes) {
|
|
|
35
37
|
function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
36
38
|
let rangeIndex = 1;
|
|
37
39
|
let featureIndex = 1;
|
|
38
|
-
let currentFeatureId = featureIndices
|
|
40
|
+
let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));
|
|
39
41
|
const faceRangeList = [];
|
|
40
42
|
const featureIds = [];
|
|
41
43
|
const uniqueFeatureIds = [currentFeatureId];
|
|
42
44
|
faceRangeList[0] = 0;
|
|
43
45
|
featureIds[0] = currentFeatureId;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (currentFeatureId !==
|
|
46
|
+
for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {
|
|
47
|
+
const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));
|
|
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] =
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
uniqueFeatureIds.push(featureIndices[index]);
|
|
51
|
+
featureIds[featureIndex] = newFeatureId;
|
|
52
|
+
if (!uniqueFeatureIds.includes(newFeatureId)) {
|
|
53
|
+
uniqueFeatureIds.push(newFeatureId);
|
|
53
54
|
}
|
|
54
|
-
|
|
55
55
|
rangeIndex += 2;
|
|
56
56
|
featureIndex += 1;
|
|
57
57
|
}
|
|
58
|
-
|
|
59
|
-
currentFeatureId = featureIndices[index];
|
|
58
|
+
currentFeatureId = newFeatureId;
|
|
60
59
|
}
|
|
61
|
-
|
|
62
60
|
faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
|
|
63
61
|
const faceRange = new Uint32Array(faceRangeList);
|
|
64
62
|
const featureCount = uniqueFeatureIds.length;
|
|
@@ -69,12 +67,25 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
|
69
67
|
};
|
|
70
68
|
}
|
|
71
69
|
|
|
70
|
+
function getFrequentValue(values) {
|
|
71
|
+
const map = {};
|
|
72
|
+
let mostFrequentValue = values[0];
|
|
73
|
+
let maxCount = 1;
|
|
74
|
+
for (const value of values) {
|
|
75
|
+
map[value] = (map[value] || 0) + 1;
|
|
76
|
+
maxCount = maxCount > map[value] ? maxCount : map[value];
|
|
77
|
+
mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;
|
|
78
|
+
}
|
|
79
|
+
return mostFrequentValue;
|
|
80
|
+
}
|
|
81
|
+
|
|
72
82
|
function makeAttributeObjects(attributes) {
|
|
73
83
|
const {
|
|
74
84
|
featureIds,
|
|
75
85
|
positions,
|
|
76
86
|
normals,
|
|
77
87
|
colors,
|
|
88
|
+
uvRegions,
|
|
78
89
|
texCoords,
|
|
79
90
|
faceRange = new Uint32Array(0)
|
|
80
91
|
} = attributes;
|
|
@@ -83,49 +94,46 @@ function makeAttributeObjects(attributes) {
|
|
|
83
94
|
let normalsList = new Float32Array(normals);
|
|
84
95
|
let colorsList = new Uint8Array(colors);
|
|
85
96
|
let texCoordsList = new Float32Array(texCoords);
|
|
86
|
-
let
|
|
87
|
-
|
|
97
|
+
let uvRegionsList = new Uint16Array(uvRegions);
|
|
88
98
|
for (let index = 0; index < featureIds.length; index++) {
|
|
89
|
-
const startIndex = faceRange[index
|
|
90
|
-
const endIndex = faceRange[index
|
|
99
|
+
const startIndex = faceRange[index * 2];
|
|
100
|
+
const endIndex = faceRange[index * 2 + 1];
|
|
91
101
|
const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);
|
|
92
102
|
const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);
|
|
93
103
|
const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);
|
|
104
|
+
const uvRegionsCount = getSliceAttributeCount('uvRegions', startIndex, endIndex);
|
|
94
105
|
const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
|
|
95
106
|
groupedData.push({
|
|
96
107
|
featureId: featureIds[index],
|
|
97
108
|
positions: positionsList.slice(0, positionsCount),
|
|
98
109
|
normals: normalsList.slice(0, normalsCount),
|
|
99
110
|
colors: colorsList.slice(0, colorsCount),
|
|
111
|
+
uvRegions: uvRegionsList.slice(0, uvRegionsCount),
|
|
100
112
|
texCoords: texCoordsList.slice(0, texCoordsCount)
|
|
101
113
|
});
|
|
102
114
|
positionsList = positionsList.slice(positionsCount);
|
|
103
115
|
normalsList = normalsList.slice(normalsCount);
|
|
104
116
|
colorsList = colorsList.slice(colorsCount);
|
|
117
|
+
uvRegionsList = uvRegionsList.slice(uvRegionsCount);
|
|
105
118
|
texCoordsList = texCoordsList.slice(texCoordsCount);
|
|
106
|
-
faceRangeIndex += 1;
|
|
107
119
|
}
|
|
108
|
-
|
|
109
120
|
return groupedData.sort((first, second) => first.featureId - second.featureId);
|
|
110
121
|
}
|
|
111
122
|
|
|
112
123
|
function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
113
|
-
const
|
|
124
|
+
const itemsPerVertex4 = 4;
|
|
114
125
|
const texCoordsPerVertex = 2;
|
|
115
126
|
const trianglesCount = endIndex - startIndex + 1;
|
|
116
127
|
const vertexCount = trianglesCount * 3;
|
|
117
|
-
|
|
118
128
|
switch (attributeName) {
|
|
119
129
|
case 'positions':
|
|
120
130
|
case 'normals':
|
|
121
131
|
return trianglesCount * POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
122
|
-
|
|
123
132
|
case 'colors':
|
|
124
|
-
|
|
125
|
-
|
|
133
|
+
case 'uvRegions':
|
|
134
|
+
return vertexCount * itemsPerVertex4;
|
|
126
135
|
case 'texCoords':
|
|
127
136
|
return vertexCount * texCoordsPerVertex;
|
|
128
|
-
|
|
129
137
|
default:
|
|
130
138
|
return 0;
|
|
131
139
|
}
|
|
@@ -133,11 +141,9 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
|
133
141
|
|
|
134
142
|
function unifyObjectsByFeatureId(sortedData) {
|
|
135
143
|
const uniqueObjects = [];
|
|
136
|
-
|
|
137
144
|
for (let index = 0; index < sortedData.length; index++) {
|
|
138
145
|
const currentObject = sortedData[index];
|
|
139
146
|
const existedObject = uniqueObjects.find(obj => obj.featureId === currentObject.featureId);
|
|
140
|
-
|
|
141
147
|
if (existedObject) {
|
|
142
148
|
existedObject.positions = concatenateTypedArrays(existedObject.positions, currentObject.positions);
|
|
143
149
|
existedObject.normals = concatenateTypedArrays(existedObject.normals, currentObject.normals);
|
|
@@ -147,7 +153,6 @@ function unifyObjectsByFeatureId(sortedData) {
|
|
|
147
153
|
uniqueObjects.push(currentObject);
|
|
148
154
|
}
|
|
149
155
|
}
|
|
150
|
-
|
|
151
156
|
return uniqueObjects;
|
|
152
157
|
}
|
|
153
158
|
|
|
@@ -157,17 +162,18 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
|
|
|
157
162
|
let positions = new Float32Array(firstAttributeObject.positions);
|
|
158
163
|
let normals = new Float32Array(firstAttributeObject.normals);
|
|
159
164
|
let colors = new Uint8Array(firstAttributeObject.colors);
|
|
165
|
+
let uvRegions = new Uint16Array(firstAttributeObject.uvRegions);
|
|
160
166
|
let texCoords = new Float32Array(firstAttributeObject.texCoords);
|
|
161
167
|
const range = [0];
|
|
162
168
|
let objIndex = 0;
|
|
163
169
|
let sum = 0;
|
|
164
|
-
|
|
165
170
|
for (let index = 1; index < unifiedObjects.length; index++) {
|
|
166
171
|
const currentAttributesObject = unifiedObjects[index];
|
|
167
172
|
featureIds.push(currentAttributesObject.featureId || 0);
|
|
168
173
|
positions = concatenateTypedArrays(positions, currentAttributesObject.positions);
|
|
169
174
|
normals = concatenateTypedArrays(normals, currentAttributesObject.normals);
|
|
170
175
|
colors = concatenateTypedArrays(colors, currentAttributesObject.colors);
|
|
176
|
+
uvRegions = concatenateTypedArrays(uvRegions, currentAttributesObject.uvRegions);
|
|
171
177
|
texCoords = concatenateTypedArrays(texCoords, currentAttributesObject.texCoords);
|
|
172
178
|
const groupedObject = unifiedObjects[objIndex];
|
|
173
179
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);
|
|
@@ -175,7 +181,6 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
|
|
|
175
181
|
sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
176
182
|
objIndex += 1;
|
|
177
183
|
}
|
|
178
|
-
|
|
179
184
|
range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
|
|
180
185
|
const faceRange = new Uint32Array(range);
|
|
181
186
|
return {
|
|
@@ -184,6 +189,7 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
|
|
|
184
189
|
positions,
|
|
185
190
|
normals,
|
|
186
191
|
colors,
|
|
192
|
+
uvRegions,
|
|
187
193
|
texCoords,
|
|
188
194
|
featureCount
|
|
189
195
|
};
|
|
@@ -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,"file":"geometry-attributes.js","names":["concatenateTypedArrays","VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","uvRegions","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","uvRegionsList","Uint16Array","startIndex","endIndex","positionsCount","getSliceAttributeCount","normalsCount","colorsCount","uvRegionsCount","texCoordsCount","featureId","sort","first","second","attributeName","itemsPerVertex4","texCoordsPerVertex","trianglesCount","vertexCount","sortedData","uniqueObjects","currentObject","existedObject","find","obj","unifiedObjects","firstAttributeObject","range","objIndex","sum","currentAttributesObject","groupedObject"],"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.ts"],"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, uvRegions, 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 uvRegions\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 uvRegions,\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 let uvRegionsList = new Uint16Array(uvRegions);\n\n for (let index = 0; index < featureIds.length; index++) {\n const startIndex = faceRange[index * 2];\n const endIndex = faceRange[index * 2 + 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 uvRegionsCount = getSliceAttributeCount('uvRegions', 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 uvRegions: uvRegionsList.slice(0, uvRegionsCount),\n texCoords: texCoordsList.slice(0, texCoordsCount)\n });\n\n positionsList = positionsList.slice(positionsCount);\n normalsList = normalsList.slice(normalsCount);\n colorsList = colorsList.slice(colorsCount);\n uvRegionsList = uvRegionsList.slice(uvRegionsCount);\n texCoordsList = texCoordsList.slice(texCoordsCount);\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 itemsPerVertex4 = 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 case 'uvRegions':\n return vertexCount * itemsPerVertex4;\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 uvRegions = new Uint16Array(firstAttributeObject.uvRegions);\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 uvRegions = concatenateTypedArrays(uvRegions, currentAttributesObject.uvRegions);\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, uvRegions, texCoords, featureCount};\n}\n"],"mappings":"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"}
|