Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /visualization/OpenGL/src/G4OpenGLStoredXViewer.cc (Version 11.3.0) and /visualization/OpenGL/src/G4OpenGLStoredXViewer.cc (Version 10.0.p1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
                                                   >>  27 // $Id: G4OpenGLStoredXViewer.cc 66373 2012-12-18 09:41:34Z gcosmo $
 27 //                                                 28 //
 28 //                                                 29 // 
 29 // Andrew Walkden  7th February 1997               30 // Andrew Walkden  7th February 1997
 30 // Class G4OpenGLStoredXViewer : a class deriv     31 // Class G4OpenGLStoredXViewer : a class derived from G4OpenGLXViewer and
 31 //                             G4OpenGLStoredV     32 //                             G4OpenGLStoredViewer.
 32                                                    33 
                                                   >>  34 #ifdef G4VIS_BUILD_OPENGLX_DRIVER
                                                   >>  35 
 33 #include "G4OpenGLStoredXViewer.hh"                36 #include "G4OpenGLStoredXViewer.hh"
 34                                                    37 
 35 #include "G4OpenGLStoredSceneHandler.hh"           38 #include "G4OpenGLStoredSceneHandler.hh"
 36 #include "G4ios.hh"                                39 #include "G4ios.hh"
 37 #include "G4Threading.hh"                      << 
 38                                                    40 
 39 G4OpenGLStoredXViewer::                            41 G4OpenGLStoredXViewer::
 40 G4OpenGLStoredXViewer (G4OpenGLStoredSceneHand     42 G4OpenGLStoredXViewer (G4OpenGLStoredSceneHandler& sceneHandler,
 41      const G4String& name)                         43      const G4String& name)
 42  : G4VViewer (sceneHandler, sceneHandler.Incre     44  : G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
 43    G4OpenGLViewer (sceneHandler),                  45    G4OpenGLViewer (sceneHandler),
 44    G4OpenGLXViewer (sceneHandler),                 46    G4OpenGLXViewer (sceneHandler),
 45    G4OpenGLStoredViewer (sceneHandler)             47    G4OpenGLStoredViewer (sceneHandler)
 46 {                                                  48 {
 47   if (fViewId < 0) return;  // In case error i     49   if (fViewId < 0) return;  // In case error in base class instantiation.
 48                                                    50 
 49   if (!vi_stored) {                                51   if (!vi_stored) {
 50     fViewId = -1;  // This flags an error.         52     fViewId = -1;  // This flags an error.
 51     G4cerr << "G4OpenGLStoredXViewer::G4OpenGL     53     G4cerr << "G4OpenGLStoredXViewer::G4OpenGLStoredXViewer -"
 52       " G4OpenGLXViewer couldn't get a visual.     54       " G4OpenGLXViewer couldn't get a visual." << G4endl;
 53     return;                                        55     return;
 54   }                                                56   }
 55 }                                                  57 }
 56                                                    58 
 57 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer      59 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {}
 58                                                    60 
 59 void G4OpenGLStoredXViewer::Initialise () {        61 void G4OpenGLStoredXViewer::Initialise () {
 60                                                    62 
 61 #ifdef G4DEBUG_VIS_OGL                             63 #ifdef G4DEBUG_VIS_OGL
 62   printf("G4OpenGLStoredXViewer::Initialise\n"     64   printf("G4OpenGLStoredXViewer::Initialise\n");
 63 #endif                                             65 #endif
 64   CreateGLXContext (vi_stored);                    66   CreateGLXContext (vi_stored);
 65   CreateMainWindow ();                             67   CreateMainWindow ();
 66   CreateFontLists ();                              68   CreateFontLists ();
 67                                                    69 
 68   InitializeGLView ();                             70   InitializeGLView ();
 69                                                    71 
 70   glDrawBuffer (GL_BACK);                          72   glDrawBuffer (GL_BACK);
 71 }                                                  73 }
 72                                                    74 
 73 void G4OpenGLStoredXViewer::DrawView () {          75 void G4OpenGLStoredXViewer::DrawView () {
 74                                                    76 
 75 #ifdef G4DEBUG_VIS_OGL                             77 #ifdef G4DEBUG_VIS_OGL
 76   printf("G4OpenGLStoredXViewer::DrawView\n");     78   printf("G4OpenGLStoredXViewer::DrawView\n");
 77 #endif                                             79 #endif
                                                   >>  80   //Make sure current viewer is attached and clean...
                                                   >>  81   glXMakeCurrent (dpy, win, cx);
 78                                                    82 
 79   G4ViewParameters::DrawingStyle style = GetVi     83   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
 80                                                    84 
 81   // See if things have changed from last time     85   // See if things have changed from last time and remake if necessary...
 82   // The fNeedKernelVisit flag might have been     86   // The fNeedKernelVisit flag might have been set by the user in
 83   // /vis/viewer/rebuild, but if not, make dec     87   // /vis/viewer/rebuild, but if not, make decision and set flag only
 84   // if necessary...                               88   // if necessary...
 85   if (!fNeedKernelVisit) KernelVisitDecision (     89   if (!fNeedKernelVisit) KernelVisitDecision ();
 86   fLastVP = fVP;                               << 
 87   G4bool kernelVisitWasNeeded = fNeedKernelVis     90   G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
 88   ProcessView ();                                  91   ProcessView ();
 89                                                    92 
 90   if(style!=G4ViewParameters::hlr && haloing_e     93   if(style!=G4ViewParameters::hlr && haloing_enabled) {
 91                                                    94 
 92     HaloingFirstPass ();                           95     HaloingFirstPass ();
 93     DrawDisplayLists ();                           96     DrawDisplayLists ();
 94 #ifdef G4DEBUG_VIS_OGL                             97 #ifdef G4DEBUG_VIS_OGL
 95   printf("G4OpenGLStoredXViewer::DrawView flus     98   printf("G4OpenGLStoredXViewer::DrawView flush \n");
 96 #endif                                             99 #endif
 97     glFlush ();                                   100     glFlush ();
 98                                                   101 
 99     HaloingSecondPass ();                         102     HaloingSecondPass ();
100                                                   103 
101     DrawDisplayLists ();                          104     DrawDisplayLists ();
102                                                   105 
103   } else {                                        106   } else {
104                                                   107 
105     if (!kernelVisitWasNeeded) {                  108     if (!kernelVisitWasNeeded) {
106 #ifdef G4DEBUG_VIS_OGL                            109 #ifdef G4DEBUG_VIS_OGL
107       printf("G4OpenGLStoredXViewer::DrawView     110       printf("G4OpenGLStoredXViewer::DrawView NO need kernel visit\n");
108 #endif                                            111 #endif
109       DrawDisplayLists ();                        112       DrawDisplayLists ();
110                                                   113 
111     } else {                                      114     } else {
112                                                   115 
113 #ifdef G4DEBUG_VIS_OGL                            116 #ifdef G4DEBUG_VIS_OGL
114       printf("G4OpenGLStoredXViewer::DrawView     117       printf("G4OpenGLStoredXViewer::DrawView NEED kernel visit\n");
115 #endif                                            118 #endif
116     // However, union cutaways are implemented    119     // However, union cutaways are implemented in DrawDisplayLists, so make
117     // an extra pass...                           120     // an extra pass...
118       if (fVP.IsCutaway() &&                      121       if (fVP.IsCutaway() &&
119     fVP.GetCutawayMode() == G4ViewParameters::    122     fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) {
120   ClearView();                                    123   ClearView();
121   DrawDisplayLists ();                            124   DrawDisplayLists ();
122       } else { // ADD TO AVOID KernelVisit=1 a    125       } else { // ADD TO AVOID KernelVisit=1 and nothing to display
123         DrawDisplayLists ();                      126         DrawDisplayLists ();
124       }                                           127       }
125     }                                             128     }
126   }                                               129   }
127                                                   130 
128   FinishView ();                                  131   FinishView ();
129                                                   132 
130 }                                                 133 }
131                                                   134 
132 void G4OpenGLStoredXViewer::FinishView () {       135 void G4OpenGLStoredXViewer::FinishView () {
133 #ifdef G4DEBUG_VIS_OGL                            136 #ifdef G4DEBUG_VIS_OGL
134   printf("G4OpenGLStoredXViewer::FinishView\n"    137   printf("G4OpenGLStoredXViewer::FinishView\n");
135 #endif                                            138 #endif
136                                                << 139   glXWaitGL (); //Wait for effects of all previous OpenGL commands to
137 //  glXWaitGL (); //Wait for effects of all pr << 140                 //be propogated before progressing.
138                 //be propagated before progres << 
139 // JA: Commented out July 2021 - slows renderi << 
140 // don't see any adverse effects.              << 
141                                                   141 
142 #ifdef G4DEBUG_VIS_OGL                            142 #ifdef G4DEBUG_VIS_OGL
143   printf("G4OpenGLStoredXViewer::FinishView fl    143   printf("G4OpenGLStoredXViewer::FinishView flush \n");
144 #endif                                            144 #endif
145   glFlush (); //FIXME                             145   glFlush (); //FIXME
146                                                   146 
147   GLint renderMode;                               147   GLint renderMode;
148   glGetIntegerv(GL_RENDER_MODE, &renderMode);     148   glGetIntegerv(GL_RENDER_MODE, &renderMode);
149   if (renderMode == GL_RENDER) glXSwapBuffers     149   if (renderMode == GL_RENDER) glXSwapBuffers (dpy, win);  
150 }                                                 150 }
                                                   >> 151 
                                                   >> 152 #endif
151                                                   153