Merge branch 'rnv/23406'

[modules/gui.git] / src / VTKViewer / VTKViewer_PolyDataMapper.h

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.h b/src/VTKViewer/VTKViewer_PolyDataMapper.h
index 8f8349520cf422faac362e1391613c9f2e82699a..14418801a163c50146aee4304fb3f4b621409cad 100644 (file)
--- a/src/VTKViewer/VTKViewer_PolyDataMapper.h
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.h
@@ -29,7 +29,11 @@
 
 #include <map>
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 
 #include <vtkSmartPointer.h>
 
@@ -43,10 +47,7 @@ class vtkImageData;
 #define MAPPER_SUPERCLASS vtkMesaPolyDataMapper
 #endif
 
-#ifndef GL_ARB_shader_objects
-typedef GLuint GLhandleARB;
-#endif
-
+#include "VTKViewer_OpenGLHelper.h"
 
 //----------------------------------------------------------------------------
 //! OpenGL Point Sprites PolyData Mapper.
@@ -132,6 +133,7 @@ private:
 
   vtkSmartPointer<vtkImageData> ImageData;
 
+  VTKViewer_OpenGLHelper OpenGLHelper;
   GLhandleARB PointProgram;
 #ifdef VTK_OPENGL2
   GLhandleARB VertexShader;
@@ -143,11 +145,13 @@ private:
     static const GLint INVALID_LOCATION = -1;
 
     GLint ModelViewProjection;
+    GLint Projection;
     GLint GeneralPointSize;
     GLint PointSprite;
 
     Locations()
     : ModelViewProjection (INVALID_LOCATION),
+      Projection          (INVALID_LOCATION),
       GeneralPointSize    (INVALID_LOCATION),
       PointSprite         (INVALID_LOCATION)
     {