Make mappings work with 8 and 16 bit segmentations #3953
Merged
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
philippotto
approved these changes
Mar 28, 2019
| return vec4(bucketColor.b, bucketColor.a, bucketColor.b, bucketColor.a); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Maybe add a comment line here stating that the following code deals with packingDegree == 4.0? :) Took me a few seconds to figure out why there isn't a if (packingDegree == 4.0) { statement.
| @@ -207,6 +207,14 @@ export const getColorForCoords: ShaderModule = { | |||
|
|
|||
| float rgbaIndex = linearizeVec3ToIndexWithMod(offsetInBucket, bucketWidth, packingDegree); | |||
|
|
|||
| if (packingDegree == 2.0) { | |||
| if (rgbaIndex == 0.0) { | |||
| return vec4(bucketColor.r, bucketColor.g, bucketColor.r, bucketColor.g); | |||
There was a problem hiding this comment.
Why is the pattern rgrg? Can't wrap my head around it right now :)
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.
Getting a vec4 using texture2d from a 2-channel texture (as in the case of 16-bit segmentations) will return a vector like (a,a,a,b), which is why the binary search for mappings on the shader failed (as an exact match of (a,b,0,0) would be needed). I solved this by allowing a new packingDegree of 2 for 16-bit layers and by transforming the volume_color before using the mapping binary search (according to the packing degree).
Therefore, 8-bit segmentations which have a packingDegree of 4 should now work as well.
URL of deployed dev instance (used for testing):
Steps to test:
webknossos.apiReady(3).then(async (api) => {api.data.setMapping(api.data.getVolumeTracingLayerName(), {1: 2, 2: 3}, {hideUnmappedIds: true})})Issues: