@loaders.gl/tile-converter 3.1.0-alpha.4 → 3.1.0-beta.5
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/bin/converter.js +1 -1
- package/dist/bundle.js +86025 -0
- package/dist/converter.min.js +292 -0
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +189 -421
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +214 -296
- 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 +4 -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 +40 -0
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -0
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js +7 -17
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/es5/bundle.js +1 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +17 -65
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +16 -16
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +9 -33
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +93 -103
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +348 -511
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-debug.js +30 -26
- package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-pages.js +102 -203
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +701 -1501
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/layers.js +15 -25
- package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/metadata.js +2 -2
- package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/node.js +12 -21
- package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/scene-server.js +3 -5
- package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +15 -55
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/store.js +4 -6
- package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/es5/i3s-server/app.js +6 -6
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/controllers/index-controller.js +20 -60
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +14 -41
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/index.js +4 -4
- package/dist/es5/lib/geoid-height-model.js +100 -114
- package/dist/es5/lib/geoid-height-model.js.map +1 -1
- package/dist/es5/lib/pgm-parser.js +68 -122
- package/dist/es5/lib/pgm-parser.js.map +1 -1
- package/dist/es5/lib/utils/compress-util.js +123 -345
- package/dist/es5/lib/utils/compress-util.js.map +1 -1
- package/dist/es5/lib/utils/file-utils.js +20 -98
- package/dist/es5/lib/utils/file-utils.js.map +1 -1
- package/dist/es5/lib/utils/lod-conversion-utils.js +9 -9
- package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/es5/lib/utils/statistic-utills.js +41 -152
- package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
- package/dist/es5/pgm-loader.js +3 -5
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +19 -13
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +19 -8
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +33 -0
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -0
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +29 -31
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +2 -2
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +2 -2
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +50 -31
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/scene-server.js +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 +2 -2
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/store.js +2 -2
- package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js +2 -2
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/lib/utils/compress-util.js +13 -13
- package/dist/esm/lib/utils/compress-util.js.map +1 -1
- package/dist/esm/lib/utils/file-utils.js +1 -1
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/statistic-utills.js +5 -5
- package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/esm/pgm-loader.js.map +1 -1
- package/package.json +22 -19
- package/src/3d-tiles-converter/3d-tiles-converter.ts +4 -2
- package/src/3d-tiles-converter/helpers/b3dm-converter.js +35 -7
- package/src/3d-tiles-converter/helpers/texture-atlas.ts +55 -0
- package/src/i3s-converter/helpers/geometry-converter.js +21 -22
- package/src/i3s-converter/i3s-converter.ts +32 -7
- package/src/i3s-converter/json-templates/metadata.js +1 -1
- package/src/i3s-converter/json-templates/scene-server.js +1 -1
- package/src/i3s-converter/json-templates/store.js +2 -2
- package/src/i3s-server/controllers/index-controller.js +1 -1
- package/dist/dist.min.js +0 -94
- package/dist/dist.min.js.map +0 -1
- package/dist/scripts/converter.js +0 -274
|
@@ -1,70 +1,66 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
8
6
|
exports.generateAttributes = generateAttributes;
|
|
9
7
|
|
|
10
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
-
|
|
12
8
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
13
9
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
17
|
-
|
|
18
|
-
var VALUES_PER_VERTEX = 3;
|
|
19
|
-
var POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;
|
|
10
|
+
const VALUES_PER_VERTEX = 3;
|
|
11
|
+
const POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;
|
|
20
12
|
|
|
21
13
|
function generateAttributes(attributes) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
14
|
+
const {
|
|
15
|
+
positions,
|
|
16
|
+
normals,
|
|
17
|
+
texCoords,
|
|
18
|
+
colors,
|
|
19
|
+
featureIndices,
|
|
20
|
+
triangleCount
|
|
21
|
+
} = attributes;
|
|
28
22
|
|
|
29
23
|
if (!featureIndices.length) {
|
|
30
24
|
return {
|
|
31
25
|
faceRange: new Uint32Array([0, triangleCount - 1]),
|
|
32
26
|
featureIds: [0],
|
|
33
27
|
featureCount: 1,
|
|
34
|
-
positions
|
|
35
|
-
normals
|
|
36
|
-
texCoords
|
|
37
|
-
colors
|
|
28
|
+
positions,
|
|
29
|
+
normals,
|
|
30
|
+
texCoords,
|
|
31
|
+
colors
|
|
38
32
|
};
|
|
39
33
|
}
|
|
40
34
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
faceRange
|
|
48
|
-
featureIds
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
35
|
+
const {
|
|
36
|
+
faceRange,
|
|
37
|
+
featureCount,
|
|
38
|
+
featureIds
|
|
39
|
+
} = calculateFaceRangesAndFeaturesCount(featureIndices);
|
|
40
|
+
const attributeObjects = makeAttributeObjects({
|
|
41
|
+
faceRange,
|
|
42
|
+
featureIds,
|
|
43
|
+
...attributes
|
|
44
|
+
});
|
|
45
|
+
const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);
|
|
46
|
+
const groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds);
|
|
47
|
+
return {
|
|
48
|
+
featureCount,
|
|
49
|
+
...groupedAttributes
|
|
50
|
+
};
|
|
55
51
|
}
|
|
56
52
|
|
|
57
53
|
function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
54
|
+
let rangeIndex = 1;
|
|
55
|
+
let featureIndex = 1;
|
|
56
|
+
let currentFeatureId = featureIndices[0];
|
|
57
|
+
const faceRangeList = [];
|
|
58
|
+
const featureIds = [];
|
|
59
|
+
const uniqueFeatureIds = [currentFeatureId];
|
|
64
60
|
faceRangeList[0] = 0;
|
|
65
61
|
featureIds[0] = currentFeatureId;
|
|
66
62
|
|
|
67
|
-
for (
|
|
63
|
+
for (let index = 1; index < featureIndices.length; index++) {
|
|
68
64
|
if (currentFeatureId !== featureIndices[index]) {
|
|
69
65
|
faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;
|
|
70
66
|
faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;
|
|
@@ -82,36 +78,38 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
|
82
78
|
}
|
|
83
79
|
|
|
84
80
|
faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
const faceRange = new Uint32Array(faceRangeList);
|
|
82
|
+
const featureCount = uniqueFeatureIds.length;
|
|
87
83
|
return {
|
|
88
|
-
faceRange
|
|
89
|
-
featureCount
|
|
90
|
-
featureIds
|
|
84
|
+
faceRange,
|
|
85
|
+
featureCount,
|
|
86
|
+
featureIds
|
|
91
87
|
};
|
|
92
88
|
}
|
|
93
89
|
|
|
94
90
|
function makeAttributeObjects(attributes) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
91
|
+
const {
|
|
92
|
+
featureIds,
|
|
93
|
+
positions,
|
|
94
|
+
normals,
|
|
95
|
+
colors,
|
|
96
|
+
texCoords,
|
|
97
|
+
faceRange
|
|
98
|
+
} = attributes;
|
|
99
|
+
const groupedData = [];
|
|
100
|
+
let positionsList = new Float32Array(positions);
|
|
101
|
+
let normalsList = new Float32Array(normals);
|
|
102
|
+
let colorsList = new Uint8Array(colors);
|
|
103
|
+
let texCoordsList = new Float32Array(texCoords);
|
|
104
|
+
let faceRangeIndex = 0;
|
|
105
|
+
|
|
106
|
+
for (let index = 0; index < featureIds.length; index++) {
|
|
107
|
+
const startIndex = faceRange[index + faceRangeIndex];
|
|
108
|
+
const endIndex = faceRange[index + faceRangeIndex + 1];
|
|
109
|
+
const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);
|
|
110
|
+
const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);
|
|
111
|
+
const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);
|
|
112
|
+
const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
|
|
115
113
|
groupedData.push({
|
|
116
114
|
featureId: featureIds[index],
|
|
117
115
|
positions: positionsList.slice(0, positionsCount),
|
|
@@ -126,16 +124,14 @@ function makeAttributeObjects(attributes) {
|
|
|
126
124
|
faceRangeIndex += 1;
|
|
127
125
|
}
|
|
128
126
|
|
|
129
|
-
return groupedData.sort(
|
|
130
|
-
return first.featureId - second.featureId;
|
|
131
|
-
});
|
|
127
|
+
return groupedData.sort((first, second) => first.featureId - second.featureId);
|
|
132
128
|
}
|
|
133
129
|
|
|
134
130
|
function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
131
|
+
const colorsPerVertex = 4;
|
|
132
|
+
const texCoordsPerVertex = 2;
|
|
133
|
+
const trianglesCount = endIndex - startIndex + 1;
|
|
134
|
+
const vertexCount = trianglesCount * 3;
|
|
139
135
|
|
|
140
136
|
switch (attributeName) {
|
|
141
137
|
case 'positions':
|
|
@@ -154,13 +150,11 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
|
154
150
|
}
|
|
155
151
|
|
|
156
152
|
function unifyObjectsByFeatureId(sortedData) {
|
|
157
|
-
|
|
153
|
+
const uniqueObjects = [];
|
|
158
154
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return obj.featureId === currentObject.featureId;
|
|
163
|
-
});
|
|
155
|
+
for (let index = 0; index < sortedData.length; index++) {
|
|
156
|
+
const currentObject = sortedData[index];
|
|
157
|
+
const existedObject = uniqueObjects.find(obj => obj.featureId === currentObject.featureId);
|
|
164
158
|
|
|
165
159
|
if (existedObject) {
|
|
166
160
|
existedObject.positions = (0, _loaderUtils.concatenateTypedArrays)(existedObject.positions, currentObject.positions);
|
|
@@ -170,34 +164,30 @@ function unifyObjectsByFeatureId(sortedData) {
|
|
|
170
164
|
} else {
|
|
171
165
|
uniqueObjects.push(currentObject);
|
|
172
166
|
}
|
|
173
|
-
};
|
|
174
|
-
|
|
175
|
-
for (var index = 0; index < sortedData.length; index++) {
|
|
176
|
-
_loop(index);
|
|
177
167
|
}
|
|
178
168
|
|
|
179
169
|
return uniqueObjects;
|
|
180
170
|
}
|
|
181
171
|
|
|
182
172
|
function groupAttributesAndRangesByFeatureId(unifiedObjects) {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
for (
|
|
194
|
-
|
|
173
|
+
const firstAttributeObject = unifiedObjects[0];
|
|
174
|
+
const featureIds = [firstAttributeObject.featureId];
|
|
175
|
+
let positions = new Float32Array(firstAttributeObject.positions);
|
|
176
|
+
let normals = new Float32Array(firstAttributeObject.normals);
|
|
177
|
+
let colors = new Uint8Array(firstAttributeObject.colors);
|
|
178
|
+
let texCoords = new Float32Array(firstAttributeObject.texCoords);
|
|
179
|
+
const range = [0];
|
|
180
|
+
let objIndex = 0;
|
|
181
|
+
let sum = 0;
|
|
182
|
+
|
|
183
|
+
for (let index = 1; index < unifiedObjects.length; index++) {
|
|
184
|
+
const currentAttributesObject = unifiedObjects[index];
|
|
195
185
|
featureIds.push(currentAttributesObject.featureId);
|
|
196
186
|
positions = (0, _loaderUtils.concatenateTypedArrays)(positions, currentAttributesObject.positions);
|
|
197
187
|
normals = (0, _loaderUtils.concatenateTypedArrays)(normals, currentAttributesObject.normals);
|
|
198
188
|
colors = (0, _loaderUtils.concatenateTypedArrays)(colors, currentAttributesObject.colors);
|
|
199
189
|
texCoords = (0, _loaderUtils.concatenateTypedArrays)(texCoords, currentAttributesObject.texCoords);
|
|
200
|
-
|
|
190
|
+
const groupedObject = unifiedObjects[objIndex];
|
|
201
191
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);
|
|
202
192
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);
|
|
203
193
|
sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
@@ -205,14 +195,14 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
|
|
|
205
195
|
}
|
|
206
196
|
|
|
207
197
|
range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
|
|
208
|
-
|
|
198
|
+
const faceRange = new Uint32Array(range);
|
|
209
199
|
return {
|
|
210
|
-
faceRange
|
|
211
|
-
featureIds
|
|
212
|
-
positions
|
|
213
|
-
normals
|
|
214
|
-
colors
|
|
215
|
-
texCoords
|
|
200
|
+
faceRange,
|
|
201
|
+
featureIds,
|
|
202
|
+
positions,
|
|
203
|
+
normals,
|
|
204
|
+
colors,
|
|
205
|
+
texCoords
|
|
216
206
|
};
|
|
217
207
|
}
|
|
218
208
|
//# sourceMappingURL=geometry-attributes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.js"],"names":["VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","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 {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 {Object} attributes\n * @returns {Object} Object with featureCount, reordered attributes and changed faceRange.\n */\nexport function generateAttributes(attributes) {\n const {positions, normals, texCoords, colors, featureIndices, triangleCount} = attributes;\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 {faceRange, featureCount, featureIds} = calculateFaceRangesAndFeaturesCount(featureIndices);\n const attributeObjects = makeAttributeObjects({faceRange, featureIds, ...attributes});\n const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n const groupedAttributes = groupAttributesAndRangesByFeatureId(\n unifiedAttributeObjectsByFeatureIds\n );\n return {featureCount, ...groupedAttributes};\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param {Object} featureIndices\n * @returns {Object} Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices) {\n let rangeIndex = 1;\n let featureIndex = 1;\n let currentFeatureId = featureIndices[0];\n const faceRangeList = [];\n const featureIds = [];\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 {Object} attributes\n * @returns {Array} sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes) {\n const {featureIds, positions, normals, colors, texCoords, faceRange} = attributes;\n const groupedData = [];\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 {String} attributeName\n * @param {Number} startIndex\n * @param {Number} endIndex\n * @returns {Number} - sliced count\n */\nfunction getSliceAttributeCount(attributeName, startIndex, endIndex) {\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 {Array} sortedData\n * @returns {Array} - unique list of objects\n */\nfunction unifyObjectsByFeatureId(sortedData) {\n const uniqueObjects = [];\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 {Array} unifiedObjects\n * @returns {Object} - ugenerated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(unifiedObjects) {\n const firstAttributeObject = unifiedObjects[0];\n const featureIds = [firstAttributeObject.featureId];\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);\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};\n}\n"],"file":"geometry-attributes.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.js"],"names":["VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","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 {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 {Object} attributes\n * @returns {Object} Object with featureCount, reordered attributes and changed faceRange.\n */\nexport function generateAttributes(attributes) {\n const {positions, normals, texCoords, colors, featureIndices, triangleCount} = attributes;\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 {faceRange, featureCount, featureIds} = calculateFaceRangesAndFeaturesCount(featureIndices);\n const attributeObjects = makeAttributeObjects({faceRange, featureIds, ...attributes});\n const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n const groupedAttributes = groupAttributesAndRangesByFeatureId(\n unifiedAttributeObjectsByFeatureIds\n );\n return {featureCount, ...groupedAttributes};\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param {Object} featureIndices\n * @returns {Object} Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices) {\n let rangeIndex = 1;\n let featureIndex = 1;\n let currentFeatureId = featureIndices[0];\n const faceRangeList = [];\n const featureIds = [];\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 {Object} attributes\n * @returns {Array} sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes) {\n const {featureIds, positions, normals, colors, texCoords, faceRange} = attributes;\n const groupedData = [];\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 {String} attributeName\n * @param {Number} startIndex\n * @param {Number} endIndex\n * @returns {Number} - sliced count\n */\nfunction getSliceAttributeCount(attributeName, startIndex, endIndex) {\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 {Array} sortedData\n * @returns {Array} - unique list of objects\n */\nfunction unifyObjectsByFeatureId(sortedData) {\n const uniqueObjects = [];\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 {Array} unifiedObjects\n * @returns {Object} - ugenerated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(unifiedObjects) {\n const firstAttributeObject = unifiedObjects[0];\n const featureIds = [firstAttributeObject.featureId];\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);\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};\n}\n"],"file":"geometry-attributes.js"}
|