Merge remote-tracking branch 'origin/rnv/vtk_opengl2_backend'

This commit is contained in:
rnv 2016-09-05 12:05:43 +03:00
commit 558d862557

View File

@ -20,17 +20,32 @@
#ifndef GEOM_PAINTERPOLYDATAMAPPER_H #ifndef GEOM_PAINTERPOLYDATAMAPPER_H
#define GEOM_PAINTERPOLYDATAMAPPER_H #define GEOM_PAINTERPOLYDATAMAPPER_H
#ifndef VTK_OPENGL2
#include <vtkPainterPolyDataMapper.h> #include <vtkPainterPolyDataMapper.h>
#else
#include <vtkPolyDataMapper.h>
#endif
/* /*
* This class can be used to prevent drawing of mappers' content (due to an * This class can be used to prevent drawing of mappers' content (due to an
* empty definition of GEOM_PainterPolyDataMapper::RenderPiece(...) method). * empty definition of GEOM_PainterPolyDataMapper::RenderPiece(...) method).
* It is used as poly data mapper in GEOM_Actor class. * It is used as poly data mapper in GEOM_Actor class.
*/ */
class GEOM_PainterPolyDataMapper: public vtkPainterPolyDataMapper class GEOM_PainterPolyDataMapper:
#ifndef VTK_OPENGL2
public vtkPainterPolyDataMapper
#else
public vtkPolyDataMapper
#endif
{ {
public: public:
#ifndef VTK_OPENGL2
vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper); vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper);
#else
vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper);
#endif
static GEOM_PainterPolyDataMapper* New(); static GEOM_PainterPolyDataMapper* New();
virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {} virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {}