@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.2
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.min.js +10 -10
- package/dist/dist.min.js +791 -554
- package/dist/es5/3d-tiles-attributes-worker.js +1 -1
- package/dist/es5/i3s-attributes-worker.js +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +15 -4
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- 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 +161 -49
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-pages.js +102 -46
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +235 -141
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/lib/utils/write-queue.js +66 -28
- package/dist/es5/lib/utils/write-queue.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +1 -1
- package/dist/esm/i3s-attributes-worker.js +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +15 -4
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- 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 +132 -30
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +3 -3
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +32 -42
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/lib/utils/write-queue.js +10 -0
- package/dist/esm/lib/utils/write-queue.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/i3s-attributes-worker.js +3 -3
- package/dist/i3s-attributes-worker.js.map +2 -2
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +12 -1
- 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 +124 -33
- package/dist/i3s-converter/helpers/node-pages.js +3 -3
- 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 +56 -50
- package/dist/i3s-converter/types.d.ts +0 -48
- package/dist/i3s-converter/types.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.d.ts +1 -0
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +13 -0
- package/package.json +15 -15
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +22 -5
- 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 +161 -37
- package/src/i3s-converter/helpers/node-pages.ts +3 -3
- package/src/i3s-converter/i3s-converter.ts +41 -51
- package/src/i3s-converter/types.ts +0 -51
- package/src/lib/utils/write-queue.ts +12 -0
|
@@ -17,6 +17,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
17
17
|
|
|
18
18
|
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
19
19
|
|
|
20
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
21
|
+
|
|
20
22
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
21
23
|
|
|
22
24
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
@@ -27,10 +29,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
27
29
|
|
|
28
30
|
var _queue = require("./queue");
|
|
29
31
|
|
|
32
|
+
var _process = _interopRequireDefault(require("process"));
|
|
33
|
+
|
|
30
34
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
31
35
|
|
|
32
36
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
33
37
|
|
|
38
|
+
var MEMORY_LIMIT = 4 * 1024 * 1024 * 1024;
|
|
39
|
+
|
|
34
40
|
var WriteQueue = function (_Queue) {
|
|
35
41
|
(0, _inherits2.default)(WriteQueue, _Queue);
|
|
36
42
|
|
|
@@ -54,6 +60,38 @@ var WriteQueue = function (_Queue) {
|
|
|
54
60
|
}
|
|
55
61
|
|
|
56
62
|
(0, _createClass2.default)(WriteQueue, [{
|
|
63
|
+
key: "enqueue",
|
|
64
|
+
value: function () {
|
|
65
|
+
var _enqueue = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(val) {
|
|
66
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
67
|
+
while (1) {
|
|
68
|
+
switch (_context.prev = _context.next) {
|
|
69
|
+
case 0:
|
|
70
|
+
(0, _get2.default)((0, _getPrototypeOf2.default)(WriteQueue.prototype), "enqueue", this).call(this, val);
|
|
71
|
+
|
|
72
|
+
if (!(_process.default.memoryUsage().rss > MEMORY_LIMIT)) {
|
|
73
|
+
_context.next = 4;
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
_context.next = 4;
|
|
78
|
+
return this.startWrite();
|
|
79
|
+
|
|
80
|
+
case 4:
|
|
81
|
+
case "end":
|
|
82
|
+
return _context.stop();
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}, _callee, this);
|
|
86
|
+
}));
|
|
87
|
+
|
|
88
|
+
function enqueue(_x) {
|
|
89
|
+
return _enqueue.apply(this, arguments);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
return enqueue;
|
|
93
|
+
}()
|
|
94
|
+
}, {
|
|
57
95
|
key: "startListening",
|
|
58
96
|
value: function startListening() {
|
|
59
97
|
this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);
|
|
@@ -68,26 +106,26 @@ var WriteQueue = function (_Queue) {
|
|
|
68
106
|
}, {
|
|
69
107
|
key: "startWrite",
|
|
70
108
|
value: function () {
|
|
71
|
-
var _startWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function
|
|
72
|
-
return _regenerator.default.wrap(function
|
|
109
|
+
var _startWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2() {
|
|
110
|
+
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
73
111
|
while (1) {
|
|
74
|
-
switch (
|
|
112
|
+
switch (_context2.prev = _context2.next) {
|
|
75
113
|
case 0:
|
|
76
114
|
if (!this.writePromise) {
|
|
77
|
-
|
|
115
|
+
_context2.next = 5;
|
|
78
116
|
break;
|
|
79
117
|
}
|
|
80
118
|
|
|
81
|
-
|
|
119
|
+
_context2.next = 3;
|
|
82
120
|
return this.writePromise;
|
|
83
121
|
|
|
84
122
|
case 3:
|
|
85
123
|
this.writePromise = null;
|
|
86
|
-
return
|
|
124
|
+
return _context2.abrupt("return");
|
|
87
125
|
|
|
88
126
|
case 5:
|
|
89
127
|
this.writePromise = this.doWrite();
|
|
90
|
-
|
|
128
|
+
_context2.next = 8;
|
|
91
129
|
return this.writePromise;
|
|
92
130
|
|
|
93
131
|
case 8:
|
|
@@ -95,10 +133,10 @@ var WriteQueue = function (_Queue) {
|
|
|
95
133
|
|
|
96
134
|
case 9:
|
|
97
135
|
case "end":
|
|
98
|
-
return
|
|
136
|
+
return _context2.stop();
|
|
99
137
|
}
|
|
100
138
|
}
|
|
101
|
-
},
|
|
139
|
+
}, _callee2, this);
|
|
102
140
|
}));
|
|
103
141
|
|
|
104
142
|
function startWrite() {
|
|
@@ -110,21 +148,21 @@ var WriteQueue = function (_Queue) {
|
|
|
110
148
|
}, {
|
|
111
149
|
key: "finalize",
|
|
112
150
|
value: function () {
|
|
113
|
-
var _finalize = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function
|
|
114
|
-
return _regenerator.default.wrap(function
|
|
151
|
+
var _finalize = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3() {
|
|
152
|
+
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
115
153
|
while (1) {
|
|
116
|
-
switch (
|
|
154
|
+
switch (_context3.prev = _context3.next) {
|
|
117
155
|
case 0:
|
|
118
156
|
this.stopListening();
|
|
119
|
-
|
|
157
|
+
_context3.next = 3;
|
|
120
158
|
return this.startWrite();
|
|
121
159
|
|
|
122
160
|
case 3:
|
|
123
161
|
case "end":
|
|
124
|
-
return
|
|
162
|
+
return _context3.stop();
|
|
125
163
|
}
|
|
126
164
|
}
|
|
127
|
-
},
|
|
165
|
+
}, _callee3, this);
|
|
128
166
|
}));
|
|
129
167
|
|
|
130
168
|
function finalize() {
|
|
@@ -136,15 +174,15 @@ var WriteQueue = function (_Queue) {
|
|
|
136
174
|
}, {
|
|
137
175
|
key: "doWrite",
|
|
138
176
|
value: function () {
|
|
139
|
-
var _doWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function
|
|
177
|
+
var _doWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4() {
|
|
140
178
|
var promises, archiveKeys, i, item, _ref, archiveKey, writePromise, writeResults;
|
|
141
179
|
|
|
142
|
-
return _regenerator.default.wrap(function
|
|
180
|
+
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
143
181
|
while (1) {
|
|
144
|
-
switch (
|
|
182
|
+
switch (_context4.prev = _context4.next) {
|
|
145
183
|
case 0:
|
|
146
184
|
if (!this.length) {
|
|
147
|
-
|
|
185
|
+
_context4.next = 20;
|
|
148
186
|
break;
|
|
149
187
|
}
|
|
150
188
|
|
|
@@ -154,18 +192,18 @@ var WriteQueue = function (_Queue) {
|
|
|
154
192
|
|
|
155
193
|
case 4:
|
|
156
194
|
if (!(i < this.writeConcurrency)) {
|
|
157
|
-
|
|
195
|
+
_context4.next = 14;
|
|
158
196
|
break;
|
|
159
197
|
}
|
|
160
198
|
|
|
161
199
|
item = this.dequeue();
|
|
162
200
|
|
|
163
201
|
if (item) {
|
|
164
|
-
|
|
202
|
+
_context4.next = 8;
|
|
165
203
|
break;
|
|
166
204
|
}
|
|
167
205
|
|
|
168
|
-
return
|
|
206
|
+
return _context4.abrupt("break", 14);
|
|
169
207
|
|
|
170
208
|
case 8:
|
|
171
209
|
_ref = item, archiveKey = _ref.archiveKey, writePromise = _ref.writePromise;
|
|
@@ -174,17 +212,17 @@ var WriteQueue = function (_Queue) {
|
|
|
174
212
|
|
|
175
213
|
case 11:
|
|
176
214
|
i++;
|
|
177
|
-
|
|
215
|
+
_context4.next = 4;
|
|
178
216
|
break;
|
|
179
217
|
|
|
180
218
|
case 14:
|
|
181
|
-
|
|
219
|
+
_context4.next = 16;
|
|
182
220
|
return Promise.allSettled(promises);
|
|
183
221
|
|
|
184
222
|
case 16:
|
|
185
|
-
writeResults =
|
|
223
|
+
writeResults = _context4.sent;
|
|
186
224
|
this.updateFileMap(archiveKeys, writeResults);
|
|
187
|
-
|
|
225
|
+
_context4.next = 0;
|
|
188
226
|
break;
|
|
189
227
|
|
|
190
228
|
case 20:
|
|
@@ -192,10 +230,10 @@ var WriteQueue = function (_Queue) {
|
|
|
192
230
|
|
|
193
231
|
case 21:
|
|
194
232
|
case "end":
|
|
195
|
-
return
|
|
233
|
+
return _context4.stop();
|
|
196
234
|
}
|
|
197
235
|
}
|
|
198
|
-
},
|
|
236
|
+
}, _callee4, this);
|
|
199
237
|
}));
|
|
200
238
|
|
|
201
239
|
function doWrite() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/write-queue.ts"],"names":["WriteQueue","listeningInterval","writeConcurrency","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/utils/write-queue.ts"],"names":["MEMORY_LIMIT","WriteQueue","listeningInterval","writeConcurrency","val","process","memoryUsage","rss","startWrite","intervalId","setInterval","bind","clearInterval","writePromise","doWrite","stopListening","length","promises","archiveKeys","i","item","dequeue","archiveKey","push","Promise","allSettled","writeResults","updateFileMap","fileMap","value","Queue"],"mappings":"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","sourcesContent":["import {Queue} from './queue';\nimport process from 'process';\n\n/** Memory limit size is based on testing */\nconst MEMORY_LIMIT = 4 * 1024 * 1024 * 1024; // 4GB\n\nexport type WriteQueueItem = {\n archiveKey?: string;\n writePromise: Promise<string>;\n};\n\nexport default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {\n private intervalId?: NodeJS.Timeout;\n public writePromise: Promise<void> | null = null;\n public fileMap: {[key: string]: string} = {};\n public listeningInterval: number;\n public writeConcurrency: number;\n\n constructor(listeningInterval: number = 2000, writeConcurrency: number = 400) {\n super();\n this.listeningInterval = listeningInterval;\n this.writeConcurrency = writeConcurrency;\n }\n\n async enqueue(val: T) {\n super.enqueue(val);\n /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */\n if (process.memoryUsage().rss > MEMORY_LIMIT) {\n await this.startWrite();\n }\n }\n\n startListening() {\n this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);\n }\n\n stopListening() {\n if (this.intervalId) {\n clearInterval(this.intervalId);\n }\n }\n\n async startWrite(): Promise<void> {\n if (this.writePromise) {\n await this.writePromise;\n this.writePromise = null;\n return;\n }\n this.writePromise = this.doWrite();\n await this.writePromise;\n this.writePromise = null;\n }\n\n async finalize(): Promise<void> {\n this.stopListening();\n await this.startWrite();\n }\n\n private async doWrite(): Promise<void> {\n while (this.length) {\n const promises: Promise<string>[] = [];\n const archiveKeys: (string | undefined)[] = [];\n for (let i = 0; i < this.writeConcurrency; i++) {\n const item = this.dequeue();\n if (!item) {\n break;\n }\n const {archiveKey, writePromise} = item as WriteQueueItem;\n archiveKeys.push(archiveKey);\n promises.push(writePromise);\n }\n const writeResults = await Promise.allSettled(promises);\n this.updateFileMap(archiveKeys, writeResults);\n }\n this.writePromise = null;\n }\n\n private updateFileMap(\n archiveKeys: (string | undefined)[],\n writeResults: PromiseSettledResult<string>[]\n ) {\n for (let i = 0; i < archiveKeys.length; i++) {\n const archiveKey = archiveKeys[i];\n if (archiveKey && 'value' in writeResults[i]) {\n this.fileMap[archiveKey] = (writeResults[i] as PromiseFulfilledResult<string>).value;\n }\n }\n }\n}\n"],"file":"write-queue.js"}
|
package/dist/es5/pgm-loader.js
CHANGED
|
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
13
13
|
|
|
14
14
|
var _geoid = require("@math.gl/geoid");
|
|
15
15
|
|
|
16
|
-
var VERSION = typeof "3.3.0-alpha.
|
|
16
|
+
var VERSION = typeof "3.3.0-alpha.2" !== 'undefined' ? "3.3.0-alpha.2" : 'latest';
|
|
17
17
|
var PGMLoader = {
|
|
18
18
|
name: 'PGM - Netpbm grayscale image format',
|
|
19
19
|
id: 'pgm',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.3.0-alpha.
|
|
2
|
+
const VERSION = typeof "3.3.0-alpha.2" !== 'undefined' ? "3.3.0-alpha.2" : 'latest';
|
|
3
3
|
export const Tile3dAttributesWorker = {
|
|
4
4
|
id: '3d-tiles-attributes',
|
|
5
5
|
name: '3DTiles Attributes Worker',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.3.0-alpha.
|
|
2
|
+
const VERSION = typeof "3.3.0-alpha.2" !== 'undefined' ? "3.3.0-alpha.2" : 'latest';
|
|
3
3
|
export const I3SAttributesWorker = {
|
|
4
4
|
id: 'i3s-attributes',
|
|
5
5
|
name: 'I3S Attributes Worker',
|
|
@@ -44,10 +44,21 @@ function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, image
|
|
|
44
44
|
const featureIdTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures[0]);
|
|
45
45
|
|
|
46
46
|
if (featureIdTexture) {
|
|
47
|
-
|
|
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;
|
|
48
52
|
return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);
|
|
49
53
|
}
|
|
50
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
|
+
|
|
51
62
|
return [];
|
|
52
63
|
}
|
|
53
64
|
|
|
@@ -75,7 +86,7 @@ function generateImplicitFeatureIds(featuresCount, constant = 0, divisor = 0) {
|
|
|
75
86
|
}
|
|
76
87
|
|
|
77
88
|
function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images) {
|
|
78
|
-
var _featureIdTexture$
|
|
89
|
+
var _featureIdTexture$fea3, _featureIdTexture$fea4, _featureIdTexture$fea5;
|
|
79
90
|
|
|
80
91
|
const CHANNELS_MAP = {
|
|
81
92
|
r: 0,
|
|
@@ -83,8 +94,8 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
83
94
|
b: 2,
|
|
84
95
|
a: 3
|
|
85
96
|
};
|
|
86
|
-
const textureIndex = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$
|
|
87
|
-
const featureChannel = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$
|
|
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;
|
|
88
99
|
|
|
89
100
|
if (!featureChannel || textureIndex === undefined) {
|
|
90
101
|
return [];
|
|
@@ -1 +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","textureCoordinates","TEXCOORD_0","generateBatchIdsFromTexture","currentValue","devisorCounter","index","push","Array","fill","CHANNELS_MAP","r","g","b","a","textureIndex","texture","featureChannel","channels","undefined","image","batchIds","compressed","u","v","tx","Math","min","emod","width","ty","height","offset","components","batchId","Uint8Array","data","mimeType","n"],"mappings":"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","sourcesContent":["import type {GLTFAccessorPostprocessed} from 'modules/gltf/src/lib/types/gltf-types';\nimport type {Image, MeshPrimitive} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';\nimport type {ExtFeatureMetadata, ExtFeatureMetadataAttribute} from '../types';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes\n * @param primitive\n * @param textures\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: MeshPrimitive,\n images: Image[]\n): number[] {\n const extensions = primitive?.extensions;\n\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as ExtFeatureMetadata,\n images\n );\n case EXT_MESH_FEATURES:\n console.warn('EXT_mesh_features extension is not supported yet');\n return [];\n default:\n return [];\n }\n }\n\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: ExtFeatureMetadata,\n images: Image[]\n): number[] {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureCoordinates = attributes.TEXCOORD_0.value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: ExtFeatureMetadataAttribute,\n textureCoordinates: Float32Array,\n images: Image[]\n) {\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (!image.compressed) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image.mimeType} compressed texture`);\n }\n\n return batchIds;\n}\n\n/**\n * Handle UVs if they are out of range [0,1].\n * @param n\n * @param m\n */\nfunction emod(n: number): number {\n return ((n % 1) + 1) % 1;\n}\n"],"file":"batch-ids-extensions.js"}
|
|
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":"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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 = 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"}
|