Changeset 1332 for trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

Timestamp:

Aug 3, 2010, 4:21:16 PM (14 years ago)

Author:

garnier

Message:

changement des shorcuts

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc (modified) (5 diffs)

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

@@ -101 +101 @@
   //  glDisable (GL_POLYGON_SMOOTH);
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::Creation !!\n");
-#endif
 }
 
@@ -110 +107 @@
 void G4OpenGLViewer::InitializeGLView () 
 {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView VVVVV\n");
-#endif
   glClearColor (0.0, 0.0, 0.0, 0.0);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ---1---\n");
-#endif
   glClearDepth (1.0);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ---2---\n");
-#endif
   glDisable (GL_BLEND);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ---3---\n");
-#endif
   glDisable (GL_LINE_SMOOTH);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ---4---\n");
-#endif
   glDisable (GL_POLYGON_SMOOTH);
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ---5---\n");
-#endif
 
   //  if (fVP != NULL) {
-  fWinSize_x = fVP.GetWindowSizeHintX();
-  fWinSize_y = fVP.GetWindowSizeHintY();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::InitializeGLView ^^^^^^\n");
-#endif
-  //  }
+    fWinSize_x = fVP.GetWindowSizeHintX();
+    fWinSize_y = fVP.GetWindowSizeHintY();
+    //  }
 }  
 
@@ -849 +825 @@
   //phi spin stuff here
   
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene dx:%f dy:%f delta:%f\n",dx,dy, deltaRotation);
+#endif
+
   vp = fVP.GetViewpointDirection ().unit ();
   up = fVP.GetUpVector ().unit ();
   
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene     vp: %f %f %f\n",vp.x(),vp.y(),vp.z());
+#endif
   yprime = (up.cross(vp)).unit();
   zprime = (vp.cross(yprime)).unit();
@@ -871 +855 @@
   // to allow more than 360° rotation
 
-  const G4Point3D targetPoint
-    = fSceneHandler.GetScene()->GetStandardTargetPoint()
-    + fVP.GetCurrentTargetPoint ();
-  G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
-  if(radius<=0.) radius = 1.;
-  const G4double cameraDistance = fVP.GetCameraDistance (radius);
-  const G4Point3D cameraPosition =
-    targetPoint + cameraDistance * fVP.GetViewpointDirection().unit();
+  //   const G4Point3D targetPoint
+  //     = fSceneHandler.GetScene()->GetStandardTargetPoint()
+  //     + fVP.GetCurrentTargetPoint ();
+  //   G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
+  //   if(radius<=0.) radius = 1.;
+  //  const G4double cameraDistance = fVP.GetCameraDistance (radius);
+  //  const G4Point3D cameraPosition =
+  //    targetPoint + cameraDistance * fVP.GetViewpointDirection().unit();
 
   if (fVP.GetLightsMoveWithCamera()) {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene GetLightsMoveWithCamera: %f \n",new_vp.z()*vp.z());
+#endif
     new_up = (new_vp.cross(yprime)).unit();
     if (new_vp.z()*vp.z() <0) {
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLViewer::rotateScene  R_____________________________________________\n");
+#endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
     }
   } else {
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLViewer::rotateScene : %f \n",new_vp.z()*vp.z());
+#endif
     new_up = up;
     if (new_vp.z()*vp.z() <0) {
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLViewer::rotateScene  X_____________________________________________\n");
+#endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
     }
@@ -906 +902 @@
   delta = a2 - a1;
   // So new viewpoint is...
+
   viewPoint = new_vp.unit() + delta;
-  
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene     up: %f %f %f\n",up.x(),up.y(),up.z());
+  printf("G4OpenGLViewer::rotateScene new up: %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
+  printf("G4OpenGLViewer::rotateScene new vp: %f %f %f delta:%f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z(),delta.x(),delta.y(),delta.z());
+#endif
+  
+
   fVP.SetViewAndLights (viewPoint);
-}
-
-#endif
+
+
+}
+
+
+void G4OpenGLViewer::rotateSceneInViewDirection(G4double dx, G4double dy,G4double deltaRotation)
+{
+  if (!fSceneHandler.GetScene()) {
+    return;
+  }
+
+  G4Vector3D vp;
+  G4Vector3D up;
+  
+  G4Vector3D xprime;
+  G4Vector3D yprime;
+  G4Vector3D zprime;
+  
+  G4double delta_alpha;
+  G4double delta_theta;
+  
+  G4Vector3D new_vp;
+  G4Vector3D new_up;
+  
+  G4double cosalpha;
+  G4double sinalpha;
+  
+  G4Vector3D a1;
+  G4Vector3D a2;
+  G4Vector3D delta;
+  G4Vector3D viewPoint;
+
+    
+  //phi spin stuff here
+  
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene dx:%f dy:%f delta:%f\n",dx,dy, deltaRotation);
+#endif
+
+  vp = fVP.GetViewpointDirection ().unit();
+  up = fVP.GetUpVector ().unit();
+
+
+
+  G4Vector3D zPrimeVector = G4Vector3D(up.y()*vp.z()-up.z()*vp.y(),
+                             up.z()*vp.x()-up.x()*vp.z(),
+                             up.x()*vp.y()-up.y()*vp.x());
+  G4long zPrimeVectorX = up.y()*vp.z()-up.z()*vp.y();
+  G4long zPrimeVectorY = up.z()*vp.x()-up.x()*vp.z();
+  G4long zPrimeVectorZ = up.x()*vp.y()-up.y()*vp.x();
+
+  viewPoint = vp/deltaRotation + (zPrimeVector*dx - up*dy) ;
+  new_up = G4Vector3D(viewPoint.y()*zPrimeVector.z()-viewPoint.z()*zPrimeVector.y(),
+                       viewPoint.z()*zPrimeVector.x()-viewPoint.x()*zPrimeVector.z(),
+                       viewPoint.x()*zPrimeVector.y()-viewPoint.y()*zPrimeVector.x());
+
+  G4long new_upLenLong = sqrt((G4long)new_up.x()*(G4long)new_up.x()+(G4long)new_up.y()*(G4long)new_up.y()+(G4long)new_up.z()*(G4long)new_up.z());
+  //  new_up = new_up/new_upLenLong;
+  //  G4double new_upLenDouble = new_up.x()*new_up.x()+new_up.y()*new_up.y()+new_up.z()*new_up.z();
+
+  G4Vector3D new_upDiv = G4Vector3D((G4double)(new_up.x()/new_upLenLong),
+                                    (G4double)(new_up.y()/new_upLenLong),
+                                    (G4double)(new_up.z()/new_upLenLong));
+
+  G4Vector3D new_upPrec = G4Vector3D(((G4double)(((G4long)viewPoint.y()*(G4long)zPrimeVector.z()
+                                                  -(G4long)viewPoint.z()*(G4long)zPrimeVector.y())/new_upLenLong)),
+                                     ((G4double)(((G4long)viewPoint.z()*(G4long)zPrimeVector.x()
+                                                  -(G4long)viewPoint.x()*(G4long)zPrimeVector.z())/new_upLenLong)),
+                                     ((G4double)(((G4long)viewPoint.x()*(G4long)zPrimeVector.y()
+                                                  -(G4long)viewPoint.y()*(G4long)zPrimeVector.x())/new_upLenLong)));
+  G4Vector3D new_upUnit = new_up.unit();
+  
+  
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::rotateScene     up: %.10lf %.10lf %.10lf len:%.10lf lenLong:%.10lf %f\n",up.x(),up.y(),up.z(), up.mag(),new_upLenLong,new_upLenLong);
+  printf("G4OpenGLViewer::rotateScene NEW new up UNIT / %.10lf %.10lf %.10lf\n",new_upUnit.x(),new_upUnit.y(),new_upUnit.z());
+  printf("G4OpenGLViewer::rotateScene NEW new up Prec: %.10lf %.10lf %.10lf\n",new_upPrec.x(),(viewPoint.z()*zPrimeVectorX-viewPoint.x()*zPrimeVectorZ),new_upPrec.z());
+  printf("G4OpenGLViewer::rotateScene NEW new up Div: %.10lf %.10lf %.10lf\n",new_upDiv.x(),new_upDiv.y(),new_upDiv.z());
+  printf("G4OpenGLViewer::rotateScene     vp: %f %f %f\n",vp.x(),vp.y(),vp.z());
+
+  viewPoint = viewPoint*deltaRotation;
+
+  printf("G4OpenGLViewer::rotateScene NEW --new vp: %f %f %f\n",viewPoint.x(),viewPoint.y(),viewPoint.z());
+#endif
+
+   fVP.SetUpVector(new_upUnit);
+   fVP.SetViewAndLights (viewPoint);
+}
+
+#endif