Correct minor issues from refactoring MarchingCells worklets

This commit is contained in:
Robert Maynard 2020-03-19 16:22:35 -04:00
parent d3512879d1
commit 1995e52047
2 changed files with 3 additions and 3 deletions

@ -29,7 +29,7 @@ struct CommonState
}
bool MergeDuplicatePoints = true;
bool GenerateNormals = true;
bool GenerateNormals = false;
vtkm::cont::ArrayHandle<vtkm::FloatDefault> InterpolationWeights;
vtkm::cont::ArrayHandle<vtkm::Id2> InterpolationEdgeIds;
vtkm::cont::ArrayHandle<vtkm::Id> CellIdMap;

@ -611,8 +611,8 @@ vtkm::cont::CellSetSingleType<> execute(
const CellSetType& cells,
const CoordinateSystem& coordinateSystem,
const vtkm::cont::ArrayHandle<ValueType, StorageTagField>& inputField,
vtkm::cont::ArrayHandle<vtkm::Vec<CoordinateType, 3>, StorageTagVertices> vertices,
vtkm::cont::ArrayHandle<vtkm::Vec<NormalType, 3>, StorageTagNormals> normals,
vtkm::cont::ArrayHandle<vtkm::Vec<CoordinateType, 3>, StorageTagVertices>& vertices,
vtkm::cont::ArrayHandle<vtkm::Vec<NormalType, 3>, StorageTagNormals>& normals,
vtkm::worklet::contour::CommonState& sharedState)
{
using vtkm::worklet::marching_cells::ClassifyCell;