Changeset 553

Timestamp:

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

Author:

garnier

Message:

r708@mac-90108: laurentgarnier | 2007-07-11 12:47:09 +0200
pas mal, sauf que le gun ne fait aucun effet

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (4 diffs)
• G4OpenGLQtViewer.cc (modified) (1 diff)

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

@@ -154 +154 @@
 
   printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
-  // If a double buffer context has been forced upon us, ignore the
-  // back buffer for this OpenGLImmediate view.
-  glDrawBuffer (GL_FRONT);
-
-  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
-
-  //Make sure current viewer is attached and clean...
-  //Qt version needed
-  //glXMakeCurrent (dpy, win, cx);
-  glViewport (0, 0, WinSize_x, WinSize_y);
-
-  if(style!=G4ViewParameters::hlr &&
-     haloing_enabled) {
-
-    HaloingFirstPass ();
-    NeedKernelVisit ();
-    ProcessView ();
-    glFlush ();
-
-    HaloingSecondPass ();
-
-  }
-
-  NeedKernelVisit ();  // Always need to visit G4 kernel.
-  ProcessView ();
-  FinishView ();
+   // If a double buffer context has been forced upon us, ignore the
+   // back buffer for this OpenGLImmediate view.
+  //   glDrawBuffer (GL_FRONT);
+
+   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
+
+   //Make sure current viewer is attached and clean...
+   //Qt version needed
+   //glXMakeCurrent (dpy, win, cx);
+   glViewport (0, 0, WinSize_x, WinSize_y);
+
+   if(style!=G4ViewParameters::hlr &&
+      haloing_enabled) {
+
+     HaloingFirstPass ();
+     NeedKernelVisit ();
+     ProcessView ();
+     glFlush ();
+
+     HaloingSecondPass ();
+
+   }
+
+   NeedKernelVisit ();  // Always need to visit G4 kernel.
+   ProcessView ();
+   FinishView ();
   printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 
@@ -210 +210 @@
 ,int height)
 {
-   printf("GLWidget::resizeGL\n");
-     int side = qMin(width, height);
-     glViewport((width - side) / 2, (height - side) / 2, side, side);
-
-     glMatrixMode(GL_PROJECTION);
-     glLoadIdentity();
-     glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
-     glMatrixMode(GL_MODELVIEW);
-   printf("GLWidget::resizeGL END\n");
-//   printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+  printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
   
-//   int side = qMin(width, height);
-//   glViewport((width - side) / 2, (height - side) / 2, side, side);
-//   glMatrixMode(GL_PROJECTION);
-//   glLoadIdentity();
-//   glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
-//   glMatrixMode(GL_MODELVIEW);
+  int side = qMin(width, height);
+  glViewport((width - side) / 2, (height - side) / 2, side, side);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+  glMatrixMode(GL_MODELVIEW);
   
-//   printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+  printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 }
 
@@ -235 +226 @@
    if (!readyToPaint)
      return;
-   printf("GLWidget::paintGL\n");
-     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-     glLoadIdentity();
-     glTranslated(0.0, 0.0, -10.0);
-     glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
-     glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
-     glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
-     glCallList(object);
-   printf("GLWidget::paintGL END\n");
+//    printf("GLWidget::paintGL\n");
+//      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+//      glLoadIdentity();
+//      glTranslated(0.0, 0.0, -10.0);
+//      glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
+//      glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
+//      glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+//      glCallList(object);
+//    printf("GLWidget::paintGL END\n");
 //   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
 //   float b=3;
 
-//   WinSize_x = (G4int) width();
-//   WinSize_y = (G4int) height();
-
-//   glViewport (0, 0, width(), height());
+   WinSize_x = (G4int) width();
+   WinSize_y = (G4int) height();
+
+   glViewport (0, 0, width(), height());
 
    SetView();
@@ -258 +249 @@
 //   printf("    ClearView\n");
    ClearView (); //ok, put the background correct
-   //  DrawView2();
+   DrawView2();
 //   //  ShowView();
 //   //  printf("before ClearView\n");

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

@@ -82 +82 @@
   printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
   //   if(!fHDC) return;
-  fWindow->resize(100, 300);
+  //  fWindow->resize(100, 300);
   //  glFlush ();
   printf("G4OpenGLQtViewer::ShowView -----------------------\n");