X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FGEOM_PainterPolyDataMapper.h;h=80b6cf82941948b460a3e9adc1b327e14fa5eba7;hb=c00b6875b6dfd412c9b5e1807e6aa37fbb1218ba;hp=02d23b23f21ff0c9ea27c76a8af5281ded9cc3ca;hpb=bd2042b4d19d69deaf182edda40bbff83e53490a;p=modules%2Fgeom.git diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.h b/src/OBJECT/GEOM_PainterPolyDataMapper.h index 02d23b23f..80b6cf829 100644 --- a/src/OBJECT/GEOM_PainterPolyDataMapper.h +++ b/src/OBJECT/GEOM_PainterPolyDataMapper.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -20,20 +20,35 @@ #ifndef GEOM_PAINTERPOLYDATAMAPPER_H #define GEOM_PAINTERPOLYDATAMAPPER_H +#ifndef VTK_OPENGL2 #include +#else +#include +#endif /* * This class can be used to prevent drawing of mappers' content (due to an * empty definition of GEOM_PainterPolyDataMapper::RenderPiece(...) method). * 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: - vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper); +#ifndef VTK_OPENGL2 + vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper) +#else + vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper) +#endif + + static GEOM_PainterPolyDataMapper* New(); - virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {} + virtual void RenderPiece(vtkRenderer* /*ren*/, vtkActor* /*act*/) {} protected: GEOM_PainterPolyDataMapper() {}