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

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.62 2010/05/11 10:22:37 allison Exp $
+// $Id: G4OpenGLViewer.cc,v 1.63 2010/10/05 15:45:19 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -113 +113 @@
   glDisable (GL_POLYGON_SMOOTH);
 
-  //  if (fVP != NULL) {
-    fWinSize_x = fVP.GetWindowSizeHintX();
-    fWinSize_y = fVP.GetWindowSizeHintY();
-    //  }
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
 }  
 
@@ -177 +175 @@
   }
     
-  glViewport(0, 0, fWinSize_x,fWinSize_y); 
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ResizeGLView END %d %d &:%d\n",fWinSize_x,fWinSize_y,this);
-#endif
-  
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::ResizeGLView viewport X:%d Y:%d\n",fWinSize_x,fWinSize_y);
+#endif
+  glViewport(0, 0, fWinSize_x,fWinSize_y);   
+
+
 }
 
@@ -191 +189 @@
     return;
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView\n");
-#endif
   // Calculates view representation based on extent of object being
   // viewed and (initial) viewpoint.  (Note: it can change later due
@@ -338 +333 @@
   background = fVP.GetBackgroundColour ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView END\n");
-#endif
 }
 
@@ -461 +453 @@
   glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::grabPixels colors:%d swap:%d lsb:%d rowlenght:%d sr:%d sp:%d align:%d\n",inColor,swapbytes, lsbfirst, rowlength,skiprows, skippixels, alignment);
+#endif
+
+
   glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
   glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
@@ -469 +466 @@
   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
 
+  glFlush();
   glReadBuffer(GL_FRONT);
   glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
-
+  //  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
   glPixelStorei (GL_UNPACK_SWAP_BYTES, swapbytes);
   glPixelStorei (GL_UNPACK_LSB_FIRST, lsbfirst);
@@ -529 +527 @@
 bool G4OpenGLViewer::printNonVectoredEPS () {
 
-  int width = getRealPrintSizeX();
-  int height = getRealPrintSizeY();
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,fPrintColour,fWinSize_x,fWinSize_y);
+  GLint viewport[4];
+  glGetIntegerv(GL_VIEWPORT, viewport);
+
+  int width2 = getRealPrintSizeX();
+  int height2 = getRealPrintSizeY();
+  int width = viewport[2]; // FIXME : Why -1 ????
+  int height = viewport[3];
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d X2:%d Y2:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,width2,height2,fPrintColour,fWinSize_x,fWinSize_y);
 #endif
   FILE* fp;
@@ -621 +624 @@
   int height = getRealPrintSizeY();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::printGl2PS file:%s Vec:%d X:%d Y:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,fPrintColour,fWinSize_x,fWinSize_y);
+#endif
+
   if (!fGL2PSAction) return false;
 
@@ -643 +650 @@
 
     // Set the viewport
-    //    fGL2PSAction->setViewport(0, 0, getRealPrintSizeX(),getRealPrintSizeY());  
+    //    fGL2PSAction->setViewport(0, 0, width, height);  
     // By default, we choose the line width (trajectories...)
     fGL2PSAction->setLineWidth(1);
@@ -693 +700 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeX %d\n",fPrintSizeX);
+#endif
   return fPrintSizeX;
 }
@@ -712 +722 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeY %d\n",fPrintSizeY);
+#endif
   return fPrintSizeY;
 }
@@ -825 +838 @@
   //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();
@@ -855 +860 @@
   // 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();
-
   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());
     }
@@ -902 +886 @@
   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);
-
-
 }