viral-viewer-2 4.9.4 → 4.9.6
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/post-processing/post-processing-renderer.js +3 -1
- package/dist/components/post-processing/post-processing-renderer.js.map +1 -1
- package/dist/components/renderer/viral-renderer.js +3 -5
- package/dist/components/renderer/viral-renderer.js.map +1 -1
- package/dist/components/scene/viral-scene.d.ts +3 -0
- package/dist/components/scene/viral-scene.js +11 -1
- package/dist/components/scene/viral-scene.js.map +1 -1
- package/dist/components/worker/viral-viewer-4.worker.d.ts +2 -0
- package/dist/components/worker/viral-viewer-4.worker.js +29 -1
- package/dist/components/worker/viral-viewer-4.worker.js.map +1 -1
- package/package.json +1 -1
|
@@ -23,7 +23,9 @@ class PostProcessingRenderer {
|
|
|
23
23
|
initN8aoPass(scene, camera) {
|
|
24
24
|
this.na8oPass = new n8ao_1.N8AOPass(scene, camera);
|
|
25
25
|
this.na8oPass.configuration.denoiseRadius = 12;
|
|
26
|
-
this.na8oPass.configuration.intensity =
|
|
26
|
+
this.na8oPass.configuration.intensity = 1;
|
|
27
|
+
this.na8oPass.configuration.aoSamples = 8;
|
|
28
|
+
this.na8oPass.configuration.denoiseSamples = 4;
|
|
27
29
|
//reduce resolution for performance purpose
|
|
28
30
|
this.na8oPass.configuration.halfRes = true;
|
|
29
31
|
this.composer.addPass(this.na8oPass);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-processing-renderer.js","sourceRoot":"","sources":["../../../src/components/post-processing/post-processing-renderer.ts"],"names":[],"mappings":";;;AACA,wDAAyD;AACzD,qFAAkF;AAClF,yEAAsE;AACtE,8EAKkD;AAClD,MAAa,sBAAsB;IAKjC,YAAoB,QAAuB;QAAvB,aAAQ,GAAR,QAAQ,CAAe;QAF3C,aAAQ,GAAoB,IAAI,CAAC;QACjC,aAAQ,GAAoB,IAAI,CAAC;QAE/B,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAEM,cAAc,CAAC,KAAY,EAAE,MAAc;QAChD,IAAI,CAAC,UAAU,GAAG,IAAI,4BAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzC,CAAC;IAGM,YAAY,CAAC,KAAY,EAAE,MAAc;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,GAAG,EAAE,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;QAC1C,2CAA2C;QAC3C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAGM,YAAY;QACjB,IAAI,QAAQ,GAAG,IAAI,mBAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"post-processing-renderer.js","sourceRoot":"","sources":["../../../src/components/post-processing/post-processing-renderer.ts"],"names":[],"mappings":";;;AACA,wDAAyD;AACzD,qFAAkF;AAClF,yEAAsE;AACtE,8EAKkD;AAClD,MAAa,sBAAsB;IAKjC,YAAoB,QAAuB;QAAvB,aAAQ,GAAR,QAAQ,CAAe;QAF3C,aAAQ,GAAoB,IAAI,CAAC;QACjC,aAAQ,GAAoB,IAAI,CAAC;QAE/B,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAEM,cAAc,CAAC,KAAY,EAAE,MAAc;QAChD,IAAI,CAAC,UAAU,GAAG,IAAI,4BAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzC,CAAC;IAGM,YAAY,CAAC,KAAY,EAAE,MAAc;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,GAAG,EAAE,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,cAAc,GAAG,CAAC,CAAC;QAC/C,2CAA2C;QAC3C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAGM,YAAY;QACjB,IAAI,QAAQ,GAAG,IAAI,mBAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;CACF;AAtCD,wDAsCC"}
|
|
@@ -31,11 +31,9 @@ class ViralRenderer {
|
|
|
31
31
|
this.viralViewerApi.viralCamera.camera) {
|
|
32
32
|
//force update without wait for next frame
|
|
33
33
|
(_a = this.viralViewerApi.viralCamera.camera) === null || _a === void 0 ? void 0 : _a.updateMatrixWorld(true);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
//
|
|
37
|
-
// );
|
|
38
|
-
this.postProcessingRenderer.render();
|
|
34
|
+
this.renderer.render(this.viralViewerApi.viralScene.scene, this.viralViewerApi.viralCamera.camera);
|
|
35
|
+
this.renderer.render(this.viralViewerApi.viralScene.overlayScene, this.viralViewerApi.viralCamera.camera);
|
|
36
|
+
// this.postProcessingRenderer.render();
|
|
39
37
|
if (this.viralViewerApi.viralTools.viralToolMeasure.isActivated) {
|
|
40
38
|
this.renderer.autoClear = false;
|
|
41
39
|
this.renderer.clearDepth();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-renderer.js","sourceRoot":"","sources":["../../../src/components/renderer/viral-renderer.ts"],"names":[],"mappings":";;;AAAA,iCAA8F;AAE9F,0FAAqF;AAErF,MAAa,aAAa;IAgBxB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAfjD,aAAQ,GAAkB,IAAI,qBAAa,CAAC;YAC1C,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,KAAK;YACd,sBAAsB,EAAE,IAAI;YAC5B,eAAe,EAAE,kBAAkB;SACpC,CAAC,CAAC;QAUD,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,gBAAgB,GAAG,sBAAc,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;QACxE,IAAI,CAAC,sBAAsB,GAAG,IAAI,iDAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1E,CAAC;IACM,UAAU,CAAC,KAAY,EAAC,MAAa;QAE1C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAC,MAAM,CAAC,CAAC;IAC7D,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,
|
|
1
|
+
{"version":3,"file":"viral-renderer.js","sourceRoot":"","sources":["../../../src/components/renderer/viral-renderer.ts"],"names":[],"mappings":";;;AAAA,iCAA8F;AAE9F,0FAAqF;AAErF,MAAa,aAAa;IAgBxB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAfjD,aAAQ,GAAkB,IAAI,qBAAa,CAAC;YAC1C,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,KAAK;YACd,sBAAsB,EAAE,IAAI;YAC5B,eAAe,EAAE,kBAAkB;SACpC,CAAC,CAAC;QAUD,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,gBAAgB,GAAG,sBAAc,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;QACxE,IAAI,CAAC,sBAAsB,GAAG,IAAI,iDAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1E,CAAC;IACM,UAAU,CAAC,KAAY,EAAC,MAAa;QAE1C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAC,MAAM,CAAC,CAAC;IAC7D,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,CAAC,QAAQ,CAAC,MAAM,CAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,YAAY,EAC3C,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CACvC,CAAC;YACF,wCAAwC;YACxC,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;AA7DD,sCA6DC"}
|
|
@@ -4,6 +4,7 @@ import { TransformControls } from "three/examples/jsm/controls/TransformControls
|
|
|
4
4
|
export declare class ViralScene {
|
|
5
5
|
viralViewerApi: ViralViewerApi;
|
|
6
6
|
scene: Scene;
|
|
7
|
+
overlayScene: Scene;
|
|
7
8
|
objects: Object3D[];
|
|
8
9
|
models: Object3D[];
|
|
9
10
|
selectables: Object3D[];
|
|
@@ -15,6 +16,8 @@ export declare class ViralScene {
|
|
|
15
16
|
addObject(object: Object3D): void;
|
|
16
17
|
addModel(object: Object3D): void;
|
|
17
18
|
addEdge(object: Object3D): void;
|
|
19
|
+
addSubObject(object: Object3D): void;
|
|
20
|
+
addSubModel(object: Object3D): void;
|
|
18
21
|
getObjectByName(name: string): Object3D<import("three").Event> | undefined;
|
|
19
22
|
addLights(): void;
|
|
20
23
|
addPivotPoint(): void;
|
|
@@ -9,6 +9,7 @@ class ViralScene {
|
|
|
9
9
|
constructor(viralViewerApi) {
|
|
10
10
|
this.viralViewerApi = viralViewerApi;
|
|
11
11
|
this.scene = new three_1.Scene();
|
|
12
|
+
this.overlayScene = new three_1.Scene();
|
|
12
13
|
this.objects = [];
|
|
13
14
|
this.models = [];
|
|
14
15
|
this.selectables = [];
|
|
@@ -19,7 +20,7 @@ class ViralScene {
|
|
|
19
20
|
this.addLights();
|
|
20
21
|
this.addPivotPoint();
|
|
21
22
|
}
|
|
22
|
-
//#region Add Objects
|
|
23
|
+
//#region Add Main Objects
|
|
23
24
|
addObject(object) {
|
|
24
25
|
this.scene.add(object);
|
|
25
26
|
this.objects.push(object);
|
|
@@ -33,6 +34,15 @@ class ViralScene {
|
|
|
33
34
|
this.edges.push(object);
|
|
34
35
|
}
|
|
35
36
|
//#endregion
|
|
37
|
+
//#region Add Sub Objects
|
|
38
|
+
addSubObject(object) {
|
|
39
|
+
this.overlayScene.add(object);
|
|
40
|
+
}
|
|
41
|
+
addSubModel(object) {
|
|
42
|
+
this.addSubObject(object);
|
|
43
|
+
this.models.push(object);
|
|
44
|
+
}
|
|
45
|
+
//#endregion
|
|
36
46
|
getObjectByName(name) {
|
|
37
47
|
var object = this.scene.getObjectByName(name);
|
|
38
48
|
return object;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-scene.js","sourceRoot":"","sources":["../../../src/components/scene/viral-scene.ts"],"names":[],"mappings":";;;AAAA,iCAee;AAGf,qFAAkF;AAClF,iDAAwD;AACxD,+CAAgD;AAEhD,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"viral-scene.js","sourceRoot":"","sources":["../../../src/components/scene/viral-scene.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,9 @@ export declare class ViralViewerWorker4 {
|
|
|
6
6
|
viralViewerApi: ViralViewerApi;
|
|
7
7
|
workerPool: WorkerThreadPool;
|
|
8
8
|
mainModel: Mesh | null;
|
|
9
|
+
subModel: Mesh | null;
|
|
9
10
|
constructor(viralViewerApi: ViralViewerApi);
|
|
10
11
|
initial(materials: RenderMaterial[]): void;
|
|
11
12
|
loadElement(elements: ViralutionElement[], callbackOnSuccess?: () => void): void;
|
|
13
|
+
loadSubElement(elements: ViralutionElement[], callbackOnSuccess?: () => void): void;
|
|
12
14
|
}
|
|
@@ -9,6 +9,7 @@ class ViralViewerWorker4 {
|
|
|
9
9
|
constructor(viralViewerApi) {
|
|
10
10
|
this.viralViewerApi = viralViewerApi;
|
|
11
11
|
this.mainModel = null;
|
|
12
|
+
this.subModel = null;
|
|
12
13
|
// Create a new Blob containing the worker code
|
|
13
14
|
const blob = new Blob([`(${load_model_worker_3_script_1.workerCode})()`]);
|
|
14
15
|
const workerPath = URL.createObjectURL(blob);
|
|
@@ -19,6 +20,9 @@ class ViralViewerWorker4 {
|
|
|
19
20
|
this.mainModel = new three_1.Mesh();
|
|
20
21
|
this.mainModel.name = "Viral Model";
|
|
21
22
|
this.viralViewerApi.viralScene.addModel(this.mainModel);
|
|
23
|
+
this.subModel = new three_1.Mesh();
|
|
24
|
+
this.subModel.name = "Viral Sub Model";
|
|
25
|
+
this.viralViewerApi.viralScene.addSubModel(this.subModel);
|
|
22
26
|
for (let index = 0; index < materials.length; index++) {
|
|
23
27
|
const material = materials[index];
|
|
24
28
|
let colorString = (0, threejs_1.rgbToThreejsColor)(material.Red, material.Green, material.Blue);
|
|
@@ -41,11 +45,11 @@ class ViralViewerWorker4 {
|
|
|
41
45
|
for (let j = 0; j < dummyMesh.children.length; j++) {
|
|
42
46
|
const element = dummyMesh.children[j];
|
|
43
47
|
element.material = [];
|
|
44
|
-
this.viralViewerApi.viralScene.selectables.push(element);
|
|
45
48
|
for (let k = 0; k < element.userData.MaterialIds.length; k++) {
|
|
46
49
|
const materialIndex = element.userData.MaterialIds[k];
|
|
47
50
|
element.material.push(this.viralViewerApi.viralMaterialManager.materials.get(materialIndex));
|
|
48
51
|
}
|
|
52
|
+
this.viralViewerApi.viralScene.selectables.push(element);
|
|
49
53
|
try {
|
|
50
54
|
this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
|
|
51
55
|
}
|
|
@@ -54,6 +58,30 @@ class ViralViewerWorker4 {
|
|
|
54
58
|
if (this.mainModel)
|
|
55
59
|
this.mainModel.add(dummyMesh);
|
|
56
60
|
this.viralViewerApi.viralRenderer.render();
|
|
61
|
+
console.log(this.mainModel);
|
|
62
|
+
callbackOnSuccess();
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
loadSubElement(elements, callbackOnSuccess = () => { }) {
|
|
66
|
+
this.workerPool.Enqueue(elements, (data) => {
|
|
67
|
+
let dummyMesh = this.viralViewerApi.viralLoader.threeLoader.parseObject(data);
|
|
68
|
+
for (let j = 0; j < dummyMesh.children.length; j++) {
|
|
69
|
+
const element = dummyMesh.children[j];
|
|
70
|
+
element.material = [];
|
|
71
|
+
for (let k = 0; k < element.userData.MaterialIds.length; k++) {
|
|
72
|
+
const materialIndex = element.userData.MaterialIds[k];
|
|
73
|
+
element.material.push(this.viralViewerApi.viralMaterialManager.materials.get(materialIndex));
|
|
74
|
+
}
|
|
75
|
+
this.viralViewerApi.viralScene.selectables.push(element);
|
|
76
|
+
try {
|
|
77
|
+
this.viralViewerApi.viralBVH.applyThreeMeshBVH(element.geometry);
|
|
78
|
+
}
|
|
79
|
+
catch (error) { }
|
|
80
|
+
}
|
|
81
|
+
if (this.subModel)
|
|
82
|
+
this.subModel.add(dummyMesh);
|
|
83
|
+
this.viralViewerApi.viralRenderer.render();
|
|
84
|
+
console.log(this.subModel);
|
|
57
85
|
callbackOnSuccess();
|
|
58
86
|
});
|
|
59
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-viewer-4.worker.js","sourceRoot":"","sources":["../../../src/components/worker/viral-viewer-4.worker.ts"],"names":[],"mappings":";;;
|
|
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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"}
|