Move mesa package to right place.

Also, add in code for rectlinear mesh.
This commit is contained in:
Dave Pugmire 2016-03-17 09:55:26 -04:00 committed by Robert Maynard
parent 294b73e00e
commit a8c7f92d58
3 changed files with 16 additions and 2 deletions

@ -66,8 +66,6 @@ if(NOT Boost_FOUND)
message(FATAL_ERROR "Please specify where to find boost headers (${VTKm_REQUIRED_BOOST_VERSION}+)" )
endif()
find_package(MESA REQUIRED)
#-----------------------------------------------------------------------------
# Check for Cxx11 support.
option(VTKm_FORCE_ANSI

@ -33,6 +33,7 @@ set(headers
)
#-----------------------------------------------------------------------------
find_package(MESA REQUIRED)
vtkm_declare_headers(${headers})
add_subdirectory(raytracing)
include_directories(${OSMESA_INCLUDE_DIR})

@ -74,6 +74,21 @@ public:
eVerts = dcoords.Cast<vtkm::cont::ArrayHandle< vtkm::Vec<vtkm::Float32,3> > > ();
RenderTriangles(numTri, eVerts, indices, sf, colorTable, scalarBounds);
}
else if(dcoords.IsSameType(vtkm::cont::ArrayHandleCartesianProduct<
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault> >()))
{
vtkm::cont::ArrayHandleCartesianProduct<
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault> > rVerts;
rVerts = dcoords.Cast<vtkm::cont::ArrayHandleCartesianProduct<
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault> > > ();
RenderTriangles(numTri, rVerts, indices, sf, colorTable, scalarBounds);
}
glFinish();
glFlush();
}