Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor cleanups

Browse Source
This commit is contained in:
Jefferson Amstutz 2024-04-04 13:07:01 -05:00
parent 86e6e6e65b
commit ea30203836
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vtkm/interop/anari/ANARIMapperPoints.cxx
View File

@ -81,8 +81,7 @@ static PointsFieldArrays UnpackFields(FieldSet fields)
retval.Field4 = makeFieldArray(fields[3], retval.NumberOfField4Components);
auto isFieldEmpty = [](const vtkm::cont::Field& f) -> bool {
return f.GetNumberOfValues() == 0 || f.GetData().GetNumberOfComponentsFlat() != 1 ||
!f.GetData().CanConvert<AttributeHandleT>();
return f.GetNumberOfValues() == 0 || f.GetData().GetNumberOfComponentsFlat() != 1;
};
if (!isFieldEmpty(fields[0]))

14
vtkm/interop/anari/ANARIMapperTriangles.cxx
View File

@ -185,11 +185,8 @@ static TriangleFieldArrays UnpackFields(vtkm::cont::ArrayHandle<vtkm::Id4> tris,
const auto numTris = tris.GetNumberOfValues();
using AttributeHandleT = decltype(retval.Field1);
auto isFieldEmpty = [](const vtkm::cont::Field& f) -> bool {
return f.GetNumberOfValues() == 0 || f.GetData().GetNumberOfComponentsFlat() != 1; // ||
// !f.GetData().CanConvert<AttributeHandleT>();
return f.GetNumberOfValues() == 0 || f.GetData().GetNumberOfComponentsFlat() != 1;
};
const bool emptyField1 = isFieldEmpty(fields[0]);
@ -211,15 +208,6 @@ static TriangleFieldArrays UnpackFields(vtkm::cont::ArrayHandle<vtkm::Id4> tris,
if (!emptyField4)
vtkm::cont::ArrayCopyShallowIfPossible(fields[3].GetData(), floatField4);
auto field1 =
emptyField1 ? AttributeHandleT{} : floatField1 /*.AsArrayHandle<AttributeHandleT>()*/;
auto field2 =
emptyField2 ? AttributeHandleT{} : floatField2 /*.AsArrayHandle<AttributeHandleT>()*/;
auto field3 =
emptyField3 ? AttributeHandleT{} : floatField3 /*.AsArrayHandle<AttributeHandleT>()*/;
auto field4 =
emptyField4 ? AttributeHandleT{} : floatField4 /*.AsArrayHandle<AttributeHandleT>()*/;
vtkm::Range field1Range = range;
vtkm::Range field2Range = range;
vtkm::Range field3Range = range;