Changeset 847

Timestamp:

Jul 28, 2008, 5:31:15 PM (16 years ago)

Author:

garnier

Message:

fix error on XmRotation

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLViewer.cc (modified) (4 diffs)
• G4OpenGLXmRotationCallbacks.cc (modified) (2 diffs)

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

@@ -927 +927 @@
   // to avoid z rotation flipping
   // to allow more than 360° rotation
-#ifdef GEANT4_QT_DEBUG
+
   const G4Point3D targetPoint
     = fSceneHandler.GetScene()->GetStandardTargetPoint()
@@ -938 +938 @@
 
 
-  printf("G4OpenGLViewer:: Tp: %f %f %f Vpd:%f %f %f - Up:%f %f %f Cp:%f %f %f\n",
-         targetPoint[0],targetPoint[1],targetPoint[2],
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLViewer:: %f %f %f Tp: %f %f %f Vpd:%f %f %f - Up:%f %f %f Cp:%f %f %f\n",
+         dx,dy,deltaRotation,targetPoint[0],targetPoint[1],targetPoint[2],
          vp.x(),vp.y(),vp.z(),
          up.x(),up.y(),up.z(),
@@ -954 +955 @@
     if (new_vp.z()*vp.z() <0) {
 #ifdef GEANT4_QT_DEBUG
-      //      printf("G4OpenGLViewer:: ***********************************************************\n");
+      //            printf("G4OpenGLViewer:: ***********************************************************\n");
 #endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
@@ -960 +961 @@
     }
   }
-  new_up.set(new_up.x(),-new_up.y(),new_up.z());
   fVP.SetUpVector(new_up);
   ////////////////

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

@@ -65 +65 @@
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
-  pView->rotateScene((G4double)pView->rot_sens,0,1);
-
+  if (pView->rotate_right) {
+    pView->rotateScene((G4double)pView->rot_sens,0,1);
+  } else {
+    pView->rotateScene(-(G4double)pView->rot_sens,0,1);
+  }
   /*
   G4double delta_theta;
@@ -137 +140 @@
 {
   //phi spin stuff here
-  G4double delta_alpha;
-  G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
-
-  pView->rotateScene(0,(G4double)pView->rot_sens,1);
-
+  //  G4double delta_alpha;
+  G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
+
+  if (pView -> rotate_up) {
+    pView->rotateScene(0,-(G4double)pView->rot_sens,1);
+  } else {
+    pView->rotateScene(0,(G4double)pView->rot_sens,1);
+  }
   /*
   if (pView->fVP.GetLightsMoveWithCamera()) {