Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/visualization/OpenGL/src/G4OpenGLImmediateXViewer.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/G4OpenGLImmediateXViewer.cc (Version 11.3.0) and /visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc (Version 9.4.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: G4OpenGLImmediateXViewer.cc,v 1.19 2009-02-04 16:48:41 lgarnier Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-09-04-patch-01 $
 27 //                                                 29 //
 28 //                                                 30 // 
 29 // Andrew Walkden  7th February 1997               31 // Andrew Walkden  7th February 1997
 30 // Class G4OpenGLImmediateXViewer : a class de     32 // Class G4OpenGLImmediateXViewer : a class derived from G4OpenGLXViewer and
 31 //                                G4OpenGLImme     33 //                                G4OpenGLImmediateViewer.
 32                                                    34 
                                                   >>  35 #ifdef G4VIS_BUILD_OPENGLX_DRIVER
                                                   >>  36 
 33 #include "G4OpenGLImmediateXViewer.hh"             37 #include "G4OpenGLImmediateXViewer.hh"
 34 #include "G4OpenGLImmediateSceneHandler.hh"        38 #include "G4OpenGLImmediateSceneHandler.hh"
 35                                                    39 
 36 #include "G4ios.hh"                                40 #include "G4ios.hh"
 37 #include "G4Threading.hh"                      << 
 38                                                    41 
 39 G4OpenGLImmediateXViewer::                         42 G4OpenGLImmediateXViewer::
 40 G4OpenGLImmediateXViewer (G4OpenGLImmediateSce     43 G4OpenGLImmediateXViewer (G4OpenGLImmediateSceneHandler& sceneHandler,
 41         const G4String&  name)                     44         const G4String&  name)
 42  : G4VViewer (sceneHandler, sceneHandler.Incre     45  : G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
 43    G4OpenGLViewer (sceneHandler),                  46    G4OpenGLViewer (sceneHandler),
 44    G4OpenGLXViewer (sceneHandler),                 47    G4OpenGLXViewer (sceneHandler),
 45    G4OpenGLImmediateViewer (sceneHandler)          48    G4OpenGLImmediateViewer (sceneHandler)
 46 {                                                  49 {
 47   if (fViewId < 0) return;  // In case error i     50   if (fViewId < 0) return;  // In case error in base class instantiation.
 48                                                    51 
 49 // ensure a suitable window was found              52 // ensure a suitable window was found
 50   if (!vi_immediate) {                             53   if (!vi_immediate) {
 51     G4cerr << "G4OpenGLImmediateXViewer::G4Ope     54     G4cerr << "G4OpenGLImmediateXViewer::G4OpenGLImmediateXViewer -"
 52       " G4OpenGLXViewer couldn't get a visual.     55       " G4OpenGLXViewer couldn't get a visual." << G4endl;  
 53     fViewId = -1;  // This flags an error.         56     fViewId = -1;  // This flags an error.
 54     return;                                        57     return;
 55   }                                                58   }
 56 }                                                  59 }
 57                                                    60 
 58 G4OpenGLImmediateXViewer::~G4OpenGLImmediateXV     61 G4OpenGLImmediateXViewer::~G4OpenGLImmediateXViewer () {}
 59                                                    62 
 60 void G4OpenGLImmediateXViewer::Initialise () {     63 void G4OpenGLImmediateXViewer::Initialise () {
 61                                                    64 
 62   CreateGLXContext (vi_immediate);                 65   CreateGLXContext (vi_immediate);
 63   CreateMainWindow ();                             66   CreateMainWindow ();
 64   CreateFontLists ();                              67   CreateFontLists ();
 65                                                    68 
 66   InitializeGLView ();                             69   InitializeGLView ();
 67                                                    70 
                                                   >>  71   // clear the buffers and window.
                                                   >>  72   ClearView ();
                                                   >>  73   FinishView ();
                                                   >>  74 
 68   // If a double buffer context has been force     75   // If a double buffer context has been forced upon us, ignore the
 69   // back buffer for this OpenGLImmediate view     76   // back buffer for this OpenGLImmediate view.
 70   glDrawBuffer (GL_FRONT);                         77   glDrawBuffer (GL_FRONT);
 71                                                    78 
 72   glDepthFunc (GL_LEQUAL);                         79   glDepthFunc (GL_LEQUAL);
 73   glDepthMask (GL_TRUE);                           80   glDepthMask (GL_TRUE);
 74 }                                                  81 }
 75                                                    82 
 76 void G4OpenGLImmediateXViewer::DrawView () {       83 void G4OpenGLImmediateXViewer::DrawView () {
 77                                                    84 
 78   G4ViewParameters::DrawingStyle style = GetVi     85   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
 79                                                    86 
                                                   >>  87   //Make sure current viewer is attached and clean...
                                                   >>  88   glXMakeCurrent (dpy, win, cx);
                                                   >>  89 
 80   if(style!=G4ViewParameters::hlr &&               90   if(style!=G4ViewParameters::hlr &&
 81      haloing_enabled) {                            91      haloing_enabled) {
 82                                                    92 
 83     HaloingFirstPass ();                           93     HaloingFirstPass ();
 84     NeedKernelVisit ();                            94     NeedKernelVisit ();
 85     ProcessView ();                                95     ProcessView ();
 86     glFlush ();                                    96     glFlush ();
 87                                                    97 
 88     HaloingSecondPass ();                          98     HaloingSecondPass ();
 89                                                    99 
 90   }                                               100   }
 91                                                   101 
 92   NeedKernelVisit ();  // Always need to visit    102   NeedKernelVisit ();  // Always need to visit G4 kernel.
 93   ProcessView ();                                 103   ProcessView ();
 94   FinishView ();                                  104   FinishView ();
 95                                                   105 
 96 }                                                 106 }
 97                                                   107 
 98 void G4OpenGLImmediateXViewer::FinishView () {    108 void G4OpenGLImmediateXViewer::FinishView () {
 99 //  glXWaitGL (); //Wait for effects of all pr << 109   glXWaitGL (); //Wait for effects of all previous OpenGL commands to
100                 //be propagated before progres << 110                 //be propogated before progressing.
101 // JA: Commented out July 2021 - slows renderi << 
102 // don't see any adverse effects.              << 
103   glFlush ();                                     111   glFlush ();
104 }                                                 112 }
                                                   >> 113 
                                                   >> 114 #endif
105                                                   115