From c41ff07def47121d9606c7513fedbcf459bc5d33 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Thu, 24 Mar 2022 19:08:51 +0100 Subject: [PATCH] Host occt-import-js locally. --- libs/loaders/occt-import-js-worker-cdn.js | 8 -------- source/engine/import/importerstp.js | 2 +- tools/update_libs.py | 12 ------------ 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 libs/loaders/occt-import-js-worker-cdn.js diff --git a/libs/loaders/occt-import-js-worker-cdn.js b/libs/loaders/occt-import-js-worker-cdn.js deleted file mode 100644 index 3c0afef..0000000 --- a/libs/loaders/occt-import-js-worker-cdn.js +++ /dev/null @@ -1,8 +0,0 @@ -importScripts ('https://cdn.jsdelivr.net/npm/occt-import-js@0.0.6/dist/occt-import-js.js'); - -onmessage = async function (ev) -{ - let occt = await occtimportjs (); - let result = occt.ReadStepFile (ev.data); - postMessage (result); -}; diff --git a/source/engine/import/importerstp.js b/source/engine/import/importerstp.js index 4c27bb3..733dfa6 100644 --- a/source/engine/import/importerstp.js +++ b/source/engine/import/importerstp.js @@ -37,7 +37,7 @@ export class ImporterStp extends ImporterBase ImportContent (fileContent, onFinish) { if (this.worker === null) { - let workerPath = GetExternalLibPath ('loaders/occt-import-js-worker-cdn.js'); + let workerPath = GetExternalLibPath ('loaders/occt-import-js-worker.js'); this.worker = new Worker (workerPath); } diff --git a/tools/update_libs.py b/tools/update_libs.py index 432f46f..7aa9cdd 100644 --- a/tools/update_libs.py +++ b/tools/update_libs.py @@ -3,8 +3,6 @@ import sys import shutil import json -from lib import tools_lib as Tools - pickrFileMap = [ [os.path.join ('@simonwep', 'pickr', 'LICENSE'), os.path.join ('pickr.license.md')], [os.path.join ('@simonwep', 'pickr', 'dist', 'pickr.es5.min.js'), os.path.join ('pickr.es5.min.js')], @@ -80,17 +78,7 @@ def Main (argv): UpdateModule (rhino3dmFileMap, nodeModulesDir, libsDir) UpdateModule (fflateFileMap, nodeModulesDir, libsDir) UpdateModule (webIfcFileMap, nodeModulesDir, libsDir) - UpdateModule (occtImportJsFileMap, nodeModulesDir, libsDir) - occtImportJsVersion = package['dependencies']['occt-import-js'] - occtWorkerFile = os.path.join (libsDir, 'loaders', 'occt-import-js-worker.js') - occtWorkerCdnFile = os.path.join (libsDir, 'loaders', 'occt-import-js-worker-cdn.js') - shutil.copy (occtWorkerFile, occtWorkerCdnFile) - Tools.ReplaceStringInFile ( - occtWorkerCdnFile, - 'occt-import-js.js', - 'https://cdn.jsdelivr.net/npm/occt-import-js@' + occtImportJsVersion + '/dist/occt-import-js.js' - ) return 0