@loaders.gl/tile-converter 4.0.0-alpha.18 → 4.0.0-alpha.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/converter.js +1 -1
- package/dist/converter.min.js +73 -73
- package/dist/deps-installer/deps-installer.d.ts +3 -2
- package/dist/deps-installer/deps-installer.d.ts.map +1 -1
- package/dist/deps-installer/deps-installer.js +36 -10
- package/dist/dist.min.js +77 -67
- package/dist/es5/deps-installer/deps-installer.js +112 -38
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +12 -9
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +32 -87
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/deps-installer/deps-installer.js +37 -11
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +10 -6
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +11 -28
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +2 -4
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +18 -13
- package/dist/i3s-converter/i3s-converter.d.ts +0 -1
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +10 -22
- package/package.json +14 -14
- package/src/deps-installer/deps-installer.ts +55 -10
- package/src/i3s-converter/helpers/geometry-converter.ts +19 -14
- package/src/i3s-converter/i3s-converter.ts +12 -28
|
@@ -14,7 +14,9 @@ var _zip = require("@loaders.gl/zip");
|
|
|
14
14
|
var _fileUtils = require("../lib/utils/file-utils");
|
|
15
15
|
var _path = require("path");
|
|
16
16
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
17
|
-
var
|
|
17
|
+
var _draco = require("@loaders.gl/draco");
|
|
18
|
+
var _textures = require("@loaders.gl/textures");
|
|
19
|
+
var VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : 'beta';
|
|
18
20
|
var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
19
21
|
var DepsInstaller = function () {
|
|
20
22
|
function DepsInstaller() {
|
|
@@ -25,7 +27,6 @@ var DepsInstaller = function () {
|
|
|
25
27
|
value: function () {
|
|
26
28
|
var _install = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
|
|
27
29
|
var path,
|
|
28
|
-
workersPath,
|
|
29
30
|
fileMap,
|
|
30
31
|
depsPath,
|
|
31
32
|
childProcess,
|
|
@@ -34,43 +35,75 @@ var DepsInstaller = function () {
|
|
|
34
35
|
while (1) switch (_context.prev = _context.next) {
|
|
35
36
|
case 0:
|
|
36
37
|
path = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
|
|
37
|
-
workersPath = _args.length > 1 && _args[1] !== undefined ? _args[1] : '';
|
|
38
38
|
console.log('Installing "EGM2008-5" model...');
|
|
39
|
-
_context.next =
|
|
39
|
+
_context.next = 4;
|
|
40
40
|
return (0, _core.load)(PGM_LINK, _zip.ZipLoader, {});
|
|
41
|
-
case
|
|
41
|
+
case 4:
|
|
42
42
|
fileMap = _context.sent;
|
|
43
43
|
depsPath = process.cwd();
|
|
44
44
|
if (path) {
|
|
45
45
|
depsPath = (0, _path.join)(depsPath, path);
|
|
46
46
|
}
|
|
47
|
-
_context.next =
|
|
47
|
+
_context.next = 9;
|
|
48
48
|
return (0, _fileUtils.writeFile)(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');
|
|
49
|
-
case
|
|
50
|
-
console.log('Installing "I3S Content Loader worker
|
|
51
|
-
_context.next =
|
|
52
|
-
return this.
|
|
53
|
-
case
|
|
54
|
-
console.log('Installing "Draco Loader worker
|
|
55
|
-
_context.next =
|
|
56
|
-
return this.
|
|
57
|
-
case
|
|
58
|
-
console.log('Installing "
|
|
59
|
-
_context.next =
|
|
60
|
-
return this.
|
|
61
|
-
case
|
|
49
|
+
case 9:
|
|
50
|
+
console.log('Installing "I3S Content Loader" worker');
|
|
51
|
+
_context.next = 12;
|
|
52
|
+
return this.installFromNpm('i3s', 'i3s-content-worker-node.js');
|
|
53
|
+
case 12:
|
|
54
|
+
console.log('Installing "Draco Loader" worker');
|
|
55
|
+
_context.next = 15;
|
|
56
|
+
return this.installFromNpm('draco', 'draco-worker-node.js');
|
|
57
|
+
case 15:
|
|
58
|
+
console.log('Installing "Draco Writer" worker');
|
|
59
|
+
_context.next = 18;
|
|
60
|
+
return this.installFromNpm('draco', 'draco-writer-worker-node.js');
|
|
61
|
+
case 18:
|
|
62
|
+
console.log('Installing "Basis Loader" worker');
|
|
63
|
+
_context.next = 21;
|
|
64
|
+
return this.installFromNpm('textures', 'basis-worker-node.js');
|
|
65
|
+
case 21:
|
|
66
|
+
console.log('Installing "KTX2 Basis Writer" worker');
|
|
67
|
+
_context.next = 24;
|
|
68
|
+
return this.installFromNpm('textures', 'ktx2-basis-writer-worker-node.js');
|
|
69
|
+
case 24:
|
|
70
|
+
console.log('Installing "Draco decoder" library');
|
|
71
|
+
_context.next = 27;
|
|
72
|
+
return this.installFromUrl(_draco.DRACO_EXTERNAL_LIBRARY_URLS[_draco.DRACO_EXTERNAL_LIBRARIES.DECODER], 'draco', _draco.DRACO_EXTERNAL_LIBRARIES.DECODER);
|
|
73
|
+
case 27:
|
|
74
|
+
_context.next = 29;
|
|
75
|
+
return this.installFromUrl(_draco.DRACO_EXTERNAL_LIBRARY_URLS[_draco.DRACO_EXTERNAL_LIBRARIES.DECODER_WASM], 'draco', _draco.DRACO_EXTERNAL_LIBRARIES.DECODER_WASM);
|
|
76
|
+
case 29:
|
|
77
|
+
console.log('Installing "Draco encoder" library');
|
|
78
|
+
_context.next = 32;
|
|
79
|
+
return this.installFromUrl(_draco.DRACO_EXTERNAL_LIBRARY_URLS[_draco.DRACO_EXTERNAL_LIBRARIES.ENCODER], 'draco', _draco.DRACO_EXTERNAL_LIBRARIES.ENCODER);
|
|
80
|
+
case 32:
|
|
81
|
+
console.log('Installing "Basis transcoder" library');
|
|
82
|
+
_context.next = 35;
|
|
83
|
+
return this.installFromNpm('textures', _textures.BASIS_EXTERNAL_LIBRARIES.TRANSCODER, 'libs');
|
|
84
|
+
case 35:
|
|
85
|
+
_context.next = 37;
|
|
86
|
+
return this.installFromNpm('textures', _textures.BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, 'libs');
|
|
87
|
+
case 37:
|
|
88
|
+
console.log('Installing "Basis encoder" library');
|
|
89
|
+
_context.next = 40;
|
|
90
|
+
return this.installFromNpm('textures', _textures.BASIS_EXTERNAL_LIBRARIES.ENCODER, 'libs');
|
|
91
|
+
case 40:
|
|
92
|
+
_context.next = 42;
|
|
93
|
+
return this.installFromNpm('textures', _textures.BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, 'libs');
|
|
94
|
+
case 42:
|
|
62
95
|
console.log('Installing "join-images" npm package');
|
|
63
96
|
childProcess = new _workerUtils.ChildProcessProxy();
|
|
64
|
-
_context.next =
|
|
97
|
+
_context.next = 46;
|
|
65
98
|
return childProcess.start({
|
|
66
99
|
command: process.platform === 'win32' ? 'npm.cmd' : 'npm',
|
|
67
100
|
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
68
101
|
wait: 0,
|
|
69
102
|
ignoreStderr: true
|
|
70
103
|
});
|
|
71
|
-
case
|
|
104
|
+
case 46:
|
|
72
105
|
console.log('All dependencies were installed succesfully.');
|
|
73
|
-
case
|
|
106
|
+
case 47:
|
|
74
107
|
case "end":
|
|
75
108
|
return _context.stop();
|
|
76
109
|
}
|
|
@@ -82,40 +115,81 @@ var DepsInstaller = function () {
|
|
|
82
115
|
return install;
|
|
83
116
|
}()
|
|
84
117
|
}, {
|
|
85
|
-
key: "
|
|
118
|
+
key: "installFromNpm",
|
|
86
119
|
value: function () {
|
|
87
|
-
var
|
|
88
|
-
var
|
|
120
|
+
var _installFromNpm = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(module, name) {
|
|
121
|
+
var extraPath,
|
|
122
|
+
fileResponse,
|
|
123
|
+
fileData,
|
|
124
|
+
path,
|
|
125
|
+
_args2 = arguments;
|
|
89
126
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
90
127
|
while (1) switch (_context2.prev = _context2.next) {
|
|
91
128
|
case 0:
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
129
|
+
extraPath = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : '';
|
|
130
|
+
_context2.next = 3;
|
|
131
|
+
return (0, _core.fetchFile)("https://unpkg.com/@loaders.gl/".concat(module, "@").concat(VERSION, "/dist/").concat(extraPath, "/").concat(name));
|
|
132
|
+
case 3:
|
|
95
133
|
fileResponse = _context2.sent;
|
|
96
|
-
_context2.next =
|
|
134
|
+
_context2.next = 6;
|
|
97
135
|
return fileResponse.arrayBuffer();
|
|
98
|
-
case
|
|
136
|
+
case 6:
|
|
99
137
|
fileData = _context2.sent;
|
|
100
138
|
if (fileData) {
|
|
101
|
-
_context2.next =
|
|
139
|
+
_context2.next = 9;
|
|
102
140
|
break;
|
|
103
141
|
}
|
|
104
142
|
return _context2.abrupt("return");
|
|
105
|
-
case
|
|
106
|
-
path = (0, _path.join)(process.cwd(),
|
|
107
|
-
_context2.next =
|
|
143
|
+
case 9:
|
|
144
|
+
path = (0, _path.join)(process.cwd(), 'modules', module, 'dist', extraPath);
|
|
145
|
+
_context2.next = 12;
|
|
108
146
|
return (0, _fileUtils.writeFile)(path, fileData, name);
|
|
109
|
-
case
|
|
147
|
+
case 12:
|
|
110
148
|
case "end":
|
|
111
149
|
return _context2.stop();
|
|
112
150
|
}
|
|
113
151
|
}, _callee2);
|
|
114
152
|
}));
|
|
115
|
-
function
|
|
116
|
-
return
|
|
153
|
+
function installFromNpm(_x, _x2) {
|
|
154
|
+
return _installFromNpm.apply(this, arguments);
|
|
155
|
+
}
|
|
156
|
+
return installFromNpm;
|
|
157
|
+
}()
|
|
158
|
+
}, {
|
|
159
|
+
key: "installFromUrl",
|
|
160
|
+
value: function () {
|
|
161
|
+
var _installFromUrl = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(url, module, name) {
|
|
162
|
+
var fileResponse, fileData, path;
|
|
163
|
+
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
164
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
165
|
+
case 0:
|
|
166
|
+
_context3.next = 2;
|
|
167
|
+
return (0, _core.fetchFile)(url);
|
|
168
|
+
case 2:
|
|
169
|
+
fileResponse = _context3.sent;
|
|
170
|
+
_context3.next = 5;
|
|
171
|
+
return fileResponse.arrayBuffer();
|
|
172
|
+
case 5:
|
|
173
|
+
fileData = _context3.sent;
|
|
174
|
+
if (fileData) {
|
|
175
|
+
_context3.next = 8;
|
|
176
|
+
break;
|
|
177
|
+
}
|
|
178
|
+
return _context3.abrupt("return");
|
|
179
|
+
case 8:
|
|
180
|
+
path = (0, _path.join)(process.cwd(), 'modules', module, 'dist', 'libs');
|
|
181
|
+
_context3.next = 11;
|
|
182
|
+
return (0, _fileUtils.writeFile)(path, fileData, name);
|
|
183
|
+
case 11:
|
|
184
|
+
case "end":
|
|
185
|
+
return _context3.stop();
|
|
186
|
+
}
|
|
187
|
+
}, _callee3);
|
|
188
|
+
}));
|
|
189
|
+
function installFromUrl(_x3, _x4, _x5) {
|
|
190
|
+
return _installFromUrl.apply(this, arguments);
|
|
117
191
|
}
|
|
118
|
-
return
|
|
192
|
+
return installFromUrl;
|
|
119
193
|
}()
|
|
120
194
|
}]);
|
|
121
195
|
return DepsInstaller;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.js","names":["_core","require","_zip","_fileUtils","_path","_workerUtils","VERSION","PGM_LINK","DepsInstaller","_classCallCheck2","default","_createClass2","key","value","_install","_asyncToGenerator2","_regenerator","mark","_callee","path","workersPath","fileMap","depsPath","childProcess","_args","arguments","wrap","_callee$","_context","prev","next","length","undefined","console","log","load","ZipLoader","sent","process","cwd","join","writeFile","Uint8Array","installWorker","ChildProcessProxy","start","command","platform","wait","ignoreStderr","stop","install","apply","_installWorker","_callee2","module","name","extraPath","fileResponse","fileData","_callee2$","_context2","fetchFile","concat","arrayBuffer","abrupt","_x","_x2","_x3","exports"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n /**\n * Run instalation\n * @param path destination folder\n * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: string = ''): Promise<void> {\n console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n let depsPath = process.cwd();\n if (path) {\n depsPath = join(depsPath, path);\n }\n\n await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n console.log('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-worker-node.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-worker-node.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-worker-node.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: process.platform === 'win32' ? 'npm.cmd' : 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0,\n ignoreStderr: true\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installWorker(module: string, name: string, extraPath: string) {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), extraPath, 'modules', module, 'dist');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deps-installer.js","names":["_core","require","_zip","_fileUtils","_path","_workerUtils","_draco","_textures","VERSION","PGM_LINK","DepsInstaller","_classCallCheck2","default","_createClass2","key","value","_install","_asyncToGenerator2","_regenerator","mark","_callee","path","fileMap","depsPath","childProcess","_args","arguments","wrap","_callee$","_context","prev","next","length","undefined","console","log","load","ZipLoader","sent","process","cwd","join","writeFile","Uint8Array","installFromNpm","installFromUrl","DRACO_EXTERNAL_LIBRARY_URLS","DRACO_EXTERNAL_LIBRARIES","DECODER","DECODER_WASM","ENCODER","BASIS_EXTERNAL_LIBRARIES","TRANSCODER","TRANSCODER_WASM","ENCODER_WASM","ChildProcessProxy","start","command","platform","wait","ignoreStderr","stop","install","apply","_installFromNpm","_callee2","module","name","extraPath","fileResponse","fileData","_args2","_callee2$","_context2","fetchFile","concat","arrayBuffer","abrupt","_x","_x2","_installFromUrl","_callee3","url","_callee3$","_context3","_x3","_x4","_x5","exports"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport {DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS} from '@loaders.gl/draco';\nimport {BASIS_EXTERNAL_LIBRARIES} from '@loaders.gl/textures';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n /**\n * Run instalation\n * @param path destination folder\n * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = ''): Promise<void> {\n console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n let depsPath = process.cwd();\n if (path) {\n depsPath = join(depsPath, path);\n }\n\n await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n console.log('Installing \"I3S Content Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('i3s', 'i3s-content-worker-node.js');\n\n console.log('Installing \"Draco Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('draco', 'draco-worker-node.js');\n\n console.log('Installing \"Draco Writer\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('draco', 'draco-writer-worker-node.js');\n\n console.log('Installing \"Basis Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('textures', 'basis-worker-node.js');\n\n console.log('Installing \"KTX2 Basis Writer\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('textures', 'ktx2-basis-writer-worker-node.js');\n\n console.log('Installing \"Draco decoder\" library'); // eslint-disable-line no-console\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.DECODER\n );\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.DECODER_WASM\n );\n\n console.log('Installing \"Draco encoder\" library'); // eslint-disable-line no-console\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.ENCODER],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.ENCODER\n );\n\n console.log('Installing \"Basis transcoder\" library'); // eslint-disable-line no-console\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.TRANSCODER, 'libs');\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, 'libs');\n\n console.log('Installing \"Basis encoder\" library'); // eslint-disable-line no-console\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER, 'libs');\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, 'libs');\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: process.platform === 'win32' ? 'npm.cmd' : 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0,\n ignoreStderr: true\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installFromNpm(module: string, name: string, extraPath: string = '') {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${extraPath}/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), 'modules', module, 'dist', extraPath);\n await writeFile(path, fileData, name);\n }\n\n private async installFromUrl(url: string, module: string, name: string) {\n const fileResponse = await fetchFile(url);\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), 'modules', module, 'dist', 'libs');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x
|
|
|
49
49
|
return _convertB3dmToI3sGeometry.apply(this, arguments);
|
|
50
50
|
}
|
|
51
51
|
function _convertB3dmToI3sGeometry() {
|
|
52
|
-
_convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel,
|
|
52
|
+
_convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries) {
|
|
53
53
|
var _tileContent$gltf4;
|
|
54
54
|
var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, _iterator6, _step6, materialAndTexture, originarMaterialId, convertedAttributes, material, texture, nodeId;
|
|
55
55
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
@@ -109,7 +109,7 @@ function _convertB3dmToI3sGeometry() {
|
|
|
109
109
|
propertyTable: propertyTable,
|
|
110
110
|
attributeStorageInfo: attributeStorageInfo,
|
|
111
111
|
draco: draco,
|
|
112
|
-
|
|
112
|
+
libraries: libraries
|
|
113
113
|
});
|
|
114
114
|
case 28:
|
|
115
115
|
_context.t1 = _context.sent;
|
|
@@ -173,11 +173,11 @@ function _makeNodeResources(_x13) {
|
|
|
173
173
|
function _makeNodeResources2() {
|
|
174
174
|
_makeNodeResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref) {
|
|
175
175
|
var _tileContent$gltf5;
|
|
176
|
-
var convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, propertyTable, attributeStorageInfo, draco,
|
|
176
|
+
var convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, propertyTable, attributeStorageInfo, draco, libraries, boundingVolumes, vertexCount, _generateAttributes, faceRange, featureIds, positions, normals, colors, uvRegions, texCoords, featureCount, header, typedFeatureIds, fileBuffer, compressedGeometry, attributes;
|
|
177
177
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
178
178
|
while (1) switch (_context2.prev = _context2.next) {
|
|
179
179
|
case 0:
|
|
180
|
-
convertedAttributes = _ref.convertedAttributes, material = _ref.material, texture = _ref.texture, tileContent = _ref.tileContent, nodeId = _ref.nodeId, featuresHashArray = _ref.featuresHashArray, propertyTable = _ref.propertyTable, attributeStorageInfo = _ref.attributeStorageInfo, draco = _ref.draco,
|
|
180
|
+
convertedAttributes = _ref.convertedAttributes, material = _ref.material, texture = _ref.texture, tileContent = _ref.tileContent, nodeId = _ref.nodeId, featuresHashArray = _ref.featuresHashArray, propertyTable = _ref.propertyTable, attributeStorageInfo = _ref.attributeStorageInfo, draco = _ref.draco, libraries = _ref.libraries;
|
|
181
181
|
boundingVolumes = convertedAttributes.boundingVolumes;
|
|
182
182
|
vertexCount = convertedAttributes.positions.length / VALUES_PER_VERTEX;
|
|
183
183
|
_generateAttributes = (0, _geometryAttributes.generateAttributes)(convertedAttributes), faceRange = _generateAttributes.faceRange, featureIds = _generateAttributes.featureIds, positions = _generateAttributes.positions, normals = _generateAttributes.normals, colors = _generateAttributes.colors, uvRegions = _generateAttributes.uvRegions, texCoords = _generateAttributes.texCoords, featureCount = _generateAttributes.featureCount;
|
|
@@ -196,7 +196,7 @@ function _makeNodeResources2() {
|
|
|
196
196
|
uvRegions: uvRegions,
|
|
197
197
|
featureIds: featureIds,
|
|
198
198
|
faceRange: faceRange
|
|
199
|
-
},
|
|
199
|
+
}, libraries) : null;
|
|
200
200
|
attributes = [];
|
|
201
201
|
if (attributeStorageInfo && propertyTable) {
|
|
202
202
|
attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
|
|
@@ -1039,7 +1039,7 @@ function generateCompressedGeometry(_x20, _x21, _x22, _x23) {
|
|
|
1039
1039
|
return _generateCompressedGeometry.apply(this, arguments);
|
|
1040
1040
|
}
|
|
1041
1041
|
function _generateCompressedGeometry() {
|
|
1042
|
-
_generateCompressedGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(vertexCount, convertedAttributes, attributes,
|
|
1042
|
+
_generateCompressedGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(vertexCount, convertedAttributes, attributes, libraries) {
|
|
1043
1043
|
var positions, normals, texCoords, colors, uvRegions, featureIds, faceRange, indices, index, featureIndices, featureIndex, compressedAttributes, attributesMetadata;
|
|
1044
1044
|
return _regenerator.default.wrap(function _callee7$(_context7) {
|
|
1045
1045
|
while (1) switch (_context7.prev = _context7.next) {
|
|
@@ -1075,15 +1075,18 @@ function _generateCompressedGeometry() {
|
|
|
1075
1075
|
return _context7.abrupt("return", (0, _core2.encode)({
|
|
1076
1076
|
attributes: compressedAttributes,
|
|
1077
1077
|
indices: indices
|
|
1078
|
-
}, _draco.DracoWriterWorker, _objectSpread(_objectSpread({}, _draco.DracoWriterWorker.options), {}, {
|
|
1079
|
-
source: dracoWorkerSoure,
|
|
1078
|
+
}, _draco.DracoWriterWorker, _objectSpread(_objectSpread({}, _draco.DracoWriterWorker.options), {}, (0, _defineProperty2.default)({
|
|
1080
1079
|
reuseWorkers: true,
|
|
1081
1080
|
_nodeWorkers: true,
|
|
1081
|
+
modules: libraries,
|
|
1082
|
+
useLocalLibraries: true,
|
|
1082
1083
|
draco: {
|
|
1083
1084
|
method: 'MESH_SEQUENTIAL_ENCODING',
|
|
1084
1085
|
attributesMetadata: attributesMetadata
|
|
1085
1086
|
}
|
|
1086
|
-
}
|
|
1087
|
+
}, 'draco-writer', {
|
|
1088
|
+
workerUrl: './modules/draco/dist/draco-writer-worker-node.js'
|
|
1089
|
+
}))));
|
|
1087
1090
|
case 10:
|
|
1088
1091
|
case "end":
|
|
1089
1092
|
return _context7.stop();
|