Changeset 802 for trunk/geant4/visualization/OpenGL

Timestamp:

May 20, 2008, 6:34:33 PM (16 years ago)

Author:

garnier

Message:

r842@wl-72126: garnier | 2008-05-20 18:34:31 +0200
ca ne marche pas, les calculs sont approximatifs et a moitie faux

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)

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

@@ -1715 +1715 @@
   G4Vector3D new_up ;
   G4Vector3D delta ;
-
-  if ((up[1]==1) &&(up[0]==0) && (up[2]==0)) {
-    up[1] = cameraPosition[2];
-  }
-  new_dx[2] = (cameraPosition[0]*up[1]-cameraPosition[1]*up[0])/100; // EN TEST  
-  new_dx[0] = (cameraPosition[1]*up[2]-cameraPosition[2]*up[1])/100;  // EN TEST 
-  new_dx[1] = (cameraPosition[2]*up[0]-cameraPosition[0]*up[2])/100;  // EN TEST 
-
-  delta = new_dx*dx*deltaRot + up*dy*deltaRot;
+  G4double new_cameraDistance;
+  G4Vector3D deltaCp;
+  G4Vector3D deltaUp;
+
+  new_dx[2] = (cameraPosition[0]*up[1]-cameraPosition[1]*up[0]);
+  new_dx[0] = (cameraPosition[1]*up[2]-cameraPosition[2]*up[1]);
+  new_dx[1] = (cameraPosition[2]*up[0]-cameraPosition[0]*up[2]);
+
+  delta = -new_dx*dx*deltaRot/45 - up*cameraDistance*dy*deltaRot/45; // 1 unit equal 45 degrees
   new_cameraPosition = cameraPosition + delta;
-  
-  new_up[2] = new_cameraPosition[0]*(-delta[1])-new_cameraPosition[1]*(-delta[0]); 
-  new_up[0] = new_cameraPosition[1]*(-delta[2])-new_cameraPosition[2]*(-delta[1]); 
-  new_up[1] = new_cameraPosition[2]*(-delta[0])-new_cameraPosition[0]*(-delta[2]); 
+
+  new_cameraDistance = std::sqrt(new_cameraPosition[0]*new_cameraPosition[0]+new_cameraPosition[1]*new_cameraPosition[1]+new_cameraPosition[2]*new_cameraPosition[2]);  
+  deltaCp = cameraDistance*(cameraPosition/new_cameraDistance)-cameraPosition;
+  new_cameraPosition = new_cameraPosition + deltaCp;
+  delta += deltaCp;
+
+  /* *********************** */
+  G4Vector3D new_UpX;
+  new_UpX[2] = (-up[0]*cameraPosition[1]+up[1]*cameraPosition[0])/(cameraDistance*cameraDistance);
+  new_UpX[0] = (-up[1]*cameraPosition[2]+up[2]*cameraPosition[1])/(cameraDistance*cameraDistance);
+  new_UpX[1] = (-up[2]*cameraPosition[0]+up[0]*cameraPosition[2])/(cameraDistance*cameraDistance);
+  G4Vector3D deltaX;
+  G4Vector3D deltaUpX;
+  deltaX = -new_UpX*dx*deltaRot/45 - (-cameraPosition/cameraDistance)*cameraDistance*dy*deltaRot/45;
+  new_up = up+deltaX;
+
+  float new_upDist;
+  new_upDist = std::sqrt(new_up[0]*new_up[0]+new_up[1]*new_up[1]+new_up[2]*new_up[2]);  
+  deltaUpX = (up/new_upDist)-up;
+  new_up += deltaUpX;
+
+
+  //  new_up = up[0]+
+
+  //  new_up[1] = up[1]*((new_cameraPosition[1])/cameraDistance)/cameraPosition[0];
+  //  new_up[1] = up[1]*((new_cameraPosition[1])/cameraDistance)/cameraPosition[0];
+  //  new_up[2] = up[2]-delta[1]/cameraDistance ;
+  //  new_up[2] = new_cameraPosition[0]*(-delta[1])-new_cameraPosition[1]*(-delta[0]); 
+  //  new_up[0] = new_cameraPosition[1]*(-delta[2])-new_cameraPosition[2]*(-delta[1]); 
+  //  new_up[1] = new_cameraPosition[2]*(-delta[0])-new_cameraPosition[0]*(-delta[2]); 
 
 
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::Rotate2 Tp %f,%f %f up:%f %f %f dx:%f %f %f\n",
-         targetPoint[0],targetPoint[1],targetPoint[2],up[0],up[1],up[2],new_dx[0],new_dx[1],new_dx[2]);
-  printf("G4OpenGLQtViewer::Rotate2 Cp %f,%f %f new_up:%f %f %f delta:%f %f %f\n",
-         new_cameraPosition[0],new_cameraPosition[1],new_cameraPosition[2],new_up[0],new_up[1],new_up[2],delta[0],delta[1],delta[2]);
+  printf(" Cp %f %f %f\tup:%f %f %f \tdx: %f %f %f\tTp %f %f %f\t\n",
+         cameraPosition[0],cameraPosition[1],cameraPosition[2],up[0],up[1],up[2],new_dx[0],new_dx[1],new_dx[2],targetPoint[0],targetPoint[1],targetPoint[2]);
+  printf(" Np %f %f %f\tnew_up: %f %f %f\tdelta: %f %f %f\tCd: %f\n",
+         new_cameraPosition[0],new_cameraPosition[1],new_cameraPosition[2],new_up[0],new_up[1],new_up[2],delta[0],delta[1],delta[2],cameraDistance);
+  printf(" DCp: %f %f %f\tNewUpX:%f %f %f\t deltaX:%f %f %f newUpDist:%f\n",deltaCp[0],deltaCp[1],deltaCp[2],new_UpX[0],new_UpX[1],new_UpX[2],deltaX[0],deltaX[1],deltaX[2],new_upDist);
 #endif