Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Volume geometry type #417

Merged
merged 20 commits into from
Oct 4, 2024
Merged

Volume geometry type #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bddee44
add volume-viewer as file dependency
frasercl Sep 20, 2024
8c1d6da
add volume types w/ basic loading code
frasercl Sep 20, 2024
47cd028
update typescript
frasercl Sep 23, 2024
75c8a3f
`VolumeSimulator` uses vol type, loads data
frasercl Sep 24, 2024
b24cade
put models in geo registry properly
frasercl Sep 24, 2024
d99190e
create and register volume model immediately
frasercl Sep 25, 2024
8514e88
try to fit volumes into the render pipeline
frasercl Sep 25, 2024
b953816
npm won't install anything until I bump ts-jest
frasercl Sep 25, 2024
8d6c442
more package wrangling to fix tests (where was lodash?!)
frasercl Sep 25, 2024
26fd9e4
now at LAST I can bump three and fix my type errors
frasercl Sep 25, 2024
bf87d24
fix new type errors created by fixing old type errors
frasercl Sep 25, 2024
9348bb0
fix more errors from bumping three
frasercl Sep 25, 2024
c023b64
filling out the `VolumeModel` class
frasercl Sep 25, 2024
52e1bbe
you have to turn on the bounding box to see the bounding box
frasercl Sep 27, 2024
1540cd0
fix conversion from collision radius to vol scale
frasercl Sep 27, 2024
2ac02c0
try again to update coverage report
frasercl Sep 26, 2024
be82f2a
Merge branch 'volume-agents' into feature/volume-geometry
frasercl Sep 30, 2024
d5ad903
update some TODOs
frasercl Oct 2, 2024
59ffb13
try out github repo dependency
frasercl Oct 2, 2024
7f62724
Merge branch 'feature/volume-geometry' of https://github.com/simulari…
frasercl Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'coverage'
name: "coverage"
on:
pull_request:
branches:
Expand Down
5 changes: 2 additions & 3 deletions examples/src/simulators/VolumeSimulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ export default class VolumeSim implements IClientSimulatorImpl {
[0]: {
name: "volume",
geometry: {
// TODO swap with volume display type when available
displayType: GeometryDisplayType.SPHERE,
url: "",
displayType: GeometryDisplayType.VOLUME,
url: "https://animatedcell-test-data.s3.us-west-2.amazonaws.com/variance/1.zarr",
color: "ffff00",
},
},
Expand Down
198 changes: 195 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"react-dom": "^18.2.0"
},
"dependencies": {
"@aics/volume-viewer": "allen-cell-animated/volume-viewer#simularium-volumes",
"@babel/plugin-transform-runtime": "^7.23.6",
"@babel/runtime": "^7.23.6",
"@fortawesome/fontawesome-free": "^5.15.2",
Expand Down
Loading
Loading