lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.5.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-12-07 15:15:39 +01:00
parent 6aa23be517
commit db49709b53
11370 changed files with 187480 additions and 160142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenGL/include/G4OpenGL.hh
+23 -23
View File
@@ -23,11 +23,10 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4OpenGL.hh 101714 2016-11-22 08:53:13Z gcosmo $
//
// G.Barrand.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OpenGL_h
#define G4OpenGL_h
@@ -39,42 +38,43 @@
#endif
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#ifndef G4VIS_BUILD_OPENGLQT_DRIVER
# include <GL/gl.h>
#else
#if defined (G4VIS_BUILD_OPENGLX_DRIVER) || defined (G4VIS_USE_OPENGLX)
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifdef __MACH__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#else
#include <GL/gl.h>
#endif
#endif
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifdef __MACH__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#else
#include <GL/gl.h>
#endif
#endif
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#ifndef G4VIS_BUILD_OPENGLQT_DRIVER
# include <GL/gl.h>
#else
#ifdef __MACH__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#endif
#endif
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
# include <GL/gl.h>
#endif
//# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
//# include <GL/glx.h>
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
# include <Wt/WGLWidget>
# define G4OPENGL_VERSION_2 1
#endif
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#ifndef G4VIS_BUILD_OPENGLX_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#if defined (G4VIS_BUILD_OPENGLX_DRIVER) || defined (G4VIS_USE_OPENGLX)
#else
#ifdef __MACH__
//# define G4OPENGL_VERSION_2 1
#include <OpenGL/gl.h>
@@ -93,6 +93,6 @@
#define G4OPENGL_FLT_BIG 1.e20
#endif
#endif
#endif
source/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh
-1
View File
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4OpenGLFontBaseStore.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// J.Allison Apr 2005.
source/visualization/OpenGL/include/G4OpenGLImmediateQt.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateQt.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// OpenGLImmediateQt graphics system factory.
source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateQtViewer.hh 83403 2014-08-21 15:07:30Z gcosmo $
//
//
// Class G4OpenGLImmediateQtViewer : a class derived from
// G4OpenGLQtViewer and G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLIMMEDIATEQTVIEWER_HH
#define G4OPENGLIMMEDIATEQTVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateSceneHandler.hh 80466 2014-04-23 12:07:25Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
// G4OpenGLImmediateSceneHandler - no Display lists.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLIMMEDIATESCENEHANDLER_HH
#define G4OPENGLIMMEDIATESCENEHANDLER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
+1 -2
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 7th February 1997
@@ -32,7 +31,7 @@
// an OpenGL viewer, for inheritance by
// derived (X, Xm...) classes.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLIMMEDIATEVIEWER_HH
#define G4OPENGLIMMEDIATEVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateWin32.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// OpenGLImmediateWin32 graphics system factory.
source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateWin32Viewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Class G4OpenGLImmediateWin32Viewer : a class derived from
// G4OpenGLWin32Viewer and G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
#ifndef G4OpenGLIMMEDIATEWIN32VIEWER_HH
#define G4OpenGLIMMEDIATEWIN32VIEWER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateWt.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateWt.hh 75567 2013-11-04 11:35:11Z gcosmo $
//
//
// OpenGLImmediateWt graphics system factory.
source/visualization/OpenGL/include/G4OpenGLImmediateWtViewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateWtViewer.hh 85263 2014-10-27 08:58:31Z gcosmo $
//
//
// Class G4OpenGLImmediateWtViewer : a class derived from
// G4OpenGLWtViewer and G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
#ifndef G4OPENGLIMMEDIATEWTVIEWER_HH
#define G4OPENGLIMMEDIATEWTVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateX.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateXViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLImmediateXViewer : a class derived from G4OpenGLXViewer and
// G4OpenGLImmediateViewer.
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#if defined (G4VIS_BUILD_OPENGLX_DRIVER) || defined (G4VIS_USE_OPENGLX)
#ifndef G4OpenGLIMMEDIATEXVIEWER_HH
#define G4OpenGLIMMEDIATEXVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateXm.hh 91686 2015-07-31 09:40:08Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateXmViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
// G4OpenGLXmViewer : Class derived from G4OpenGLXViewer, to provide
// (Motif) widget OpenGL functionality for GEANT4.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLIMMEDIATEXMVIEWER_HH
#define G4OPENGLIMMEDIATEXMVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLQt.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id:$
//
// John Allison 27th October 2012
// Base class for OpenGLImmediate/StoredQt graphics system factories.
source/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh
+1 -3
View File
@@ -24,12 +24,10 @@
// ********************************************************************
//
//
// $Id: G4OpenGLQtExportDialog.hh 82764 2014-07-08 14:24:04Z gcosmo $
// GEANT4 tag $Name:
//
//
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLQTEXPORTDIALOG_HH
#define G4OPENGLQTEXPORTDIALOG_HH
source/visualization/OpenGL/include/G4OpenGLQtMovieDialog.hh
+1 -3
View File
@@ -24,12 +24,10 @@
// ********************************************************************
//
//
// $Id: G4OpenGLQtMovieDialog.hh 66373 2012-12-18 09:41:34Z gcosmo $
// GEANT4 tag $Name:
//
//
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLQTMOVIEDIALOG_HH
#define G4OPENGLQTMOVIEDIALOG_HH
source/visualization/OpenGL/include/G4OpenGLQtViewer.hh
+1 -2
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLQtViewer.hh 108601 2018-02-26 10:03:17Z gcosmo $
//
//
// G4OpenGLQtViewer : Class to provide WindowsNT specific
@@ -32,7 +31,7 @@
//
// 30/06/2014 : M.Kelsey : Change QPixmap objects to pointers
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLQTVIEWER_HH
#define G4OPENGLQTVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
+5 -6
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLSceneHandler.hh 99440 2016-09-22 08:34:04Z gcosmo $
//
//
// Andrew Walkden 27th March 1996
// OpenGL scene handler - base for immediate mode and stored mode classes to
// inherit from.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLSCENEHANDLER_HH
#define G4OPENGLSCENEHANDLER_HH
@@ -124,12 +123,12 @@ public:
void drawVBOArray(std::vector<double> vertices);
// Buffers used to access vertex and indices elements
#ifndef G4VIS_BUILD_OPENGLWT_DRIVER
GLuint fVertexBufferObject;
GLuint fIndicesBufferObject;
#else
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
Wt::WGLWidget::Buffer fVertexBufferObject;
Wt::WGLWidget::Buffer fIndicesBufferObject;
#else
GLuint fVertexBufferObject;
GLuint fIndicesBufferObject;
#endif // G4VIS_BUILD_OPENGLWT_DRIVER
#endif //G4OPENGL_VERSION_2
source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLSceneHandler.icc 99076 2016-09-01 12:40:47Z gcosmo $
//
//
// Andrew Walkden 20th January 1998
source/visualization/OpenGL/include/G4OpenGLStoredQt.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredQt.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// OpenGLStoredQt graphics system factory.
source/visualization/OpenGL/include/G4OpenGLStoredQtSceneHandler.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredSceneHandler.hh,v 1.32 2010-11-10 17:10:49 allison Exp $
//
//
// Laurent Garnier 27th October 2011
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLSTOREDQTSCENEHANDLER_HH
#define G4OPENGLSTOREDQTSCENEHANDLER_HH
source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredQtViewer.hh 83403 2014-08-21 15:07:30Z gcosmo $
//
//
// Class G4OpenGLStoredQtViewer : a class derived from
// G4OpenGLQtViewer and G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
#ifndef G4OPENGLSTOREDQTVIEWER_HH
#define G4OPENGLSTOREDQTVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredSceneHandler.hh 81942 2014-06-06 15:54:20Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
// G4OpenGLStoredSceneHandler - creates OpenGL Display lists.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLSTOREDSCENEHANDLER_HH
#define G4OPENGLSTOREDSCENEHANDLER_HH
source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
+1 -2
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredViewer.hh 108131 2018-01-09 13:23:26Z gcosmo $
//
//
// Andrew Walkden 7th February 1997
@@ -32,7 +31,7 @@
// an OpenGL viewer, for inheritance by
// derived (X, Xm...) classes.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLSTOREDVIEWER_HH
#define G4OPENGLSTOREDVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredWin32.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// OpenGLStoredWin32 graphics system factory.
source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredWin32Viewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Class G4OpenGLStoredWin32Viewer : a class derived from
// G4OpenGLWin32Viewer and G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
#ifndef G4OPENGLSTOREDWIN32VIEWER_HH
#define G4OPENGLSTOREDWIN32VIEWER_HH
source/visualization/OpenGL/include/G4OpenGLStoredX.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredX.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredXViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 7th February 1997
// Class G4OpenGLStoredXViewer : a class derived from G4OpenGLXViewer and
// G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#if defined (G4VIS_BUILD_OPENGLX_DRIVER) || defined (G4VIS_USE_OPENGLX)
#ifndef G4OPENGLSTOREDXVIEWER_HH
#define G4OPENGLSTOREDXVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredXm.hh 91686 2015-07-31 09:40:08Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredXmViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
// Class G4OpenGLStoredXmViewer : a class derived from G4OpenGLXmViewer
// and G4OpenGLStoredViewer.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OpenGLSTOREDXMVIEWER_HH
#define G4OpenGLSTOREDXMVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLTransform3D.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 24th October 1996
// G4OpenGLTransform3D provides OpenGL style transformation matrix
// from G4Transform3D.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLTRANSFORM3D_HH
#define G4OPENGLTRANSFORM3D_HH
source/visualization/OpenGL/include/G4OpenGLVboDrawer.hh
+5 -6
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLVboDrawer.hh 74103 2014-06-23 07:52:38Z lgarnier $
//
//
// G4OpenGLVboDrawer : Class to provide Wt and Qt specific
@@ -93,7 +92,7 @@
// + WT (OpenGL ES) case +
// +--------------------------------+
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
class G4OpenGLImmediateWtViewer;
@@ -297,7 +296,7 @@ public:
virtual ~G4OpenGLVboDrawer ();
// WT specific
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
void vboGlClear(Wt::WFlags< GLenum > mask);
void vboGlUniformMatrix4(const Wt::WGLWidget::UniformLocation &location, const Wt::WMatrix4x4 &mat);
void vboGlUniformMatrix4(const Wt::WGLWidget::UniformLocation &location, const double* matrix);
@@ -338,8 +337,8 @@ public:
#else
void vboGlMultMatrixf( const GLfloat *m );
void vboGlMultMatrixd( const GLdouble *m );
#endif
#endif // G4VIS_BUILD_OPENGLWT_DRIVER
void vboGlFlush();
void vboGlOrtho(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
void vboGlFrustum(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
@@ -373,7 +372,7 @@ private:
std::string fOGLType;
GLenum fMatrixMode;
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
G4OpenGLImmediateWtViewer* fVboViewer;
#else
G4OpenGLImmediateQtViewer* fVboViewer;
source/visualization/OpenGL/include/G4OpenGLViewer.hh
+9 -10
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLViewer.hh 108131 2018-01-09 13:23:26Z gcosmo $
//
//
// Andrew Walkden 27th March 1996
// OpenGL viewer - opens window, hard copy, etc.
#ifdef G4VIS_BUILD_OPENGL_DRIVER
#if defined (G4VIS_BUILD_OPENGL_DRIVER) || defined (G4VIS_USE_OPENGL)
#ifndef G4OPENGLVIEWER_HH
#define G4OPENGLVIEWER_HH
@@ -252,7 +251,7 @@ private :
#ifdef G4OPENGL_VERSION_2
public:
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
inline Wt::WGLWidget::Program getShaderProgram() {
return fShaderProgram;
}
@@ -275,19 +274,19 @@ public:
inline GLuint getShaderViewModelMatrix() {
return fmvMatrixUniform;
}
#endif
#endif // G4VIS_BUILD_OPENGLWT_DRIVER
protected :
// define the keyword shader to handle it in a better way for OpenGL and WebGL
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
#define Shader Wt::WGLWidget::Shader
#else
#define Shader GLuint
#endif
#endif // G4VIS_BUILD_OPENGLWT_DRIVER
// define some attributes and variables for OpenGL and WebGL
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
Wt::WGLWidget::Program fShaderProgram;
// Program and related variables
@@ -309,8 +308,8 @@ protected :
GLuint fmvMatrixUniform;
GLuint fnMatrixUniform;
GLuint ftMatrixUniform;
#endif
#endif // G4VIS_BUILD_OPENGLWT_DRIVER
#endif
};
source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4OpenGLViewerMessenger.hh 99440 2016-09-22 08:34:04Z gcosmo $
#ifndef G4OPENGLVIEWERMESSENGER_HH
#define G4OPENGLVIEWERMESSENGER_HH
source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLWin32Viewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// G4OpenGLWin32Viewer : Class to provide WindowsNT specific
// functionality for OpenGL in GEANT4
#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
#if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
#ifndef G4OPENGLWIN32VIEWER_HH
#define G4OPENGLWIN32VIEWER_HH
source/visualization/OpenGL/include/G4OpenGLWtViewer.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLWtViewer.hh 75567 2013-11-04 11:35:11Z gcosmo $
//
//
// G4OpenGLWtViewer : Class to provide WindowsNT specific
// functionality for OpenGL in GEANT4
#ifdef G4VIS_BUILD_OPENGLWT_DRIVER
#if defined (G4VIS_BUILD_OPENGLWT_DRIVER) || defined (G4VIS_USE_OPENGLWT)
#ifndef G4OPENGLWTVIEWER_HH
#define G4OPENGLWTVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLXViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXViewer.hh 87695 2014-12-17 09:35:24Z gcosmo $
//
//
// Andrew Walkden 7th February 1997
// G4OpenGLXViewer : Class to provide XWindows specific
// functionality for OpenGL in GEANT4
#ifdef G4VIS_BUILD_OPENGLX_DRIVER
#if defined (G4VIS_BUILD_OPENGLX_DRIVER) || defined (G4VIS_USE_OPENGLX)
#ifndef G4OPENGLXVIEWER_HH
#define G4OPENGLXVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLXm.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id:$
//
// John Allison 16th July 2015
// Base class for OpenGLImmediate/StoredXm graphics system factories.
source/visualization/OpenGL/include/G4OpenGLXmBox.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmBox.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Box container class
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMBOX_HH
#define G4OPENGLXMBOX_HH
source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmFourArrowButtons.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMFOURARROWBUTTONS_HH
#define G4OPENGLXMFOURARROWBUTTONS_HH
source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
+1 -2
View File
@@ -24,13 +24,12 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmFramedBox.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Framed box container class
//Inherits from G4OpenGLXmBox
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMFRAMEDBOX_HH
#define G4OPENGLXMFRAMEDBOX_HH
source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmPushButton.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Push button class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMPUSHBUTTON_HH
#define G4OPENGLXMPUSHBUTTON_HH
source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmRadioButton.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Radio button class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMRADIOBUTTON_HH
#define G4OPENGLXMRADIOBUTTON_HH
source/visualization/OpenGL/include/G4OpenGLXmResources.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmResources.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Default resources file for GEANT4 OpenGL Motif windows.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMRESOURCES_HH
#define G4OPENGLXMRESOURCES_HH
source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmSeparator.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Separator class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMSEPARATOR_HH
#define G4OPENGLXMSEPARATOR_HH
source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmSliderBar.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMSLIDERBAR_HH
#define G4OPENGLXMSLIDERBAR_HH
source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmTextField.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Text field class. Inherits from G4OpenGLXmVWidgetComponent
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMTEXTFIELD_HH
#define G4OPENGLXMTEXTFIELD_HH
source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmTopLevelShell.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Top level shell class
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMTOPLEVELSHELL_HH
#define G4OPENGLXMTOPLEVELSHELL_HH
source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmVWidgetComponent.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Base class for all Motif component widgets
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVWIDGETCOMPONENT_HH
#define G4OPENGLXMVWIDGETCOMPONENT_HH
source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmVWidgetContainer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Base class for all Motif container widgets
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVWIDGETCONTAINER_HH
#define G4OPENGLXMVWIDGETCONTAINER_HH
source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmVWidgetObject.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Virtual base class for all Motif widgets.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVWIDGETOBJECT_HH
#define G4OPENGLXMVWIDGETOBJECT_HH
source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
+1 -2
View File
@@ -24,12 +24,11 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmVWidgetShell.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
//Base class for all Motif window widgets (shells)
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVWIDGETSHELL_HH
#define G4OPENGLXMVWIDGETSHELL_HH
source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
+1 -2
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
// G4OpenGLXmViewer : Class derived from G4OpenGLXViewer, to provide
// (Motif) widget OpenGL functionality for GEANT4.
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVIEWER_HH
#define G4OPENGLXMVIEWER_HH
source/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh
+1 -2
View File
@@ -24,9 +24,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXmViewerMessenger.hh 66373 2012-12-18 09:41:34Z gcosmo $
#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
#if defined (G4VIS_BUILD_OPENGLXM_DRIVER) || defined (G4VIS_USE_OPENGLXM)
#ifndef G4OPENGLXMVIEWERMESSENGER_HH
#define G4OPENGLXMVIEWERMESSENGER_HH
source/visualization/OpenGL/include/G4VisFeaturesOfOpenGL.hh
-1
View File
@@ -24,7 +24,6 @@
// ********************************************************************
//
//
// $Id: G4VisFeaturesOfOpenGL.hh 66264 2012-12-14 10:17:44Z allison $
//
//