Changeset 976

Timestamp:

Apr 10, 2009, 11:31:00 AM (15 years ago)

Author:

garnier

Message:

modifs mineures

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• G4OpenGLImmediateXViewer.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (2 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLXmRotationCallbacks.cc (modified) (1 diff)
• G4OpenGLXmViewer.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.12 2009/02/04 16:48:41 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.13 2009/03/31 17:14:42 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -86 +86 @@
 
   //Make sure current viewer is attached and clean...
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  glXMakeCurrent (dpy, win, cx);
 
   if(style!=G4ViewParameters::hlr &&

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.38 2009/03/05 16:36:13 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.39 2009/03/31 17:14:42 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -32 +32 @@
 //                     functionality for OpenGL in GEANT4
 //
+// 27/06/2003 : G.Barrand : implementation (at last !).
 
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.23 2009/01/19 16:26:40 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.24 2009/03/31 17:14:42 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.16 2008/07/28 15:36:45 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.17 2009/01/19 16:53:42 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 // 

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

@@ -635 +635 @@
   // can bind the OpenGL rendering context to the window.
 
-  fGLXWin = XtWindow (glxarea);
-
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  win = XtWindow (glxarea);
+
+  glXMakeCurrent (dpy, win, cx);
 
   // This should be add AFTER glXMakeCurrent done because it will fire a resizeCallback
@@ -684 +684 @@
 {
   XtDestroyWidget  (shell);
-  fGLXWin = 0; // ...to avoid XDestroyWindow in G4OpenGLXViewer base class
+  win = 0; // ...to avoid XDestroyWindow in G4OpenGLXViewer base class
   // because XtDestroyWidget has already destroyed it.
   G4Xt::getInstance () ->RemoveShell (shell);