Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing error in volume renderer

Browse Source
This commit is contained in:
Matt Larsen 2017-02-10 14:00:02 -08:00
parent 9d9c39e197
commit 87e53d6c00
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vtkm/rendering/raytracing/VolumeRendererStructured.h
View File

@ -542,6 +542,8 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField
vtkm::Float32 ty = 0.f;
vtkm::Float32 tz = 0.f;
vtkm::Float32 scalar0 = 0.f;
vtkm::Vec<vtkm::Float32,4> sampleColor(0.f, 0.f, 0.f, 0.f);
while(currentDistance < lastSample)
{
@ -567,18 +569,19 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField
ty = (sampleLocation[1] - bottomLeft[1]) * invSpacing[1];
tz = (sampleLocation[2] - bottomLeft[2]) * invSpacing[2];
//normalize scalar
scalar0 = (scalar0 - MinScalar) * InverseDeltaScalar;
vtkm::Id colorIndex;
colorIndex = static_cast<vtkm::Id>(scalar0 *
static_cast<vtkm::Float32>(ColorMapSize));
colorIndex = vtkm::Min(ColorMapSize, vtkm::Max(vtkm::Id(0),colorIndex));
sampleColor = ColorMap.Get(colorIndex);
newCell = false;
}
//normalize scalar
scalar0 = (scalar0 - MinScalar) * InverseDeltaScalar;
vtkm::Id colorIndex;
colorIndex = static_cast<vtkm::Id>(scalar0 *
static_cast<vtkm::Float32>(ColorMapSize));
colorIndex = vtkm::Min(ColorMapSize, vtkm::Max(vtkm::Id(0),colorIndex));
vtkm::Vec<vtkm::Float32,4> sampleColor = ColorMap.Get(colorIndex);
//sampleColor[3] = .05f;
//composite