mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
Merge topic 'fix/scalar_rendering'
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:
commit
319af8e25e
@ -371,11 +371,22 @@ 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)
|
||||
{
|
||||
Normalize = true;
|
||||
if (minScalar > maxScalar)
|
||||
{
|
||||
// support the scalar renderer
|
||||
Normalize = false;
|
||||
MinScalar = 0;
|
||||
invDeltaScalar = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Make sure the we don't divide by zero on
|
||||
//something like an iso-surface
|
||||
@ -384,6 +395,7 @@ public:
|
||||
else
|
||||
invDeltaScalar = 1.f / minScalar;
|
||||
}
|
||||
}
|
||||
typedef void ControlSignature(FieldIn, FieldInOut, WholeArrayIn, WholeArrayIn);
|
||||
typedef void ExecutionSignature(_1, _2, _3, _4);
|
||||
template <typename ScalarPortalType, typename IndicesPortalType>
|
||||
@ -399,9 +411,11 @@ public:
|
||||
vtkm::Id3 pointId = indicesPortal.Get(hitIndex);
|
||||
|
||||
scalar = Precision(scalars.Get(pointId[0]));
|
||||
//normalize
|
||||
if (Normalize)
|
||||
{
|
||||
scalar = (scalar - MinScalar) * invDeltaScalar;
|
||||
}
|
||||
}
|
||||
}; //class GetScalar
|
||||
|
||||
} // namespace detail
|
||||
|
@ -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
|
||||
|
@ -358,11 +358,22 @@ 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)
|
||||
{
|
||||
Normalize = true;
|
||||
if (minScalar > maxScalar)
|
||||
{
|
||||
// support the scalar renderer
|
||||
Normalize = false;
|
||||
MinScalar = 0;
|
||||
invDeltaScalar = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Make sure the we don't divide by zero on
|
||||
//something like an iso-surface
|
||||
@ -371,6 +382,7 @@ public:
|
||||
else
|
||||
invDeltaScalar = 1.f / minScalar;
|
||||
}
|
||||
}
|
||||
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
|
||||
typedef void ExecutionSignature(_1, _2, _3, _4);
|
||||
template <typename ScalarPortalType, typename IndicesPortalType>
|
||||
@ -386,9 +398,11 @@ public:
|
||||
vtkm::Vec<vtkm::Id, 5> pointId = indicesPortal.Get(hitIndex);
|
||||
|
||||
scalar = Precision(scalars.Get(pointId[0]));
|
||||
//normalize
|
||||
if (Normalize)
|
||||
{
|
||||
scalar = (scalar - MinScalar) * invDeltaScalar;
|
||||
}
|
||||
}
|
||||
}; //class GetScalar
|
||||
|
||||
} // namespace detail
|
||||
|
@ -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
|
||||
|
@ -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());
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -249,11 +249,22 @@ 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)
|
||||
{
|
||||
Normalize = true;
|
||||
if (minScalar > maxScalar)
|
||||
{
|
||||
// support the scalar renderer
|
||||
Normalize = false;
|
||||
MinScalar = 0;
|
||||
invDeltaScalar = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Make sure the we don't divide by zero on
|
||||
//something like an iso-surface
|
||||
@ -262,6 +273,7 @@ public:
|
||||
else
|
||||
invDeltaScalar = 1.f / minScalar;
|
||||
}
|
||||
}
|
||||
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
|
||||
typedef void ExecutionSignature(_1, _2, _3, _4);
|
||||
template <typename ScalarPortalType, typename IndicesPortalType>
|
||||
@ -276,9 +288,11 @@ public:
|
||||
vtkm::Id pointId = indicesPortal.Get(hitIndex);
|
||||
|
||||
scalar = Precision(scalars.Get(pointId));
|
||||
//normalize
|
||||
if (Normalize)
|
||||
{
|
||||
scalar = (scalar - MinScalar) * invDeltaScalar;
|
||||
}
|
||||
}
|
||||
}; //class GetScalar
|
||||
|
||||
} // namespace detail
|
||||
|
@ -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)
|
||||
{
|
||||
Normalize = true;
|
||||
if (minScalar > maxScalar)
|
||||
{
|
||||
// support the scalar renderer
|
||||
Normalize = false;
|
||||
MinScalar = 0;
|
||||
invDeltaScalar = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
//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 = 0.f;
|
||||
invDeltaScalar = 1.f / minScalar;
|
||||
}
|
||||
}
|
||||
typedef void ControlSignature(FieldIn,
|
||||
FieldIn,
|
||||
@ -282,8 +294,11 @@ public:
|
||||
Precision cScalar = Precision(scalars.Get(indices[3]));
|
||||
lerpedScalar = aScalar * n + bScalar * u + cScalar * v;
|
||||
//normalize
|
||||
if (Normalize)
|
||||
{
|
||||
lerpedScalar = (lerpedScalar - MinScalar) * invDeltaScalar;
|
||||
}
|
||||
}
|
||||
}; //class LerpScalar
|
||||
|
||||
template <typename Precision>
|
||||
@ -292,11 +307,22 @@ public:
|
||||
private:
|
||||
Precision MinScalar;
|
||||
Precision invDeltaScalar;
|
||||
bool Normalize;
|
||||
|
||||
public:
|
||||
VTKM_CONT
|
||||
NodalScalar(const vtkm::Float32& minScalar, const vtkm::Float32& maxScalar)
|
||||
: MinScalar(minScalar)
|
||||
{
|
||||
Normalize = true;
|
||||
if (minScalar > maxScalar)
|
||||
{
|
||||
// support the scalar renderer
|
||||
Normalize = false;
|
||||
MinScalar = 0;
|
||||
invDeltaScalar = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Make sure the we don't divide by zero on
|
||||
//something like an iso-surface
|
||||
@ -305,6 +331,7 @@ public:
|
||||
else
|
||||
invDeltaScalar = 1.f / minScalar;
|
||||
}
|
||||
}
|
||||
|
||||
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
|
||||
|
||||
@ -323,9 +350,11 @@ public:
|
||||
//Todo: one normalization
|
||||
scalar = Precision(scalars.Get(indices[0]));
|
||||
|
||||
//normalize
|
||||
if (Normalize)
|
||||
{
|
||||
scalar = (scalar - MinScalar) * invDeltaScalar;
|
||||
}
|
||||
}
|
||||
}; //class LerpScalar
|
||||
|
||||
template <typename Precision>
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user