Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix/scalar_rendering'

Browse Source 
6fe468410 add normalization bypass for nodal scalars
4c0a3858b don't always normalize scalars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sudhanshu Sane <ssane@cs.uoregon.edu>
Merge-request: !2056
This commit is contained in:
Matt Larsen 2020-04-24 00:35:12 +00:00 committed by Kitware Robot
commit 319af8e25e
10 changed files with 114 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vtkm/rendering/raytracing/CylinderIntersector.cxx
View File

@ -371,18 +371,30 @@ class GetScalar : public vtkm::worklet::WorkletMapField
private:
Precision MinScalar;
Precision invDeltaScalar;
bool Normalize;
public:
VTKM_CONT
GetScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
: MinScalar(minScalar)
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
Normalize = true;
if (minScalar > maxScalar)
{
// support the scalar renderer
Normalize = false;
MinScalar = 0;
invDeltaScalar = 1;
}
else
invDeltaScalar = 1.f / minScalar;
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
else
invDeltaScalar = 1.f / minScalar;
}
}
typedef void ControlSignature(FieldIn, FieldInOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
@ -399,8 +411,10 @@ public:
vtkm::Id3 pointId = indicesPortal.Get(hitIndex);
scalar = Precision(scalars.Get(pointId[0]));
//normalize
scalar = (scalar - MinScalar) * invDeltaScalar;
if (Normalize)
{
scalar = (scalar - MinScalar) * invDeltaScalar;
}
}
}; //class GetScalar

4
vtkm/rendering/raytracing/CylinderIntersector.h
View File

@ -53,11 +53,11 @@ public:
void IntersectionData(Ray<vtkm::Float32>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
void IntersectionData(Ray<vtkm::Float64>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
vtkm::Id GetNumberOfShapes() const override;
}; // class ShapeIntersector

28
vtkm/rendering/raytracing/QuadIntersector.cxx
View File

@ -358,18 +358,30 @@ class GetScalar : public vtkm::worklet::WorkletMapField
private:
Precision MinScalar;
Precision invDeltaScalar;
bool Normalize;
public:
VTKM_CONT
GetScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
: MinScalar(minScalar)
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
Normalize = true;
if (minScalar > maxScalar)
{
// support the scalar renderer
Normalize = false;
MinScalar = 0;
invDeltaScalar = 1;
}
else
invDeltaScalar = 1.f / minScalar;
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
else
invDeltaScalar = 1.f / minScalar;
}
}
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
@ -386,8 +398,10 @@ public:
vtkm::Vec<vtkm::Id, 5> pointId = indicesPortal.Get(hitIndex);
scalar = Precision(scalars.Get(pointId[0]));
//normalize
scalar = (scalar - MinScalar) * invDeltaScalar;
if (Normalize)
{
scalar = (scalar - MinScalar) * invDeltaScalar;
}
}
}; //class GetScalar

4
vtkm/rendering/raytracing/QuadIntersector.h
View File

@ -51,11 +51,11 @@ public:
void IntersectionData(Ray<vtkm::Float32>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
void IntersectionData(Ray<vtkm::Float64>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
vtkm::Id GetNumberOfShapes() const override;
}; // class ShapeIntersector

3
vtkm/rendering/raytracing/ScalarRenderer.cxx
View File

@ -124,7 +124,6 @@ void ScalarRenderer::AddField(const vtkm::cont::Field& scalarField)
{
throw vtkm::cont::ErrorBadValue("ScalarRenderer(AddField): field must be a scalar");
}
Ranges.push_back(ranges.ReadPortal().Get(0));
Fields.push_back(scalarField);
}
@ -172,7 +171,7 @@ void ScalarRenderer::RenderOnDevice(Ray<Precision>& rays, Precision missScalar)
for (size_t f = 0; f < numFields; ++f)
{
timer.Start();
Intersector->IntersectionData(rays, Fields[f], Ranges[f]);
Intersector->IntersectionData(rays, Fields[f]);
time = timer.GetElapsedTime();
logger->AddLogData("intersection_data", time);
AddBuffer(rays, missScalar, Fields[f].GetName());

1
vtkm/rendering/raytracing/ScalarRenderer.h
View File

@ -29,7 +29,6 @@ class VTKM_RENDERING_EXPORT ScalarRenderer
protected:
std::shared_ptr<ShapeIntersector> Intersector;
std::vector<vtkm::cont::Field> Fields;
std::vector<vtkm::Range> Ranges;
bool IntersectorValid;
template <typename Precision>

4
vtkm/rendering/raytracing/ShapeIntersector.h
View File

@ -54,11 +54,11 @@ public:
//
virtual void IntersectionData(Ray<vtkm::Float32>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) = 0;
const vtkm::Range& scalarRange = vtkm::Range()) = 0;
virtual void IntersectionData(Ray<vtkm::Float64>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) = 0;
const vtkm::Range& scalarRange = vtkm::Range()) = 0;
template <typename Precision>

28
vtkm/rendering/raytracing/SphereIntersector.cxx
View File

@ -249,18 +249,30 @@ class GetScalar : public vtkm::worklet::WorkletMapField
private:
Precision MinScalar;
Precision invDeltaScalar;
bool Normalize;
public:
VTKM_CONT
GetScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
: MinScalar(minScalar)
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
Normalize = true;
if (minScalar > maxScalar)
{
// support the scalar renderer
Normalize = false;
MinScalar = 0;
invDeltaScalar = 1;
}
else
invDeltaScalar = 1.f / minScalar;
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
else
invDeltaScalar = 1.f / minScalar;
}
}
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
@ -276,8 +288,10 @@ public:
vtkm::Id pointId = indicesPortal.Get(hitIndex);
scalar = Precision(scalars.Get(pointId));
//normalize
scalar = (scalar - MinScalar) * invDeltaScalar;
if (Normalize)
{
scalar = (scalar - MinScalar) * invDeltaScalar;
}
}
}; //class GetScalar

55
vtkm/rendering/raytracing/TriangleIntersector.cxx
View File

@ -243,18 +243,30 @@ public:
private:
Precision MinScalar;
Precision invDeltaScalar;
bool Normalize;
public:
VTKM_CONT
LerpScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
: MinScalar(minScalar)
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
Normalize = true;
if (minScalar > maxScalar)
{
// support the scalar renderer
Normalize = false;
MinScalar = 0;
invDeltaScalar = 1;
}
else
invDeltaScalar = 0.f;
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
else
invDeltaScalar = 1.f / minScalar;
}
}
typedef void ControlSignature(FieldIn,
FieldIn,
@ -282,7 +294,10 @@ public:
Precision cScalar = Precision(scalars.Get(indices[3]));
lerpedScalar = aScalar * n + bScalar * u + cScalar * v;
//normalize
lerpedScalar = (lerpedScalar - MinScalar) * invDeltaScalar;
if (Normalize)
{
lerpedScalar = (lerpedScalar - MinScalar) * invDeltaScalar;
}
}
}; //class LerpScalar
@ -292,18 +307,30 @@ public:
private:
Precision MinScalar;
Precision invDeltaScalar;
bool Normalize;
public:
VTKM_CONT
NodalScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
: MinScalar(minScalar)
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
Normalize = true;
if (minScalar > maxScalar)
{
// support the scalar renderer
Normalize = false;
MinScalar = 0;
invDeltaScalar = 1;
}
else
invDeltaScalar = 1.f / minScalar;
{
//Make sure the we don't divide by zero on
//something like an iso-surface
if (maxScalar - MinScalar != 0.f)
invDeltaScalar = 1.f / (maxScalar - MinScalar);
else
invDeltaScalar = 1.f / minScalar;
}
}
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
@ -323,8 +350,10 @@ public:
//Todo: one normalization
scalar = Precision(scalars.Get(indices[0]));
//normalize
scalar = (scalar - MinScalar) * invDeltaScalar;
if (Normalize)
{
scalar = (scalar - MinScalar) * invDeltaScalar;
}
}
}; //class LerpScalar

4
vtkm/rendering/raytracing/TriangleIntersector.h
View File

@ -46,11 +46,11 @@ public:
VTKM_CONT void IntersectionData(Ray<vtkm::Float32>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
VTKM_CONT void IntersectionData(Ray<vtkm::Float64>& rays,
const vtkm::cont::Field scalarField,
const vtkm::Range& scalarRange) override;
const vtkm::Range& scalarRange = vtkm::Range()) override;
template <typename Precision>
VTKM_CONT void IntersectRaysImp(Ray<Precision>& rays, bool returnCellIndex);