VolumeManager, AccumulateBlockVolume.frag, AccumulateSimpleVolume.fra…

…g: Respect Volume visibilty of the volume node. Add sceneGraphVisibility per volume shader uniform. Should solve scenerygraphics/sciview#422
scenerygraphics · Jun 13, 2023 · 62715f9 · 62715f9
1 parent 63edcca
commit 62715f9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/main/kotlin/graphics/scenery/volumes/VolumeManager.kt b/src/main/kotlin/graphics/scenery/volumes/VolumeManager.kt
@@ -45,7 +45,6 @@ import java.nio.IntBuffer
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.ForkJoinPool
-import java.util.function.BiConsumer
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.system.measureTimeMillis
@@ -287,34 +286,39 @@ class VolumeManager(
             "convert",
             "slicingPlanes",
             "slicingMode",
-            "usedSlicingPlanes"
+            "usedSlicingPlanes",
+            "sceneGraphVisibility"
         )
         segments[SegmentType.SampleVolume] = SegmentTemplate(
             "SampleSimpleVolume.frag",
             "im", "sourcemax", "intersectBoundingBox",
             "volume", "transferFunction", "colorMap", "sampleVolume", "convert", "slicingPlanes",
-            "slicingMode", "usedSlicingPlanes"
+            "slicingMode", "usedSlicingPlanes",
+            "sceneGraphVisibility"
         )
         segments[SegmentType.Convert] = SegmentTemplate(
             "Converter.frag",
             "convert", "offset", "scale"
         )
         segments[SegmentType.AccumulatorMultiresolution] = SegmentTemplate(
             "AccumulateBlockVolume.frag",
-            "vis", "sampleVolume", "convert"
+            "vis", "sampleVolume", "convert", "sceneGraphVisibility"
         )
         segments[SegmentType.Accumulator] = SegmentTemplate(
             "AccumulateSimpleVolume.frag",
-            "vis", "sampleVolume", "convert"
+            "vis", "sampleVolume", "convert", "sceneGraphVisibility"
         )
 
         customSegments?.forEach { type, segment -> segments[type] = segment }
 
         val additionalBindings = customBindings
-        ?: TriConsumer { _: Map<SegmentType, SegmentTemplate>, instances: Map<SegmentType, Segment>, _: Int ->
+            ?: TriConsumer { _: Map<SegmentType, SegmentTemplate>, instances: Map<SegmentType, Segment>, i: Int ->
                 logger.debug("Connecting additional bindings")
+
                 instances[SegmentType.SampleMultiresolutionVolume]?.bind("convert", instances[SegmentType.Convert])
                 instances[SegmentType.SampleVolume]?.bind("convert", instances[SegmentType.Convert])
+                instances[SegmentType.SampleVolume]?.bind("sceneGraphVisibility", instances[SegmentType.Accumulator])
+                instances[SegmentType.SampleMultiresolutionVolume]?.bind("sceneGraphVisibility", instances[SegmentType.AccumulatorMultiresolution])
             }
 
         val newProgvol = MultiVolumeShaderMip(
@@ -465,6 +469,7 @@ class VolumeManager(
                     currentProg.setCustomUniformForVolume(i, "slicingMode", state.node.slicingMode.id)
                     currentProg.setCustomUniformForVolume(i,"usedSlicingPlanes",
                         min(state.node.slicingPlaneEquations.size, Volume.MAX_SUPPORTED_SLICING_PLANES))
+                    currentProg.setCustomUniformForVolume(i, "sceneGraphVisibility", if (state.node.visible) 1 else 0)
 
                     context.bindTexture(state.transferFunction)
                     context.bindTexture(state.colorMap)

diff --git a/src/main/resources/graphics/scenery/volumes/AccumulateBlockVolume.frag b/src/main/resources/graphics/scenery/volumes/AccumulateBlockVolume.frag
@@ -1,3 +1,8 @@
+// sceneGraphVisibility should be in main BDVVolume.frag but doing per
+// volume uniforms there is wonky and doing them here in a shader segment works better
+uniform int sceneGraphVisibility;
+
+vis = vis && bool(sceneGraphVisibility);
 if (vis)
 {
     vec4 x = sampleVolume(wpos, volumeCache, cacheSize, blockSize, paddedBlockSize, cachePadOffset);

diff --git a/src/main/resources/graphics/scenery/volumes/AccumulateSimpleVolume.frag b/src/main/resources/graphics/scenery/volumes/AccumulateSimpleVolume.frag
@@ -1,3 +1,8 @@
+// sceneGraphVisibility should be in main BDVVolume.frag but doing per
+// volume uniforms there is wonky and doing them here in a shader segment works better
+uniform int sceneGraphVisibility;
+
+vis = vis && bool(sceneGraphVisibility);
 if (vis)
 {
     vec4 x = sampleVolume(wpos);