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

Timestamp:

Mar 10, 2010, 11:29:32 AM (14 years ago)

Author:

garnier

Message:

update

File:

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

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

@@ -195 +195 @@
     }
   }
-  GLsizei side = fWinSize_x;
-  if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   GLsizei side = fWinSize_x;
+//   if (fWinSize_y < fWinSize_x) side = fWinSize_y;
   
   // SPECIAL CASE if fWinSize_x is even (69 for example) 
@@ -208 +208 @@
 
   // SPECIAL CASE
-  if ((fWinSize_x - side)%2) {
-    //    fWinSize_x --;
-
-    side = fWinSize_x;
-    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
-  }
-  if ((fWinSize_y - side)%2) {
-    //    fWinSize_y --;
-
-    side = fWinSize_x;
-    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
-  }
-  
-  GLint X = (fWinSize_x - side) / 2;
-  GLint Y = (fWinSize_y - side) / 2;
-  
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
-#endif
-  glViewport(X, Y, side, side);
-  //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
+//   if ((fWinSize_x - side)%2) {
+//     //    fWinSize_x --;
+
+//     side = fWinSize_x;
+//     if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   }
+//   if ((fWinSize_y - side)%2) {
+//     //    fWinSize_y --;
+
+//     side = fWinSize_x;
+//     if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   }
+  
+//   GLint X = (fWinSize_x - side) / 2;
+//   GLint Y = (fWinSize_y - side) / 2;
+  
+#ifdef G4DEBUG_VIS_OGL
+  //  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
+#endif
+
+  //  glViewport(X, Y, side, side);
+  glViewport(0, 0, fWinSize_x,fWinSize_y);  
   
 
@@ -256 +257 @@
   glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuse);
   
+  G4double ratioX = 1;
+  G4double ratioY = 1;
+  if (fWinSize_y > fWinSize_x) {
+    ratioX = ((G4double)fWinSize_y) / ((G4double)fWinSize_x);
+  }
+  if (fWinSize_x > fWinSize_y) {
+    ratioY = ((G4double)fWinSize_x) / ((G4double)fWinSize_y);
+  }
+  
   // Get radius of scene, etc.
   // Note that this procedure properly takes into account zoom, dolly and pan.
@@ -268 +278 @@
   const GLdouble pnear  = fVP.GetNearDistance (cameraDistance, radius);
   const GLdouble pfar   = fVP.GetFarDistance  (cameraDistance, pnear, radius);
-  const GLdouble right  = fVP.GetFrontHalfHeight (pnear, radius);
+  const GLdouble right  = fVP.GetFrontHalfHeight (pnear, radius) * ratioY;
   const GLdouble left   = -right;
-  const GLdouble bottom = left;
-  const GLdouble top    = right;
+  const GLdouble top    = fVP.GetFrontHalfHeight (pnear, radius) * ratioX;
+  const GLdouble bottom = -top;
   
   // FIXME
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV\n");
+  printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV sizeX:%d sizeY:%d ratioX:%f ratioY:%f\n",fWinSize_x,fWinSize_y,ratioX,ratioY);
 #endif
   ResizeGLView();
@@ -291 +301 @@
   if (fVP.GetFieldHalfAngle() == 0.) {
     glOrtho (left, right, bottom, top, pnear, pfar);
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLViewer::SetView glOrtho %f %f %f %f %f %f\n",left, right, bottom, top, pnear, pfar);
+#endif
   }
   else {