@openbraininstitute/morphoviewer 0.24.16 → 0.24.18
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 +7 -5
- package/lib/dist/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.js +2 -2
- package/lib/dist/components/morpho-viewer-small-circuit/painter/camera.js +2 -2
- package/lib/dist/components/morpho-viewer-small-circuit/painter/index.d.ts +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/index.d.ts.map +1 -1
- package/lib/dist/components/morpho-viewer-small-circuit/painter/index.js +2 -2
- package/lib/dist/components/morpho-viewer-small-circuit/painter/manager.d.ts +6 -1
- 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 +42 -11
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.d.ts +5 -2
- 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 +31 -19
- package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts +2 -1
- 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 +29 -7
- 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 +91 -78
- package/lib/dist/utils.js +2 -2
- package/package.json +6 -3
package/README.md
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
# @
|
|
2
|
-
|
|
3
|
-
<p align="center">
|
|
4
|
-
<a href="https://www.epfl.ch/research/domains/bluebrain/">Blue Brain Project</a>
|
|
5
|
-
</p>
|
|
1
|
+
# @openbraininstitute/morphoviewer
|
|
6
2
|
|
|
7
3
|
[See it in action](https://openbraininstitute.github.io/morphoviewer/).
|
|
8
4
|
|
|
@@ -33,3 +29,9 @@ The development of this software was supported by funding to the Blue Brain Proj
|
|
|
33
29
|
|
|
34
30
|
Copyright (c) 2024 Blue Brain Project/EPFL
|
|
35
31
|
Copyright (c) 2025 Open Brain Institute
|
|
32
|
+
|
|
33
|
+
## Release notes
|
|
34
|
+
|
|
35
|
+
### v0.24.18
|
|
36
|
+
|
|
37
|
+
- Add Tauri-based testing tool (`tst/`) for checking LOD blocks bounding boxes
|
package/lib/dist/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"morpho-viewer-small-circuit.d.ts","sourceRoot":"","sources":["../../../src/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"morpho-viewer-small-circuit.d.ts","sourceRoot":"","sources":["../../../src/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,GAAG,CAAC;AA0CvD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,2CAmC5E"}
|
|
@@ -5,7 +5,7 @@ import { classNames } from "./../../utils.js";
|
|
|
5
5
|
import { ButtonCameraReset } from "../button-reset-camera/index.js";
|
|
6
6
|
import { IconClose } from "../icons/close.js";
|
|
7
7
|
import { IconFullscreen } from "../icons/fullscreen.js";
|
|
8
|
-
import { usePainterManager } from "./painter/
|
|
8
|
+
import { usePainterManager } from "./painter/index.js";
|
|
9
9
|
import styles from "./morpho-viewer-small-circuit.module.css";
|
|
10
10
|
export function MorphoViewerSmallCircuit(props) {
|
|
11
11
|
var _a;
|
|
@@ -29,4 +29,4 @@ const Canvas = React.memo(({ painterManager }) => {
|
|
|
29
29
|
};
|
|
30
30
|
} }, "canvas"));
|
|
31
31
|
});
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ycGhvLXZpZXdlci1zbWFsbC1jaXJjdWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbXBvbmVudHMvbW9ycGhvLXZpZXdlci1zbWFsbC1jaXJjdWl0L21vcnBoby12aWV3ZXItc21hbGwtY2lyY3VpdC50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUxQixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXJDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMzQyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFckQsT0FBTyxFQUF1QixpQkFBaUIsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVuRSxPQUFPLE1BQU0sTUFBTSwwQ0FBMEMsQ0FBQztBQXVDOUQsTUFBTSxVQUFVLHdCQUF3QixDQUFDLEtBQW9DOztJQUMzRSxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUF3QixJQUFJLENBQUMsQ0FBQztJQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN6QyxNQUFNLHNCQUFzQixHQUFHLEdBQUcsRUFBRTtRQUNsQyxNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHO1lBQUUsT0FBTztRQUVqQixtQkFBbUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQixDQUFDLENBQUM7SUFFRixPQUFPLENBQ0wsZUFDRSxHQUFHLEVBQUUsR0FBRyxFQUNSLFNBQVMsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsd0JBQXdCLENBQUMsRUFDdkUsS0FBSyxFQUFFO1lBQ0wsVUFBVSxFQUFFLE1BQUEsS0FBSyxDQUFDLGVBQWUsbUNBQUksTUFBTTtTQUM1QyxhQUVELEtBQUMsTUFBTSxJQUFDLGNBQWMsRUFBRSxPQUFPLEdBQUksRUFDbkMsNkJBQ0UsZUFBTyxFQUNQLEtBQUMsaUJBQWlCLElBQUMsY0FBYyxFQUFFLE9BQU8sR0FBSSxFQUM5QyxlQUFLLFNBQVMsRUFBRSxNQUFNLENBQUMsSUFBSSxhQUN6QixpQkFBUSxJQUFJLEVBQUMsUUFBUSxFQUFDLE9BQU8sRUFBRSxzQkFBc0IsWUFDbkQsS0FBQyxjQUFjLEtBQUcsR0FDWCxFQUNSLEtBQUssQ0FBQyxPQUFPLElBQUksQ0FDaEIsaUJBQVEsSUFBSSxFQUFDLFFBQVEsRUFBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sWUFDMUMsS0FBQyxTQUFTLEtBQUcsR0FDTixDQUNWLElBQ0csSUFDQyxJQUNMLENBQ1AsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxjQUFjLEVBQXNDLEVBQUUsRUFBRTtJQUNuRixPQUFPLENBQ0wsaUJBRUUsR0FBRyxFQUFFLENBQUMsTUFBZ0MsRUFBRSxFQUFFO1lBQ3hDLGNBQWMsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1lBQy9CLE9BQU8sR0FBRyxFQUFFO2dCQUNWLGNBQWMsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDO1lBQy9CLENBQUMsQ0FBQztRQUNKLENBQUMsSUFORyxRQUFRLENBT1osQ0FDSCxDQUFDO0FBQ0osQ0FBQyxDQUFDLENBQUMifQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TgdControllerCameraOrbit, tgdActionCreateCameraInterpolation, tgdEasingFunctionInOutCubic, } from "@tolokoban/tgd";
|
|
2
|
-
const ZOOM_MIN = 0.
|
|
3
|
-
const ZOOM_MAX =
|
|
2
|
+
const ZOOM_MIN = 0.5;
|
|
3
|
+
const ZOOM_MAX = 20;
|
|
4
4
|
export class CameraManager {
|
|
5
5
|
constructor(context, eventRestingPosition) {
|
|
6
6
|
this.context = context;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { PainterManager, usePainterManager } from "./manager";
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
export { PainterManager, usePainterManager } from "./manager.js";
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY29tcG9uZW50cy9tb3JwaG8tdmlld2VyLXNtYWxsLWNpcmN1aXQvcGFpbnRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sV0FBVyxDQUFDIn0=
|
|
@@ -4,6 +4,7 @@ export declare class PainterManager {
|
|
|
4
4
|
readonly eventRestingPosition: TgdEvent<boolean>;
|
|
5
5
|
readonly eventCellHover: TgdEvent<MorphoViewerSmallCircuitCell | undefined>;
|
|
6
6
|
readonly eventCellClick: TgdEvent<MorphoViewerSmallCircuitCell | undefined>;
|
|
7
|
+
onLoadProgress?(progress: number): void;
|
|
7
8
|
private readonly viewportMatchingScale;
|
|
8
9
|
private _canvas;
|
|
9
10
|
private _background;
|
|
@@ -19,6 +20,8 @@ export declare class PainterManager {
|
|
|
19
20
|
private readonly cellsForHighights;
|
|
20
21
|
private readonly groupHighlithedCells;
|
|
21
22
|
private loadCell;
|
|
23
|
+
private cellCountTotal;
|
|
24
|
+
private cellCountLoaded;
|
|
22
25
|
private framebufferCircuit;
|
|
23
26
|
private textureFramebufferCircuit;
|
|
24
27
|
private framebufferHighlightedCells;
|
|
@@ -27,9 +30,11 @@ export declare class PainterManager {
|
|
|
27
30
|
private textureFramebufferBlur;
|
|
28
31
|
private loadedCells;
|
|
29
32
|
private circuitSignature;
|
|
33
|
+
private bbox;
|
|
30
34
|
readonly cameraReset: () => void | undefined;
|
|
31
35
|
setCircuit(circuit: MorphoViewerSmallCircuitCell[], loadCell: (id: string) => Promise<MorphoViewerSmallCircuitCellData | null>): void;
|
|
32
36
|
private updateCircuit;
|
|
37
|
+
private adaptCameraFromBBox;
|
|
33
38
|
get highlightedCellIds(): string[] | undefined;
|
|
34
39
|
set highlightedCellIds(value: string[] | undefined);
|
|
35
40
|
private updateHightedCells;
|
|
@@ -45,5 +50,5 @@ export declare class PainterManager {
|
|
|
45
50
|
private readonly handlePointerTap;
|
|
46
51
|
private delete;
|
|
47
52
|
}
|
|
48
|
-
export declare function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, }: MorphoViewerSmallCircuitProps): PainterManager;
|
|
53
|
+
export declare function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, }: MorphoViewerSmallCircuitProps): PainterManager;
|
|
49
54
|
//# 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,EAKL,QAAQ,EAcT,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-small-circuit/painter/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,QAAQ,EAcT,MAAM,gBAAgB,CAAC;AASxB,OAAO,KAAK,EACV,4BAA4B,EAC5B,gCAAgC,EAChC,6BAA6B,EAC9B,MAAM,IAAI,CAAC;AAMZ,qBAAa,cAAc;IACzB,SAAgB,oBAAoB,oBAA2B;IAC/D,SAAgB,cAAc,qDAA4D;IAC1F,SAAgB,cAAc,qDAA4D;IAOnF,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAM9C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAO;IAC7C,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4B;IAC5D,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8C;IACzE,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkC;IACpE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAElC;IACH,OAAO,CAAC,QAAQ,CACT;IAIP,OAAO,CAAC,cAAc,CAAK;IAK3B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,yBAAyB,CAA6B;IAC9D,OAAO,CAAC,2BAA2B,CAA4B;IAC/D,OAAO,CAAC,kCAAkC,CAA6B;IACvE,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,sBAAsB,CAA6B;IAC3D,OAAO,CAAC,WAAW,CAAsE;IACzF,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,IAAI,CAAwB;IAEpC,QAAQ,CAAC,WAAW,yBAA2C;IAE/D,UAAU,CACR,OAAO,EAAE,4BAA4B,EAAE,EACvC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC;IAqB5E,OAAO,CAAC,aAAa;IAqDrB,OAAO,CAAC,mBAAmB;IAoB3B,IAAW,kBAAkB,IAGQ,MAAM,EAAE,GAAG,SAAS,CADxD;IACD,IAAW,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,EAKxD;IAED,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,UAAU,IAGQ,MAAM,CAD3B;IACD,IAAI,UAAU,CAAC,KAAK,EAAE,MAAM,EAU3B;IAED,IAAI,MAAM,IAGS,iBAAiB,GAAG,IAAI,CAD1C;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,EAgD1C;IAED,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,iCAAiC;IAkBzC,OAAO,CAAC,qBAAqB;IAuC7B,OAAO,CAAC,SAAS;IAoBjB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CASjC;IAEF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAM/B;IAEF,OAAO,CAAC,MAAM;CAsBf;AAED,wBAAgB,iBAAiB,CAAC,EAChC,eAAe,EACf,OAAO,EACP,QAAQ,EACR,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,cAAc,GACf,EAAE,6BAA6B,kBAmC/B"}
|
|
@@ -3,7 +3,7 @@ import React from "react";
|
|
|
3
3
|
import { CacheLRU } from "./../../../tools/cache-lru.js";
|
|
4
4
|
import { CameraManager } from "./camera.js";
|
|
5
5
|
import { OffscreenPainter } from "./offscreen-painter/index.js";
|
|
6
|
-
import { PainterCell } from "./painter-cell/
|
|
6
|
+
import { PainterCell } from "./painter-cell/index.js";
|
|
7
7
|
export class PainterManager {
|
|
8
8
|
constructor() {
|
|
9
9
|
this.eventRestingPosition = new TgdEvent();
|
|
@@ -26,6 +26,8 @@ export class PainterManager {
|
|
|
26
26
|
name: "groupHighlisthedCells",
|
|
27
27
|
});
|
|
28
28
|
this.loadCell = null;
|
|
29
|
+
this.cellCountTotal = 0;
|
|
30
|
+
this.cellCountLoaded = 0;
|
|
29
31
|
this.framebufferCircuit = null;
|
|
30
32
|
this.textureFramebufferCircuit = null;
|
|
31
33
|
this.framebufferHighlightedCells = null;
|
|
@@ -34,6 +36,7 @@ export class PainterManager {
|
|
|
34
36
|
this.textureFramebufferBlur = null;
|
|
35
37
|
this.loadedCells = new CacheLRU(24);
|
|
36
38
|
this.circuitSignature = "";
|
|
39
|
+
this.bbox = new TgdBoundingBox();
|
|
37
40
|
this.cameraReset = () => { var _a; return (_a = this.cameraManager) === null || _a === void 0 ? void 0 : _a.resetCamera(); };
|
|
38
41
|
this.handlePointerHover = (evt) => {
|
|
39
42
|
const { offscreen } = this;
|
|
@@ -74,12 +77,16 @@ export class PainterManager {
|
|
|
74
77
|
this.updateCircuit();
|
|
75
78
|
}
|
|
76
79
|
updateCircuit() {
|
|
80
|
+
var _a;
|
|
77
81
|
const { context } = this;
|
|
78
82
|
if (!context)
|
|
79
83
|
return;
|
|
80
84
|
const { loadCell, loadedCells } = this;
|
|
81
85
|
if (!loadCell)
|
|
82
86
|
return;
|
|
87
|
+
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, 0);
|
|
88
|
+
this.cellCountTotal = this.circuit.length;
|
|
89
|
+
this.cellCountLoaded = 0;
|
|
83
90
|
const camera = new TgdCameraPerspective({
|
|
84
91
|
zoom: 1,
|
|
85
92
|
});
|
|
@@ -88,17 +95,27 @@ export class PainterManager {
|
|
|
88
95
|
loadCell,
|
|
89
96
|
loadedCells,
|
|
90
97
|
});
|
|
91
|
-
const bbox = new TgdBoundingBox();
|
|
92
98
|
const { cellsForHighights: highlightingCells } = this;
|
|
93
99
|
highlightingCells.clear();
|
|
94
100
|
this.groupHighlithedCells.removeAll(false);
|
|
101
|
+
this.bbox = new TgdBoundingBox();
|
|
95
102
|
for (const cell of this.circuit) {
|
|
96
103
|
const [x, y, z] = cell.center;
|
|
97
|
-
|
|
104
|
+
const r = cell.somaRadius;
|
|
105
|
+
this.bbox.addSphere(x, y, z, r * 5);
|
|
98
106
|
const painterCell = new PainterCell(context, {
|
|
99
107
|
cell,
|
|
100
108
|
loadCell,
|
|
101
109
|
matrerial: "full",
|
|
110
|
+
onCellLoaded: (bbox) => {
|
|
111
|
+
var _a;
|
|
112
|
+
if (bbox) {
|
|
113
|
+
this.bbox.addBBox(bbox);
|
|
114
|
+
this.adaptCameraFromBBox();
|
|
115
|
+
}
|
|
116
|
+
this.cellCountLoaded++;
|
|
117
|
+
(_a = this.onLoadProgress) === null || _a === void 0 ? void 0 : _a.call(this, this.cellCountLoaded / this.cellCountTotal);
|
|
118
|
+
},
|
|
102
119
|
});
|
|
103
120
|
this.groupCells.add(painterCell);
|
|
104
121
|
const highlightedCell = new PainterCell(context, {
|
|
@@ -108,6 +125,17 @@ export class PainterManager {
|
|
|
108
125
|
});
|
|
109
126
|
highlightingCells.set(cell.id, highlightedCell);
|
|
110
127
|
}
|
|
128
|
+
this.updateHightedCells();
|
|
129
|
+
context.camera = camera;
|
|
130
|
+
this.adaptCameraFromBBox();
|
|
131
|
+
context.paint();
|
|
132
|
+
}
|
|
133
|
+
adaptCameraFromBBox() {
|
|
134
|
+
const { context } = this;
|
|
135
|
+
if (!context)
|
|
136
|
+
return;
|
|
137
|
+
const { bbox } = this;
|
|
138
|
+
const { camera } = context;
|
|
111
139
|
const bboxW = Math.abs(bbox.max[0] - bbox.min[0]);
|
|
112
140
|
const bboxH = Math.abs(bbox.max[1] - bbox.min[1]);
|
|
113
141
|
camera.transfo.position = bbox.center;
|
|
@@ -115,14 +143,11 @@ export class PainterManager {
|
|
|
115
143
|
camera.fitSpaceAtTarget(bboxW * scale, bboxH * scale);
|
|
116
144
|
camera.near = 1;
|
|
117
145
|
camera.far = camera.transfo.distance * 2;
|
|
118
|
-
camera.zoom =
|
|
146
|
+
camera.zoom = 2;
|
|
119
147
|
const { cameraManager } = this;
|
|
120
148
|
if (cameraManager) {
|
|
121
149
|
cameraManager.target = camera.getCurrentState();
|
|
122
150
|
}
|
|
123
|
-
this.updateHightedCells();
|
|
124
|
-
context.paint();
|
|
125
|
-
context.camera = camera;
|
|
126
151
|
}
|
|
127
152
|
get highlightedCellIds() {
|
|
128
153
|
return this._highlightedCellIds;
|
|
@@ -183,7 +208,7 @@ export class PainterManager {
|
|
|
183
208
|
context.inputs.pointer.eventTap.addListener(this.handlePointerTap);
|
|
184
209
|
this.context = context;
|
|
185
210
|
this.cameraManager = new CameraManager(context, this.eventRestingPosition);
|
|
186
|
-
const clear =
|
|
211
|
+
const clear = new TgdPainterClear(context, {
|
|
187
212
|
color: [
|
|
188
213
|
this.backgroundColor.R,
|
|
189
214
|
this.backgroundColor.G,
|
|
@@ -191,13 +216,16 @@ export class PainterManager {
|
|
|
191
216
|
this.backgroundColor.A,
|
|
192
217
|
],
|
|
193
218
|
depth: 1,
|
|
194
|
-
})
|
|
219
|
+
});
|
|
220
|
+
this.painterClear = clear;
|
|
195
221
|
context.add(clear, new TgdPainterState(context, {
|
|
196
222
|
depth: "less",
|
|
223
|
+
cull: "back",
|
|
197
224
|
children: [this.groupCells],
|
|
198
225
|
}), new TgdPainterClear(context, { depth: 1 }), new TgdPainterState(context, {
|
|
199
226
|
depth: "less",
|
|
200
227
|
blend: "add",
|
|
228
|
+
cull: "back",
|
|
201
229
|
children: [this.groupHighlithedCells],
|
|
202
230
|
}));
|
|
203
231
|
this.updateCircuit();
|
|
@@ -311,12 +339,15 @@ export class PainterManager {
|
|
|
311
339
|
}
|
|
312
340
|
}
|
|
313
341
|
}
|
|
314
|
-
export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, }) {
|
|
342
|
+
export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHover, onCellClick, highlightedCellIds, onLoadProgress, }) {
|
|
315
343
|
const ref = React.useRef(null);
|
|
316
344
|
if (!ref.current) {
|
|
317
345
|
ref.current = new PainterManager();
|
|
318
346
|
}
|
|
319
347
|
const manager = ref.current;
|
|
348
|
+
React.useEffect(() => {
|
|
349
|
+
manager.onLoadProgress = onLoadProgress;
|
|
350
|
+
}, [onLoadProgress, manager]);
|
|
320
351
|
React.useEffect(() => {
|
|
321
352
|
manager.background = backgroundColor !== null && backgroundColor !== void 0 ? backgroundColor : "#000";
|
|
322
353
|
}, [backgroundColor, manager]);
|
|
@@ -344,4 +375,4 @@ export function usePainterManager({ backgroundColor, circuit, loadCell, onCellHo
|
|
|
344
375
|
}, [onCellClick, manager]);
|
|
345
376
|
return ref.current;
|
|
346
377
|
}
|
|
347
|
-
//# 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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"}
|
|
378
|
+
//# 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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"}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { type TgdContext, type TgdMaterial, TgdPainterNode } from "@tolokoban/tgd";
|
|
1
|
+
import { TgdBoundingBox, type TgdContext, type TgdMaterial, TgdPainterNode } from "@tolokoban/tgd";
|
|
2
2
|
import { type MorphoViewerTree } from "../../../../morpho-viewer-simul";
|
|
3
|
-
export declare function createCellFromTree(context: TgdContext, material: TgdMaterial, tree: MorphoViewerTree, forSelection: boolean):
|
|
3
|
+
export declare function createCellFromTree(context: TgdContext, material: TgdMaterial, tree: MorphoViewerTree, forSelection: boolean): {
|
|
4
|
+
bbox: TgdBoundingBox;
|
|
5
|
+
node: TgdPainterNode;
|
|
6
|
+
};
|
|
4
7
|
//# sourceMappingURL=tree.d.ts.map
|
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,EACL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,cAAc,EAGf,MAAM,gBAAgB,CAAC;
|
|
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,EACL,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,CAmChD"}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/factory/tree.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TgdPainterNode, TgdPainterSegments, TgdPainterSegmentsData, } from "@tolokoban/tgd";
|
|
1
|
+
import { TgdBoundingBox, TgdPainterNode, TgdPainterSegments, TgdPainterSegmentsData, } from "@tolokoban/tgd";
|
|
2
2
|
import { MorphoViewerTreeItemType, } from "./../../../../morpho-viewer-simul/index.js";
|
|
3
3
|
export function createCellFromTree(context, material, tree, forSelection) {
|
|
4
4
|
const segmentsSoma = new TgdPainterSegmentsData();
|
|
@@ -6,23 +6,35 @@ export function createCellFromTree(context, material, tree, forSelection) {
|
|
|
6
6
|
for (const item of tree.roots) {
|
|
7
7
|
fillSegments(undefined, item, segmentsSoma, segmentsNeurites);
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
9
|
+
const bbox = new TgdBoundingBox();
|
|
10
|
+
for (const segments of [segmentsSoma, segmentsNeurites]) {
|
|
11
|
+
for (let i = 0; i < segments.count; i++) {
|
|
12
|
+
const [x0, y0, z0, r0] = segmentsNeurites.getXYZR0(i);
|
|
13
|
+
bbox.addSphere(x0, y0, z0, r0 * 2);
|
|
14
|
+
const [x1, y1, z1, r1] = segmentsNeurites.getXYZR1(i);
|
|
15
|
+
bbox.addSphere(x1, y1, z1, r1 * 2);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return {
|
|
19
|
+
bbox,
|
|
20
|
+
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
|
+
}),
|
|
37
|
+
};
|
|
26
38
|
}
|
|
27
39
|
function fillSegments(parent, item, segmentsSoma, segmentsNeurites) {
|
|
28
40
|
var _a;
|
|
@@ -39,4 +51,4 @@ function fillSegments(parent, item, segmentsSoma, segmentsNeurites) {
|
|
|
39
51
|
fillSegments(item, child, segmentsSoma, segmentsNeurites);
|
|
40
52
|
}
|
|
41
53
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL21vcnBoby12aWV3ZXItc21hbGwtY2lyY3VpdC9wYWludGVyL3BhaW50ZXItY2VsbC9mYWN0b3J5L3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLGNBQWMsRUFHZCxjQUFjLEVBQ2Qsa0JBQWtCLEVBQ2xCLHNCQUFzQixHQUN2QixNQUFNLGdCQUFnQixDQUFDO0FBRXhCLE9BQU8sRUFHTCx3QkFBd0IsR0FDekIsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxNQUFNLFVBQVUsa0JBQWtCLENBQ2hDLE9BQW1CLEVBQ25CLFFBQXFCLEVBQ3JCLElBQXNCLEVBQ3RCLFlBQXFCO0lBRXJCLE1BQU0sWUFBWSxHQUFHLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUNsRCxNQUFNLGdCQUFnQixHQUFHLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUN0RCxLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM5QixZQUFZLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBQ0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxjQUFjLEVBQUUsQ0FBQztJQUNsQyxLQUFLLE1BQU0sUUFBUSxJQUFJLENBQUMsWUFBWSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsQ0FBQztRQUN4RCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdEQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDbkMsTUFBTSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxHQUFHLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN0RCxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNyQyxDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU87UUFDTCxJQUFJO1FBQ0osSUFBSSxFQUFFLElBQUksY0FBYyxDQUFDO1lBQ3ZCLFFBQVEsRUFBRTtnQkFDUixJQUFJLGtCQUFrQixDQUFDLE9BQU8sRUFBRTtvQkFDOUIsU0FBUyxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO29CQUNoQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDeEMsUUFBUTtvQkFDUixPQUFPLEVBQUUsWUFBWSxDQUFDLFdBQVcsRUFBRTtpQkFDcEMsQ0FBQztnQkFDRixJQUFJLGtCQUFrQixDQUFDLE9BQU8sRUFBRTtvQkFDOUIsU0FBUyxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUMvQixTQUFTLEVBQUUsQ0FBQztvQkFDWixnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDeEMsUUFBUTtvQkFDUixPQUFPLEVBQUUsZ0JBQWdCLENBQUMsV0FBVyxFQUFFO2lCQUN4QyxDQUFDO2FBQ0g7U0FDRixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsTUFBd0MsRUFDeEMsSUFBMEIsRUFDMUIsWUFBb0MsRUFDcEMsZ0JBQXdDOztJQUV4QyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDWixZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDakcsQ0FBQztTQUFNLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN2RCxZQUFZLENBQUMsR0FBRyxDQUNkLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUM3QyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FDdEMsQ0FBQztJQUNKLENBQUM7U0FBTSxDQUFDO1FBQ04sZ0JBQWdCLENBQUMsR0FBRyxDQUNsQixDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFDN0MsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQ3RDLENBQUM7SUFDSixDQUFDO0lBQ0QsS0FBSyxNQUFNLEtBQUssSUFBSSxNQUFBLElBQUksQ0FBQyxRQUFRLG1DQUFJLEVBQUUsRUFBRSxDQUFDO1FBQ3hDLFlBQVksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFlBQVksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzVELENBQUM7QUFDSCxDQUFDIn0=
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { type TgdContext, TgdPainterGroup } from "@tolokoban/tgd";
|
|
1
|
+
import { TgdBoundingBox, type TgdContext, TgdPainterGroup } from "@tolokoban/tgd";
|
|
2
2
|
import type { MorphoViewerSmallCircuitCell, MorphoViewerSmallCircuitCellData } from "../../types";
|
|
3
3
|
export interface PainterCellOptions {
|
|
4
4
|
matrerial?: PainterCellMaterialName;
|
|
5
5
|
cell: MorphoViewerSmallCircuitCell;
|
|
6
6
|
loadCell(id: string): Promise<MorphoViewerSmallCircuitCellData | null>;
|
|
7
|
+
onCellLoaded?(bbox: TgdBoundingBox | null): void;
|
|
7
8
|
}
|
|
8
9
|
export type PainterCellMaterialName = "full" | "flat" | number;
|
|
9
10
|
export declare class PainterCell extends TgdPainterGroup {
|
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,EAEL,cAAc,EAEd,KAAK,UAAU,EAOf,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,KAAK,EAAE,4BAA4B,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAElG,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;IAK5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,MAAM,CAAS;gBAGJ,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,kBAAkB;IAyC9C,IAAI,KAAK,IAGQ,OAAO,CADvB;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAUvB;YAEa,QAAQ;CA4BvB"}
|
package/lib/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
|
-
import { TgdColor, TgdGeometrySphereIco, TgdLight, TgdMaterialDiffuse, TgdMaterialFlat, TgdMaterialSolid, TgdPainterGroup, TgdPainterMesh, TgdQuat, TgdVec4, } from "@tolokoban/tgd";
|
|
2
|
+
import { TgdBoundingBox, TgdColor, TgdGeometrySphereIco, TgdLight, TgdMaterialDiffuse, TgdMaterialFlat, TgdMaterialSolid, TgdPainterGroup, TgdPainterMesh, TgdQuat, TgdVec4, } from "@tolokoban/tgd";
|
|
3
3
|
import { int16ToVec3 } from "./../../../../utils.js";
|
|
4
4
|
import { createCellFromTree } from "./factory/tree.js";
|
|
5
5
|
export class PainterCell extends TgdPainterGroup {
|
|
@@ -63,23 +63,25 @@ export class PainterCell extends TgdPainterGroup {
|
|
|
63
63
|
loadCell() {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
const { context, material } = this;
|
|
66
|
-
const { cell, loadCell } = this.options;
|
|
66
|
+
const { cell, loadCell, onCellLoaded } = this.options;
|
|
67
67
|
try {
|
|
68
68
|
const [path] = cell.id.split("?");
|
|
69
69
|
const data = yield loadCell(path);
|
|
70
70
|
if (isCellAsTree(data)) {
|
|
71
|
-
const
|
|
71
|
+
const { node, bbox } = createCellFromTree(context, material, data.data, typeof this.options.matrerial === "number");
|
|
72
72
|
const [x, y, z] = cell.center;
|
|
73
73
|
const quat = new TgdQuat(cell.orientation);
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
node.transfo.setPosition(x, y, z);
|
|
75
|
+
node.transfo.orientation = quat;
|
|
76
|
+
onCellLoaded === null || onCellLoaded === void 0 ? void 0 : onCellLoaded(applyTransfoToBBox(node.transfo, bbox));
|
|
76
77
|
this.removeAll();
|
|
77
|
-
this.add(
|
|
78
|
+
this.add(node);
|
|
78
79
|
context.paint();
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
catch (error) {
|
|
82
83
|
console.error(`Error loading cell "${cell.id}":`, error);
|
|
84
|
+
onCellLoaded === null || onCellLoaded === void 0 ? void 0 : onCellLoaded(null);
|
|
83
85
|
}
|
|
84
86
|
});
|
|
85
87
|
}
|
|
@@ -102,4 +104,24 @@ function ensureCellHasColor(cell) {
|
|
|
102
104
|
}
|
|
103
105
|
return [color.R, color.G, color.B, color.A];
|
|
104
106
|
}
|
|
105
|
-
|
|
107
|
+
function applyTransfoToBBox(transfo, bbox) {
|
|
108
|
+
const { matrix } = transfo;
|
|
109
|
+
const [x0, y0, z0] = bbox.min;
|
|
110
|
+
const [x1, y1, z1] = bbox.max;
|
|
111
|
+
const points = [
|
|
112
|
+
new TgdVec4(x0, y0, z0, 1),
|
|
113
|
+
new TgdVec4(x0, y0, z1, 1),
|
|
114
|
+
new TgdVec4(x0, y1, z0, 1),
|
|
115
|
+
new TgdVec4(x0, y1, z1, 1),
|
|
116
|
+
new TgdVec4(x1, y0, z0, 1),
|
|
117
|
+
new TgdVec4(x1, y0, z1, 1),
|
|
118
|
+
new TgdVec4(x1, y1, z0, 1),
|
|
119
|
+
new TgdVec4(x1, y1, z1, 1),
|
|
120
|
+
].map((vec) => vec.applyMatrix(matrix));
|
|
121
|
+
const transformedBBox = new TgdBoundingBox();
|
|
122
|
+
for (const [x, y, z] of points) {
|
|
123
|
+
transformedBBox.addPoint(x, y, z);
|
|
124
|
+
}
|
|
125
|
+
return transformedBBox;
|
|
126
|
+
}
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFpbnRlci1jZWxsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2NvbXBvbmVudHMvbW9ycGhvLXZpZXdlci1zbWFsbC1jaXJjdWl0L3BhaW50ZXIvcGFpbnRlci1jZWxsL3BhaW50ZXItY2VsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUVMLGNBQWMsRUFDZCxRQUFRLEVBRVIsb0JBQW9CLEVBQ3BCLFFBQVEsRUFFUixrQkFBa0IsRUFDbEIsZUFBZSxFQUNmLGdCQUFnQixFQUNoQixlQUFlLEVBQ2YsY0FBYyxFQUNkLE9BQU8sRUFFUCxPQUFPLEdBQ1IsTUFBTSxnQkFBZ0IsQ0FBQztBQUV4QixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXRDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBa0JwRCxNQUFNLE9BQU8sV0FBWSxTQUFRLGVBQWU7SUFJOUMsWUFDbUIsT0FBbUIsRUFDbkIsT0FBMkI7O1FBRTVDLEtBQUssQ0FBQztZQUNKLElBQUksRUFBRSxRQUFRLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFO1NBQ2hDLENBQUMsQ0FBQztRQUxjLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFDbkIsWUFBTyxHQUFQLE9BQU8sQ0FBb0I7UUFKdEMsV0FBTSxHQUFHLEtBQUssQ0FBQztRQVNyQixNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQ3pCLE1BQU0sUUFBUSxHQUFHLElBQUksb0JBQW9CLENBQUM7WUFDeEMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVTtZQUN2QixZQUFZLEVBQUUsQ0FBQztTQUNoQixDQUFDLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2QyxNQUFNLFlBQVksR0FBRyxNQUFBLE9B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
|
|
@@ -19,5 +19,6 @@ export interface MorphoViewerSmallCircuitProps {
|
|
|
19
19
|
onCellClick?(cell: MorphoViewerSmallCircuitCell | undefined): void;
|
|
20
20
|
onClose?(): void;
|
|
21
21
|
loadCell(id: string): Promise<MorphoViewerSmallCircuitCellData | null>;
|
|
22
|
+
onLoadProgress?(progress: number): void;
|
|
22
23
|
}
|
|
23
24
|
//# 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,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,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,CAAC;CAChB;AAED,MAAM,MAAM,gCAAgC,GAAG;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACxC,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;IAKjB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/morpho-viewer-small-circuit/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,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,CAAC;CAChB;AAED,MAAM,MAAM,gCAAgC,GAAG;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACxC,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;IAKjB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,CAAC;IAOvE,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC"}
|
package/lib/dist/package.json
CHANGED
|
@@ -1,83 +1,96 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
"
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
"license": "ISC",
|
|
24
|
-
"devDependencies": {
|
|
25
|
-
"@biomejs/biome": "^2.4.4",
|
|
26
|
-
"@types/jest": "^30.0.0",
|
|
27
|
-
"@types/react": "^19.2.14",
|
|
28
|
-
"@typescript-eslint/eslint-plugin": "^8.55.0",
|
|
29
|
-
"@typescript-eslint/parser": "^8.55.0",
|
|
30
|
-
"babel-jest": "^30.2.0",
|
|
31
|
-
"build-typescript-library": "^0.10.0",
|
|
32
|
-
"jest": "^30.2.0",
|
|
33
|
-
"jest-environment-jsdom": "^30.2.0",
|
|
34
|
-
"oxfmt": "^0.46.0",
|
|
35
|
-
"oxlint": "^1.61.0",
|
|
36
|
-
"ts-jest": "^29.4.6",
|
|
37
|
-
"ts-loader": "^9.5.4",
|
|
38
|
-
"ts-patch": "^3.2.1",
|
|
39
|
-
"typedoc": "^0.28.16",
|
|
40
|
-
"typescript": "^5.9.3",
|
|
41
|
-
"typescript-eslint": "^8.55.0",
|
|
42
|
-
"typescript-transform-paths": "^3.5.1"
|
|
43
|
-
},
|
|
44
|
-
"jest": {
|
|
45
|
-
"testEnvironment": "jsdom",
|
|
46
|
-
"moduleFileExtensions": ["tsx", "ts", "js", "jsx", "wasm"],
|
|
47
|
-
"transform": {
|
|
48
|
-
"^.+\\.tsx?$": "ts-jest"
|
|
2
|
+
"name": "@openbraininstitute/morphoviewer",
|
|
3
|
+
"version": "0.24.18",
|
|
4
|
+
"description": "Class to display SWC files in 3D on a canvas",
|
|
5
|
+
"main": "./dist/index.js",
|
|
6
|
+
"module": "./dist/index.js",
|
|
7
|
+
"typings": "./dist/index.d.ts",
|
|
8
|
+
"types": "./dist",
|
|
9
|
+
"files": [
|
|
10
|
+
"./dist"
|
|
11
|
+
],
|
|
12
|
+
"scripts": {
|
|
13
|
+
"clean": "rm -rf ./dist .tsbuildinfo",
|
|
14
|
+
"doc": "typedoc --watch",
|
|
15
|
+
"prebuild": "npm run clean",
|
|
16
|
+
"build": "build-typescript-library .",
|
|
17
|
+
"prestart": "npm run clean",
|
|
18
|
+
"start": "build-typescript-library --watch .",
|
|
19
|
+
"format": "biome format --write src/",
|
|
20
|
+
"lint": "biome check src/",
|
|
21
|
+
"test": "jest",
|
|
22
|
+
"test:watch": "jest --watch"
|
|
49
23
|
},
|
|
50
|
-
"
|
|
51
|
-
|
|
52
|
-
|
|
24
|
+
"keywords": [
|
|
25
|
+
"SWC",
|
|
26
|
+
"morphology",
|
|
27
|
+
"OBI",
|
|
28
|
+
"webgl2",
|
|
29
|
+
"BBP"
|
|
30
|
+
],
|
|
31
|
+
"author": "Fabien PETITJEAN <fabien.petitjean@epfl.ch>",
|
|
32
|
+
"license": "ISC",
|
|
33
|
+
"dependencies": {
|
|
34
|
+
"@tolokoban/tgd": "^2.0.126",
|
|
35
|
+
"fflate": "^0.8.2",
|
|
36
|
+
"tslib": "^2.8.1"
|
|
53
37
|
},
|
|
54
|
-
"
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
38
|
+
"devDependencies": {
|
|
39
|
+
"@types/jest": "^30.0.0",
|
|
40
|
+
"@types/react": "^19.2.14",
|
|
41
|
+
"babel-jest": "^30.3.0",
|
|
42
|
+
"build-typescript-library": "^0.10.0",
|
|
43
|
+
"jest": "^30.3.0",
|
|
44
|
+
"jest-environment-jsdom": "^30.3.0",
|
|
45
|
+
"ts-jest": "^29.4.9",
|
|
46
|
+
"ts-loader": "^9.5.7",
|
|
47
|
+
"ts-patch": "^3.3.0",
|
|
48
|
+
"typedoc": "^0.28.19",
|
|
49
|
+
"typescript": "^5.9.3",
|
|
50
|
+
"typescript-transform-paths": "^3.5.6"
|
|
61
51
|
},
|
|
62
|
-
"
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
"
|
|
72
|
-
|
|
52
|
+
"jest": {
|
|
53
|
+
"testEnvironment": "jsdom",
|
|
54
|
+
"moduleFileExtensions": [
|
|
55
|
+
"tsx",
|
|
56
|
+
"ts",
|
|
57
|
+
"js",
|
|
58
|
+
"jsx",
|
|
59
|
+
"wasm"
|
|
60
|
+
],
|
|
61
|
+
"transform": {
|
|
62
|
+
"^.+\\.tsx?$": "ts-jest"
|
|
63
|
+
},
|
|
64
|
+
"testMatch": [
|
|
65
|
+
"**/*.(test|spec).(ts|tsx)"
|
|
66
|
+
],
|
|
67
|
+
"globals": {
|
|
68
|
+
"ENV_VARIABLES": {}
|
|
69
|
+
},
|
|
70
|
+
"moduleNameMapper": {
|
|
71
|
+
"^@tgd/(.*)$": "<rootDir>/src/tgd/$1",
|
|
72
|
+
"^@tgd": "<rootDir>/src/tgd",
|
|
73
|
+
"^@/(.*)$": "<rootDir>/src/$1",
|
|
74
|
+
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/mocks.js",
|
|
75
|
+
"\\.(css|less)$": "<rootDir>/__mocks__/mocks.js",
|
|
76
|
+
"\\.(py|sh|txt|bin)$": "<rootDir>/__mocks__/mocks.js"
|
|
77
|
+
},
|
|
78
|
+
"verbose": true,
|
|
79
|
+
"collectCoverage": true,
|
|
80
|
+
"coverageReporters": [
|
|
81
|
+
"lcov"
|
|
82
|
+
],
|
|
83
|
+
"coverageDirectory": "test-coverage",
|
|
84
|
+
"coverageThreshold": {
|
|
85
|
+
"global": {
|
|
86
|
+
"branches": 0,
|
|
87
|
+
"functions": 0,
|
|
88
|
+
"lines": 0,
|
|
89
|
+
"statements": 0
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
"peerDependencies": {
|
|
94
|
+
"react": "^19.2.5"
|
|
73
95
|
}
|
|
74
|
-
|
|
75
|
-
"peerDependencies": {
|
|
76
|
-
"react": "^19.2.4"
|
|
77
|
-
},
|
|
78
|
-
"dependencies": {
|
|
79
|
-
"@tolokoban/tgd": "^2.0.124",
|
|
80
|
-
"fflate": "^0.8.2",
|
|
81
|
-
"tslib": "^2.8.1"
|
|
82
|
-
}
|
|
83
|
-
}
|
|
96
|
+
}
|
package/lib/dist/utils.js
CHANGED
|
@@ -48,9 +48,9 @@ export function vec3ToInt16(vec3) {
|
|
|
48
48
|
export function useDebugMode() {
|
|
49
49
|
const [debugMode, setDebugMode] = React.useState(false);
|
|
50
50
|
React.useEffect(() => {
|
|
51
|
-
const item = globalThis.localStorage.getItem("@
|
|
51
|
+
const item = globalThis.localStorage.getItem("@openbraininstitute/morphoviewer:debug");
|
|
52
52
|
setDebugMode(!!item && item.length > 0);
|
|
53
53
|
}, []);
|
|
54
54
|
return debugMode;
|
|
55
55
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBVzFCLE1BQU0sVUFBVSxhQUFhLENBQUksWUFBZSxFQUFFLEtBQTZCO0lBQzdFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLEdBQUcsS0FBSyxDQUFDLFFBQVEsQ0FBSSxZQUFZLENBQUMsQ0FBQztJQUMxRCxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRTtRQUNuQixJQUFJLENBQUMsS0FBSztZQUFFLE9BQU87UUFFbkIsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM1QixPQUFPLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUNaLE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQzNCLFlBQWUsRUFDZixLQUF5QztJQUV6QyxNQUFNLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxHQUFHLEtBQUssQ0FBQyxRQUFRLENBQUksWUFBWSxDQUFDLENBQUM7SUFDMUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUU7UUFDbkIsSUFBSSxDQUFDLEtBQUs7WUFBRSxPQUFPO1FBRW5CLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUIsT0FBTyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzlDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDWixPQUFPO1FBQ0wsS0FBSztRQUNMLENBQUMsR0FBTSxFQUFFLEVBQUU7WUFDVCxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZCLENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSxVQUFVLENBQUMsR0FBRyxJQUFlO0lBQzNDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQzFGLENBQUM7QUFFRCxTQUFTLGFBQWEsQ0FBQyxLQUFhO0lBQ2xDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLEtBQUssQ0FBQztJQUM3QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ1IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDO0lBQzdCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUM7SUFDN0IsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDbkIsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsS0FBYTtJQUN2QyxPQUFPLGFBQWEsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQUVELFNBQVMsYUFBYSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQWU7SUFDNUMsT0FBTyxDQUFDLENBQUMsR0FBRyxLQUFLLEdBQUcsS0FBSyxHQUFHLENBQUMsR0FBRyxLQUFLLEdBQUcsQ0FBQyxDQUFDLEdBQUcsdUJBQXVCLENBQUM7QUFDdkUsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsSUFBa0I7SUFDNUMsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztBQUNqRCxDQUFDO0FBRUQsTUFBTSxVQUFVLFlBQVk7SUFDMUIsTUFBTSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1FBQ25CLE1BQU0sSUFBSSxHQUFHLFVBQVUsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLHdDQUF3QyxDQUFDLENBQUM7UUFDdkYsWUFBWSxDQUFDLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDUCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openbraininstitute/morphoviewer",
|
|
3
|
-
"version": "0.24.
|
|
3
|
+
"version": "0.24.18",
|
|
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",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"webgl2"
|
|
21
21
|
],
|
|
22
22
|
"scripts": {
|
|
23
|
-
"clean": "rm -rf dist node_modules package-lock.json lib/node_modules lib/package-lock.json doc/node_modules doc/package-lock.json && npm run version",
|
|
23
|
+
"clean": "rm -rf dist node_modules package-lock.json lib/node_modules lib/package-lock.json lib/dist doc/node_modules doc/package-lock.json doc/dist doc/public/docs && npm run version",
|
|
24
24
|
"prebuild": "npm run version",
|
|
25
25
|
"build": "cd lib && npm install && npm run build && cd .. && npm pack",
|
|
26
26
|
"minor": "npm version minor -no-git-tag-version --force && node version.mjs",
|
|
@@ -34,8 +34,11 @@
|
|
|
34
34
|
"react": "^19.2.4"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@tolokoban/tgd": "^2.0.
|
|
37
|
+
"@tolokoban/tgd": "^2.0.126",
|
|
38
38
|
"fflate": "^0.8.2",
|
|
39
39
|
"tslib": "^2.8.1"
|
|
40
|
+
},
|
|
41
|
+
"devDependencies": {
|
|
42
|
+
"@biomejs/biome": "^2.4.13"
|
|
40
43
|
}
|
|
41
44
|
}
|