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

Jump to bottom

Volume loader and demo #791

Merged
merged 24 commits into from
Jan 17, 2022
Merged

Volume loader and demo #791

merged 24 commits into from
Jan 17, 2022

Conversation

MathiasPaulin
Copy link
Contributor

This PR adds a volume loaders, handling pvm volume format from The Volume Library (http://schorsch.efi.fh-nuernberg.de/data/volume/) and add a demo about volume rendering.

@codecov
Copy link

codecov bot commented Jul 2, 2021 •
edited
Loading

Codecov Report

Merging #791 (57b429b) into release-candidate (e7279ba) will increase coverage by 0.88%.
The diff coverage is 62.52%.

❗ Current head 57b429b differs from pull request most recent head ac4d31e. Consider uploading reports for the commit ac4d31e to get more accurate results
Impacted file tree graph

@@                  Coverage Diff                  @@
##           release-candidate     #791      +/-   ##
=====================================================
+ Coverage              26.41%   27.29%   +0.88%     
=====================================================
  Files                    321      326       +5     
  Lines                  21413    21887     +474     
=====================================================
+ Hits                    5656     5975     +319     
- Misses                 15757    15912     +155
Impacted Files Coverage Δ
src/Gui/BaseApplication.cpp 0.00% <0.00%> (ø)
tests/ExampleApps/VolumeDemoApp/main.cpp 0.00% <0.00%> (ø)
src/IO/VolumesLoader/VolumeLoader.cpp 44.71% <44.71%> (ø)
src/IO/VolumesLoader/pvmutils.cpp 65.96% <65.96%> (ø)
src/Core/Geometry/Volume.cpp 26.66% <100.00%> (+26.66%) ⬆️
src/Core/Geometry/Volume.hpp 73.52% <100.00%> (+73.52%) ⬆️
tests/unittest/IO/volumeloader.cpp 100.00% <100.00%> (ø)
src/Core/Asset/VolumeData.hpp 100.00% <0.00%> (ø)
src/Core/Asset/FileData.inl 42.37% <0.00%> (+10.16%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be4f7f2...ac4d31e. Read the comment docs.

@MathiasPaulin MathiasPaulin force-pushed the VolumeDemo branch 2 times, most recently from 7b3dd7e to 48a068a Compare July 5, 2021 07:48
@MathiasPaulin MathiasPaulin added Core Related to Ra::Core Feature Request Type of issue: feature request IO Related to Ra::IO tests Related to tests WIP Work in Progress labels Jul 5, 2021
@nmellado
Copy link
Contributor

It seems that the volume files are not copied in the build directory, and so I cannot run the tests because the files are not found.

@MathiasPaulin MathiasPaulin force-pushed the VolumeDemo branch 3 times, most recently from 8552c3d to 8cb243d Compare July 14, 2021 16:42
@MathiasPaulin MathiasPaulin force-pushed the VolumeDemo branch 2 times, most recently from d03894a to 8382bb8 Compare July 28, 2021 11:53
@nmellado
Copy link
Contributor

@MathiasPaulin FYI you have compiling errors on this PR,

@MathiasPaulin MathiasPaulin force-pushed the VolumeDemo branch 4 times, most recently from 5a89309 to 15c48cf Compare January 13, 2022 06:47
@nmellado
Copy link
Contributor

Nice proposal.
Would it make sense to have the VolumeDemo loading one of the volumetric file ? It would be more fancy.

nmellado
nmellado approved these changes Jan 13, 2022
View reviewed changes
Copy link
Contributor

@nmellado nmellado left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to merge on my side.
@dlyr do you want to have a look ?

dlyr
dlyr reviewed Jan 13, 2022
View reviewed changes
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
dlyr
dlyr reviewed Jan 14, 2022
View reviewed changes
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
src/Core/Geometry/Volume.hpp Outdated Show resolved Hide resolved
tests/ExampleApps/VolumeDemoApp/main.cpp Show resolved Hide resolved
tests/ExampleApps/VolumeDemoApp/main.cpp Outdated Show resolved Hide resolved
tests/ExampleApps/VolumeDemoApp/main.cpp Outdated Show resolved Hide resolved
@dlyr
Copy link
Contributor

dlyr commented Jan 17, 2022

I'm fine for accepting this PR, @MathiasPaulin if it's ok for you could you rebase and remove WIP tag ?
I could also do this, but I prefer to be sure there is no pending WIP before merge.

MathiasPaulin and others added 24 commits January 17, 2022 18:16
@MathiasPaulin
[test] Add a volume rendering demo.
9a1f341
@MathiasPaulin
[shaders] Volume shader does not attenuate direct lighting by default
d93c9c5
@MathiasPaulin
[IO] Add loaders for Volume data.
b7fa41a
@MathiasPaulin
[IO] Add property to RadiumIO so that clients can test for volume loa…
2c296fb 
…ding support.
@MathiasPaulin
[tests][IO] Add test on volume loader.
517c15f
@MathiasPaulin
[tests][IO] small refactor.
584f740
@dlyr @MathiasPaulin
[tests] more volume loader unit test, refactor a bit.
6eb17b5
@MathiasPaulin
[tests][IO] update test data file.
3d476a0
@MathiasPaulin
[git] declare pvm file as binary file
56e5496
@MathiasPaulin
[test] Free allocated memory after volumeloader test
1bccd98
@MathiasPaulin
[tests] update Bucky.pvm to binary file
3d6e8ef
@MathiasPaulin
Remove Bucky.pvm
83ec226
@MathiasPaulin
Add Bucky.pvm
e8c857c
@MathiasPaulin
[core] Compute gradients in discrete, dense volume grid
173863a
@MathiasPaulin
[IO] fix Volumeloader segfault
bb143b3
@MathiasPaulin
[core] Add density to the gradient container
9bfc8ae
@MathiasPaulin
[cmake][core][IO][tests] Add RADIUM_IO_VOLUMES cmake option to enable…
6f10fad 
…/disable volume loaders
@MathiasPaulin
[IO] fix Radium::IO target property detection for volume loaders
48b5828
@MathiasPaulin
[tests] Add logs
eb32ca7
@MathiasPaulin
[test] fix segfault when sampling volume
e413a21
@MathiasPaulin
[core] fix openmp shared variable code
69ac89c
@MathiasPaulin
[test] VolumeDemo now loads Lobster.pvm
27b4bb3
@MathiasPaulin
[core] Integrate comments from review and improve genericity of densi…
566478f 
…ty gradient computation.
@MathiasPaulin
[test] Integrate comments from review.
ac4d31e
@MathiasPaulin MathiasPaulin removed the WIP Work in Progress label Jan 17, 2022
@MathiasPaulin
Copy link
Contributor Author

I'm fine for accepting this PR, @MathiasPaulin if it's ok for you could you rebase and remove WIP tag ?
I could also do this, but I prefer to be sure there is no pending WIP before merge.

Rebase done, WIP tag removed, this PR is ready for merge.

@nmellado nmellado merged commit 43a64cb into STORM-IRIT:release-candidate Jan 17, 2022
@MathiasPaulin MathiasPaulin deleted the VolumeDemo branch January 18, 2022 07:30
ntsh-oni pushed a commit to ntsh-oni/Radium-Engine that referenced this pull request Jan 24, 2024
@nmellado
Merge pull request STORM-IRIT#791 from MathiasPaulin/VolumeDemo
97229da 
Volume loader and demo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nmellado nmellado nmellado approved these changes

@dlyr dlyr dlyr left review comments

Assignees
No one assigned
Labels
Core Related to Ra::Core Feature Request Type of issue: feature request IO Related to Ra::IO tests Related to tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MathiasPaulin @nmellado @dlyr