Add multi component using multiple image data #3132
+2,921
−3,242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Draft
bruyeret
force-pushed
the
multi-component
branch
from
0556774
to
f08182a
Compare
These functions used a `getInput` method that doesn't exist It is not a breaking change as these functions instantly crash when called
The ImageSlice actor already used a more concise code. Do the same for the base Actor and and Volume actor.
The prop3D has three children that were redefining `getBounds` in the same way. Move the definition of `getBounds` in the prop3D. Update typescript accordingly.
BREAKING CHANGE: Move vtkVolumeMapper's properties related to rendering in vtkVolumeProperty. Add a clear error message for these widely used methods. This is part of the MultiVolumeMapper feature.
This work is part of the MultiVolumeMapper feature Fix the getVolumes function which didn't return an array
Instead of comparing a big state that take all actor properties into account, compare the mtime of the actor as it takes properties into account
Support multiple images as input Uniform styling of fragment shader Fix resource sharing core object for volume mapper scalars Many shader bugs are fixed, often linked to wrong coordinate system. Fix normal computation in shader. BREAKING CHANGE: the volume mapper fragment shader is very different. This can cause shader replacements to break. refactor: Use the right matrices in volume FS shader
bruyeret
force-pushed
the
multi-component
branch
from
f08182a
to
1ec4d5b
Compare
The normals have been fixed in the shader, hence the difference Also the sample distance is not computed in index space anymore This explains some differences
bruyeret
force-pushed
the
multi-component
branch
from
1ec4d5b
to
e4eacd7
Compare
bruyeret
force-pushed
the
multi-component
branch
from
159df1e
to
4976534
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Volume mapper now support up to 4 inputs, each representing a component.
This PR contains a very big refactor that opens possibilities for multi volume handling.
To add multiple components using multiple image data:
addInputDatato add multiple image data to the volume mappersetProperty(volumeProperty, n)to also add volume properties per componentThe first volume property will be used for all rendering properties except
preferSizeOverAccuracyandinterpolationType.BREAKING CHANGE:
Some properties have been moved from the volume mapper to the volume property, the following methods have been moved:
'getAnisotropy',
'getComputeNormalFromOpacity',
'getFilterMode',
'getFilterModeAsString',
'getGlobalIlluminationReach',
'getIpScalarRange',
'getIpScalarRangeByReference',
'getLAOKernelRadius',
'getLAOKernelSize',
'getLocalAmbientOcclusion',
'getPreferSizeOverAccuracy',
'getVolumetricScatteringBlending',
'setAnisotropy',
'setAverageIPScalarRange',
'setComputeNormalFromOpacity',
'setFilterMode',
'setFilterModeToNormalized',
'setFilterModeToOff',
'setFilterModeToRaw',
'setGlobalIlluminationReach',
'setIpScalarRange',
'setIpScalarRangeFrom',
'setLAOKernelRadius',
'setLAOKernelSize',
'setLocalAmbientOcclusion',
'setPreferSizeOverAccuracy',
'setVolumetricScatteringBlending'