viral-viewer-2 3.0.3 → 3.0.4
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.
|
@@ -85,9 +85,9 @@ class ViralViewerWorker3 {
|
|
|
85
85
|
// matrix4.fromArray(numbers);
|
|
86
86
|
// instancedMesh.setMatrixAt(index, matrix4);
|
|
87
87
|
// }
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
if (this.mainModel)
|
|
89
|
+
this.mainModel.add(mesh);
|
|
90
|
+
this.viralViewerApi.viralRenderer.render();
|
|
91
91
|
callbackOnSuccess();
|
|
92
92
|
});
|
|
93
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-3.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-3.worker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"viral-viewer-3.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-3.worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -34099,12 +34099,11 @@ function workerFunction() {
|
|
|
34099
34099
|
});
|
|
34100
34100
|
}
|
|
34101
34101
|
self.addEventListener("message", (event) => {
|
|
34102
|
-
let data = event.data;
|
|
34103
34102
|
progressGeometries(event.data, (buffer) => {
|
|
34104
34103
|
const dummyGeometry = new BufferGeometry();
|
|
34105
34104
|
dummyGeometry.setAttribute("position", new BufferAttribute(buffer, 3));
|
|
34106
34105
|
dummyGeometry.computeVertexNormals();
|
|
34107
|
-
if (data.Instances > 0) {
|
|
34106
|
+
if (event.data.Instances > 0) {
|
|
34108
34107
|
let geometry = new BufferGeometry();
|
|
34109
34108
|
// In case number of polygon larger than expect, merge them to reduce polygon first, for optimize purpose
|
|
34110
34109
|
if (dummyGeometry.attributes.position.count > maxPolygonPerObject) {
|
|
@@ -34117,11 +34116,11 @@ function workerFunction() {
|
|
|
34117
34116
|
else {
|
|
34118
34117
|
geometry = dummyGeometry;
|
|
34119
34118
|
}
|
|
34120
|
-
const childMesh = new InstancedMesh(geometry, null, data.Instances.length);
|
|
34119
|
+
const childMesh = new InstancedMesh(geometry, null, event.data.Instances.length);
|
|
34121
34120
|
childMesh.castShadow = true;
|
|
34122
34121
|
childMesh.receiveShadow = true;
|
|
34123
|
-
for (let index = 0; index < data.Instances.length; index++) {
|
|
34124
|
-
const transform = data.Instances[index];
|
|
34122
|
+
for (let index = 0; index < event.data.Instances.length; index++) {
|
|
34123
|
+
const transform = event.data.Instances[index];
|
|
34125
34124
|
let numbers = [
|
|
34126
34125
|
transform.BasisX.X,
|
|
34127
34126
|
-transform.BasisX.Z,
|
|
@@ -34163,14 +34162,14 @@ function workerFunction() {
|
|
|
34163
34162
|
childMesh.add(line);
|
|
34164
34163
|
}
|
|
34165
34164
|
}
|
|
34166
|
-
childMesh.instanceMatrix.needsUpdate = true;
|
|
34165
|
+
// childMesh.instanceMatrix.needsUpdate = true;
|
|
34167
34166
|
childMesh.updateMatrix();
|
|
34168
34167
|
let jsonData = childMesh.toJSON();
|
|
34169
|
-
jsonData.object.type = "InstancedMesh";
|
|
34170
|
-
jsonData.object.count = childMesh.count;
|
|
34171
|
-
jsonData.object.instanceMatrix = childMesh.instanceMatrix.toJSON();
|
|
34172
|
-
if (this.instanceColor !== null)
|
|
34173
|
-
|
|
34168
|
+
// jsonData.object.type = "InstancedMesh";
|
|
34169
|
+
// jsonData.object.count = childMesh.count;
|
|
34170
|
+
// jsonData.object.instanceMatrix = childMesh.instanceMatrix.toJSON();
|
|
34171
|
+
// if (this.instanceColor !== null)
|
|
34172
|
+
// jsonData.object.instanceColor = childMesh.instanceColor.toJSON();
|
|
34174
34173
|
console.log(jsonData);
|
|
34175
34174
|
self.postMessage(jsonData);
|
|
34176
34175
|
}
|