Changeset 921 for trunk/source/visualization/OpenGL

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (2 diffs)
• include/G4OpenGLViewer.hh (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -22 +22 @@
 
 CPPFLAGS += -DG4DEBUG_VIS_OGL
+
+ifdef G4VIS_BUILD_OPENGL_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
+ifdef G4VIS_BUILD_OI_DRIVER
+CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
+endif
 CPPFLAGS += -I$(G4BASE)/visualization/management/include
 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
@@ -35 +42 @@
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 
+INTYLIBS += -L$(G4LIBDIR) -lG4gl2ps
+
 include $(G4INSTALL)/config/moc.gmk
 include $(G4INSTALL)/config/common.gmk

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

@@ -38 +38 @@
 
 #include "G4VViewer.hh"
-#include <GL/gl.h>
+#include "G4OpenGL2PSAction.hh"
 
 class G4OpenGLSceneHandler;
@@ -108 +108 @@
     fDisplayLightFrontT;
   G4double fDisplayLightFrontRed, fDisplayLightFrontGreen, fDisplayLightFrontBlue;
+  G4OpenGL2PSAction* fGL2PSAction;
 
 private :

trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -48 +48 @@
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
-
-#include "Geant4_gl2ps.h"
 
 #include <sstream>
@@ -118 +116 @@
   fWinSize_x = fVP.GetWindowSizeHintX();
   fWinSize_y = fVP.GetWindowSizeHintY();
+
+  fGL2PSAction = new G4OpenGL2PSAction();
 
   //  glClearColor (0.0, 0.0, 0.0, 0.0);
@@ -883 +883 @@
 
   //  fGL2PSAction->enableFileWriting();
+
+
+  //////////////
+  if (!fGL2PSAction) return;
+
+  fGL2PSAction->setFileName("gl2psTest.ps");
+  G4cout << "Produce " << aFile << "..." << G4endl;
+  if (fGL2PSAction->enableFileWriting()) {
+    DrawView();
+    fGL2PSAction->disableFileWriting();
+  }
+  //////////////
+
   FILE *fFile = fopen(aFile,"w");
   if(!fFile) {
@@ -930 +943 @@
                    15, 20, 10, buffsize, fFile, aFile);
     DrawView();
+#ifdef G4DEBUG_VIS_OGL
+    printf("into While............\n");
+#endif
     res = gl2psEndPage();
   }