Changeset 552 for trunk

Timestamp:

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

Author:

garnier

Message:

r707@mac-90108: laurentgarnier | 2007-07-11 12:20:42 +0200
modif en mettant l exemple OpenGL a la place : sans le drawView, ca marche

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLQtViewer.cc (modified) (1 diff)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -56 +56 @@
   void initializeGL ();
   void DrawView ();
+  void DrawView2 ();
   void FinishView ();
   void resizeGL(int width,int height);

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

@@ -69 +69 @@
 void G4OpenGLImmediateQtViewer::Initialise() {
    printf("GLWidget::Initialise \n");
-   //  printf("readyToPaint = false \n");
-  //  readyToPaint = false;
+   printf("readyToPaint = false \n");
+   readyToPaint = false;
    //  printf("G4OpenGLImmediateQtViewer::Initialise () 1\n");
   //  CreateGLQtContext ();
@@ -81 +81 @@
 
   printf("readyToPaint = true \n");
-  //  readyToPaint = true;
+  readyToPaint = true;
 }
 
@@ -148 +148 @@
 //   FinishView ();
   printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+
+}
+
+void G4OpenGLImmediateQtViewer::DrawView2 () {
+
+  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 ();
+  printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 
 }
@@ -200 +233 @@
 void G4OpenGLImmediateQtViewer::paintGL()
  {
+   if (!readyToPaint)
+     return;
    printf("GLWidget::paintGL\n");
      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -211 +246 @@
 //   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
 //   float b=3;
-//   if (!readyToPaint)
-//     return;
 
 //   WinSize_x = (G4int) width();
@@ -219 +252 @@
 //   glViewport (0, 0, width(), height());
 
-//   SetView();
+   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
-//   //  DrawView();
+   ClearView (); //ok, put the background correct
+   //  DrawView2();
 //   //  ShowView();
 //   //  printf("before ClearView\n");
 //   //  ClearView (); //ok, put the background correct
 //   // FIXME
-//   //  FinishView();
+  FinishView();
 //   //  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 //   //  glLoadIdentity();

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

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