Changeset 555

Timestamp:

Jul 12, 2007, 5:33:10 PM (17 years ago)

Author:

garnier

Message:

r710@mac-90108: laurentgarnier | 2007-07-12 16:45:14 +0200
il ny a plus de ClearView et les glDrawBuffer dont a GL_BACK...

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (4 diffs)
• G4OpenGLStoredQt.cc (modified) (2 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

@@ -80 +80 @@
    printf("G4OpenGLImmediateQtViewer::InitialiseGL () 1\n");
 
+   glDrawBuffer (GL_BACK); // FIXME : Ne marche pas avec cette ligne, mais affiche le run correctement...
    // clear the buffers and window.
-   //  ClearView ();
-//   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 2\n");
-   //  FinishView ();
+   ClearView ();
+   //   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 2\n");
+   FinishView ();
 
    // If a double buffer context has been forced upon us, ignore the
    // back buffer for this OpenGLImmediate view.
-//   glDrawBuffer (GL_FRONT);
+
 
    glDepthFunc (GL_LEQUAL);
@@ -109 +110 @@
    // If a double buffer context has been forced upon us, ignore the
    // back buffer for this OpenGLImmediate view.
-  //   glDrawBuffer (GL_FRONT);
+  glDrawBuffer (GL_BACK);
 
    G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
@@ -188 +189 @@
 //      glCallList(object);
 //    printf("GLWidget::paintGL END\n");
-//   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
 //   float b=3;
 
@@ -194 +195 @@
    WinSize_y = (G4int) height();
 
-   glViewport (0, 0, width(), height());
-
-   SetView();
+   //   glViewport (0, 0, width(), height());
+
+   //   SetView();
 //   //  printf("before ClearView\n");
 //   //  makeCurrent();
 //   //  for (int a=0;a<100000000;a++) {b = b/3.1456;}
-//   printf("    ClearView\n");
-   ClearView (); //ok, put the background correct
+   printf("    ClearView\n");
+   //   ClearView (); //ok, put the background correct
    DrawView2();
-//   //  ShowView();
-//   //  printf("before ClearView\n");
-//   //  ClearView (); //ok, put the background correct
+   //  ShowView();
+   //  printf("before ClearView\n");
+   //  ClearView (); //ok, put the background correct
 //   // FIXME
-  FinishView();
+//  FinishView();
 //   //  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 //   //  glLoadIdentity();
 //   //  glTranslated(0.0, 0.0, -10.0);
 
-//   printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
+   printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
  }
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQt.cc

@@ -59 +59 @@
 G4VViewer* G4OpenGLStoredQt::CreateViewer
 (G4VSceneHandler& scene, const G4String& name) {
+  printf("....................................G4OpenGLStoredQt::CreateViewer \n");
   G4VViewer* pView =
     new G4OpenGLStoredQtViewer ((G4OpenGLStoredSceneHandler&) scene, name);
@@ -74 +75 @@
       " new G4OpenGLStoredQtViewer." << G4endl;
   }
+  printf("...................................G4OpenGLStoredQt::CreateViewer END\n");
   return pView;
 }

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

@@ -120 +120 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+  printf("................G4OpenGLStoredQtViewer::FinishView");
   if(!fWindow) return;
 
   glFlush ();
   fWindow->swapBuffers ();
+  printf("................G4OpenGLStoredQtViewer::FinishView     END");
 }