Changeset 536 for trunk/geant4/visualization/OpenGL

Timestamp:

Jun 26, 2007, 3:34:37 PM (17 years ago)

Author:

garnier

Message:

r675@mac-90108: laurentgarnier | 2007-06-26 11:09:39 +0200
sans erreurs de compil

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -42 +42 @@
 #include "G4OpenGLSceneHandler.hh"
 
+#include <QGLWidget>
+
 class G4OpenGLSceneHandler;
 
@@ -60 +62 @@
   G4int WinSize_x;
   G4int WinSize_y;
-  //  HDC fHDC;
+  QGLWidget* fWindow;
 private:
   //  static LRESULT CALLBACK WindowProc(HWND,UINT,WPARAM,LPARAM);
   //  static bool SetWindowPixelFormat(HDC);
 private:
-  //  HWND fWindow;
   //  HGLRC fHGLRC;
 };

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

@@ -106 +106 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  if(!fHDC) return;
+  //    if(!fHDC) return;
 
   glFlush ();
 
   // Empty the Windows message queue :
-  MSG event;
-  while ( ::PeekMessage(&event, NULL, 0, 0, PM_REMOVE) ) {
-    ::TranslateMessage(&event);
-    ::DispatchMessage (&event);
-  }
+//   MSG event;
+//   while ( ::PeekMessage(&event, NULL, 0, 0, PM_REMOVE) ) {
+//     ::TranslateMessage(&event);
+//     ::DispatchMessage (&event);
+//   }
 }
 

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

@@ -120 +120 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  if(!fHDC) return;
+  if(!fWindow) return;
 
   glFlush ();
-  ::SwapBuffers(fHDC);
-
-  // Empty the Windows message queue :
-  MSG event;
-  while ( ::PeekMessage(&event, NULL, 0, 0, PM_REMOVE) ) {
-    ::TranslateMessage(&event);
-    ::DispatchMessage (&event);
-  }
+  fWindow->swapBuffers ();
 }