Changeset 1295


Ignore:
Timestamp:
Jun 2, 2010, 11:25:35 AM (14 years ago)
Author:
garnier
Message:

CVS update

Location:
trunk/source/visualization/OpenGL/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1285 r1295  
    2626//
    2727// $Id: G4OpenGLImmediateQtViewer.cc,v 1.18 2010/03/10 11:03:46 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: vis-V09-03-06 $
    2929//
    3030//
    … …  
    8282  //   glDrawBuffer (GL_FRONT); // FIXME : Ne marche pas avec cette ligne, mais affiche le run correctement...
    8383  // clear the buffers and window.
    84   //   ClearView ();
    85   //   FinishView ();
     84  ClearView ();
     85  FinishView ();
    8686
    8787  glDepthFunc (GL_LEQUAL);
    … …  
    105105
    106106#ifdef G4DEBUG_VIS_OGL
    107   printf("G4OpenGLImmediateQtViewer::ComputeView %d %d &:%d  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",getWinWidth(), getWinHeight(),this);
     107  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",getWinWidth(), getWinHeight());
    108108#endif
    109109  makeCurrent();
    … …  
    156156{
    157157#ifdef G4DEBUG_VIS_OGL
    158   printf("\n\nG4OpenGLImmediateQtViewer::paintGL  &: %d??\n",this);
     158  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
    159159#endif
    160160  if (!fReadyToPaint) {

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

    r1286 r1295  
    2626//
    2727// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.32 2010/05/29 15:52:49 allison Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: vis-V09-03-06 $
    2929//
    3030//
    … …  
    208208void G4OpenGLImmediateSceneHandler::RequestPrimitives (const G4VSolid& solid)
    209209{
    210 #ifdef G4DEBUG_VIS_OGL
    211   //  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n");
    212 #endif
    213210  if (fReadyForTransients) {
    214211    // Always draw transient solids, e.g., hits represented as solids.
    … …  
    246243  // Else invoke base class method...
    247244  G4VSceneHandler::RequestPrimitives (solid);
    248 #ifdef G4DEBUG_VIS_OGL
    249   //  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n");
     245}
     246
     247G4int G4OpenGLImmediateSceneHandler::fSceneIdCount = 0;
     248
    250249#endif
    251 }
    252 
    253 G4int G4OpenGLImmediateSceneHandler::fSceneIdCount = 0;
    254 
    255 #endif

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

    r1285 r1295  
    2626//
    2727// $Id: G4OpenGLStoredQtViewer.cc,v 1.29 2010/03/10 11:03:46 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: vis-V09-03-06 $
    2929//
    3030//
    … …  
    8585
    8686  // clear the buffers and window.
    87   //   ClearView ();
    88   //   FinishView ();
     87  ClearView ();
     88  FinishView ();
    8989   
    9090  glDepthFunc (GL_LEQUAL);

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

    r1242 r1295  
    2626//
    2727// $Id: G4OpenGLStoredViewer.cc,v 1.26 2009/04/08 16:55:44 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: vis-V09-03-06 $
    2929//
    3030//
    … …  
    126126void G4OpenGLStoredViewer::DrawDisplayLists () {
    127127#ifdef G4DEBUG_VIS_OGL
    128   //      printf("G4OpenGLStoredViewer::DrawDisplayLists \n");
     128      printf("G4OpenGLStoredViewer::DrawDisplayLists \n");
    129129#endif
    130130
    … …  
    134134  size_t nPasses = cutawayUnion? cutaways.size(): 1;
    135135#ifdef G4DEBUG_VIS_OGL
    136   //  printf("G4OpenGLStoredViewer::DrawDisplayLists");
     136  printf("G4OpenGLStoredViewer::DrawDisplayLists");
    137137#endif
    138138  for (size_t i = 0; i < nPasses; ++i) {
    139139#ifdef G4DEBUG_VIS_OGL
    140     //    printf("+");
     140    printf("+");
    141141#endif
    142142
    … …  
    156156    for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) {
    157157#ifdef G4DEBUG_VIS_OGL
    158       //      printf("-");
     158      printf("-");
    159159#endif
    160160      G4OpenGLStoredSceneHandler::TO& to =
    … …  
    179179  }
    180180#ifdef G4DEBUG_VIS_OGL
    181   //      printf("\n");
     181      printf("\n");
    182182#endif
    183183

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

    r1286 r1295  
    2626//
    2727// $Id: G4OpenGLStoredXViewer.cc,v 1.26 2010/05/29 15:56:50 allison Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: vis-V09-03-06 $
    2929//
    3030//
    … …  
    5757}
    5858
    59 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {
    60 #ifdef G4DEBUG_VIS_OGL
    61   printf("G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer DELETE\n");
    62 #endif
    63   //  GetSceneHandler()->RemoveViewerFromList(this);
    64 }
     59G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {}
    6560
    6661void G4OpenGLStoredXViewer::Initialise () {
Note: See TracChangeset for help on using the changeset viewer.