Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'master'

Browse Source 
7cfc1199 Demo.cxx: MapperRayTracer is no longer a templated class. UnitTestMapperEGL.cxx: MapperGL is no longer a templated class. UnitTestMapperGLFW.cxx: strmp needs cstring rendering/CMakeLists.txt: need to append egl_sources to sources.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !552
This commit is contained in:
Mark Kim 2016-09-16 09:02:06 -04:00 committed by Kitware Robot
commit e59fc37f90
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/demo/Demo.cxx
View File

@ -78,7 +78,7 @@ int main(int argc, char* argv[])
fieldName = "SCALARS:pointvar";
}
typedef vtkm::rendering::MapperRayTracer<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> Mapper;
typedef vtkm::rendering::MapperRayTracer Mapper;
typedef vtkm::rendering::CanvasRayTracer Canvas;
// Set up a camera for rendering the input data

2
vtkm/rendering/CMakeLists.txt
View File

@ -128,7 +128,7 @@ if(VTKm_OpenGL_FOUND)
vtkm_configure_component_EGL()
if(VTKm_EGL_FOUND)
list(APPEND headers ${egl_headers})
list(APPEND sources ${egl_headers})
list(APPEND sources ${egl_sources})
endif()
vtkm_configure_component_GLFW()

2
vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx
View File

@ -33,7 +33,7 @@ namespace {
void RenderTests()
{
typedef vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> M;
typedef vtkm::rendering::MapperGL M;
typedef vtkm::rendering::CanvasEGL C;
typedef vtkm::rendering::View3D V3;
typedef vtkm::rendering::View2D V2;

3
vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx
View File

@ -19,16 +19,17 @@
//============================================================================
#include <vtkm/Bounds.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <GLFW/glfw3.h>
#include <vtkm/rendering/Actor.h>
#include <vtkm/rendering/CanvasGL.h>
#include <vtkm/rendering/MapperGL.h>
#include <GLFW/glfw3.h>
#include <vtkm/rendering/Scene.h>
#include <vtkm/rendering/View2D.h>
#include <vtkm/rendering/View3D.h>
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/rendering/testing/RenderTest.h>
#include <cstring>
namespace {
static const vtkm::Id WIDTH = 512, HEIGHT = 512;