Changeset 914 for trunk/source/visualization/OpenGL/include

Timestamp:

Feb 3, 2009, 4:41:56 PM (17 years ago)

Author:

garnier

Message:

test avec des predefined headers...mais +10% de temps de compilation....

Location:

trunk/source/visualization/OpenGL/include

Files:

• G4OpenGLBitMapStore.hh (modified) (1 diff)
• G4OpenGLImmediateSceneHandler.hh (modified) (1 diff)
• G4OpenGLImmediateViewer.hh (modified) (1 diff)
• G4OpenGLImmediateWin32Viewer.hh (modified) (1 diff)
• G4OpenGLImmediateXViewer.hh (modified) (1 diff)
• G4OpenGLImmediateXmViewer.hh (modified) (1 diff)
• G4OpenGLQtExportDialog.hh (modified) (1 diff)
• G4OpenGLQtViewer.hh (modified) (2 diffs)
• G4OpenGLSceneHandler.hh (modified) (1 diff)
• G4OpenGLStoredQtViewer.hh (modified) (1 diff)
• G4OpenGLStoredSceneHandler.hh (modified) (1 diff)
• G4OpenGLStoredXViewer.hh (modified) (1 diff)
• G4OpenGLStoredXmViewer.hh (modified) (1 diff)
• G4OpenGLViewer.hh (modified) (2 diffs)
• G4OpenGLWin32Viewer.hh (modified) (1 diff)
• G4OpenGLXViewer.hh (modified) (2 diffs)
• G4OpenGLXmBox.hh (modified) (1 diff)
• G4OpenGLXmFramedBox.hh (modified) (1 diff)
• G4OpenGLXmVWidgetObject.hh (modified) (1 diff)
• G4OpenGLXmViewer.hh (modified) (1 diff)

trunk/source/visualization/OpenGL/include/G4OpenGLBitMapStore.hh

@@ -46 +46 @@
 
 #include "globals.hh"
-#include "G4OpenGL.hh"
 #include <map>
+
+#include <GL/gl.h>
+#include <GL/glu.h>
 
 namespace G4OpenGLBitMapStore {

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh

@@ -37 +37 @@
 #define G4OPENGLIMMEDIATESCENEHANDLER_HH
 
-#include "G4VSceneHandler.hh"
-#include "G4OpenGLViewer.hh"
-#include "G4OpenGLImmediateViewer.hh"
+#include "G4OpenGLSceneHandler.hh"
 #include "globals.hh"
-#include "G4RotationMatrix.hh"
-#include "G4OpenGLSceneHandler.hh"
 
 class G4OpenGLImmediate;

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh

@@ -39 +39 @@
 #define G4OPENGLIMMEDIATEVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLViewer.hh"
-#include "G4OpenGLSceneHandler.hh"
-#include "G4OpenGLImmediateSceneHandler.hh"
-#include "G4OpenGLTransform3D.hh"
 #include "globals.hh"
 

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh

@@ -37 +37 @@
 #define G4OpenGLIMMEDIATEWIN32VIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLImmediateViewer.hh"
 #include "G4OpenGLWin32Viewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh

@@ -38 +38 @@
 #define G4OpenGLIMMEDIATEXVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLImmediateViewer.hh"
 #include "G4OpenGLXViewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh

@@ -38 +38 @@
 #define G4OPENGLIMMEDIATEXMVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLImmediateViewer.hh"
 #include "G4OpenGLXmViewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -36 +36 @@
 
 #include <qdialog.h>
-#include <qobject.h>
 
 class QButtonGroup;

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -39 +39 @@
 #include "globals.hh"
 
-#include "G4VViewer.hh"
-#include "G4OpenGLSceneHandler.hh"
+#include "G4OpenGLViewer.hh"
 
 #include <qobject.h>
 #include <qpoint.h>
+
+class G4OpenGLSceneHandler;
 
 class QGLWidget;
@@ -143 +144 @@
   void createRadioAction(QAction *,QAction *, const std::string&,unsigned int a=1);
   void rescaleImage(int, int);
-  bool generateEPS(QString,int,QImage);  
+  bool generateEPS2(QString,int,QImage);  
   bool generateVectorEPS (QString,int,int,QImage);
   bool generatePS_PDF(QString,int,QImage);  

trunk/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh

@@ -39 +39 @@
 
 #include "globals.hh"
-#include "G4RotationMatrix.hh"
-
-#include "G4OpenGL.hh"
 
 #include "G4VSceneHandler.hh"
-#include "G4OpenGLViewer.hh"
-#include "G4OpenGLBitMapStore.hh"
+#include "G4OpenGLBitMapStore.hh";
+#include <GL/gl.h>
+#include <GL/glu.h>
+
 #include <map>
 

trunk/source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -37 +37 @@
 #define G4OpenGLSTOREDQTVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLStoredViewer.hh"
 #include "G4OpenGLQtViewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -37 +37 @@
 #define G4OPENGLSTOREDSCENEHANDLER_HH
 
-#include "G4VSceneHandler.hh"
-#include "G4OpenGLViewer.hh"
-#include "G4OpenGLStoredViewer.hh"
 #include "globals.hh"
-#include "G4RotationMatrix.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include <map>

trunk/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh

@@ -38 +38 @@
 #define G4OPENGLSTOREDXVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLStoredViewer.hh"
 #include "G4OpenGLXViewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh

@@ -38 +38 @@
 #define G4OpenGLSTOREDXMVIEWER_HH
 
-#include "G4VViewer.hh"
 #include "G4OpenGLStoredViewer.hh"
 #include "G4OpenGLXmViewer.hh"

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -38 +38 @@
 
 #include "G4VViewer.hh"
-#include "G4OpenGL.hh"
+#include <GL/gl.h>
 
 class G4OpenGLSceneHandler;
@@ -70 +70 @@
   void rotateScene (G4double dx, G4double dy,G4double delta);
 //////////////////////////////Vectored PostScript production functions///
+  GLubyte* grabPixels (int inColor,
+                       unsigned int width,
+                       unsigned int height);
+  int generateEPS (const char* filnam,
+                   int inColour,
+                   unsigned int width,
+                   unsigned int height);
   void printBuffer(GLint, GLfloat*);
   GLfloat* spewPrimitiveEPS (FILE*, GLfloat*);

trunk/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh

@@ -39 +39 @@
 #include "globals.hh"
 
-#include "G4VViewer.hh"
-#include "G4OpenGLSceneHandler.hh"
+#include "G4OpenGLViewer.hh"
 
 class G4OpenGLSceneHandler;

trunk/source/visualization/OpenGL/include/G4OpenGLXViewer.hh

@@ -38 +38 @@
 #define G4OPENGLXVIEWER_HH
 
-#include "G4VViewer.hh"
-#include "G4OpenGLSceneHandler.hh"
+#include "G4OpenGLViewer.hh"
 #include "globals.hh"
 
@@ -72 +71 @@
 
 //////////////////////////////Pixmap (screen dump) production functions/////
-  GLubyte* grabPixels (int inColor,
-                       unsigned int width,
-                       unsigned int height);
-  int generateEPS (char* filnam,
-                   int inColour,
-                   unsigned int width,
-                   unsigned int height);
   GLXContext create_GL_print_context (XVisualInfo*& pvi);
 

trunk/source/visualization/OpenGL/include/G4OpenGLXmBox.hh

@@ -38 +38 @@
 #include "G4OpenGLXmVWidgetContainer.hh"
 #include "globals.hh"
-#include <Xm/Frame.h>
-#include <Xm/RowColumn.h>
 
 class G4OpenGLXmVWidgetComponent;

trunk/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh

@@ -37 +37 @@
 #define G4OPENGLXMFRAMEDBOX_HH
 
-#include "G4OpenGLXmVWidgetContainer.hh"
 #include "G4OpenGLXmBox.hh"
 #include "globals.hh"
-#include <Xm/Frame.h>
-#include <Xm/RowColumn.h>
 
 class G4OpenGLXmVWidgetComponent;

trunk/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh

@@ -40 +40 @@
 #include "X11/Intrinsic.h"
 #include <X11/Xlib.h>
-#include "G4OpenGLXmViewer.hh"
 
+class G4OpenGLXmViewer;
 class G4OpenGLXmVWidgetObject {
 

trunk/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh

@@ -39 +39 @@
 
 #include "G4OpenGLXViewer.hh"
-#include "G4OpenGLSceneHandler.hh"
 #include "globals.hh"