viral-viewer-2 5.4.5 → 5.4.7
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.
|
@@ -4,6 +4,8 @@ exports.ViralViewerWorker4 = void 0;
|
|
|
4
4
|
const three_1 = require("three");
|
|
5
5
|
const load_model_worker_3_script_1 = require("../worker-script/load-model-worker-3.script");
|
|
6
6
|
const worker_pool_1 = require("./base/worker-pool");
|
|
7
|
+
const log_1 = require("../../utils/log");
|
|
8
|
+
const viral_instanced_mesh_1 = require("../custom-objects/viral-instanced-mesh");
|
|
7
9
|
const threejs_1 = require("../../utils/threejs");
|
|
8
10
|
class ViralViewerWorker4 {
|
|
9
11
|
constructor(viralViewerApi) {
|
|
@@ -42,22 +44,54 @@ class ViralViewerWorker4 {
|
|
|
42
44
|
for (let j = 0; j < dummyMesh.children.length; j++) {
|
|
43
45
|
const originalElement = dummyMesh.children[j];
|
|
44
46
|
const element = originalElement.clone();
|
|
47
|
+
//apply BVH first
|
|
45
48
|
try {
|
|
46
49
|
this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
|
|
47
50
|
}
|
|
48
|
-
catch (error) {
|
|
51
|
+
catch (error) {
|
|
52
|
+
if (this.viralViewerApi.options.isDev)
|
|
53
|
+
log_1.LogUtil.error(error);
|
|
54
|
+
}
|
|
55
|
+
//progress materials
|
|
49
56
|
element.material = [];
|
|
50
57
|
for (let k = 0; k < element.userData.MaterialIds.length; k++) {
|
|
51
58
|
const materialIndex = element.userData.MaterialIds[k];
|
|
52
59
|
element.material.push(this.viralViewerApi.viralMaterialManager.materials.get(materialIndex));
|
|
53
60
|
}
|
|
54
|
-
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
61
|
+
//mapping, in case is instancedmesh convert to our type
|
|
62
|
+
if (element === null || element === void 0 ? void 0 : element.isInstancedMesh) {
|
|
63
|
+
let instancedMesh = new viral_instanced_mesh_1.ViralInstancedMesh(element.geometry, element.material, element.count);
|
|
64
|
+
instancedMesh.instanceColor = element.instanceColor;
|
|
65
|
+
instancedMesh.instanceMatrix = element.instanceMatrix;
|
|
66
|
+
instancedMesh.userData = element.userData;
|
|
67
|
+
this.viralViewerApi.viralScene.selectables.push(instancedMesh);
|
|
68
|
+
if (this.mainModel)
|
|
69
|
+
this.mainModel.add(instancedMesh);
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
this.viralViewerApi.viralScene.selectables.push(element);
|
|
73
|
+
if (this.mainModel)
|
|
74
|
+
this.mainModel.add(element);
|
|
75
|
+
}
|
|
76
|
+
//should dispose to prevent memory leak
|
|
77
|
+
try {
|
|
78
|
+
(_a = originalElement.geometry) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
if (this.viralViewerApi.options.isDev)
|
|
82
|
+
log_1.LogUtil.error(error);
|
|
83
|
+
}
|
|
84
|
+
try {
|
|
85
|
+
if (originalElement.material)
|
|
86
|
+
(_b = originalElement.material) === null || _b === void 0 ? void 0 : _b.dispose();
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
if (this.viralViewerApi.options.isDev)
|
|
90
|
+
log_1.LogUtil.error(error);
|
|
91
|
+
}
|
|
59
92
|
}
|
|
60
93
|
this.viralViewerApi.viralRenderer.render();
|
|
94
|
+
console.log(this.mainModel);
|
|
61
95
|
callbackOnSuccess();
|
|
62
96
|
});
|
|
63
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":";;;AAEA,iCAA0E;AAC1E,4FAAyE;AACzE,oDAAsD;
|
|
1
|
+
{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":"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"}
|