Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_OpenGLHelper.h
diff --git
a/src/VTKViewer/VTKViewer_OpenGLHelper.h
b/src/VTKViewer/VTKViewer_OpenGLHelper.h
index 26333be2d2d7481ad532c7f12b8bea533daa294c..4dd55b8f83567825df06b609f43b679fba3976eb 100644
(file)
--- a/
src/VTKViewer/VTKViewer_OpenGLHelper.h
+++ b/
src/VTKViewer/VTKViewer_OpenGLHelper.h
@@
-24,6
+24,10
@@
#include <vtkMatrix4x4.h>
#include "VTKViewer.h"
#include <vtkMatrix4x4.h>
#include "VTKViewer.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
+
#include <GL/gl.h>
#include <GL/gl.h>
@@
-66,6
+70,11
@@
typedef ptrdiff_t GLsizeiptrARB;
#define GL_STATIC_DRAW_ARB 0x88E4
#endif
#define GL_STATIC_DRAW_ARB 0x88E4
#endif
+
+namespace GUI_OPENGL {
+char* readFromFile( std::string fileName );
+}
+
class VTKVIEWER_EXPORT VTKViewer_OpenGLHelper
{
public:
class VTKVIEWER_EXPORT VTKViewer_OpenGLHelper
{
public:
@@
-85,9
+94,10
@@
public:
void DestroyShaderProgram (GLhandleARB theProgram,
GLhandleARB theVertexShader,
GLhandleARB theFragmentShader) const;
void DestroyShaderProgram (GLhandleARB theProgram,
GLhandleARB theVertexShader,
GLhandleARB theFragmentShader) const;
-
+#ifdef VTK_OPENGL2
void SetUniformMatrix (const GLint theLocation,
const vtkMatrix4x4* theMatrix) const;
void SetUniformMatrix (const GLint theLocation,
const vtkMatrix4x4* theMatrix) const;
+#endif
protected:
typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
protected:
typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);