viral-viewer-2 2.4.2 → 2.4.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.
|
@@ -45,10 +45,13 @@ class ViralViewerWorker2 {
|
|
|
45
45
|
const geometry = new three_1.BufferGeometry();
|
|
46
46
|
geometry.setAttribute("position", new three_1.BufferAttribute(buffer, 3));
|
|
47
47
|
geometry.computeVertexNormals();
|
|
48
|
-
const edges = new
|
|
49
|
-
const line = new
|
|
48
|
+
// const edges = new EdgesGeometry(geometry, 90);
|
|
49
|
+
// const line = new LineSegments(
|
|
50
|
+
// edges,
|
|
51
|
+
// new LineBasicMaterial({ color: "#202020" })
|
|
52
|
+
// );
|
|
50
53
|
const childMesh = new three_1.Mesh(geometry, this.threejsMaterials.get(model.MaterialIndex));
|
|
51
|
-
childMesh.add(line);
|
|
54
|
+
// childMesh.add(line);
|
|
52
55
|
childMesh.castShadow = true;
|
|
53
56
|
childMesh.receiveShadow = true;
|
|
54
57
|
if (this.mainModel)
|
|
@@ -69,14 +72,12 @@ class ViralViewerWorker2 {
|
|
|
69
72
|
geometry.setAttribute("position", new three_1.BufferAttribute(buffer, 3));
|
|
70
73
|
//geometry = BufferGeometryUtils.mergeVertices(geometry, 0.1);
|
|
71
74
|
geometry.computeVertexNormals();
|
|
72
|
-
const edges = new
|
|
75
|
+
// const edges = new EdgesGeometry(geometry, 90);
|
|
73
76
|
// const line = new LineSegments(
|
|
74
77
|
// edges,
|
|
75
78
|
// new LineBasicMaterial({ color: "#202020" })
|
|
76
79
|
// );
|
|
77
|
-
const lineMesh = new three_1.InstancedMesh(edges, new three_1.LineBasicMaterial({ color: "#202020" }), model.Instances.length);
|
|
78
80
|
const childMesh = new three_1.InstancedMesh(geometry, this.threejsMaterials.get(model.MaterialIndex), model.Instances.length);
|
|
79
|
-
// childMesh.add(line);
|
|
80
81
|
childMesh.castShadow = true;
|
|
81
82
|
childMesh.receiveShadow = true;
|
|
82
83
|
for (let index = 0; index < model.Instances.length; index++) {
|
|
@@ -103,12 +104,17 @@ class ViralViewerWorker2 {
|
|
|
103
104
|
let matrix4 = new three_1.Matrix4();
|
|
104
105
|
matrix4.fromArray(numbers);
|
|
105
106
|
childMesh.setMatrixAt(index, matrix4);
|
|
106
|
-
|
|
107
|
+
// const edges = new EdgesGeometry(geometry, 90);
|
|
108
|
+
// const line = new LineSegments(
|
|
109
|
+
// edges,
|
|
110
|
+
// new LineBasicMaterial({ color: "#202020" })
|
|
111
|
+
// );
|
|
107
112
|
// line.applyMatrix4(matrix4);
|
|
113
|
+
// childMesh.add(line);
|
|
108
114
|
}
|
|
109
115
|
if (this.mainModel) {
|
|
110
116
|
this.mainModel.add(childMesh);
|
|
111
|
-
this.
|
|
117
|
+
// this.viralViewerApi.viralRenderer.render();
|
|
112
118
|
}
|
|
113
119
|
callbackOnSuccess();
|
|
114
120
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-2.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-2.worker.ts"],"names":[],"mappings":";;;AACA,uCAA4K;AAC5K,
|
|
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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"}
|