Changeset 711 for trunk/geant4/visualization/OpenGL

Timestamp:

Feb 4, 2008, 6:41:34 PM (16 years ago)

Author:

garnier

Message:

debut de recherche du decalage de deplacement

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -156 +156 @@
   void toggleFullScreen();
   // Only use for Qt>4.0
-  void dialogClosed();
+  //  void dialogClosed();
 };
 

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

@@ -244 +244 @@
 
 #if QT_VERSION >= 0x040000
-  QObject ::connect(GLWindow, 
-                    SIGNAL(rejected()),
-                    this, 
-                    SLOT(dialogClosed()));
+//   QObject ::connect(GLWindow, 
+//                     SIGNAL(rejected()),
+//                     this, 
+//                     SLOT(dialogClosed()));
 #endif
 
@@ -270 +270 @@
 /**  Close the dialog and set the pointer to NULL
  */
-void G4OpenGLQtViewer::dialogClosed() {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::dialogClosed END\n");
-#endif
-  //  GLWindow = NULL;
-}
+// void G4OpenGLQtViewer::dialogClosed() {
+// #ifdef GEANT4_QT_DEBUG
+//   printf("G4OpenGLQtViewer::dialogClosed END\n");
+// #endif
+//   //  GLWindow = NULL;
+// }
 #endif
 
@@ -1386 +1386 @@
 
 /**
+   Move the scene of dx, dy, dz values.
+   Values are in 
+   100 moves of 1 => move of 10cm of the scene
    @param dx delta mouse x position
    @param dy delta mouse y position
@@ -1392 +1395 @@
 void G4OpenGLQtViewer::G4MouseMoveEvent(int dx, int dy, int dz)
 {
-  int deltaX = 
-GLenum clip = glGet(GL_CLIP_PLANE);
-  int deltaY = ;
-
-
-  G4Point3D stp
-    = GetSceneHandler()->GetScene()->GetStandardTargetPoint();
+//               2
+//         ------------       0              0              tx
+//         right - left
+//                            2
+//             0         ------------        0              ty
+//                       top - bottom
+//                                           -2
+//             0              0         ------------        tz
+//                                       zFar-zNear
+//             0              0              0              1
+//        where
+//                        tx = - (right + left) / (right - left)
+//                        ty = - (top + bottom) / (top - bottom)
+//                        tz = - (zFar + zNear) / (zFar - zNear)
+ double              projection_view[16];
+ glGetDoublev (GL_PROJECTION_MATRIX, projection_view);
+ printf("%f\t%f\t%f\t%f\n",projection_view[0],projection_view[1],projection_view[2],projection_view[3]);
+ printf("%f\t%f\t%f\t%f\n",projection_view[4],projection_view[5],projection_view[6],projection_view[7]);
+ printf("%f\t%f\t%f\t%f\n",projection_view[8],projection_view[9],projection_view[10],projection_view[11]);
+ printf("%f\t%f\t%f\t%f\n",projection_view[12],projection_view[13],projection_view[14],projection_view[15]);
+//   int deltaX = 
+// GLenum clip = glGet(GL_CLIP_PLANE);
+//   int deltaY = ;
+
+
+  G4Point3D stp = GetSceneHandler()->GetScene()->GetStandardTargetPoint();
   
   G4Point3D tp = stp + fVP.GetCurrentTargetPoint ();