@loaders.gl/tile-converter 3.1.0-beta.1 → 3.1.0
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/bundle.js +1455 -1296
- package/dist/converter.min.js +292 -0
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +429 -189
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +306 -209
- 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 +8 -4
- 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 +13 -13
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js +51 -32
- 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 +61 -17
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +55 -16
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +33 -9
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +103 -93
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.d.ts +5 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +546 -351
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-debug.js +27 -31
- package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-pages.js +209 -101
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +1645 -700
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/layers.js +213 -177
- package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/metadata.js +24 -20
- package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/node.js +92 -74
- package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/scene-server.js +34 -28
- package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +162 -107
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/store.js +4 -2
- package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/es5/i3s-converter/types.js +2 -0
- package/dist/es5/i3s-converter/types.js.map +1 -0
- 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 +60 -20
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +41 -14
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/index.js +4 -4
- package/dist/es5/lib/utils/{compress-utils.d.ts → compress-util.d.ts} +0 -0
- package/dist/es5/lib/utils/compress-util.js +345 -123
- package/dist/es5/lib/utils/compress-util.js.map +1 -1
- package/dist/es5/lib/utils/file-utils.js +98 -20
- 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 +152 -41
- package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
- package/dist/es5/pgm-loader.js +31 -4
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +7 -6
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +7 -0
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js +12 -9
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +2 -6
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js +35 -3
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js +2 -2
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.d.ts +5 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +52 -34
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +2 -4
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +15 -4
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +147 -62
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/layers.js +37 -27
- package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js +2 -2
- package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/node.js +16 -12
- package/dist/esm/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/scene-server.js +2 -2
- package/dist/esm/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +19 -14
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/esm/i3s-converter/types.js +2 -0
- package/dist/esm/i3s-converter/types.js.map +1 -0
- package/dist/esm/lib/utils/{compress-utils.d.ts → compress-util.d.ts} +0 -0
- package/dist/esm/pgm-loader.js +3 -3
- package/dist/esm/pgm-loader.js.map +1 -1
- package/package.json +16 -14
- package/src/3d-tiles-converter/3d-tiles-converter.ts +21 -20
- package/src/3d-tiles-converter/helpers/{b3dm-converter.js → b3dm-converter.ts} +19 -2
- package/src/3d-tiles-converter/helpers/{i3s-obb-to-3d-tiles-obb.js → i3s-obb-to-3d-tiles-obb.ts} +16 -1
- package/src/3d-tiles-converter/helpers/texture-atlas.ts +4 -4
- package/src/3d-tiles-converter/json-templates/{tileset.js → tileset.ts} +9 -9
- package/src/deps-installer/deps-installer.js +2 -2
- package/src/i3s-converter/helpers/coordinate-converter.ts +62 -9
- package/src/i3s-converter/helpers/{create-scene-server-path.js → create-scene-server-path.ts} +2 -2
- package/src/i3s-converter/helpers/{geometry-attributes.js → geometry-attributes.ts} +4 -4
- package/src/i3s-converter/helpers/geometry-converter.d.ts +5 -1
- package/src/i3s-converter/helpers/geometry-converter.js +68 -26
- package/src/i3s-converter/helpers/{node-debug.js → node-debug.ts} +3 -2
- package/src/i3s-converter/helpers/{node-pages.js → node-pages.ts} +41 -26
- package/src/i3s-converter/i3s-converter.ts +204 -133
- package/src/i3s-converter/json-templates/{layers.js → layers.ts} +29 -27
- package/src/i3s-converter/json-templates/{metadata.js → metadata.ts} +2 -2
- package/src/i3s-converter/json-templates/{node.js → node.ts} +12 -12
- package/src/i3s-converter/json-templates/{scene-server.js → scene-server.ts} +2 -2
- package/src/i3s-converter/json-templates/{shared-resources.js → shared-resources.ts} +14 -14
- package/src/i3s-converter/json-templates/{store.js → store.ts} +0 -0
- package/src/i3s-converter/types.ts +14 -0
- package/src/lib/utils/{compress-utils.d.ts → compress-util.d.ts} +0 -0
- package/src/pgm-loader.ts +2 -2
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.d.ts +0 -23
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.d.ts +0 -16
- package/dist/es5/i3s-converter/helpers/node-pages.d.ts +0 -144
- package/dist/es5/lib/geoid-height-model.d.ts +0 -41
- package/dist/es5/lib/geoid-height-model.js +0 -149
- package/dist/es5/lib/geoid-height-model.js.map +0 -1
- package/dist/es5/lib/pgm-parser.d.ts +0 -14
- package/dist/es5/lib/pgm-parser.js +0 -192
- package/dist/es5/lib/pgm-parser.js.map +0 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.d.ts +0 -23
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.d.ts +0 -16
- package/dist/esm/i3s-converter/helpers/node-pages.d.ts +0 -144
- package/dist/esm/lib/geoid-height-model.d.ts +0 -41
- package/dist/esm/lib/geoid-height-model.js +0 -140
- package/dist/esm/lib/geoid-height-model.js.map +0 -1
- package/dist/esm/lib/pgm-parser.d.ts +0 -14
- package/dist/esm/lib/pgm-parser.js +0 -183
- package/dist/esm/lib/pgm-parser.js.map +0 -1
- package/src/3d-tiles-converter/helpers/b3dm-converter.d.ts +0 -23
- package/src/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.d.ts +0 -16
- package/src/i3s-converter/helpers/node-pages.d.ts +0 -144
- package/src/lib/geoid-height-model.d.ts +0 -41
- package/src/lib/geoid-height-model.js +0 -239
- package/src/lib/pgm-parser.d.ts +0 -14
- package/src/lib/pgm-parser.js +0 -179
|
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.createSceneServerPath = createSceneServerPath;
|
|
9
9
|
|
|
10
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
+
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
+
|
|
10
14
|
var _uuid = require("uuid");
|
|
11
15
|
|
|
12
16
|
var _jsonMapTransform = _interopRequireDefault(require("json-map-transform"));
|
|
@@ -17,14 +21,34 @@ var _sceneServer = require("../json-templates/scene-server");
|
|
|
17
21
|
|
|
18
22
|
var _fileUtils = require("../../lib/utils/file-utils");
|
|
19
23
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
24
|
+
function createSceneServerPath(_x, _x2, _x3) {
|
|
25
|
+
return _createSceneServerPath.apply(this, arguments);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function _createSceneServerPath() {
|
|
29
|
+
_createSceneServerPath = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(layerName, layers0, rootPath) {
|
|
30
|
+
var sceneServerData, sceneServer, nodePagePath;
|
|
31
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
32
|
+
while (1) {
|
|
33
|
+
switch (_context.prev = _context.next) {
|
|
34
|
+
case 0:
|
|
35
|
+
sceneServerData = {
|
|
36
|
+
serviceItemId: (0, _uuid.v4)().replace(/-/gi, ''),
|
|
37
|
+
layerName: layerName,
|
|
38
|
+
layers0: layers0
|
|
39
|
+
};
|
|
40
|
+
sceneServer = (0, _jsonMapTransform.default)(sceneServerData, (0, _sceneServer.SCENE_SERVER)());
|
|
41
|
+
nodePagePath = (0, _path.join)(rootPath, 'SceneServer');
|
|
42
|
+
_context.next = 5;
|
|
43
|
+
return (0, _fileUtils.writeFile)(nodePagePath, JSON.stringify(sceneServer));
|
|
44
|
+
|
|
45
|
+
case 5:
|
|
46
|
+
case "end":
|
|
47
|
+
return _context.stop();
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}, _callee);
|
|
51
|
+
}));
|
|
52
|
+
return _createSceneServerPath.apply(this, arguments);
|
|
29
53
|
}
|
|
30
54
|
//# sourceMappingURL=create-scene-server-path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/helpers/create-scene-server-path.
|
|
1
|
+
{"version":3,"sources":["../../../../src/i3s-converter/helpers/create-scene-server-path.ts"],"names":["createSceneServerPath","layerName","layers0","rootPath","sceneServerData","serviceItemId","replace","sceneServer","nodePagePath","JSON","stringify"],"mappings":";;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;AACA;;SASsBA,qB;;;;;qFAAf,iBAAqCC,SAArC,EAAgDC,OAAhD,EAAyDC,QAAzD;AAAA;AAAA;AAAA;AAAA;AAAA;AACCC,YAAAA,eADD,GACmB;AACtBC,cAAAA,aAAa,EAAE,gBAASC,OAAT,CAAiB,KAAjB,EAAwB,EAAxB,CADO;AAEtBL,cAAAA,SAAS,EAATA,SAFsB;AAGtBC,cAAAA,OAAO,EAAPA;AAHsB,aADnB;AAOCK,YAAAA,WAPD,GAOe,+BAAUH,eAAV,EAA2B,gCAA3B,CAPf;AAQCI,YAAAA,YARD,GAQgB,gBAAKL,QAAL,EAAe,aAAf,CARhB;AAAA;AAAA,mBASC,0BAAUK,YAAV,EAAwBC,IAAI,CAACC,SAAL,CAAeH,WAAf,CAAxB,CATD;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import {v4 as uuidv4} from 'uuid';\nimport transform from 'json-map-transform';\nimport {join} from 'path';\n\nimport {SCENE_SERVER as sceneServerTemplate} from '../json-templates/scene-server';\nimport {writeFile} from '../../lib/utils/file-utils';\n\n/**\n * Form and save sceneServer meta data into a file\n * @param {string} layerName - layer name to display\n * @param {object} layers0 - layer object embedded into sceneServer meta data\n * @param {string} rootPath - root path of new converted tileset\n * @return {promise}\n */\nexport async function createSceneServerPath(layerName, layers0, rootPath) {\n const sceneServerData = {\n serviceItemId: uuidv4().replace(/-/gi, ''),\n layerName,\n layers0\n };\n\n const sceneServer = transform(sceneServerData, sceneServerTemplate());\n const nodePagePath = join(rootPath, 'SceneServer');\n await writeFile(nodePagePath, JSON.stringify(sceneServer));\n}\n"],"file":"create-scene-server-path.js"}
|
|
@@ -1,66 +1,70 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
6
8
|
exports.generateAttributes = generateAttributes;
|
|
7
9
|
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
|
|
8
12
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
9
13
|
|
|
10
|
-
|
|
11
|
-
|
|
14
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
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;
|
|
12
20
|
|
|
13
21
|
function generateAttributes(attributes) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
triangleCount
|
|
21
|
-
} = attributes;
|
|
22
|
+
var positions = attributes.positions,
|
|
23
|
+
normals = attributes.normals,
|
|
24
|
+
texCoords = attributes.texCoords,
|
|
25
|
+
colors = attributes.colors,
|
|
26
|
+
featureIndices = attributes.featureIndices,
|
|
27
|
+
triangleCount = attributes.triangleCount;
|
|
22
28
|
|
|
23
29
|
if (!featureIndices.length) {
|
|
24
30
|
return {
|
|
25
31
|
faceRange: new Uint32Array([0, triangleCount - 1]),
|
|
26
32
|
featureIds: [0],
|
|
27
33
|
featureCount: 1,
|
|
28
|
-
positions,
|
|
29
|
-
normals,
|
|
30
|
-
texCoords,
|
|
31
|
-
colors
|
|
34
|
+
positions: positions,
|
|
35
|
+
normals: normals,
|
|
36
|
+
texCoords: texCoords,
|
|
37
|
+
colors: colors
|
|
32
38
|
};
|
|
33
39
|
}
|
|
34
40
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
faceRange,
|
|
42
|
-
featureIds
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
...groupedAttributes
|
|
50
|
-
};
|
|
41
|
+
var _calculateFaceRangesA = calculateFaceRangesAndFeaturesCount(featureIndices),
|
|
42
|
+
faceRange = _calculateFaceRangesA.faceRange,
|
|
43
|
+
featureCount = _calculateFaceRangesA.featureCount,
|
|
44
|
+
featureIds = _calculateFaceRangesA.featureIds;
|
|
45
|
+
|
|
46
|
+
var attributeObjects = makeAttributeObjects(_objectSpread({
|
|
47
|
+
faceRange: faceRange,
|
|
48
|
+
featureIds: featureIds
|
|
49
|
+
}, attributes));
|
|
50
|
+
var unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);
|
|
51
|
+
var groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds);
|
|
52
|
+
return _objectSpread({
|
|
53
|
+
featureCount: featureCount
|
|
54
|
+
}, groupedAttributes);
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
var rangeIndex = 1;
|
|
59
|
+
var featureIndex = 1;
|
|
60
|
+
var currentFeatureId = featureIndices[0];
|
|
61
|
+
var faceRangeList = [];
|
|
62
|
+
var featureIds = [];
|
|
63
|
+
var uniqueFeatureIds = [currentFeatureId];
|
|
60
64
|
faceRangeList[0] = 0;
|
|
61
65
|
featureIds[0] = currentFeatureId;
|
|
62
66
|
|
|
63
|
-
for (
|
|
67
|
+
for (var index = 1; index < featureIndices.length; index++) {
|
|
64
68
|
if (currentFeatureId !== featureIndices[index]) {
|
|
65
69
|
faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;
|
|
66
70
|
faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;
|
|
@@ -78,38 +82,36 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
|
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
|
|
81
|
-
|
|
82
|
-
|
|
85
|
+
var faceRange = new Uint32Array(faceRangeList);
|
|
86
|
+
var featureCount = uniqueFeatureIds.length;
|
|
83
87
|
return {
|
|
84
|
-
faceRange,
|
|
85
|
-
featureCount,
|
|
86
|
-
featureIds
|
|
88
|
+
faceRange: faceRange,
|
|
89
|
+
featureCount: featureCount,
|
|
90
|
+
featureIds: featureIds
|
|
87
91
|
};
|
|
88
92
|
}
|
|
89
93
|
|
|
90
94
|
function makeAttributeObjects(attributes) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);
|
|
112
|
-
const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
|
|
95
|
+
var featureIds = attributes.featureIds,
|
|
96
|
+
positions = attributes.positions,
|
|
97
|
+
normals = attributes.normals,
|
|
98
|
+
colors = attributes.colors,
|
|
99
|
+
texCoords = attributes.texCoords,
|
|
100
|
+
faceRange = attributes.faceRange;
|
|
101
|
+
var groupedData = [];
|
|
102
|
+
var positionsList = new Float32Array(positions);
|
|
103
|
+
var normalsList = new Float32Array(normals);
|
|
104
|
+
var colorsList = new Uint8Array(colors);
|
|
105
|
+
var texCoordsList = new Float32Array(texCoords);
|
|
106
|
+
var faceRangeIndex = 0;
|
|
107
|
+
|
|
108
|
+
for (var index = 0; index < featureIds.length; index++) {
|
|
109
|
+
var startIndex = faceRange[index + faceRangeIndex];
|
|
110
|
+
var endIndex = faceRange[index + faceRangeIndex + 1];
|
|
111
|
+
var positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);
|
|
112
|
+
var normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);
|
|
113
|
+
var colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);
|
|
114
|
+
var texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
|
|
113
115
|
groupedData.push({
|
|
114
116
|
featureId: featureIds[index],
|
|
115
117
|
positions: positionsList.slice(0, positionsCount),
|
|
@@ -124,14 +126,16 @@ function makeAttributeObjects(attributes) {
|
|
|
124
126
|
faceRangeIndex += 1;
|
|
125
127
|
}
|
|
126
128
|
|
|
127
|
-
return groupedData.sort((first, second)
|
|
129
|
+
return groupedData.sort(function (first, second) {
|
|
130
|
+
return first.featureId - second.featureId;
|
|
131
|
+
});
|
|
128
132
|
}
|
|
129
133
|
|
|
130
134
|
function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
+
var colorsPerVertex = 4;
|
|
136
|
+
var texCoordsPerVertex = 2;
|
|
137
|
+
var trianglesCount = endIndex - startIndex + 1;
|
|
138
|
+
var vertexCount = trianglesCount * 3;
|
|
135
139
|
|
|
136
140
|
switch (attributeName) {
|
|
137
141
|
case 'positions':
|
|
@@ -150,11 +154,13 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
|
150
154
|
}
|
|
151
155
|
|
|
152
156
|
function unifyObjectsByFeatureId(sortedData) {
|
|
153
|
-
|
|
157
|
+
var uniqueObjects = [];
|
|
154
158
|
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
159
|
+
var _loop = function _loop(index) {
|
|
160
|
+
var currentObject = sortedData[index];
|
|
161
|
+
var existedObject = uniqueObjects.find(function (obj) {
|
|
162
|
+
return obj.featureId === currentObject.featureId;
|
|
163
|
+
});
|
|
158
164
|
|
|
159
165
|
if (existedObject) {
|
|
160
166
|
existedObject.positions = (0, _loaderUtils.concatenateTypedArrays)(existedObject.positions, currentObject.positions);
|
|
@@ -164,30 +170,34 @@ function unifyObjectsByFeatureId(sortedData) {
|
|
|
164
170
|
} else {
|
|
165
171
|
uniqueObjects.push(currentObject);
|
|
166
172
|
}
|
|
173
|
+
};
|
|
174
|
+
|
|
175
|
+
for (var index = 0; index < sortedData.length; index++) {
|
|
176
|
+
_loop(index);
|
|
167
177
|
}
|
|
168
178
|
|
|
169
179
|
return uniqueObjects;
|
|
170
180
|
}
|
|
171
181
|
|
|
172
182
|
function groupAttributesAndRangesByFeatureId(unifiedObjects) {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
for (
|
|
184
|
-
|
|
183
|
+
var firstAttributeObject = unifiedObjects[0];
|
|
184
|
+
var featureIds = [firstAttributeObject.featureId];
|
|
185
|
+
var positions = new Float32Array(firstAttributeObject.positions);
|
|
186
|
+
var normals = new Float32Array(firstAttributeObject.normals);
|
|
187
|
+
var colors = new Uint8Array(firstAttributeObject.colors);
|
|
188
|
+
var texCoords = new Float32Array(firstAttributeObject.texCoords);
|
|
189
|
+
var range = [0];
|
|
190
|
+
var objIndex = 0;
|
|
191
|
+
var sum = 0;
|
|
192
|
+
|
|
193
|
+
for (var index = 1; index < unifiedObjects.length; index++) {
|
|
194
|
+
var currentAttributesObject = unifiedObjects[index];
|
|
185
195
|
featureIds.push(currentAttributesObject.featureId);
|
|
186
196
|
positions = (0, _loaderUtils.concatenateTypedArrays)(positions, currentAttributesObject.positions);
|
|
187
197
|
normals = (0, _loaderUtils.concatenateTypedArrays)(normals, currentAttributesObject.normals);
|
|
188
198
|
colors = (0, _loaderUtils.concatenateTypedArrays)(colors, currentAttributesObject.colors);
|
|
189
199
|
texCoords = (0, _loaderUtils.concatenateTypedArrays)(texCoords, currentAttributesObject.texCoords);
|
|
190
|
-
|
|
200
|
+
var groupedObject = unifiedObjects[objIndex];
|
|
191
201
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);
|
|
192
202
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);
|
|
193
203
|
sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
@@ -195,14 +205,14 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
|
|
|
195
205
|
}
|
|
196
206
|
|
|
197
207
|
range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
|
|
198
|
-
|
|
208
|
+
var faceRange = new Uint32Array(range);
|
|
199
209
|
return {
|
|
200
|
-
faceRange,
|
|
201
|
-
featureIds,
|
|
202
|
-
positions,
|
|
203
|
-
normals,
|
|
204
|
-
colors,
|
|
205
|
-
texCoords
|
|
210
|
+
faceRange: faceRange,
|
|
211
|
+
featureIds: featureIds,
|
|
212
|
+
positions: positions,
|
|
213
|
+
normals: normals,
|
|
214
|
+
colors: colors,
|
|
215
|
+
texCoords: texCoords
|
|
206
216
|
};
|
|
207
217
|
}
|
|
208
218
|
//# 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.ts"],"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: 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 {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: any[] = [];\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: any[] = [];\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,4 +1,5 @@
|
|
|
1
1
|
import {Vector3, Matrix4} from '@math.gl/core';
|
|
2
|
+
import {GeoidHeightModel} from '../../lib/geoid-height-model';
|
|
2
3
|
/**
|
|
3
4
|
* Convert binary data from b3dm file to i3s resources
|
|
4
5
|
*
|
|
@@ -25,7 +26,9 @@ export default function convertB3dmToI3sGeometry(
|
|
|
25
26
|
nodeId: number,
|
|
26
27
|
featuresHashArray: any,
|
|
27
28
|
attributeStorageInfo: any,
|
|
28
|
-
draco: boolean
|
|
29
|
+
draco: boolean,
|
|
30
|
+
generateBoundingVolumes: boolean,
|
|
31
|
+
geoidHeightModel: GeoidHeightModel
|
|
29
32
|
): Promise<
|
|
30
33
|
{
|
|
31
34
|
geometry: ArrayBuffer;
|
|
@@ -36,5 +39,6 @@ export default function convertB3dmToI3sGeometry(
|
|
|
36
39
|
vertexCount: number;
|
|
37
40
|
attributes: any;
|
|
38
41
|
featureCount: number;
|
|
42
|
+
boundingVolumes: any;
|
|
39
43
|
}[]
|
|
40
44
|
>;
|