viral-viewer-2 2.1.8 → 2.2.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/components/worker/viral-viewer-2.worker.d.ts +2 -1
- package/dist/components/worker/viral-viewer-2.worker.js +10 -11
- package/dist/components/worker/viral-viewer-2.worker.js.map +1 -1
- package/dist/viral-viewer-api.d.ts +0 -2
- package/dist/viral-viewer-api.js +2 -3
- package/dist/viral-viewer-api.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,9 +2,10 @@ import { ViralViewerApi } from "../../viral-viewer-api";
|
|
|
2
2
|
import { RenderMaterial, ViralViewerRevitNoneStructuralGeometry, ViralViewerRevitStructuralGeometry } from "../../types";
|
|
3
3
|
import { Mesh, MeshPhongMaterial } from "three";
|
|
4
4
|
import { Dictionary } from "../../models/dictionary.model";
|
|
5
|
+
import { WorkerThreadPool } from "./worker-pool";
|
|
5
6
|
export declare class ViralViewerWorker2 {
|
|
6
7
|
viralViewerApi: ViralViewerApi;
|
|
7
|
-
|
|
8
|
+
workerPool: WorkerThreadPool;
|
|
8
9
|
materials: RenderMaterial[];
|
|
9
10
|
mainModel: Mesh | null;
|
|
10
11
|
threejsMaterials: Dictionary<number, MeshPhongMaterial>;
|
|
@@ -4,6 +4,7 @@ exports.ViralViewerWorker2 = void 0;
|
|
|
4
4
|
const three_1 = require("three");
|
|
5
5
|
const load_model_worker_2_script_1 = require("../worker-script/load-model-worker-2.script");
|
|
6
6
|
const dictionary_model_1 = require("../../models/dictionary.model");
|
|
7
|
+
const worker_pool_1 = require("./worker-pool");
|
|
7
8
|
class ViralViewerWorker2 {
|
|
8
9
|
constructor(viralViewerApi, scriptUrl = "../worker-script/load-model-worker-2.script.js") {
|
|
9
10
|
this.viralViewerApi = viralViewerApi;
|
|
@@ -14,7 +15,7 @@ class ViralViewerWorker2 {
|
|
|
14
15
|
const blob = new Blob([`(${load_model_worker_2_script_1.workerCode})()`]);
|
|
15
16
|
const workerPath = URL.createObjectURL(blob);
|
|
16
17
|
// Create a new Worker from the Blob
|
|
17
|
-
this.
|
|
18
|
+
this.workerPool = new worker_pool_1.WorkerThreadPool(4, workerPath);
|
|
18
19
|
}
|
|
19
20
|
initial(materials) {
|
|
20
21
|
this.materials = materials;
|
|
@@ -35,11 +36,11 @@ class ViralViewerWorker2 {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
loadStructuralGeometry(model, callbackOnSuccess = () => { }) {
|
|
38
|
-
this.
|
|
39
|
-
switch (
|
|
39
|
+
this.workerPool.Enqueue({ type: 1, data: model, materials: this.materials }, (data) => {
|
|
40
|
+
switch (data.type) {
|
|
40
41
|
case 1:
|
|
41
42
|
console.log('load structure');
|
|
42
|
-
let buffer =
|
|
43
|
+
let buffer = data.buffer;
|
|
43
44
|
const geometry = new three_1.BufferGeometry();
|
|
44
45
|
geometry.setAttribute("position", new three_1.BufferAttribute(buffer, 3));
|
|
45
46
|
geometry.computeVertexNormals();
|
|
@@ -56,15 +57,14 @@ class ViralViewerWorker2 {
|
|
|
56
57
|
default:
|
|
57
58
|
break;
|
|
58
59
|
}
|
|
59
|
-
};
|
|
60
|
-
this.worker.postMessage({ type: 1, data: model, materials: this.materials });
|
|
60
|
+
});
|
|
61
61
|
}
|
|
62
62
|
loadNoneStructuralGeometry(model, callbackOnSuccess = () => { }) {
|
|
63
|
-
this.
|
|
64
|
-
switch (
|
|
63
|
+
this.workerPool.Enqueue({ type: 2, data: model, materials: this.materials }, (data) => {
|
|
64
|
+
switch (data.type) {
|
|
65
65
|
case 1:
|
|
66
66
|
console.log('load none structure');
|
|
67
|
-
let buffer =
|
|
67
|
+
let buffer = data.buffer;
|
|
68
68
|
const geometry = new three_1.BufferGeometry();
|
|
69
69
|
geometry.setAttribute("position", new three_1.BufferAttribute(buffer, 3));
|
|
70
70
|
geometry.computeVertexNormals();
|
|
@@ -81,8 +81,7 @@ class ViralViewerWorker2 {
|
|
|
81
81
|
default:
|
|
82
82
|
break;
|
|
83
83
|
}
|
|
84
|
-
};
|
|
85
|
-
this.worker.postMessage({ type: 2, data: model, materials: this.materials });
|
|
84
|
+
});
|
|
86
85
|
}
|
|
87
86
|
rgbToHex(r, g, b) {
|
|
88
87
|
return "#" + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-2.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-2.worker.ts"],"names":[],"mappings":";;;AAEA,iCAA0I;AAC1I,4FAAyE;AACzE,oEAA2D;
|
|
1
|
+
{"version":3,"file":"viral-viewer-2.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-2.worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ import { ViralSpinner } from "./components/spinner/viral-spinner";
|
|
|
14
14
|
import { LocalStorageService } from "./services/local-storage.service";
|
|
15
15
|
import { ViralKeyboard } from "./components/keyboard/viral-keyboard";
|
|
16
16
|
import { ViralViewerWorker2 } from "./components/worker/viral-viewer-2.worker";
|
|
17
|
-
import { TestWorkerPool } from "./components/worker/test-worker-pool";
|
|
18
17
|
export declare class ViralViewerApi {
|
|
19
18
|
options: ViewerOptions;
|
|
20
19
|
targetElement: HTMLElement;
|
|
@@ -32,7 +31,6 @@ export declare class ViralViewerApi {
|
|
|
32
31
|
compressProcessor: CompressProcessor;
|
|
33
32
|
worker: ViralViewerWorker | null;
|
|
34
33
|
worker2: ViralViewerWorker2 | null;
|
|
35
|
-
worker3: TestWorkerPool | null;
|
|
36
34
|
localStorageService: LocalStorageService;
|
|
37
35
|
constructor(options: ViewerOptions);
|
|
38
36
|
}
|
package/dist/viral-viewer-api.js
CHANGED
|
@@ -16,13 +16,12 @@ const viral_spinner_1 = require("./components/spinner/viral-spinner");
|
|
|
16
16
|
const local_storage_service_1 = require("./services/local-storage.service");
|
|
17
17
|
const viral_keyboard_1 = require("./components/keyboard/viral-keyboard");
|
|
18
18
|
const viral_viewer_2_worker_1 = require("./components/worker/viral-viewer-2.worker");
|
|
19
|
-
const test_worker_pool_1 = require("./components/worker/test-worker-pool");
|
|
20
19
|
class ViralViewerApi {
|
|
21
20
|
constructor(options) {
|
|
22
21
|
this.compressProcessor = new compress_processor_1.CompressProcessor();
|
|
23
22
|
this.worker = null;
|
|
24
23
|
this.worker2 = null;
|
|
25
|
-
|
|
24
|
+
// worker3: TestWorkerPool | null = null;
|
|
26
25
|
this.localStorageService = new local_storage_service_1.LocalStorageService();
|
|
27
26
|
this.options = options;
|
|
28
27
|
this.targetElement = options.container;
|
|
@@ -39,7 +38,7 @@ class ViralViewerApi {
|
|
|
39
38
|
this.pointCloudLoader = new viral_viewer_point_cloud_loader_1.ViralViewerPointCloudLoader(this);
|
|
40
39
|
this.worker = new viral_viewer_worker_1.ViralViewerWorker(this);
|
|
41
40
|
this.worker2 = new viral_viewer_2_worker_1.ViralViewerWorker2(this);
|
|
42
|
-
this.worker3 = new
|
|
41
|
+
// this.worker3 = new TestWorkerPool();
|
|
43
42
|
this.viralAnimation.animation();
|
|
44
43
|
}
|
|
45
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-api.js","sourceRoot":"","sources":["../src/viral-viewer-api.ts"],"names":[],"mappings":";;;AACA,6FAAuF;AACvF,iFAA6E;AAC7E,iFAA4E;AAC5E,yGAAkG;AAClG,mEAA+D;AAC/D,gEAA4D;AAC5D,gEAA4D;AAC5D,yEAAqE;AACrE,8FAAyF;AACzF,4EAAwE;AACxE,gEAA4D;AAC5D,sEAAkE;AAClE,4EAAuE;AACvE,yEAAqE;AACrE,qFAA+E;
|
|
1
|
+
{"version":3,"file":"viral-viewer-api.js","sourceRoot":"","sources":["../src/viral-viewer-api.ts"],"names":[],"mappings":";;;AACA,6FAAuF;AACvF,iFAA6E;AAC7E,iFAA4E;AAC5E,yGAAkG;AAClG,mEAA+D;AAC/D,gEAA4D;AAC5D,gEAA4D;AAC5D,yEAAqE;AACrE,8FAAyF;AACzF,4EAAwE;AACxE,gEAA4D;AAC5D,sEAAkE;AAClE,4EAAuE;AACvE,yEAAqE;AACrE,qFAA+E;AAK/E,MAAa,cAAc;IAmBvB,YAAY,OAAsB;QALlC,sBAAiB,GAAsB,IAAI,sCAAiB,EAAE,CAAC;QAC/D,WAAM,GAA6B,IAAI,CAAC;QACxC,YAAO,GAA8B,IAAI,CAAC;QAC1C,yCAAyC;QACzC,wBAAmB,GAAwB,IAAI,2CAAmB,EAAE,CAAC;QAEjE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,kDAAsB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,gBAAgB,GAAG,IAAI,6DAA2B,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,0CAAkB,CAAC,IAAI,CAAC,CAAC;QAC5C,uCAAuC;QACvC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;IAEpC,CAAC;CAGJ;AAzCD,wCAyCC"}
|