@openbraininstitute/morphoviewer 0.25.2 → 0.25.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.
- package/README.md +12 -0
- package/lib/dist/components/button-reset-camera/button-reset-camera.d.ts.map +1 -1
- package/lib/dist/components/button-reset-camera/button-reset-camera.js +1 -1
- package/lib/dist/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.js +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/camera.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/camera.js +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/manager.d.ts +9 -11
- package/lib/dist/components/morpho-viewer-small-circuit/painter/manager.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/manager.js +176 -196
- package/lib/dist/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.d.ts +2 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.js +8 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.js +20 -19
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts +4 -0
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.js +28 -14
- package/lib/dist/components/morpho-viewer-small-circuit/types.d.ts +1 -0
- package/lib/dist/components/morpho-viewer-small-circuit/types.d.ts.map +1 -1
- package/lib/dist/package.json +2 -2
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -32,6 +32,18 @@ Copyright (c) 2025 Open Brain Institute
|
|
|
32
32
|
|
|
33
33
|
## Release notes
|
|
34
34
|
|
|
35
|
+
### v0.25.4
|
|
36
|
+
|
|
37
|
+
- Fix **event listener leak** in `MorphoViewerSmallCircuit` camera adaptation: the paint event listener was never removed, causing infinite re-registration on each paint cycle
|
|
38
|
+
|
|
39
|
+
### v0.25.3
|
|
40
|
+
|
|
41
|
+
- Add optional `verbose` prop to `MorphoViewerSmallCircuit` for enabling/disabling debug console output
|
|
42
|
+
- Refactor `MorphoViewerSmallCircuit` rendering pipeline: remove `TgdFilterBlur`, `TgdPainterFilter`, `TgdPainterFramebufferWithAntiAliasing`, and `TgdPainterMix` for a leaner rendering approach
|
|
43
|
+
- Refactor `CameraManager` to use `TgdControllerCameraOrbit` with smooth camera interpolation via `tgdActionCreateCameraInterpolation`
|
|
44
|
+
- Use `TgdValueWaitable` for lazy context initialization in `PainterManager`
|
|
45
|
+
- Add `isDeleted` guard in `OffscreenPainter` to prevent operations after deletion
|
|
46
|
+
|
|
35
47
|
### v0.25.2
|
|
36
48
|
|
|
37
49
|
- Increase default **minRadius** from `0.25` to `2.5` in `MorphologyCanvas` and from `2` to `2.5` in `SwcPainter` for better rendering of thin neurites
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button-reset-camera.d.ts","sourceRoot":"","sources":["../../../src/components/button-reset-camera/button-reset-camera.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"button-reset-camera.d.ts","sourceRoot":"","sources":["../../../src/components/button-reset-camera/button-reset-camera.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE;QACd,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,oBAAoB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;KACzC,CAAC;CACH;AAED,wBAAgB,iBAAiB,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,sBAAsB,2CAYtF"}
|
|
@@ -7,4 +7,4 @@ export function ButtonCameraReset({ className, painterManager }) {
|
|
|
7
7
|
const restPosition = useEventValue(false, painterManager.eventRestingPosition);
|
|
8
8
|
return (_jsx("div", { className: classNames(className, styles.buttonResetCamera, restPosition && styles.hide), children: _jsx(Tooltip, { tooltip: "Recenter the view", arrow: "topLeft", foreColor: "#fff", backColor: "#05a", children: _jsx("button", { type: "button", onClick: painterManager.cameraReset, children: _jsx(IconCenter, {}) }) }) }));
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnV0dG9uLXJlc2V0LWNhbWVyYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21wb25lbnRzL2J1dHRvbi1yZXNldC1jYW1lcmEvYnV0dG9uLXJlc2V0LWNhbWVyYS50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXBELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUk3QyxPQUFPLE1BQU0sTUFBTSxrQ0FBa0MsQ0FBQztBQVV0RCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUEwQjtJQUNyRixNQUFNLFlBQVksR0FBRyxhQUFhLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRS9FLE9BQU8sQ0FDTCxjQUFLLFNBQVMsRUFBRSxVQUFVLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxpQkFBaUIsRUFBRSxZQUFZLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxZQUMxRixLQUFDLE9BQU8sSUFBQyxPQUFPLEVBQUMsbUJBQW1CLEVBQUMsS0FBSyxFQUFDLFNBQVMsRUFBQyxTQUFTLEVBQUMsTUFBTSxFQUFDLFNBQVMsRUFBQyxNQUFNLFlBQ3BGLGlCQUFRLElBQUksRUFBQyxRQUFRLEVBQUMsT0FBTyxFQUFFLGNBQWMsQ0FBQyxXQUFXLFlBQ3ZELEtBQUMsVUFBVSxLQUFHLEdBQ1AsR0FDRCxHQUNOLENBQ1AsQ0FBQztBQUNKLENBQUMifQ==
|
package/lib/dist/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offscreen-painter.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"offscreen-painter.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.ts"],"names":[],"mappings":"AACA,OAAO,EACH,UAAU,EAEV,UAAU,EAOb,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,qBAAa,gBAAiB,SAAQ,UAAU;IAWhC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVrC,GAAG,SAAK;IACf,SAAgB,OAAO,EAAE,UAAU,CAAA;IAEnC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,OAAO,CAAC,KAAK,CAAyC;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,gBAAgB,CAA2C;gBAEtC,eAAe,EAAE,UAAU;IAexD,IAAI,SAAS,IAAI,MAAM,CAEtB;IACD,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,EAG9B;IAED,IAAI,IAAI,IAIO,cAAc,GAAG,SAAS,CAFxC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,EAyBxC;IAED,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAYjE,KAAK,aASH;IAEF,MAAM;CAIT"}
|
package/lib/dist/components/morpho-viewer-simul/painter/offscreen-painter/offscreen-painter.js
CHANGED
|
@@ -81,4 +81,4 @@ export class OffscreenPainter extends TgdPainter {
|
|
|
81
81
|
this.offscreenContext.delete();
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2Zmc2NyZWVuLXBhaW50ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvY29tcG9uZW50cy9tb3JwaG8tdmlld2VyLXNpbXVsL3BhaW50ZXIvb2Zmc2NyZWVuLXBhaW50ZXIvb2Zmc2NyZWVuLXBhaW50ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNILFVBQVUsRUFFVixVQUFVLEVBQ1YsZUFBZSxFQUNmLGVBQWUsRUFDZixlQUFlLEVBQ2YsMEJBQTBCLEVBQzFCLGVBQWUsRUFDZixnQkFBZ0IsR0FDbkIsTUFBTSxnQkFBZ0IsQ0FBQTtBQUd2QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFaEQsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFVBQVU7SUFXNUMsWUFBNkIsZUFBMkI7UUFDcEQsS0FBSyxFQUFFLENBQUE7UUFEa0Isb0JBQWUsR0FBZixlQUFlLENBQVk7UUFWakQsUUFBRyxHQUFHLENBQUMsQ0FBQztRQUdQLGVBQVUsR0FBRyxDQUFDLENBQUM7UUFDTixvQkFBZSxHQUFHLElBQUksZUFBZSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUVyRCxVQUFLLEdBQStCLFNBQVMsQ0FBQztRQUNyQyxVQUFLLEdBQUcsSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUN2QyxxQkFBZ0IsR0FBc0MsSUFBSSxDQUFDO1FBb0VuRSxVQUFLLEdBQUcsR0FBRyxFQUFFO1lBQ1QsTUFBTSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsR0FBRyxJQUFJLENBQUE7WUFDbkUsZ0JBQWdCLENBQUMsTUFBTSxHQUFHLGVBQWUsQ0FBQyxNQUFNLENBQUE7WUFDaEQsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLGVBQWUsQ0FBQTtZQUNsQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/camera.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,UAAU,EAEf,KAAK,QAAQ,EAGd,MAAM,gBAAgB,CAAC;AAKxB,qBAAa,aAAa;IAOtB,OAAO,CAAC,QAAQ,CAAC,OAAO;aACR,oBAAoB,EAAE,QAAQ,CAAC,OAAO,CAAC;IAPlD,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAM;IAE5C,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,KAAK,CAAyC;gBAGnC,OAAO,EAAE,UAAU,EACpB,oBAAoB,EAAE,QAAQ,CAAC,OAAO,CAAC;IAazD,WAAW;IAWX,MAAM;IAMN,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAE/B;CACH"}
|
|
@@ -38,4 +38,4 @@ export class CameraManager {
|
|
|
38
38
|
this.context.animCancelArray(this.animations);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FtZXJhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NvbXBvbmVudHMvbW9ycGhvLXZpZXdlci1zbWFsbC1jaXJjdWl0L3BhaW50ZXIvY2FtZXJhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxxQkFBcUIsRUFHckIsd0JBQXdCLEVBRXhCLGtDQUFrQyxFQUNsQywyQkFBMkIsR0FDNUIsTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUM7QUFDdEIsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDO0FBRXJCLE1BQU0sT0FBTyxhQUFhO0lBTXhCLFlBQ21CLE9BQW1CLEVBQ3BCLG9CQUF1QztRQUR0QyxZQUFPLEdBQVAsT0FBTyxDQUFZO1FBQ3BCLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBbUI7UUFQbEQsV0FBTSxHQUE0QixFQUFFLENBQUM7UUFFcEMsZUFBVSxHQUFtQixFQUFFLENBQUM7UUFDaEMsVUFBSyxHQUFvQyxJQUFJLENBQUM7UUFrQ3JDLHFCQUFnQixHQUFHLEdBQUcsRUFBRTtZQUN2QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLENBQUMsQ0FBQztRQTlCQSxNQUFNLE1BQU0sR0FBRyxJQUFJLHFCQUFxQixFQUFFLENBQUM7UUFDM0MsT0FBTyxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLHdCQUF3QixDQUFDLE9BQU8sRUFBRTtZQUNqRCxZQUFZLEVBQUUsSUFBSTtZQUNsQixPQUFPLEVBQUUsUUFBUTtZQUNqQixPQUFPLEVBQUUsUUFBUTtTQUNsQixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDMUQsb0JBQW9CLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxXQUFXO1FBQ1QsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUN6QixPQUFPLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUM7WUFDckMsUUFBUSxFQUFFLEdBQUc7WUFDYixjQUFjLEVBQUUsMkJBQTJCO1lBQzNDLE1BQU0sRUFBRSxrQ0FBa0MsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUM7WUFDdkUsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1NBQ3RELENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNOztRQUNKLE1BQUEsSUFBSSxDQUFDLEtBQUssMENBQUUsTUFBTSxFQUFFLENBQUM7UUFDckIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7UUFDbEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ2hELENBQUM7Q0FLRiJ9
|
|
@@ -10,7 +10,7 @@ export declare class PainterManager {
|
|
|
10
10
|
private _canvas;
|
|
11
11
|
private _background;
|
|
12
12
|
private readonly backgroundColor;
|
|
13
|
-
private context;
|
|
13
|
+
private readonly context;
|
|
14
14
|
private cameraManager;
|
|
15
15
|
private painterClear;
|
|
16
16
|
private offscreen;
|
|
@@ -26,21 +26,22 @@ export declare class PainterManager {
|
|
|
26
26
|
private framebufferCircuit;
|
|
27
27
|
private textureFramebufferCircuit;
|
|
28
28
|
private framebufferHighlightedCells;
|
|
29
|
-
private textureFramebufferHighlightedCells;
|
|
30
29
|
private framebufferBlur;
|
|
31
|
-
private
|
|
32
|
-
private loadedCells;
|
|
30
|
+
private loadedCellsCache;
|
|
33
31
|
private circuitSignature;
|
|
34
32
|
private bbox;
|
|
35
33
|
private _gizmo;
|
|
36
34
|
private painterGizmo;
|
|
37
35
|
private readonly groupGizmo;
|
|
36
|
+
private _verbose;
|
|
38
37
|
readonly cameraReset: () => void | undefined;
|
|
38
|
+
get verbose(): boolean;
|
|
39
|
+
set verbose(verbose: boolean);
|
|
39
40
|
get gizmo(): false | TgdPainterGizmoOptions;
|
|
40
41
|
set gizmo(gizmo: boolean | Partial<TgdPainterGizmoOptions> | undefined);
|
|
41
42
|
setCircuit(circuit: MorphoViewerSmallCircuitCell[], loadCell: (id: string) => Promise<MorphoViewerSmallCircuitCellData | null>): void;
|
|
42
|
-
private updateCircuit;
|
|
43
|
-
private adaptCameraFromBBox;
|
|
43
|
+
private readonly updateCircuit;
|
|
44
|
+
private readonly adaptCameraFromBBox;
|
|
44
45
|
get highlightedCellIds(): string[] | undefined;
|
|
45
46
|
set highlightedCellIds(value: string[] | undefined);
|
|
46
47
|
private updateHightedCells;
|
|
@@ -48,13 +49,10 @@ export declare class PainterManager {
|
|
|
48
49
|
set background(color: string);
|
|
49
50
|
get canvas(): HTMLCanvasElement | null;
|
|
50
51
|
set canvas(canvas: HTMLCanvasElement | null);
|
|
51
|
-
|
|
52
|
-
private createFramebufferHighlightedCells;
|
|
53
|
-
private createFramebufferBlur;
|
|
54
|
-
private createMix;
|
|
52
|
+
readonly debug: () => void;
|
|
55
53
|
private readonly handlePointerHover;
|
|
56
54
|
private readonly handlePointerTap;
|
|
57
55
|
private delete;
|
|
58
56
|
}
|
|
59
|
-
export declare function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, gizmo, }: MorphoViewerSmallCircuitProps): PainterManager;
|
|
57
|
+
export declare function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, gizmo, verbose, }: MorphoViewerSmallCircuitProps): PainterManager;
|
|
60
58
|
//# sourceMappingURL=manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/manager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TgdBoundingBox,
|
|
1
|
+
import { TgdBoundingBox, TgdCameraOrthographic, TgdColor, TgdContext, TgdEvent, TgdPainterClear, TgdPainterGizmo, TgdPainterGroup, TgdPainterState, TgdValueWaitable, } from "@tolokoban/tgd";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import { watchSpacePerPixel } from "./../../../behaviors/index.js";
|
|
4
4
|
import { CacheLRU } from "./../../../tools/cache-lru.js";
|
|
@@ -21,7 +21,7 @@ export class PainterManager {
|
|
|
21
21
|
this._canvas = null;
|
|
22
22
|
this._background = "#000";
|
|
23
23
|
this.backgroundColor = new TgdColor(0, 0, 0, 1);
|
|
24
|
-
this.context =
|
|
24
|
+
this.context = new TgdValueWaitable();
|
|
25
25
|
this.cameraManager = null;
|
|
26
26
|
this.painterClear = null;
|
|
27
27
|
this.offscreen = null;
|
|
@@ -39,16 +39,133 @@ export class PainterManager {
|
|
|
39
39
|
this.framebufferCircuit = null;
|
|
40
40
|
this.textureFramebufferCircuit = null;
|
|
41
41
|
this.framebufferHighlightedCells = null;
|
|
42
|
-
this.textureFramebufferHighlightedCells = null;
|
|
43
42
|
this.framebufferBlur = null;
|
|
44
|
-
this.
|
|
45
|
-
this.loadedCells = new CacheLRU(24);
|
|
43
|
+
this.loadedCellsCache = new CacheLRU(24);
|
|
46
44
|
this.circuitSignature = "";
|
|
47
45
|
this.bbox = new TgdBoundingBox();
|
|
48
46
|
this._gizmo = false;
|
|
49
47
|
this.painterGizmo = null;
|
|
50
48
|
this.groupGizmo = new TgdPainterGroup({ name: "GroupGizmo" });
|
|
49
|
+
this._verbose = false;
|
|
51
50
|
this.cameraReset = () => { var _a; return (_a = this.cameraManager) === null || _a === void 0 ? void 0 : _a.resetCamera(); };
|
|
51
|
+
this.updateCircuit = () => {
|
|
52
|
+
var _a, _b;
|
|
53
|
+
const context = this.context.value;
|
|
54
|
+
if (!context)
|
|
55
|
+
return;
|
|
56
|
+
const { loadCell, loadedCellsCache: loadedCells } = this;
|
|
57
|
+
if (!loadCell) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
this.groupCells.removeAll();
|
|
62
|
+
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, 0);
|
|
63
|
+
this.cellCountTotal = this.circuit.length;
|
|
64
|
+
this.cellCountLoaded = 0;
|
|
65
|
+
(_b = this.offscreen) === null || _b === void 0 ? void 0 : _b.delete();
|
|
66
|
+
this.offscreen = new OffscreenPainter(context, {
|
|
67
|
+
circuit: this.circuit,
|
|
68
|
+
loadCell,
|
|
69
|
+
loadedCells,
|
|
70
|
+
});
|
|
71
|
+
const { cellsForHighights: highlightingCells } = this;
|
|
72
|
+
highlightingCells.clear();
|
|
73
|
+
this.groupHighlithedCells.removeAll(false);
|
|
74
|
+
this.bbox = new TgdBoundingBox();
|
|
75
|
+
for (const cell of this.circuit) {
|
|
76
|
+
const [x, y, z] = cell.center;
|
|
77
|
+
const r = cell.somaRadius;
|
|
78
|
+
this.bbox.addSphere(x, y, z, r * 5);
|
|
79
|
+
const painterCell = new PainterCell(context, {
|
|
80
|
+
cell,
|
|
81
|
+
loadCell,
|
|
82
|
+
matrerial: "full",
|
|
83
|
+
onCellLoaded: (bbox) => {
|
|
84
|
+
var _a;
|
|
85
|
+
if (bbox) {
|
|
86
|
+
this.bbox.addBBox(bbox);
|
|
87
|
+
}
|
|
88
|
+
this.adaptCameraFromBBox();
|
|
89
|
+
this.cellCountLoaded++;
|
|
90
|
+
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, this.cellCountLoaded / this.cellCountTotal);
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
this.groupCells.add(painterCell);
|
|
94
|
+
const highlightedCell = new PainterCell(context, {
|
|
95
|
+
cell,
|
|
96
|
+
loadCell,
|
|
97
|
+
matrerial: "flat",
|
|
98
|
+
});
|
|
99
|
+
highlightingCells.set(cell.id, highlightedCell);
|
|
100
|
+
}
|
|
101
|
+
this.updateHightedCells();
|
|
102
|
+
this.adaptCameraFromBBox();
|
|
103
|
+
context.paint();
|
|
104
|
+
}
|
|
105
|
+
catch (ex) {
|
|
106
|
+
console.error("Unable ton update circuit:", ex);
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
this.adaptCameraFromBBox = () => {
|
|
110
|
+
try {
|
|
111
|
+
const context = this.context.value;
|
|
112
|
+
if (!context)
|
|
113
|
+
return;
|
|
114
|
+
const { bbox } = this;
|
|
115
|
+
if (bbox.min[0] > bbox.max[0])
|
|
116
|
+
return;
|
|
117
|
+
const { camera } = context;
|
|
118
|
+
if (camera.screenWidth < 1 || camera.screenHeight < 1) {
|
|
119
|
+
const listener = () => {
|
|
120
|
+
context.eventPaint.removeListener(listener);
|
|
121
|
+
this.adaptCameraFromBBox();
|
|
122
|
+
};
|
|
123
|
+
context.eventPaint.addListener(listener);
|
|
124
|
+
context.paint();
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
const bboxW = Math.abs(bbox.max[0] - bbox.min[0]);
|
|
128
|
+
const bboxH = Math.abs(bbox.max[1] - bbox.min[1]);
|
|
129
|
+
const bboxD = Math.abs(bbox.max[2] - bbox.min[2]);
|
|
130
|
+
const bboxRadius = Math.max(bboxW, bboxH, bboxD);
|
|
131
|
+
camera.transfo.position = bbox.center;
|
|
132
|
+
const scale = 1.1;
|
|
133
|
+
camera.fitSpaceAtTarget(bboxW * scale, bboxH * scale);
|
|
134
|
+
camera.transfo.distance = bboxRadius * scale;
|
|
135
|
+
camera.near = 1;
|
|
136
|
+
camera.far = camera.transfo.distance * 2;
|
|
137
|
+
camera.zoom = 2;
|
|
138
|
+
if (!this.cameraManager) {
|
|
139
|
+
this.cameraManager = new CameraManager(context, this.eventRestingPosition);
|
|
140
|
+
}
|
|
141
|
+
this.cameraManager.target = camera.getCurrentState();
|
|
142
|
+
context.paint();
|
|
143
|
+
}
|
|
144
|
+
catch (ex) {
|
|
145
|
+
console.error("Unable to adapt camera to bbox:", ex);
|
|
146
|
+
}
|
|
147
|
+
};
|
|
148
|
+
this.debug = () => {
|
|
149
|
+
const context = this.context.value;
|
|
150
|
+
const camera = context === null || context === void 0 ? void 0 : context.camera;
|
|
151
|
+
console.log("🐞 [manager@357] this.bbox =", this.bbox);
|
|
152
|
+
if (camera) {
|
|
153
|
+
console.log([
|
|
154
|
+
`near: ${camera.near}`,
|
|
155
|
+
`far: ${camera.far}`,
|
|
156
|
+
`zoom: ${camera.zoom}`,
|
|
157
|
+
`screenWidth: ${camera.screenWidth}`,
|
|
158
|
+
`screenHeight: ${camera.screenHeight}`,
|
|
159
|
+
`spaceWidthAtTarget: ${camera.spaceWidthAtTarget}`,
|
|
160
|
+
`spaceHeightAtTarget: ${camera.spaceHeightAtTarget}`,
|
|
161
|
+
`distance: ${camera.transfo.distance}`,
|
|
162
|
+
`position: ${camera.transfo.position}`,
|
|
163
|
+
].join("\n"));
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
console.log("NO CAMERA!!!");
|
|
167
|
+
}
|
|
168
|
+
};
|
|
52
169
|
this.handlePointerHover = (evt) => {
|
|
53
170
|
const { offscreen } = this;
|
|
54
171
|
if (!offscreen)
|
|
@@ -68,6 +185,16 @@ export class PainterManager {
|
|
|
68
185
|
this.eventCellClick.dispatch(cell);
|
|
69
186
|
};
|
|
70
187
|
}
|
|
188
|
+
get verbose() {
|
|
189
|
+
return this._verbose;
|
|
190
|
+
}
|
|
191
|
+
set verbose(verbose) {
|
|
192
|
+
if (this._verbose === verbose)
|
|
193
|
+
return;
|
|
194
|
+
this._verbose = verbose;
|
|
195
|
+
if (this.context.value)
|
|
196
|
+
this.context.value.verbose = verbose;
|
|
197
|
+
}
|
|
71
198
|
get gizmo() {
|
|
72
199
|
return this._gizmo;
|
|
73
200
|
}
|
|
@@ -93,96 +220,30 @@ export class PainterManager {
|
|
|
93
220
|
}
|
|
94
221
|
}
|
|
95
222
|
setCircuit(circuit, loadCell) {
|
|
96
|
-
|
|
223
|
+
var _a;
|
|
224
|
+
if (this.circuit === circuit) {
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
if (circuit.length === 0) {
|
|
228
|
+
this.loadedCellsCache.clear();
|
|
97
229
|
return;
|
|
230
|
+
}
|
|
98
231
|
const signature = circuit.map((item) => item.id).join("\n");
|
|
99
232
|
if (this.circuitSignature !== signature) {
|
|
100
233
|
this.circuitSignature = signature;
|
|
101
|
-
this.
|
|
234
|
+
this.loadedCellsCache.clear();
|
|
102
235
|
}
|
|
103
236
|
this.circuit = circuit;
|
|
104
237
|
this.loadCell = (id) => {
|
|
105
|
-
const cached = this.
|
|
238
|
+
const cached = this.loadedCellsCache.get(id);
|
|
106
239
|
if (cached)
|
|
107
240
|
return cached;
|
|
108
241
|
const promise = loadCell(id);
|
|
109
|
-
this.
|
|
242
|
+
this.loadedCellsCache.set(id, promise);
|
|
110
243
|
return promise;
|
|
111
244
|
};
|
|
112
|
-
this.updateCircuit();
|
|
113
|
-
}
|
|
114
|
-
updateCircuit() {
|
|
115
|
-
var _a;
|
|
116
|
-
const { context } = this;
|
|
117
|
-
if (!context)
|
|
118
|
-
return;
|
|
119
|
-
const { loadCell, loadedCells } = this;
|
|
120
|
-
if (!loadCell)
|
|
121
|
-
return;
|
|
122
245
|
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, 0);
|
|
123
|
-
this.
|
|
124
|
-
this.cellCountLoaded = 0;
|
|
125
|
-
const camera = new TgdCameraPerspective({
|
|
126
|
-
zoom: 1,
|
|
127
|
-
});
|
|
128
|
-
this.offscreen = new OffscreenPainter(context, {
|
|
129
|
-
circuit: this.circuit,
|
|
130
|
-
loadCell,
|
|
131
|
-
loadedCells,
|
|
132
|
-
});
|
|
133
|
-
const { cellsForHighights: highlightingCells } = this;
|
|
134
|
-
highlightingCells.clear();
|
|
135
|
-
this.groupHighlithedCells.removeAll(false);
|
|
136
|
-
this.bbox = new TgdBoundingBox();
|
|
137
|
-
for (const cell of this.circuit) {
|
|
138
|
-
const [x, y, z] = cell.center;
|
|
139
|
-
const r = cell.somaRadius;
|
|
140
|
-
this.bbox.addSphere(x, y, z, r * 5);
|
|
141
|
-
const painterCell = new PainterCell(context, {
|
|
142
|
-
cell,
|
|
143
|
-
loadCell,
|
|
144
|
-
matrerial: "full",
|
|
145
|
-
onCellLoaded: (bbox) => {
|
|
146
|
-
var _a;
|
|
147
|
-
if (bbox) {
|
|
148
|
-
this.bbox.addBBox(bbox);
|
|
149
|
-
this.adaptCameraFromBBox();
|
|
150
|
-
}
|
|
151
|
-
this.cellCountLoaded++;
|
|
152
|
-
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, this.cellCountLoaded / this.cellCountTotal);
|
|
153
|
-
},
|
|
154
|
-
});
|
|
155
|
-
this.groupCells.add(painterCell);
|
|
156
|
-
const highlightedCell = new PainterCell(context, {
|
|
157
|
-
cell,
|
|
158
|
-
loadCell,
|
|
159
|
-
matrerial: "flat",
|
|
160
|
-
});
|
|
161
|
-
highlightingCells.set(cell.id, highlightedCell);
|
|
162
|
-
}
|
|
163
|
-
this.updateHightedCells();
|
|
164
|
-
context.camera = camera;
|
|
165
|
-
this.adaptCameraFromBBox();
|
|
166
|
-
context.paint();
|
|
167
|
-
}
|
|
168
|
-
adaptCameraFromBBox() {
|
|
169
|
-
const { context } = this;
|
|
170
|
-
if (!context)
|
|
171
|
-
return;
|
|
172
|
-
const { bbox } = this;
|
|
173
|
-
const { camera } = context;
|
|
174
|
-
const bboxW = Math.abs(bbox.max[0] - bbox.min[0]);
|
|
175
|
-
const bboxH = Math.abs(bbox.max[1] - bbox.min[1]);
|
|
176
|
-
camera.transfo.position = bbox.center;
|
|
177
|
-
const scale = 2;
|
|
178
|
-
camera.fitSpaceAtTarget(bboxW * scale, bboxH * scale);
|
|
179
|
-
camera.near = 1;
|
|
180
|
-
camera.far = camera.transfo.distance * 2;
|
|
181
|
-
camera.zoom = 2;
|
|
182
|
-
const { cameraManager } = this;
|
|
183
|
-
if (cameraManager) {
|
|
184
|
-
cameraManager.target = camera.getCurrentState();
|
|
185
|
-
}
|
|
246
|
+
this.context.waitUntiDefined().then(this.updateCircuit);
|
|
186
247
|
}
|
|
187
248
|
get highlightedCellIds() {
|
|
188
249
|
return this._highlightedCellIds;
|
|
@@ -210,7 +271,7 @@ export class PainterManager {
|
|
|
210
271
|
painter.black = false;
|
|
211
272
|
}
|
|
212
273
|
}
|
|
213
|
-
(_a = this.context) === null || _a === void 0 ? void 0 : _a.paint();
|
|
274
|
+
(_a = this.context.value) === null || _a === void 0 ? void 0 : _a.paint();
|
|
214
275
|
}
|
|
215
276
|
get background() {
|
|
216
277
|
return this._background;
|
|
@@ -218,33 +279,46 @@ export class PainterManager {
|
|
|
218
279
|
set background(color) {
|
|
219
280
|
this._background = color;
|
|
220
281
|
this.backgroundColor.parse(color);
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
clear
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
282
|
+
this.context.waitUntiDefined().then(() => {
|
|
283
|
+
const clear = this.painterClear;
|
|
284
|
+
if (clear) {
|
|
285
|
+
clear.red = this.backgroundColor.R;
|
|
286
|
+
clear.green = this.backgroundColor.G;
|
|
287
|
+
clear.blue = this.backgroundColor.B;
|
|
288
|
+
clear.alpha = this.backgroundColor.A;
|
|
289
|
+
}
|
|
290
|
+
});
|
|
228
291
|
}
|
|
229
292
|
get canvas() {
|
|
230
293
|
return this._canvas;
|
|
231
294
|
}
|
|
232
295
|
set canvas(canvas) {
|
|
233
|
-
if (this._canvas === canvas)
|
|
296
|
+
if (this._canvas === canvas) {
|
|
234
297
|
return;
|
|
298
|
+
}
|
|
235
299
|
if (this.context) {
|
|
236
300
|
this.delete();
|
|
237
301
|
}
|
|
238
302
|
this._canvas = canvas;
|
|
239
303
|
if (!canvas)
|
|
240
304
|
return;
|
|
241
|
-
const context = new TgdContext(canvas, {
|
|
305
|
+
const context = new TgdContext(canvas, {
|
|
306
|
+
antialias: true,
|
|
307
|
+
alpha: false,
|
|
308
|
+
verbose: this.verbose,
|
|
309
|
+
name: "RenderingContext",
|
|
310
|
+
});
|
|
311
|
+
this.context.value = context;
|
|
312
|
+
context.camera = new TgdCameraOrthographic({
|
|
313
|
+
zoom: 1,
|
|
314
|
+
});
|
|
242
315
|
watchSpacePerPixel(context, this.eventScalebar);
|
|
243
316
|
context.inputs.pointer.eventHover.addListener(this.handlePointerHover);
|
|
244
317
|
context.inputs.pointer.eventTap.addListener(this.handlePointerTap);
|
|
245
|
-
this.
|
|
318
|
+
context.inputs.pointer.eventTapMultiple.addListener(this.debug);
|
|
246
319
|
this.cameraManager = new CameraManager(context, this.eventRestingPosition);
|
|
247
320
|
const clear = new TgdPainterClear(context, {
|
|
321
|
+
name: "Clear background and depth",
|
|
248
322
|
color: [
|
|
249
323
|
this.backgroundColor.R,
|
|
250
324
|
this.backgroundColor.G,
|
|
@@ -262,98 +336,7 @@ export class PainterManager {
|
|
|
262
336
|
depth: "less",
|
|
263
337
|
cull: "back",
|
|
264
338
|
children: [this.groupCells],
|
|
265
|
-
}), new TgdPainterClear(context, { depth: 1 }), new TgdPainterState(context, {
|
|
266
|
-
depth: "less",
|
|
267
|
-
blend: "add",
|
|
268
|
-
cull: "back",
|
|
269
|
-
children: [this.groupHighlithedCells],
|
|
270
339
|
}), this.groupGizmo);
|
|
271
|
-
this.updateCircuit();
|
|
272
|
-
}
|
|
273
|
-
createramebufferCircuit(context, clear) {
|
|
274
|
-
this.textureFramebufferCircuit = new TgdTexture2D(context);
|
|
275
|
-
this.framebufferCircuit = new TgdPainterFramebufferWithAntiAliasing(context, {
|
|
276
|
-
textureColor0: this.textureFramebufferCircuit,
|
|
277
|
-
depthBuffer: true,
|
|
278
|
-
children: [
|
|
279
|
-
clear,
|
|
280
|
-
new TgdPainterState(context, {
|
|
281
|
-
depth: webglPresetDepth.less,
|
|
282
|
-
children: [this.groupCells],
|
|
283
|
-
}),
|
|
284
|
-
],
|
|
285
|
-
});
|
|
286
|
-
return this.framebufferCircuit;
|
|
287
|
-
}
|
|
288
|
-
createFramebufferHighlightedCells(context) {
|
|
289
|
-
const { viewportMatchingScale } = this;
|
|
290
|
-
this.textureFramebufferHighlightedCells = new TgdTexture2D(context);
|
|
291
|
-
this.framebufferHighlightedCells = new TgdPainterFramebufferWithAntiAliasing(context, {
|
|
292
|
-
viewportMatchingScale,
|
|
293
|
-
textureColor0: this.textureFramebufferHighlightedCells,
|
|
294
|
-
depthBuffer: true,
|
|
295
|
-
children: [
|
|
296
|
-
new TgdPainterClear(context, { depth: 1, color: [0, 0, 0, 1] }),
|
|
297
|
-
new TgdPainterState(context, {
|
|
298
|
-
depth: webglPresetDepth.less,
|
|
299
|
-
children: [this.groupHighlithedCells],
|
|
300
|
-
}),
|
|
301
|
-
],
|
|
302
|
-
});
|
|
303
|
-
return this.framebufferHighlightedCells;
|
|
304
|
-
}
|
|
305
|
-
createFramebufferBlur(context) {
|
|
306
|
-
const { textureFramebufferHighlightedCells } = this;
|
|
307
|
-
if (!textureFramebufferHighlightedCells)
|
|
308
|
-
throw new Error("You must call createFramebufferHighlightedCells() before this createFramebufferBlur()!");
|
|
309
|
-
const { viewportMatchingScale } = this;
|
|
310
|
-
const size = 3;
|
|
311
|
-
this.textureFramebufferBlur = new TgdTexture2D(context);
|
|
312
|
-
this.framebufferBlur = new TgdPainterFramebufferWithAntiAliasing(context, {
|
|
313
|
-
viewportMatchingScale,
|
|
314
|
-
textureColor0: this.textureFramebufferBlur,
|
|
315
|
-
children: [
|
|
316
|
-
new TgdPainterClear(context, { color: [0, 0, 0, 1] }),
|
|
317
|
-
new TgdPainterState(context, {
|
|
318
|
-
depth: webglPresetDepth.off,
|
|
319
|
-
children: [
|
|
320
|
-
new TgdPainterFilter(context, {
|
|
321
|
-
flipY: true,
|
|
322
|
-
texture: textureFramebufferHighlightedCells,
|
|
323
|
-
filters: [
|
|
324
|
-
new TgdFilterBlur({
|
|
325
|
-
size,
|
|
326
|
-
direction: 0,
|
|
327
|
-
}),
|
|
328
|
-
new TgdFilterBlur({
|
|
329
|
-
size,
|
|
330
|
-
direction: 90,
|
|
331
|
-
}),
|
|
332
|
-
],
|
|
333
|
-
}),
|
|
334
|
-
],
|
|
335
|
-
}),
|
|
336
|
-
],
|
|
337
|
-
});
|
|
338
|
-
return this.framebufferBlur;
|
|
339
|
-
}
|
|
340
|
-
createMix(context) {
|
|
341
|
-
const { framebufferCircuit, framebufferBlur } = this;
|
|
342
|
-
if (!framebufferCircuit)
|
|
343
|
-
throw new Error("Framebuffer for circuit must be created before calling createMix()!");
|
|
344
|
-
if (!framebufferBlur)
|
|
345
|
-
throw new Error("Framebuffer for blur must be created before calling createMix()!");
|
|
346
|
-
return new TgdPainterState(context, {
|
|
347
|
-
depth: webglPresetDepth.off,
|
|
348
|
-
blend: webglPresetBlend.off,
|
|
349
|
-
children: [
|
|
350
|
-
new TgdPainterMix(context, {
|
|
351
|
-
texture1: framebufferCircuit.textureColor0,
|
|
352
|
-
texture2: framebufferBlur.textureColor0,
|
|
353
|
-
strength: 1.5,
|
|
354
|
-
}),
|
|
355
|
-
],
|
|
356
|
-
});
|
|
357
340
|
}
|
|
358
341
|
delete() {
|
|
359
342
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
@@ -372,14 +355,14 @@ export class PainterManager {
|
|
|
372
355
|
this.groupCells.removeAll();
|
|
373
356
|
(_g = this.painterClear) === null || _g === void 0 ? void 0 : _g.delete();
|
|
374
357
|
this.painterClear = null;
|
|
375
|
-
if (this.context) {
|
|
376
|
-
this.context.inputs.pointer.eventHover.removeListener(this.handlePointerHover);
|
|
377
|
-
this.context.delete();
|
|
378
|
-
this.context =
|
|
358
|
+
if (this.context.value) {
|
|
359
|
+
this.context.value.inputs.pointer.eventHover.removeListener(this.handlePointerHover);
|
|
360
|
+
this.context.value.delete();
|
|
361
|
+
this.context.value = undefined;
|
|
379
362
|
}
|
|
380
363
|
}
|
|
381
364
|
}
|
|
382
|
-
export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, gizmo, }) {
|
|
365
|
+
export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, gizmo, verbose, }) {
|
|
383
366
|
const [, setSpacePerPixel] = React.useState(-1);
|
|
384
367
|
const ref = React.useRef(null);
|
|
385
368
|
if (!ref.current) {
|
|
@@ -388,14 +371,11 @@ export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHo
|
|
|
388
371
|
const manager = ref.current;
|
|
389
372
|
React.useEffect(() => {
|
|
390
373
|
manager.eventScalebar.addListener(setSpacePerPixel);
|
|
391
|
-
return () => manager.eventScalebar.removeListener(setSpacePerPixel);
|
|
392
|
-
}, [manager]);
|
|
393
|
-
React.useEffect(() => {
|
|
394
374
|
manager.onLoadProgress = onLoadProgress;
|
|
395
|
-
|
|
396
|
-
React.useEffect(() => {
|
|
375
|
+
manager.verbose = verbose !== null && verbose !== void 0 ? verbose : false;
|
|
397
376
|
manager.background = backgroundColor !== null && backgroundColor !== void 0 ? backgroundColor : "#000";
|
|
398
|
-
|
|
377
|
+
return () => manager.eventScalebar.removeListener(setSpacePerPixel);
|
|
378
|
+
}, [onLoadProgress, manager, verbose, backgroundColor]);
|
|
399
379
|
React.useEffect(() => {
|
|
400
380
|
manager.setCircuit(circuit, loadCell);
|
|
401
381
|
}, [circuit, loadCell, manager]);
|
|
@@ -423,4 +403,4 @@ export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHo
|
|
|
423
403
|
}, [gizmo, manager]);
|
|
424
404
|
return ref.current;
|
|
425
405
|
}
|
|
426
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/manager.ts"],"names":[],"mappings":"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"}
|
|
406
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TgdContext } from "@tolokoban/tgd";
|
|
2
|
-
import { CacheLRU } from "../../../../tools/cache-lru";
|
|
2
|
+
import type { CacheLRU } from "../../../../tools/cache-lru";
|
|
3
3
|
import type { MorphoViewerSmallCircuitCell, MorphoViewerSmallCircuitCellData } from "../../types";
|
|
4
4
|
export interface OffscreenPainterOptions {
|
|
5
5
|
circuit: MorphoViewerSmallCircuitCell[];
|
|
@@ -14,6 +14,7 @@ export declare class OffscreenPainter {
|
|
|
14
14
|
private readonly offscreenContext;
|
|
15
15
|
private readonly group;
|
|
16
16
|
private readonly circuit;
|
|
17
|
+
private isDeleted;
|
|
17
18
|
constructor(onscreenContext: TgdContext, options: OffscreenPainterOptions);
|
|
18
19
|
getItemAt(xScreen: number, yScreen: number): MorphoViewerSmallCircuitCell | undefined;
|
|
19
20
|
private readonly paint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offscreen-painter.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EAKX,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"offscreen-painter.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EAKX,MAAM,gBAAgB,CAAC;AAMxB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,4BAA4B,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAElG,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACxC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAC3E,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC,CAAC;CACzE;AAID,qBAAa,gBAAgB;IAWzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAV3B,GAAG,SAAK;IACf,SAAgB,OAAO,EAAE,UAAU,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAa;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,SAAS,CAAS;gBAGP,eAAe,EAAE,UAAU,EAC5C,OAAO,EAAE,uBAAuB;IAkClC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS;IAUrF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAWpB;IAEF,MAAM;CAKP"}
|
|
@@ -8,7 +8,10 @@ export class OffscreenPainter {
|
|
|
8
8
|
this.mix = 0;
|
|
9
9
|
this.offscreenCanvas = new OffscreenCanvas(1, 1);
|
|
10
10
|
this.group = new TgdPainterGroup();
|
|
11
|
+
this.isDeleted = false;
|
|
11
12
|
this.paint = () => {
|
|
13
|
+
if (this.isDeleted)
|
|
14
|
+
return;
|
|
12
15
|
const { onscreenContext, offscreenContext, offscreenCanvas } = this;
|
|
13
16
|
offscreenContext.camera = onscreenContext.camera;
|
|
14
17
|
const { canvas } = onscreenContext;
|
|
@@ -25,6 +28,7 @@ export class OffscreenPainter {
|
|
|
25
28
|
antialias: false,
|
|
26
29
|
alpha: false,
|
|
27
30
|
depth: true,
|
|
31
|
+
name: "OffscreenPainter",
|
|
28
32
|
});
|
|
29
33
|
this.context = context;
|
|
30
34
|
context.camera = onscreenContext.camera;
|
|
@@ -47,6 +51,8 @@ export class OffscreenPainter {
|
|
|
47
51
|
}
|
|
48
52
|
getItemAt(xScreen, yScreen) {
|
|
49
53
|
var _a;
|
|
54
|
+
if (this.isDeleted)
|
|
55
|
+
return;
|
|
50
56
|
const { circuit, offscreenContext: context } = this;
|
|
51
57
|
const [R, G, B] = context.readPixel(xScreen, yScreen);
|
|
52
58
|
const divider = 1 / 0xff;
|
|
@@ -56,6 +62,7 @@ export class OffscreenPainter {
|
|
|
56
62
|
delete() {
|
|
57
63
|
this.onscreenContext.eventPaint.removeListener(this.paint);
|
|
58
64
|
this.offscreenContext.delete();
|
|
65
|
+
this.isDeleted = true;
|
|
59
66
|
}
|
|
60
67
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2Zmc2NyZWVuLXBhaW50ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvY29tcG9uZW50cy9tb3JwaG8tdmlld2VyLXNtYWxsLWNpcmN1aXQvcGFpbnRlci9vZmZzY3JlZW4tcGFpbnRlci9vZmZzY3JlZW4tcGFpbnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLGVBQWUsRUFDZixlQUFlLEVBQ2YsZUFBZSxFQUNmLGdCQUFnQixHQUNqQixNQUFNLGdCQUFnQixDQUFDO0FBRXhCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFFdEMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBVzlDLE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBQztBQUV0QixNQUFNLE9BQU8sZ0JBQWdCO0lBVTNCLFlBQ21CLGVBQTJCLEVBQzVDLE9BQWdDO1FBRGYsb0JBQWUsR0FBZixlQUFlLENBQVk7UUFWdkMsUUFBRyxHQUFHLENBQUMsQ0FBQztRQUdFLG9CQUFlLEdBQUcsSUFBSSxlQUFlLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBRTVDLFVBQUssR0FBRyxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBRXZDLGNBQVMsR0FBRyxLQUFLLENBQUM7UUFnRFQsVUFBSyxHQUFHLEdBQUcsRUFBRTtZQUM1QixJQUFJLElBQUksQ0FBQyxTQUFTO2dCQUFFLE9BQU87WUFFM0IsTUFBTSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLEVBQUUsR0FBRyxJQUFJLENBQUM7WUFDcEUsZ0JBQWdCLENBQUMsTUFBTSxHQUFHLGVBQWUsQ0FBQyxNQUFNLENBQUM7WUFDakQsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLGVBQWUsQ0FBQztZQUNuQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDdEMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3ZDLGVBQWUsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDO1lBQzFCLGVBQWUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDO1lBQzNCLGdCQUFnQixDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzNCLENBQUMsQ0FBQztRQXJEQSxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUM7UUFDL0IsZUFBZSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ25ELE1BQU0sT0FBTyxHQUFHLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUU7WUFDbkQscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixTQUFTLEVBQUUsS0FBSztZQUNoQixLQUFLLEVBQUUsS0FBSztZQUNaLEtBQUssRUFBRSxJQUFJO1lBQ1gsSUFBSSxFQUFFLGtCQUFrQjtTQUN6QixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixPQUFPLENBQUMsTUFBTSxHQUFHLGVBQWUsQ0FBQyxNQUFNLENBQUM7UUFDeEMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE9BQU8sQ0FBQztRQUNoQyxPQUFPLENBQUMsR0FBRyxDQUNULElBQUksZUFBZSxDQUFDLE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUMvRCxJQUFJLGVBQWUsQ0FBQyxPQUFPLEVBQUU7WUFDM0IsS0FBSyxFQUFFLGdCQUFnQixDQUFDLElBQUk7WUFDNUIsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztTQUN2QixDQUFDLENBQ0gsQ0FBQztRQUNGLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQztRQUN4QixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNoQyxNQUFNLElBQUksR0FBRyxJQUFJLFdBQVcsQ0FBQyxPQUFPLEVBQUU7Z0JBQ3BDLElBQUk7Z0JBQ0osUUFBUSxFQUFFLE9BQU8sQ0FBQyxRQUFRO2dCQUMxQixTQUFTLEVBQUUsS0FBSzthQUNqQixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNyQixLQUFLLEVBQUUsQ0FBQztRQUNWLENBQUM7UUFDRCxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDZixDQUFDO0lBRUQsU0FBUyxDQUFDLE9BQWUsRUFBRSxPQUFlOztRQUN4QyxJQUFJLElBQUksQ0FBQyxTQUFTO1lBQUUsT0FBTztRQUUzQixNQUFNLEVBQUUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUNwRCxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN0RCxNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ3pCLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsR0FBRyxPQUFPLEVBQUUsQ0FBQyxHQUFHLE9BQU8sRUFBRSxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsR0FBRyxXQUFXLENBQUM7UUFDakYsT0FBTyxNQUFBLE9BQU8sQ0FBQyxLQUFLLENBQUMsbUNBQUksU0FBUyxDQUFDO0lBQ3JDLENBQUM7SUFlRCxNQUFNO1FBQ0osSUFBSSxDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzRCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUM7SUFDeEIsQ0FBQztDQUNGIn0=
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../../../../src/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../../../../src/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,cAAc,EAGf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,kCAAkC,CAAC;AAE1C,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,gBAAgB,EACtB,YAAY,EAAE,OAAO,GACpB;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAoChD"}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.js
CHANGED
|
@@ -9,30 +9,31 @@ export function createCellFromTree(context, material, tree, forSelection) {
|
|
|
9
9
|
const bbox = new TgdBoundingBox();
|
|
10
10
|
for (const segments of [segmentsSoma, segmentsNeurites]) {
|
|
11
11
|
for (let i = 0; i < segments.count; i++) {
|
|
12
|
-
const [x0, y0, z0, r0] =
|
|
12
|
+
const [x0, y0, z0, r0] = segments.getXYZR0(i);
|
|
13
13
|
bbox.addSphere(x0, y0, z0, r0 * 2);
|
|
14
|
-
const [x1, y1, z1, r1] =
|
|
14
|
+
const [x1, y1, z1, r1] = segments.getXYZR1(i);
|
|
15
15
|
bbox.addSphere(x1, y1, z1, r1 * 2);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
+
const painterSoma = new TgdPainterSegments(context, {
|
|
19
|
+
roundness: forSelection ? 5 : 12,
|
|
20
|
+
radiusMultiplier: forSelection ? 1.1 : 1,
|
|
21
|
+
material,
|
|
22
|
+
dataset: segmentsSoma.makeDataset(),
|
|
23
|
+
});
|
|
24
|
+
painterSoma.name = "painterSoma";
|
|
25
|
+
const painterNeurites = new TgdPainterSegments(context, {
|
|
26
|
+
roundness: forSelection ? 3 : 5,
|
|
27
|
+
minRadius: 2,
|
|
28
|
+
radiusMultiplier: forSelection ? 1.6 : 1,
|
|
29
|
+
material,
|
|
30
|
+
dataset: segmentsNeurites.makeDataset(),
|
|
31
|
+
});
|
|
32
|
+
painterNeurites.name = "painterNeurites";
|
|
18
33
|
return {
|
|
19
34
|
bbox,
|
|
20
35
|
node: new TgdPainterNode({
|
|
21
|
-
children: [
|
|
22
|
-
new TgdPainterSegments(context, {
|
|
23
|
-
roundness: forSelection ? 5 : 12,
|
|
24
|
-
radiusMultiplier: forSelection ? 1.1 : 1,
|
|
25
|
-
material,
|
|
26
|
-
dataset: segmentsSoma.makeDataset(),
|
|
27
|
-
}),
|
|
28
|
-
new TgdPainterSegments(context, {
|
|
29
|
-
roundness: forSelection ? 3 : 5,
|
|
30
|
-
minRadius: 2,
|
|
31
|
-
radiusMultiplier: forSelection ? 1.6 : 1,
|
|
32
|
-
material,
|
|
33
|
-
dataset: segmentsNeurites.makeDataset(),
|
|
34
|
-
}),
|
|
35
|
-
],
|
|
36
|
+
children: [painterSoma, painterNeurites],
|
|
36
37
|
}),
|
|
37
38
|
};
|
|
38
39
|
}
|
|
@@ -66,6 +67,6 @@ function computeCoordU(type) {
|
|
|
66
67
|
MorphoViewerTreeItemType.Myelin,
|
|
67
68
|
MorphoViewerTreeItemType.Unknown,
|
|
68
69
|
];
|
|
69
|
-
return (types.indexOf(type) + .5) / types.length;
|
|
70
|
+
return (types.indexOf(type) + 0.5) / types.length;
|
|
70
71
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL21vcnBoby12aWV3ZXItc21hbGwtY2lyY3VpdC9wYWludGVyL3BhaW50ZXItY2VsbC9mYWN0b3J5L3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGNBQWMsRUFHZCxjQUFjLEVBQ2Qsa0JBQWtCLEVBQ2xCLHNCQUFzQixHQUN2QixNQUFNLGdCQUFnQixDQUFDO0FBRXhCLE9BQU8sRUFHTCx3QkFBd0IsR0FDekIsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxNQUFNLFVBQVUsa0JBQWtCLENBQ2hDLE9BQW1CLEVBQ25CLFFBQXFCLEVBQ3JCLElBQXNCLEVBQ3RCLFlBQXFCO0lBRXJCLE1BQU0sWUFBWSxHQUFHLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUNsRCxNQUFNLGdCQUFnQixHQUFHLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUN0RCxLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM5QixZQUFZLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBQ0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxjQUFjLEVBQUUsQ0FBQztJQUNsQyxLQUFLLE1BQU0sUUFBUSxJQUFJLENBQUMsWUFBWSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsQ0FBQztRQUN4RCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzlDLElBQUksQ0FBQyxTQUFTLENBQUMs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
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts
CHANGED
|
@@ -14,9 +14,13 @@ export declare class PainterCell extends TgdPainterGroup {
|
|
|
14
14
|
private _black;
|
|
15
15
|
private readonly texturePalette;
|
|
16
16
|
private readonly textureBlack;
|
|
17
|
+
private _isDeleted;
|
|
17
18
|
constructor(context: TgdContext, options: PainterCellOptions);
|
|
19
|
+
get isDeleted(): boolean;
|
|
20
|
+
private set isDeleted(value);
|
|
18
21
|
get black(): boolean;
|
|
19
22
|
set black(value: boolean);
|
|
23
|
+
paint(time: number, delta: number): void;
|
|
20
24
|
private loadCell;
|
|
21
25
|
delete(): void;
|
|
22
26
|
}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"painter-cell.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"painter-cell.d.ts","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,KAAK,UAAU,EAOf,eAAe,EAQhB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,KAAK,EACV,4BAA4B,EAC5B,gCAAgC,EAEjC,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,IAAI,EAAE,4BAA4B,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAKvE,YAAY,CAAC,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI,CAAC;CAClD;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/D,qBAAa,WAAY,SAAQ,eAAe;IAQ5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,UAAU,CAAS;gBAGR,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,kBAAkB;IA2C9C,IAAI,SAAS,IAAI,OAAO,CAEvB;IACD,OAAO,KAAK,SAAS,QAIpB;IAGD,IAAI,KAAK,IAGQ,OAAO,CADvB;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAQvB;IAED,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;YAM1B,QAAQ;IA6BtB,MAAM,IAAI,IAAI;CAKf"}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.js
CHANGED
|
@@ -6,17 +6,13 @@ export class PainterCell extends TgdPainterGroup {
|
|
|
6
6
|
constructor(context, options) {
|
|
7
7
|
var _a;
|
|
8
8
|
super({
|
|
9
|
-
name: `
|
|
9
|
+
name: `PainterCell / ${options.cell.id}`,
|
|
10
10
|
});
|
|
11
11
|
this.context = context;
|
|
12
12
|
this.options = options;
|
|
13
13
|
this._black = false;
|
|
14
|
+
this._isDeleted = false;
|
|
14
15
|
const { cell } = options;
|
|
15
|
-
const geometry = new TgdGeometrySphereIco({
|
|
16
|
-
center: cell.center,
|
|
17
|
-
radius: cell.somaRadius,
|
|
18
|
-
subdivisions: 2,
|
|
19
|
-
});
|
|
20
16
|
const texture = createPaletteTexture(context, cell.color);
|
|
21
17
|
this.texturePalette = texture;
|
|
22
18
|
this.textureBlack = new TgdTexture2D(context).loadBitmap(tgdCanvasCreateFill(1, 1, "#000"));
|
|
@@ -40,13 +36,27 @@ export class PainterCell extends TgdPainterGroup {
|
|
|
40
36
|
});
|
|
41
37
|
break;
|
|
42
38
|
}
|
|
39
|
+
const geometry = new TgdGeometrySphereIco({
|
|
40
|
+
center: cell.center,
|
|
41
|
+
radius: cell.somaRadius,
|
|
42
|
+
subdivisions: 2,
|
|
43
|
+
});
|
|
43
44
|
const mesh = new TgdPainterMesh(context, {
|
|
45
|
+
name: `IcoSphere / ${options.cell.id}`,
|
|
44
46
|
geometry,
|
|
45
47
|
material: this.material,
|
|
46
48
|
});
|
|
47
49
|
this.add(mesh);
|
|
48
50
|
this.loadCell();
|
|
49
51
|
}
|
|
52
|
+
get isDeleted() {
|
|
53
|
+
return this._isDeleted || this.context.isDeleted;
|
|
54
|
+
}
|
|
55
|
+
set isDeleted(isDeleted) {
|
|
56
|
+
if (this._isDeleted === isDeleted)
|
|
57
|
+
return;
|
|
58
|
+
this._isDeleted = isDeleted;
|
|
59
|
+
}
|
|
50
60
|
get black() {
|
|
51
61
|
return this._black;
|
|
52
62
|
}
|
|
@@ -56,11 +66,14 @@ export class PainterCell extends TgdPainterGroup {
|
|
|
56
66
|
this._black = value;
|
|
57
67
|
const { material } = this;
|
|
58
68
|
if (material instanceof TgdMaterialFlatTexture) {
|
|
59
|
-
material.texture = value
|
|
60
|
-
? this.textureBlack
|
|
61
|
-
: this.texturePalette;
|
|
69
|
+
material.texture = value ? this.textureBlack : this.texturePalette;
|
|
62
70
|
}
|
|
63
71
|
}
|
|
72
|
+
paint(time, delta) {
|
|
73
|
+
if (this.context.isDeleted)
|
|
74
|
+
return;
|
|
75
|
+
super.paint(time, delta);
|
|
76
|
+
}
|
|
64
77
|
loadCell() {
|
|
65
78
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
79
|
const { context, material } = this;
|
|
@@ -89,6 +102,7 @@ export class PainterCell extends TgdPainterGroup {
|
|
|
89
102
|
delete() {
|
|
90
103
|
this.texturePalette.delete();
|
|
91
104
|
this.textureBlack.delete();
|
|
105
|
+
this.isDeleted = true;
|
|
92
106
|
}
|
|
93
107
|
}
|
|
94
108
|
function isCellAsTree(data) {
|
|
@@ -104,19 +118,19 @@ function createPaletteTexture(context, color) {
|
|
|
104
118
|
colors.basalDendrite,
|
|
105
119
|
colors.apicalDendrite,
|
|
106
120
|
colors.myelin,
|
|
107
|
-
colors.unknown
|
|
121
|
+
colors.unknown,
|
|
108
122
|
]);
|
|
109
123
|
const texture = new TgdTexture2D(context, {
|
|
110
124
|
params: {
|
|
111
125
|
minFilter: "NEAREST",
|
|
112
|
-
magFilter: "NEAREST"
|
|
113
|
-
}
|
|
126
|
+
magFilter: "NEAREST",
|
|
127
|
+
},
|
|
114
128
|
}).loadBitmap(canvas);
|
|
115
129
|
return texture;
|
|
116
130
|
}
|
|
117
131
|
function resolveColorsPerSection(color) {
|
|
118
132
|
if (!color) {
|
|
119
|
-
const randomColor = TgdColor.fromHSL(Math.random(), .8, 0.5).toString();
|
|
133
|
+
const randomColor = TgdColor.fromHSL(Math.random(), 0.8, 0.5).toString();
|
|
120
134
|
return {
|
|
121
135
|
apicalDendrite: randomColor,
|
|
122
136
|
axon: randomColor,
|
|
@@ -158,4 +172,4 @@ function applyTransfoToBBox(transfo, bbox) {
|
|
|
158
172
|
}
|
|
159
173
|
return transformedBBox;
|
|
160
174
|
}
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"painter-cell.js","sourceRoot":"","sources":["../../../../../src/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,cAAc,EACd,QAAQ,EAER,oBAAoB,EACpB,QAAQ,EAER,kBAAkB,EAClB,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,cAAc,EACd,OAAO,EACP,YAAY,EAEZ,OAAO,EACP,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAsBpD,MAAM,OAAO,WAAY,SAAQ,eAAe;IAO9C,YACmB,OAAmB,EACnB,OAA2B;;QAE5C,KAAK,CAAC;YACJ,IAAI,EAAE,iBAAiB,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;SACzC,CAAC,CAAC;QALc,YAAO,GAAP,OAAO,CAAY;QACnB,YAAO,GAAP,OAAO,CAAoB;QAPtC,WAAM,GAAG,KAAK,CAAC;QAGf,eAAU,GAAG,KAAK,CAAC;QASzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QACzB,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5F,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,MAAM,CAAC;QACjD,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,MAAM;gBACT,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAkB,CAAC;oBACrC,KAAK,EAAE,OAAO;oBACd,kBAAkB,EAAE,IAAI;oBACxB,OAAO,EAAE,IAAI,QAAQ,CAAC;wBACpB,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;qBAC1B,CAAC;iBACH,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;gBACxD,MAAM;YACR;gBACE,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAe,CAAC;oBAClC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;iBACzC,CAAC,CAAC;gBACH,MAAM;QACV,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,oBAAoB,CAAC;YACxC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,YAAY,EAAE,CAAC;SAChB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE;YACvC,IAAI,EAAE,eAAe,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;YACtC,QAAQ;YACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACnD,CAAC;IACD,IAAY,SAAS,CAAC,SAAkB;QACtC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO;QAE1C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAGD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,IAAI,KAAK,CAAC,KAAc;QACtB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK;YAAE,OAAO;QAElC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1B,IAAI,QAAQ,YAAY,sBAAsB,EAAE,CAAC;YAC/C,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACrE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,KAAa;QAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS;YAAE,OAAO;QAEnC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3B,CAAC;IAEa,QAAQ;;YACpB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YACnC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YAEtD,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,kBAAkB,CACvC,OAAO,EACP,QAAQ,EACR,IAAI,CAAC,IAAI,EACT,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,CAC3C,CAAC;oBACF,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;oBAC9B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC3C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAClC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;oBAChC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;oBACvD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACf,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzD,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;KAAA;IAED,MAAM;QACJ,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;CACF;AAED,SAAS,YAAY,CACnB,IAA6C;IAE7C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAmB,EACnB,KAA4C;IAE5C,MAAM,MAAM,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,sBAAsB,CAAC;QACpC,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,aAAa;QACpB,MAAM,CAAC,cAAc;QACrB,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,OAAO;KACf,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE;QACxC,MAAM,EAAE;YACN,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;SACrB;KACF,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,uBAAuB,CAAC,KAA4C;IAC3E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzE,OAAO;YACL,cAAc,EAAE,WAAW;YAC3B,IAAI,EAAE,WAAW;YACjB,aAAa,EAAE,WAAW;YAC1B,MAAM,EAAE,WAAW;YACnB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,cAAc,EAAE,KAAK;YACrB,IAAI,EAAE,KAAK;YACX,aAAa,EAAE,KAAK;YACpB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAmB,EAAE,IAAoB;IACnE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9B,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9B,MAAM,MAAM,GAAc;QACxB,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;KAC3B,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC;QAC/B,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
|
@@ -32,5 +32,6 @@ export type MorphoViewerSmallCircuitProps = PropsForGizmo & PropsForScalebar & {
|
|
|
32
32
|
loadCell(id: string): Promise<MorphoViewerSmallCircuitCellData | null>;
|
|
33
33
|
onLoadProgress?(progress: number): void;
|
|
34
34
|
controls?: ControlsLayoutProps["content"];
|
|
35
|
+
verbose?: boolean;
|
|
35
36
|
};
|
|
36
37
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/morpho-viewer-small-circuit/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/morpho-viewer-small-circuit/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEhE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1C,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,MAAM,gCAAgC,GAAG;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,aAAa,GACvD,gBAAgB,GAAG;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,4BAA4B,EAAE,CAAC;IAIxC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,WAAW,CAAC,CAAC,IAAI,EAAE,4BAA4B,GAAG,SAAS,GAAG,IAAI,CAAC;IACnE,WAAW,CAAC,CAAC,IAAI,EAAE,4BAA4B,GAAG,SAAS,GAAG,IAAI,CAAC;IACnE,OAAO,CAAC,IAAI,IAAI,CAAC;IACjB,UAAU,CAAC,IAAI,IAAI,CAAC;IAKpB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAOvE,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAM1C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC"}
|
package/lib/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openbraininstitute/morphoviewer",
|
|
3
|
-
"version": "0.25.
|
|
3
|
+
"version": "0.25.4",
|
|
4
4
|
"description": "Class to display SWC files in 3D on a canvas",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"module": "./dist/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"url": "https://github.com/openbraininstitute/morphoviewer/issues"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@tolokoban/tgd": "^2.0.
|
|
44
|
+
"@tolokoban/tgd": "^2.0.139",
|
|
45
45
|
"fflate": "^0.8.2",
|
|
46
46
|
"tslib": "^2.8.1"
|
|
47
47
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openbraininstitute/morphoviewer",
|
|
3
|
-
"version": "0.25.
|
|
3
|
+
"version": "0.25.4",
|
|
4
4
|
"description": "Class to display SWC morphology files in 3D",
|
|
5
5
|
"main": "./lib/dist/index.js",
|
|
6
6
|
"module": "./lib/dist/index.js",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"react": "^19.2.4"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@tolokoban/tgd": "^2.0.
|
|
37
|
+
"@tolokoban/tgd": "^2.0.139",
|
|
38
38
|
"fflate": "^0.8.2",
|
|
39
39
|
"tslib": "^2.8.1"
|
|
40
40
|
},
|