Ignore:
Timestamp:
Apr 2, 2009, 3:23:18 PM (15 years ago)
Author:
garnier
Message:

after maj on CVS good-HEAD

Location:
trunk/source/visualization/OpenGL
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/History

    r951 r959  
    2121-------------------------------------
    2222
    23 24th March 2009, Laurent Garnier (vis-V09-02-01)
     2324th March 2009, Laurent Garnier (opengl-V09-02-01)
    2424 - G4OpenGLViewer : Add a fix and resizing when X/Y size was even (lack of precision
    2525   in a /2)

  • trunk/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh

    r956 r959  
    2626//
    2727// $Id: G4OpenGLWin32Viewer.hh,v 1.15 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r955 r959  
    16341634*/
    16351635void G4OpenGLQtViewer::rescaleImage(
    1636  int /*aWidth*/
    1637 ,int /*aHeight*/
     1636 int /* aWidth */
     1637,int /* aHeight */
    16381638){
    16391639  //  GLfloat* feedback_buffer;

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

    r955 r959  
    214214{
    215215
     216#ifdef G4DEBUG_VIS_OGL
    216217  printf("G4OpenGLStoredSceneHandler::AddPrimitive\n");
    217 
     218#endif
    218219  std::vector< G4Polymarker > poly;
    219220    // 40,83 N03 lancement
    … …  
    286287  }
    287288#endif 
     289#ifdef G4DEBUG_VIS_OGL
    288290  printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n");
     291#endif
    289292  AddPrimitivePreamble(polymarker);
    290293  G4OpenGLSceneHandler::AddPrimitive(polymarker);
    … …  
    378381void G4OpenGLStoredSceneHandler::EndModeling () {
    379382  // Make a List which calls the other lists.
     383#ifdef G4DEBUG_VIS_OGL
    380384  printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n");
     385#endif
    381386  fTopPODL = glGenLists (1);
    382387  if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?

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

    r955 r959  
    115115
    116116void G4OpenGLViewer::ClearView () {
     117#ifdef G4DEBUG_VIS_OGL
    117118  printf("G4OpenGLViewer::ClearView\n");
     119#endif
    118120  glClearColor (background.GetRed(),
    119121                background.GetGreen(),
    … …  
    141143void G4OpenGLViewer::ResizeGLView()
    142144{
     145#ifdef G4DEBUG_VIS_OGL
    143146  printf("G4OpenGLViewer::ResizeGLView %d %d\n",fWinSize_x,fWinSize_y);
     147#endif
    144148  // Check size
    145149  GLint dims[2];
    … …  
    182186  GLint Y = (fWinSize_y - side) / 2;
    183187 
     188#ifdef G4DEBUG_VIS_OGL
    184189  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);
     190#endif
    185191  glViewport(X, Y, side, side);
    186192  //    glViewport(0, 0, fWinSize_x,fWinSize_y); 

  • trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

    r955 r959  
    413413void G4OpenGLXViewer::printEPS() {
    414414 
     415#ifdef G4DEBUG_VIS_OGL
    415416    printf("G4OpenGLXViewer::print \n");
     417#endif
    416418
    417419  //using namespace std;
    … …  
    541543//                  fGLXWin,
    542544//                  cx);
     545#ifdef G4DEBUG_VIS_OGL
    543546    printf("G4OpenGLXViewer::print Restored context:%d old winGL:%d \n",cx,fGLXWin);
     547#endif
    544548    //    printf("Error 1:%d 2:%d\n",er1,er2);
    545549   
    … …  
    589593
    590594 
     595#ifdef G4DEBUG_VIS_OGL
    591596  printf("------%d------\n",tmp_cx);
     597#endif
    592598  return glXCreateContext (dpy,
    593599                           pvi,
Note: See TracChangeset for help on using the changeset viewer.