viral-viewer-2 5.3.9 → 5.4.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.
|
@@ -5,7 +5,6 @@ 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
7
|
const log_1 = require("../../utils/log");
|
|
8
|
-
const viral_instanced_mesh_1 = require("../custom-objects/viral-instanced-mesh");
|
|
9
8
|
const threejs_1 = require("../../utils/threejs");
|
|
10
9
|
class ViralViewerWorker4 {
|
|
11
10
|
constructor(viralViewerApi) {
|
|
@@ -44,13 +43,14 @@ class ViralViewerWorker4 {
|
|
|
44
43
|
let element = dummyMesh.children[j];
|
|
45
44
|
console.log(element);
|
|
46
45
|
//apply BVH first
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
46
|
+
try {
|
|
47
|
+
this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (this.viralViewerApi.options.isDev) {
|
|
51
|
+
log_1.LogUtil.error(error);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
54
|
//progress material
|
|
55
55
|
element.material = [];
|
|
56
56
|
for (let k = 0; k < element.userData.MaterialIds.length; k++) {
|
|
@@ -58,22 +58,24 @@ class ViralViewerWorker4 {
|
|
|
58
58
|
element.material.push(this.viralViewerApi.viralMaterialManager.materials.get(materialIndex));
|
|
59
59
|
}
|
|
60
60
|
//in case is instanced mesh, cast to our type
|
|
61
|
-
if (
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
61
|
+
// if (element?.isInstancedMesh && element.isInstancedMesh == true) {
|
|
62
|
+
// let instancedMesh = new ViralInstancedMesh(
|
|
63
|
+
// element.geometry,
|
|
64
|
+
// element.material,
|
|
65
|
+
// element.count
|
|
66
|
+
// );
|
|
67
|
+
// instancedMesh.instanceColor = element.instanceColor;
|
|
68
|
+
// instancedMesh.instanceMatrix = element.instanceMatrix;
|
|
69
|
+
// if (this.mainModel) this.mainModel.add(instancedMesh);
|
|
70
|
+
// this.viralViewerApi.viralScene.selectables.push(instancedMesh);
|
|
71
|
+
// //should dispose after cast
|
|
72
|
+
// element.dispose();
|
|
73
|
+
// } else {
|
|
74
|
+
log_1.LogUtil.information("add normal mesh");
|
|
75
|
+
if (this.mainModel)
|
|
76
|
+
this.mainModel.add(element);
|
|
77
|
+
this.viralViewerApi.viralScene.selectables.push(element);
|
|
78
|
+
// }
|
|
77
79
|
}
|
|
78
80
|
this.viralViewerApi.viralRenderer.render();
|
|
79
81
|
callbackOnSuccess();
|
|
@@ -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;AACtD,yCAA0C;
|
|
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;AACtD,yCAA0C;AAE1C,iDAAgD;AAEhD,MAAa,kBAAkB;IAG7B,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAD1C,cAAS,GAAgB,IAAI,CAAC;QAEnC,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,uCAAU,KAAK,CAAC,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,oCAAoC;QACpC,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAgB,CACpC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,EAC1C,UAAU,CACX,CAAC;IACJ,CAAC;IACM,OAAO,CAAC,SAA2B;QACxC,IAAI,CAAC,SAAS,GAAG,IAAI,YAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAExD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,WAAW,GAAG,mBAAS,CAAC,iBAAiB,CAC3C,QAAQ,CAAC,GAAG,EACZ,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,IAAI,CACd,CAAC;YAEF,IAAI,cAAc,GAAG,IAAI,yBAAiB,CAAC;gBACzC,KAAK,EAAE,WAAW;gBAClB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,WAAW,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;gBACjD,WAAW,EAAE,IAAI;gBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,aAAa,EAAE,IAAI;gBACnB,mBAAmB,EAAE,CAAC;gBACtB,kBAAkB,EAAE,GAAG;aACxB,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CACpD,KAAK,EACL,cAAc,CACf,CAAC;SACH;IACH,CAAC;IACM,WAAW,CAChB,QAA6B,EAC7B,iBAAiB,GAAG,GAAG,EAAE,GAAE,CAAC;QAE5B,IAAI,CAAC,UAAU,CAAC,OAAO,CAA2B,QAAQ,EAAE,CAAC,IAAS,EAAE,EAAE;YACxE,IAAI,SAAS,GACX,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAClD,IAAI,OAAO,GAAQ,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrB,iBAAiB;gBACjB,IAAI;oBACF,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;iBAClE;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;wBACrC,aAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;qBACtB;iBACF;gBACD,mBAAmB;gBACnB,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;gBACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC5D,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBACtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CACnB,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CACpD,aAAa,CACb,CACH,CAAC;iBACH;gBAED,6CAA6C;gBAC7C,qEAAqE;gBACrE,gDAAgD;gBAChD,wBAAwB;gBACxB,wBAAwB;gBACxB,oBAAoB;gBACpB,OAAO;gBACP,yDAAyD;gBACzD,2DAA2D;gBAC3D,2DAA2D;gBAC3D,oEAAoE;gBACpE,gCAAgC;gBAChC,uBAAuB;gBACvB,WAAW;gBACX,aAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;gBACvC,IAAI,IAAI,CAAC,SAAS;oBAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzD,IAAI;aACL;YACD,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC3C,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA9FD,gDA8FC"}
|