Import Geant4 11.2.0.beta source tree

source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -34,9 +34,6 @@
 
 #include "G4VViewer.hh"
 #include "G4OpenGL.hh"
-#ifdef G4OPENGL_VERSION_2
-#include "G4OpenGLVboDrawer.hh"
-#endif
 
 class G4OpenGLSceneHandler;
 class G4gl2ps;
@@ -110,16 +107,6 @@ public:
   virtual bool exportImage(std::string name="", int width=-1, int height=-1);
   bool setExportImageFormat(std::string format,bool quiet = false);
 
-#ifdef G4OPENGL_VERSION_2
-
-  void setVboDrawer(G4OpenGLVboDrawer* drawer);
-  G4OpenGLVboDrawer* fVboDrawer;
-
-  inline bool isInitialized() {
-    return fGlViewInitialized;
-  }
-#endif
-
 protected:
   G4OpenGLViewer (G4OpenGLSceneHandler& scene);
   virtual ~G4OpenGLViewer ();
@@ -241,39 +228,6 @@ private :
   bool fIsGettingPickInfos;
   // Block SetView() during picking
   
-#ifdef G4OPENGL_VERSION_2
-public:
-  inline GLuint getShaderProgram() {
-    return fShaderProgram;
-  }
-  inline GLuint getShaderProjectionMatrix() {
-    return fpMatrixUniform;
-  }
-  inline GLuint getShaderTransformMatrix() {
-    return ftMatrixUniform;
-  }
-  inline GLuint getShaderViewModelMatrix() {
-    return fmvMatrixUniform;
-  }
-
-protected :
-  
-  // define the keyword shader to handle it in a better way for OpenGL and WebGL
-#define Shader GLuint
-
-  // define some attributes and variables for OpenGL and WebGL
-  GLuint fShaderProgram;
-  
-  // Program and related variables
-  GLuint fVertexPositionAttribute;
-  GLuint fVertexNormalAttribute;
-  GLuint fpMatrixUniform;
-  GLuint fcMatrixUniform;
-  GLuint fmvMatrixUniform;
-  GLuint fnMatrixUniform;
-  GLuint ftMatrixUniform;
-
-#endif
 };
 
 #endif