Changeset 948 for trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

Timestamp:

Mar 23, 2009, 6:25:48 PM (15 years ago)

Author:

garnier

Message:

Works for OGLSXm et non vector

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (6 diffs)

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

@@ -49 +49 @@
 #include "G4Point3D.hh"
 #include "G4Normal3D.hh"
+#include "G4StateManager.hh"
 
 #include <X11/Xatom.h>
@@ -484 +485 @@
     fGLXWin=glxpmap;
     
+    //
     bool er1 = glXMakeCurrent (dpy,
                                fGLXWin,  // pixmap win Id
@@ -490 +492 @@
     glViewport (0, 0, fWinSize_x, fWinSize_y);
     
+    //    InitializeGLView ();
+    
+    // clear the buffers and window.
     ClearView ();
-    SetView ();
+    SetView();
+    //    FinishView ();
+
 #ifdef G4DEBUG_VIS_OGL
     printf("G4OpenGLXViewer::print Call DrawView context:%d old winGL:%d \n",cx,fGLXWin);
 #endif
-    DrawView ();
+
+
+
+    // Need to force redraw for SXm mode
+    NeedKernelVisit ();
+
+    // Need to change state to IDLE
+    G4StateManager* stateManager = G4StateManager::GetStateManager(); 
+    G4ApplicationState oldState = stateManager->GetCurrentState(); 
+    stateManager->SetNewState(G4State_Idle);  
+
+    
+
+    DrawView (); // Will make current glX
+
+    // Restore state
+     stateManager->SetNewState(oldState);  
+
+
+
     
     std::string file = "G4OpenGL_XPixmap.eps";
@@ -511 +537 @@
     printf("Error 1:%d 2:%d\n",er1,er2);
     
+    //    glXDestroyContext(pcx);
+    //    glXDestroyGLXPixmap(glpixmap)
   }
 
@@ -548 +576 @@
 
   
+  printf("------%d------\n",tmp_cx);
   return glXCreateContext (dpy,
                            pvi,
-                           tmp_cx,
+                           0,
                            False);
 }
@@ -596 +625 @@
   glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
         
-//   glXWaitGL (); //Wait for effects of all previous OpenGL commands to
-//                 //be propagated before progressing.
-//   glFlush ();
-   for (int i = 0; i<size; i++) {
-     if (buffer[i] != 0)
-       printf("%d",buffer[i]);
-     //     else
-     //       printf(".");
-   }
+  glXWaitGL (); //Wait for effects of all previous OpenGL commands to
+  //                 //be propagated before progressing.
+  glFlush ();
 
 //   printf("-----------\n-----------\n-----------\n-----------\n-----------\n%d %d %d\n",width, height,size);