Changeset 940 for trunk/source/visualization/OpenGL/src

Timestamp:

Mar 5, 2009, 12:35:38 PM (15 years ago)

Author:

garnier

Message:

Ok dans CVS

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (1 diff)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLStoredXmViewer.cc (modified) (2 diffs)
• G4OpenGLViewer.cc (modified) (9 diffs)
• G4OpenGLXViewer.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.36 2009/02/25 15:14:29 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.37 2009/03/05 11:04:20 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -32 +32 @@
 //                                G4OpenGLStoredViewer.
 
-#define G4DEBUG_VIS_OGL
-
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 

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

@@ -33 +33 @@
 //                              and G4OpenGLStoredViewer.
 
-#define G4DEBUG_VIS_OGL 1
 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER
 
@@ -122 +121 @@
       FinishView ();
     } else {
-#ifdef G4DEBUG_VIS_OGL
-      printf("**************************  G4OpenGLStoredXmViewer::ComputeView Need kernel Visit \n");
-#endif
     // However, union cutaways are implemented in DrawDisplayLists, so make
     // an extra pass...

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.48 2009/02/16 15:31:05 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.49 2009/03/05 11:04:20 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -33 +33 @@
 
 #ifdef G4VIS_BUILD_OPENGL_DRIVER
-
-#define G4DEBUG_VIS_OGL
 
 #include "G4ios.hh"
@@ -51 +49 @@
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
-#include "G4StateManager.hh"
 
 // GL2PS
@@ -146 +143 @@
 
 void G4OpenGLViewer::ClearView () {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ClearView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
-#endif
   glClearColor (background.GetRed(),
                 background.GetGreen(),
@@ -160 +154 @@
   glClear (GL_STENCIL_BUFFER_BIT);
   glFlush ();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ClearView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
-#endif
 }
 
@@ -178 +169 @@
 
 void G4OpenGLViewer::SetView () {
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
-#endif
 
   if (!fSceneHandler.GetScene()) {
@@ -321 +308 @@
   background = fVP.GetBackgroundColour ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
 }
 
 void G4OpenGLViewer::HaloingFirstPass () {
   
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::HaloingFirstPass VVVVVVVVVVVVVVVVVV \n");
-#endif
   //To perform haloing, first Draw all information to the depth buffer
   //alone, using a chunky line width, and then Draw all info again, to
@@ -353 +334 @@
 void G4OpenGLViewer::HaloingSecondPass () {
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::HaloingSecondtPass VVVVVVVVVVVVVVVVVV \n");
-#endif
   //And finally, turn the colour buffer back on with a sesible line width...
   glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -907 +885 @@
   if (!fGL2PSAction) return false;
 
-
   fGL2PSAction->setFileName(fPrintFilename.c_str());
   // try to resize

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.49 2009/02/16 15:31:05 lgarnier Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.50 2009/03/05 11:04:20 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -49 +49 @@
 #include "G4Point3D.hh"
 #include "G4Normal3D.hh"
-#include "G4StateManager.hh"
 
 #include <X11/Xatom.h>