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

Merge topic 'color_fix'

Browse Source 
bd845f01 Adding coordinate system include to the volume renderer
59020fe9 Adding several more includes to the volume renderer
9f074e4a Removing typename from typdef declaration in the volume renderer
d14791a7 Merge branch 'color_fix' of https://gitlab.kitware.com/mclarsen/vtk-m into color_fix
bee68682 Fixing the include in the rendering library
f611b0b4 Fixing the include in the rendering library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !686
This commit is contained in:
Matt Larsen 2017-02-09 23:00:26 +00:00 committed by Kitware Robot
commit c487931f1f
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/rendering/Color.h
View File

@ -21,7 +21,7 @@
#define vtk_m_rendering_Color_h
#include <iostream>
#include <vtkm/cont/DataSet.h>
#include <vtkm/Types.h>
namespace vtkm {
namespace rendering {

2
vtkm/rendering/ColorTable.h
View File

@ -20,8 +20,8 @@
#ifndef vtk_m_rendering_ColorTable_h
#define vtk_m_rendering_ColorTable_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/rendering/vtkm_rendering_export.h>
#include <vtkm/rendering/Color.h>
#include <memory>

3
vtkm/rendering/Mapper.h
View File

@ -20,6 +20,9 @@
#ifndef vtk_m_rendering_Mapper_h
#define vtk_m_rendering_Mapper_h
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/Field.h>
#include <vtkm/rendering/Camera.h>
#include <vtkm/rendering/Canvas.h>
#include <vtkm/rendering/ColorTable.h>

5
vtkm/rendering/raytracing/VolumeRendererStructured.h
View File

@ -25,7 +25,10 @@
#include <math.h>
#include <iostream>
#include <stdio.h>
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
#include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/ErrorBadValue.h>
#include <vtkm/rendering/ColorTable.h>
#include <vtkm/rendering/raytracing/Ray.h>
@ -43,7 +46,7 @@ class VolumeRendererStructured
{
public:
typedef vtkm::cont::ArrayHandle<vtkm::FloatDefault> DefaultHandle;
typedef typename vtkm::cont::ArrayHandleCartesianProduct<DefaultHandle,DefaultHandle,DefaultHandle> CartesianArrayHandle;
typedef vtkm::cont::ArrayHandleCartesianProduct<DefaultHandle,DefaultHandle,DefaultHandle> CartesianArrayHandle;
class Sampler : public vtkm::worklet::WorkletMapField
{