Changeset 727 for trunk

Timestamp:

Feb 18, 2008, 6:26:55 PM (16 years ago)

Author:

garnier

Message:

correction du ticket #65. Pb sur autorotation et reouverture partielle du ticket #120

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (6 diffs)
• G4OpenGLViewer.cc (modified) (1 diff)

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

@@ -291 +291 @@
   ,fContextMenu(0)
   ,fMouseAction(STYLE1)
-  ,fDeltaRotation(1)
+  ,fDeltaRotation(0.5)
   ,fDeltaSceneTranslation(0.01)
   ,fDeltaDepth(0.01)
@@ -1483 +1483 @@
 {
   fAutoMove = mAutoMove;
-#ifdef GEANT4_QT_DEBUG
-  printf("                   mouse move event %d %d\n",pos_x,pos_y);
-#endif
 
   if (!fAutoMove) {  // keep old delta if automove
@@ -1513 +1510 @@
   }
   fLastPos = QPoint(pos_x, pos_y);
-#ifdef GEANT4_QT_DEBUG
-  if (mButtons & Qt::LeftButton) {
-    printf("                  end of  mouse move event %d %d delta:%f %f\n",pos_x,pos_y,fDeltaPosX,fDeltaPosY);
-  } else {
-    printf("                  end of  mouse move event %d %d delta:%f %f --------------NO BUTTON\n",pos_x,pos_y,fDeltaPosX,fDeltaPosY);
-  }
-#endif
 }
 
@@ -1616 +1606 @@
   
     new_vp = std::cos(delta_alpha) * vp + std::sin(delta_alpha) * zprime;
-  
+
+    // to avoid z rotation flipping
+    // to allow more than 360° rotation
     if (fVP.GetLightsMoveWithCamera()) {
       new_up = (new_vp.cross(yprime)).unit();
-      fVP.SetUpVector(new_up);
+      if (new_vp.z()*vp.z() <0) {
+        new_up.set(new_up.x(),-new_up.y(),new_up.z());
+      }
     } else {
       new_up = up;
-    }
+      if (new_vp.z()*vp.z() <0) {
+        new_up.set(new_up.x(),-new_up.y(),new_up.z());
+      }
+    }
+    fVP.SetUpVector(new_up);
     ////////////////
     // Rotates by fixed azimuthal angle delta_theta.
@@ -1639 +1637 @@
     viewPoint = new_vp.unit() + delta;
     
+#ifdef GEANT4_QT_DEBUG
+//     printf("vp Vector : %f %f %f delta_alpha:%f delta_theta:%f cosalpha:%f sinalpha:%f\n",viewPoint.x(),viewPoint.y(),viewPoint.z(),delta_alpha,delta_theta,cosalpha,sinalpha);
+//     printf("up : %f %f %f\n",up.x(),up.y(),up.z());
+//     printf("new up : %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
+//     printf("vp : %f %f %f\n",vp.x(),vp.y(),vp.z());
+//     printf("new_vp : %f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z());
+#endif
     fVP.SetViewAndLights (viewPoint);
     updateQWidget();
@@ -1994 +1999 @@
 #endif
     if (event->key() == Qt::Key_Plus) {
-      fDeltaPosX =fDeltaPosX*(1+fDeltaMove);
-      fDeltaPosY =fDeltaPosY*(1+fDeltaMove);
+      fDeltaPosX =fDeltaPosX*(1+fDeltaRotation);
+      fDeltaPosY =fDeltaPosY*(1+fDeltaRotation);
+      printf("rotate + %f %f\n",fDeltaPosX,fDeltaPosY);
     }
     else if (event->key() == Qt::Key_Minus) {
-      fDeltaPosX =fDeltaPosX*(1-fDeltaMove);
-      fDeltaPosY =fDeltaPosY*(1-fDeltaMove);
+      fDeltaPosX =fDeltaPosX*(1-fDeltaRotation);
+      fDeltaPosY =fDeltaPosY*(1-fDeltaRotation);
+      printf("rotate - %f %f\n",fDeltaPosX,fDeltaPosY);
     }
   } else {

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

@@ -196 +196 @@
   }
   
-  printf("Set view to : %f %f %f %f %f %f \n",left, right, bottom, top, pnear, pfar);
   glMatrixMode (GL_MODELVIEW); // apply further transformations to scene.
   glLoadIdentity();