viral-viewer-2 4.2.9 → 4.3.1
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/renderer/viral-renderer.js +2 -2
- package/dist/components/renderer/viral-renderer.js.map +1 -1
- package/dist/components/worker/viral-viewer-4.worker.js +4 -8
- package/dist/components/worker/viral-viewer-4.worker.js.map +1 -1
- package/dist/components/worker-script/load-model-worker-3.script.js +37 -40
- package/dist/components/worker-script/load-model-worker-3.script.js.map +1 -1
- package/package.json +1 -1
|
@@ -8,8 +8,8 @@ class ViralRenderer {
|
|
|
8
8
|
this.renderer = new three_1.WebGLRenderer({
|
|
9
9
|
alpha: true,
|
|
10
10
|
antialias: true,
|
|
11
|
-
logarithmicDepthBuffer: true,
|
|
12
|
-
powerPreference: "high-performance",
|
|
11
|
+
// logarithmicDepthBuffer: true,
|
|
12
|
+
// powerPreference: "high-performance",
|
|
13
13
|
});
|
|
14
14
|
this.setupRenderer();
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-renderer.js","sourceRoot":"","sources":["../../../src/components/renderer/viral-renderer.ts"],"names":[],"mappings":";;;AAAA,iCAA8E;AAG9E,MAAa,aAAa;IAOxB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QANjD,aAAQ,GAAkB,IAAI,qBAAa,CAAC;YAC1C,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;YACf,
|
|
1
|
+
{"version":3,"file":"viral-renderer.js","sourceRoot":"","sources":["../../../src/components/renderer/viral-renderer.ts"],"names":[],"mappings":";;;AAAA,iCAA8E;AAG9E,MAAa,aAAa;IAOxB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QANjD,aAAQ,GAAkB,IAAI,qBAAa,CAAC;YAC1C,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;YACf,gCAAgC;YAChC,uCAAuC;SACxC,CAAC,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IACM,aAAa;QAClB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,wBAAgB,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,OAAO,CACnB,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,WAAW,EAC7C,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,YAAY,CAC/C,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1E,CAAC;IACM,MAAM;;QACX,IACE,IAAI,CAAC,cAAc,CAAC,WAAW;YAC/B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,EACtC;YACA,0CAA0C;YAC1C,MAAA,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,0CAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EACpC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CACvC,CAAC;YACF,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE;gBAC/D,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,qBAAqB,EACrE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CACvC,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;aAChC;SACF;IACH,CAAC;CACF;AA3CD,sCA2CC"}
|
|
@@ -30,6 +30,9 @@ class ViralViewerWorker4 {
|
|
|
30
30
|
transparent: material.Opacity != 1 ? true : false,
|
|
31
31
|
flatShading: true,
|
|
32
32
|
name: material.Name,
|
|
33
|
+
polygonOffset: true,
|
|
34
|
+
polygonOffsetFactor: 1,
|
|
35
|
+
polygonOffsetUnits: 0.1,
|
|
33
36
|
});
|
|
34
37
|
this.viralViewerApi.viralScene.materials.add(index, renderMaterial);
|
|
35
38
|
}
|
|
@@ -38,20 +41,13 @@ class ViralViewerWorker4 {
|
|
|
38
41
|
this.workerPool.Enqueue(element, (data) => {
|
|
39
42
|
var _a, _b;
|
|
40
43
|
let dummyMesh = this.viralViewerApi.viralLoader.threeLoader.parseObject(data);
|
|
41
|
-
console.log(dummyMesh);
|
|
42
44
|
if (dummyMesh.children.length > 0) {
|
|
43
45
|
for (let index = 0; index < dummyMesh.children.length; index++) {
|
|
44
46
|
const child = dummyMesh.children[index];
|
|
47
|
+
child.material = this.viralViewerApi.viralScene.materials.get(child.userData.MaterialId);
|
|
45
48
|
if ((_a = dummyMesh.userData) === null || _a === void 0 ? void 0 : _a.IsInstancedMesh) {
|
|
46
|
-
for (let j = 0; j < child.children.length; j++) {
|
|
47
|
-
const element = child.children[j];
|
|
48
|
-
element.material = this.viralViewerApi.viralScene.materials.get(element.userData.MaterialId);
|
|
49
|
-
this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
|
|
50
|
-
}
|
|
51
49
|
child.userData.type = "Revit Element";
|
|
52
|
-
continue;
|
|
53
50
|
}
|
|
54
|
-
child.material = this.viralViewerApi.viralScene.materials.get(child.userData.MaterialId);
|
|
55
51
|
this.viralViewerApi.viralBVH.applyThreeMeshBVH(child.geometry);
|
|
56
52
|
}
|
|
57
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":";;;AASA,iCAQe;AACf,4FAAyE;AACzE,oDAAsD;AACtD,iDAAwD;AAExD,MAAa,kBAAkB;IAI7B,YACS,cAA8B,EACrC,YAAoB,gDAAgD;QAD7D,mBAAc,GAAd,cAAc,CAAgB;QAHhC,cAAS,GAAqB,EAAE,CAAC;QACjC,cAAS,GAAgB,IAAI,CAAC;QAKnC,+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,SAAS,CAAC;QAE3B,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;QACxD,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,IAAA,2BAAiB,EACjC,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;
|
|
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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"}
|
|
@@ -34058,51 +34058,48 @@ which can be placed in CurveUtils.
|
|
|
34058
34058
|
return result;
|
|
34059
34059
|
}
|
|
34060
34060
|
self.addEventListener("message", (event) => {
|
|
34061
|
-
|
|
34061
|
+
//1 element may have multiple solids
|
|
34062
|
+
const solids = progressGeometries(event.data);
|
|
34062
34063
|
if (event.data.Instances && event.data.Instances.length > 0) {
|
|
34063
|
-
|
|
34064
|
-
|
|
34065
|
-
for (let index = 0; index <
|
|
34066
|
-
const
|
|
34067
|
-
|
|
34068
|
-
|
|
34069
|
-
|
|
34070
|
-
|
|
34071
|
-
|
|
34072
|
-
|
|
34073
|
-
|
|
34074
|
-
|
|
34075
|
-
|
|
34076
|
-
|
|
34077
|
-
|
|
34078
|
-
|
|
34079
|
-
|
|
34080
|
-
|
|
34081
|
-
|
|
34082
|
-
|
|
34083
|
-
transform
|
|
34084
|
-
|
|
34085
|
-
|
|
34086
|
-
|
|
34087
|
-
|
|
34088
|
-
|
|
34089
|
-
|
|
34090
|
-
|
|
34091
|
-
|
|
34092
|
-
|
|
34093
|
-
|
|
34094
|
-
|
|
34095
|
-
}
|
|
34096
|
-
// childMesh.instanceMatrix.needsUpdate = true;
|
|
34097
|
-
instanceGroup.updateMatrix();
|
|
34098
|
-
instanceGroup.userData.IsInstancedMesh = true;
|
|
34099
|
-
let jsonData = instanceGroup.toJSON();
|
|
34064
|
+
let group = new Mesh();
|
|
34065
|
+
//foreach solid create new InstancedMesh
|
|
34066
|
+
for (let index = 0; index < solids.length; index++) {
|
|
34067
|
+
const solid = solids[index];
|
|
34068
|
+
const instancedMesh = new InstancedMesh(solid.geometry, new MeshBasicMaterial(), event.data.Instances.length);
|
|
34069
|
+
for (let j = 0; j < event.data.Instances.length; j++) {
|
|
34070
|
+
const transform = event.data.Instances[j];
|
|
34071
|
+
let numbers = [
|
|
34072
|
+
transform.BasisX.X, -transform.BasisX.Z, -transform.BasisX.Y,
|
|
34073
|
+
0, -transform.BasisZ.X,
|
|
34074
|
+
transform.BasisZ.Z,
|
|
34075
|
+
transform.BasisZ.Y,
|
|
34076
|
+
0, -transform.BasisY.X,
|
|
34077
|
+
transform.BasisY.Z,
|
|
34078
|
+
transform.BasisY.Y,
|
|
34079
|
+
0, -transform.Offset.X,
|
|
34080
|
+
transform.Offset.Z,
|
|
34081
|
+
transform.Offset.Y,
|
|
34082
|
+
1,
|
|
34083
|
+
];
|
|
34084
|
+
//transform first
|
|
34085
|
+
let matrix4 = new Matrix4();
|
|
34086
|
+
matrix4.fromArray(numbers);
|
|
34087
|
+
instancedMesh.setMatrixAt(j, matrix4);
|
|
34088
|
+
}
|
|
34089
|
+
instancedMesh.userData.MaterialId = solid.userData.MaterialId;
|
|
34090
|
+
instancedMesh.updateMatrix();
|
|
34091
|
+
group.add(instancedMesh);
|
|
34092
|
+
}
|
|
34093
|
+
group.userData.IsInstancedMesh = true;
|
|
34094
|
+
group.updateMatrix();
|
|
34095
|
+
let jsonData = group.toJSON();
|
|
34100
34096
|
self.postMessage(jsonData);
|
|
34101
34097
|
}
|
|
34102
34098
|
else {
|
|
34099
|
+
//recreate element by combine solids
|
|
34103
34100
|
const mesh = new Mesh();
|
|
34104
|
-
for (let index = 0; index <
|
|
34105
|
-
const element =
|
|
34101
|
+
for (let index = 0; index < solids.length; index++) {
|
|
34102
|
+
const element = solids[index];
|
|
34106
34103
|
mesh.add(element);
|
|
34107
34104
|
}
|
|
34108
34105
|
let jsonData = mesh.toJSON();
|