Import Geant4 11.1.0.beta source tree

source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -64,9 +64,6 @@ public:
   void ClearStore ();
   void ClearTransientStore ();
 
-  static G4int GetDisplayListLimit() {return fDisplayListLimit;}
-  static void SetDisplayListLimit(G4int lim) {fDisplayListLimit = lim;}
-
 protected:
 
   G4bool AddPrimitivePreamble(const G4VMarker& visible);
@@ -87,12 +84,19 @@ protected:
   virtual G4bool ExtraTOProcessing
   (const G4Visible&, size_t /*currentTOListIndex*/) {return true;}
 
-  static G4int  fSceneIdCount;   // static counter for OpenGLStored scenes.
-  // Display list management.  All static since there's only one OGL store.
-  static G4int  fDisplayListId;  // Workspace.
-  static G4bool fMemoryForDisplayLists;  // avoid memory overflow
-  static G4int  fDisplayListLimit;       // avoid memory overflow
-  
+  static G4int fSceneIdCount;   // static counter for OpenGLStored scenes.
+
+  // Display list management.  Static since there's only one OGL store.
+  // Used to link a TODL or PODL to a display list.
+  static G4int fDisplayListId;
+
+  // Under some circumstances we need to prevent use of a display list.
+  // For example, a transient display of the current time window during
+  // a sequence of evolving time windows. This is set in
+  // G4OpenGLStoredViewer::AddPrimitiveForASingleFrame and acted upon in
+  // AddPrimitivePreambleInternal.
+  G4bool fDoNotUseDisplayList;  // Avoid display list use if true
+
   // PODL = Persistent Object Display List.
   // This "top PODL" was made redundant when the PO list was
   // "unwrapped" 27th October 2011, but keep it for now in case we

source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -39,7 +39,7 @@
 #endif
 
 class G4OpenGLSceneHandler;
-class G4OpenGL2PSAction;
+class G4gl2ps;
 class G4Text;
 
 class G4OpenGLViewerPickMap {
@@ -200,7 +200,7 @@ protected:
     transparency_enabled,   //is alpha blending enabled?
     antialiasing_enabled,   //is antialiasing enabled?
     haloing_enabled;        //is haloing enabled for wireframe?
-  G4OpenGL2PSAction* fGL2PSAction;
+  G4gl2ps* fGL2PSAction;
 
   G4double     fRot_sens;        // Rotation sensibility in degrees
   G4double     fPan_sens;        // Translation sensibility

source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh

@@ -55,7 +55,7 @@ private:
   G4UIcommand*             fpCommandFlushAt;
 
   G4UIdirectory* fpDirectorySet;
-  G4UIcmdWithAnInteger* fpCommandDisplayListLimit;
+  G4UIcmdWithoutParameter* fpCommandDisplayListLimit;
   G4UIcommand*          fpCommandExportFormat;
   G4UIcommand*          fpCommandPrintFilename;
   G4UIcmdWithAString*   fpCommandPrintMode;

source/visualization/OpenGL/include/G4gl2ps.hh

@@ -0,0 +1,82 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+//
+
+#ifndef G4gl2ps_h
+#define G4gl2ps_h 
+
+#include "G4String.hh"
+
+#include <tools/gl2ps_def.h>
+
+class G4gl2ps {
+
+public:
+ G4gl2ps();
+ ~G4gl2ps();
+
+ void setOpenGLFunctions(tools_gl2ps_gl_funcs_t*);
+ void setFileName(const char*);
+ void setExportImageFormat(unsigned int);
+  
+ void setExportImageFormat_PS()  {setExportImageFormat(TOOLS_GL2PS_PS);}
+ void setExportImageFormat_EPS() {setExportImageFormat(TOOLS_GL2PS_EPS);}
+ void setExportImageFormat_TEX() {setExportImageFormat(TOOLS_GL2PS_TEX);}
+ void setExportImageFormat_PDF() {setExportImageFormat(TOOLS_GL2PS_PDF);}
+ void setExportImageFormat_SVG() {setExportImageFormat(TOOLS_GL2PS_SVG);}
+ void setExportImageFormat_PGF() {setExportImageFormat(TOOLS_GL2PS_PGF);}
+  
+ bool enableFileWriting();
+ void disableFileWriting();
+ bool fileWritingEnabled() const;
+  
+ bool beginPage();
+ bool endPage();
+  
+ void setLineWidth(int);
+ void setPointSize(int);
+ void addTextOpt(const char*,const char*,
+                 tools_GLshort,tools_GLint,tools_GLfloat);
+ void setViewport(int,int,int,int);
+ bool extendBufferSize();
+ void resetBufferSizeParameters();
+ void setBufferSize(int);
+
+ tools_GL2PScontextPointer context() const {return fContext;}
+protected:
+ tools_gl2ps_gl_funcs_t fOpenGLFuncs;
+ tools_GL2PScontextPointer fContext;
+ FILE* fFile;
+ G4String fFileName;
+ int fViewport[4];
+ int fBufferSize;
+ int fBufferSizeLimit;
+private:
+ unsigned int fExportImageFormat;
+};
+
+#endif
+