Skip to content

Commit 602bddb

Browse files
committed
Allow transparent segmentations
1 parent 04d0c0e commit 602bddb

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

Assets/Scripts/VolumeObject/VolumeRenderedObject.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,17 +254,19 @@ public void UpdateSegmentationLabels()
254254
float minDataValue = secondaryDataset.GetMinDataValue();
255255
float maxDataValue = secondaryDataset.GetMaxDataValue();
256256
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(0.0f, 0.0f));
257-
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(1.0f, 1.0f));
258257
for (int i = 0; i < segmentationLabels.Count; i++)
259258
{
260259
SegmentationLabel segmentationLabel = segmentationLabels[i];
261260
float t = segmentationLabel.id / maxDataValue;
261+
float segmAlpha = segmentationLabel.colour.a;
262262
secondaryTransferFunction.colourControlPoints.Add(new TFColourControlPoint(t, segmentationLabel.colour));
263-
if (i == 0)
264-
{
265-
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(t - 0.01f, 0.0f));
266-
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(t, 1.0f));
267-
}
263+
if (t > 0.0f)
264+
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(Mathf.Max(t - 0.001f, 0.0f), segmAlpha));
265+
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(t, segmAlpha));
266+
if (i == segmentationLabels.Count - 1)
267+
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(1.0f, segmAlpha));
268+
else
269+
secondaryTransferFunction.alphaControlPoints.Add(new TFAlphaControlPoint(t + 0.001f, segmAlpha));
268270
}
269271
secondaryTransferFunction.GenerateTexture();
270272
secondaryTransferFunction.GetTexture().filterMode = FilterMode.Point;

Assets/Shaders/DirectVolumeRenderingShader.shader

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -476,13 +476,17 @@
476476
const float secondaryDensity = getSecondaryDensity(currPos);
477477
if (secondaryDensity > 0.0)
478478
{
479-
col = getSecondaryTF1DColour(secondaryDensity);
480-
float3 gradient = getGradient(currPos);
481-
float gradMag = length(gradient);
482-
float3 normal = gradient / gradMag;
483-
col.rgb = calculateLighting(col.rgb, normal, getLightDirection(-ray.direction), -ray.direction, 0.15);
484-
col.a = 1.0;
485-
break;
479+
float4 secondaryColour = getSecondaryTF1DColour(secondaryDensity);
480+
if (secondaryColour.a > 0.0)
481+
{
482+
col = secondaryColour;
483+
float3 gradient = getGradient(currPos);
484+
float gradMag = length(gradient);
485+
float3 normal = gradient / gradMag;
486+
col.rgb = calculateLighting(col.rgb, normal, getLightDirection(-ray.direction), -ray.direction, 0.15);
487+
col.a = 1.0;
488+
break;
489+
}
486490
}
487491
#endif
488492
if (density > _MinVal && density < _MaxVal)

0 commit comments

Comments
 (0)