Ignore:
Timestamp:
Dec 22, 2010, 11:33:38 AM (15 years ago)
Author:
garnier
Message:

before tag

Location:
trunk/source/visualization/OpenGL/include
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/include/CVS/Entries

    r1343 r1346  
    1 /G4OpenGL.hh/1.9/Tue Nov 17 09:18:31 2009//
    2 /G4OpenGLBitMapStore.hh/1.4/Wed Apr  8 15:15:07 2009//
    3 /G4OpenGLFontBaseStore.hh/1.4/Wed Feb  4 16:48:40 2009//
    4 /G4OpenGLImmediateQt.hh/1.2/Wed Feb  4 16:48:40 2009//
    5 /G4OpenGLImmediateQtViewer.hh/1.7/Wed Mar 10 11:03:46 2010//
    6 /G4OpenGLImmediateSceneHandler.hh/1.15/Wed Feb  4 16:48:40 2009//
    7 /G4OpenGLImmediateViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    8 /G4OpenGLImmediateWin32.hh/1.8/Wed Feb  4 16:48:40 2009//
    9 /G4OpenGLImmediateWin32Viewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    10 /G4OpenGLImmediateX.hh/1.8/Wed Feb  4 16:48:40 2009//
    11 /G4OpenGLImmediateXViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    12 /G4OpenGLImmediateXm.hh/1.8/Wed Feb  4 16:48:40 2009//
    13 /G4OpenGLImmediateXmViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    14 /G4OpenGLQtExportDialog.hh/1.7/Wed Feb  4 16:48:40 2009//
    15 /G4OpenGLQtMovieDialog.hh/1.4/Tue Oct  7 05:36:11 2008//
    16 /G4OpenGLQtViewer.hh/1.25/Fri Oct  8 10:07:31 2010//
    17 /G4OpenGLSceneHandler.hh/1.30/Sun May 30 09:53:05 2010//
    18 /G4OpenGLSceneHandler.icc/1.9/Wed Feb  4 16:48:40 2009//
    19 /G4OpenGLStoredQt.hh/1.2/Wed Feb  4 16:48:40 2009//
    20 /G4OpenGLStoredQtViewer.hh/1.10/Wed Mar 10 11:03:46 2010//
    21 /G4OpenGLStoredSceneHandler.hh/1.30/Sat Nov  6 12:09:41 2010//
    22 /G4OpenGLStoredViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    23 /G4OpenGLStoredWin32.hh/1.8/Wed Feb  4 16:48:40 2009//
    24 /G4OpenGLStoredWin32Viewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    25 /G4OpenGLStoredX.hh/1.8/Wed Feb  4 16:48:40 2009//
    26 /G4OpenGLStoredXViewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    27 /G4OpenGLStoredXm.hh/1.7/Wed Feb  4 16:48:40 2009//
    28 /G4OpenGLStoredXmViewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    29 /G4OpenGLTransform3D.hh/1.8/Wed Feb  4 16:48:41 2009//
    30 /G4OpenGLViewer.hh/1.33/Tue Oct  5 15:45:19 2010//
    31 /G4OpenGLViewerMessenger.hh/1.8/Fri Nov  5 06:25:23 2010//
    32 /G4OpenGLWin32Viewer.hh/1.15/Wed Feb  4 16:48:41 2009//
    33 /G4OpenGLXViewer.hh/1.32/Tue Apr 28 14:33:04 2009//
    34 /G4OpenGLXmBox.hh/1.8/Wed Feb  4 16:48:41 2009//
    35 /G4OpenGLXmFourArrowButtons.hh/1.7/Wed Feb  4 16:48:41 2009//
    36 /G4OpenGLXmFramedBox.hh/1.8/Wed Feb  4 16:48:41 2009//
    37 /G4OpenGLXmPushButton.hh/1.8/Wed Feb  4 16:48:41 2009//
    38 /G4OpenGLXmRadioButton.hh/1.8/Wed Feb  4 16:48:41 2009//
    39 /G4OpenGLXmResources.hh/1.6/Wed Feb  4 16:48:41 2009//
    40 /G4OpenGLXmSeparator.hh/1.7/Wed Feb  4 16:48:41 2009//
    41 /G4OpenGLXmSliderBar.hh/1.8/Wed Feb  4 16:48:41 2009//
    42 /G4OpenGLXmTextField.hh/1.8/Wed Feb  4 16:48:41 2009//
    43 /G4OpenGLXmTopLevelShell.hh/1.7/Wed Feb  4 16:48:41 2009//
    44 /G4OpenGLXmVWidgetComponent.hh/1.7/Wed Feb  4 16:48:41 2009//
    45 /G4OpenGLXmVWidgetContainer.hh/1.7/Wed Feb  4 16:48:41 2009//
    46 /G4OpenGLXmVWidgetObject.hh/1.7/Wed Feb  4 16:48:41 2009//
    47 /G4OpenGLXmVWidgetShell.hh/1.7/Wed Feb  4 16:48:41 2009//
    48 /G4OpenGLXmViewer.hh/1.11/Wed Feb  4 16:48:41 2009//
    49 /G4OpenGLXmViewerMessenger.hh/1.5/Wed Feb  4 16:48:41 2009//
     1/G4OpenGL.hh/1.9/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     2/G4OpenGLBitMapStore.hh/1.4/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     3/G4OpenGLFontBaseStore.hh/1.4/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     4/G4OpenGLImmediateQt.hh/1.2/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     5/G4OpenGLImmediateQtViewer.hh/1.7/Tue Dec  7 16:11:32 2010//Tgeant4-09-04-ref-00
     6/G4OpenGLImmediateSceneHandler.hh/1.15/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     7/G4OpenGLImmediateViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     8/G4OpenGLImmediateWin32.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     9/G4OpenGLImmediateWin32Viewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     10/G4OpenGLImmediateX.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     11/G4OpenGLImmediateXViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     12/G4OpenGLImmediateXm.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     13/G4OpenGLImmediateXmViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     14/G4OpenGLQtExportDialog.hh/1.7/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     15/G4OpenGLQtMovieDialog.hh/1.4/Tue Oct  7 05:36:11 2008//Tgeant4-09-04-ref-00
     16/G4OpenGLQtViewer.hh/1.25/Thu Nov 25 11:06:38 2010//Tgeant4-09-04-ref-00
     17/G4OpenGLSceneHandler.hh/1.30/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     18/G4OpenGLSceneHandler.icc/1.9/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     19/G4OpenGLStoredQt.hh/1.2/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     20/G4OpenGLStoredQtViewer.hh/1.10/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     21/G4OpenGLStoredSceneHandler.hh/1.32/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     22/G4OpenGLStoredViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     23/G4OpenGLStoredWin32.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     24/G4OpenGLStoredWin32Viewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     25/G4OpenGLStoredX.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     26/G4OpenGLStoredXViewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     27/G4OpenGLStoredXm.hh/1.7/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     28/G4OpenGLStoredXmViewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     29/G4OpenGLTransform3D.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     30/G4OpenGLViewer.hh/1.33/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     31/G4OpenGLViewerMessenger.hh/1.8/Fri Nov  5 06:25:23 2010//Tgeant4-09-04-ref-00
     32/G4OpenGLWin32Viewer.hh/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     33/G4OpenGLXViewer.hh/1.32/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     34/G4OpenGLXmBox.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     35/G4OpenGLXmFourArrowButtons.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     36/G4OpenGLXmFramedBox.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     37/G4OpenGLXmPushButton.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     38/G4OpenGLXmRadioButton.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     39/G4OpenGLXmResources.hh/1.6/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     40/G4OpenGLXmSeparator.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     41/G4OpenGLXmSliderBar.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     42/G4OpenGLXmTextField.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     43/G4OpenGLXmTopLevelShell.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     44/G4OpenGLXmVWidgetComponent.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     45/G4OpenGLXmVWidgetContainer.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     46/G4OpenGLXmVWidgetObject.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     47/G4OpenGLXmVWidgetShell.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     48/G4OpenGLXmViewer.hh/1.11/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     49/G4OpenGLXmViewerMessenger.hh/1.5/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    5050D

  • trunk/source/visualization/OpenGL/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1343 r1346  
    4040#endif
    4141
    42 #include <GL/gl.h>
    43 #include <GL/glu.h>
     42
     43#ifdef G4VIS_USE_OPENGLX
     44#  include <GL/gl.h>
     45#  include <GL/glu.h>
     46//# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
     47//#  include <GL/glx.h>
     48#else
     49#  ifdef __APPLE__ &&  G4VIS_USE_OPENGLQT
     50// Already done in Qt
     51//#    include <OpenGL/gl.h>
     52//#    include <OpenGL/glu.h>
     53#    include <qgl.h>
     54#  else
     55#    include <GL/gl.h>
     56#    include <GL/glu.h>
     57#  endif
     58#endif
    4459
    4560#define G4OPENGL_FLT_BIG 1.e20

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

    r1343 r1346  
    4949
    5050#include "G4OpenGL.hh"
    51 #include <GL/gl.h>
    52 #include <GL/glu.h>
    5351
    5452namespace G4OpenGLBitMapStore {

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

    r1343 r1346  
    4242#include "G4VSceneHandler.hh"
    4343#include "G4OpenGLBitMapStore.hh"
    44 #include <GL/gl.h>
    45 #include <GL/glu.h>
     44#include "G4OpenGL.hh"
    4645
    4746#include <map>

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

    r1343 r1346  
    3737#define G4OPENGLSTOREDQTVIEWER_HH
    3838
     39#include <qgl.h>
    3940#include "G4OpenGLStoredViewer.hh"
    4041#include "G4OpenGLQtViewer.hh"
    41 
    42 #include <qgl.h>  // include qglwidget
    4342
    4443class QMouseEvent;

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

    r1343 r1346  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.30 2010/11/06 12:09:41 allison Exp $
     27// $Id: G4OpenGLStoredSceneHandler.hh,v 1.32 2010/11/10 17:10:49 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8383  static G4bool fMemoryForDisplayLists;  // avoid memory overflow
    8484  static G4int  fDisplayListLimit;       // avoid memory overflow
    85   static G4int  fDisplayListBase;        // avoid memory overflow
    8685  G4int fAddPrimitivePreambleNestingDepth;
    8786 
    8887  // PODL = Persistent Object Display List.
    8988  GLint  fTopPODL;                  // List which calls the other PODLs.
     89  // PO = Persistent Object, i.e., run-durantion object, e.g., geometry.
    9090  struct PO {
    9191    PO(G4int id, const G4Transform3D& tr = G4Transform3D());
    … …  
    9696  std::vector<PO> fPOList;
    9797 
    98   // TO = Transparent Object.
     98  // TO = Transient Object, e.g., trajectories.
    9999  struct TO {
    100100    TO(G4int id, const G4Transform3D& tr = G4Transform3D());

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

    r1340 r1346  
    7272  void rotateSceneInViewDirection (G4double dx, G4double dy,G4double delta);
    7373//////////////////////////////Vectored PostScript production functions///
     74  bool drawGl2psText(const char * textString, int size);
    7475  void printEPS();
    7576  // print EPS file. Depending of fVectoredPs, it will print Vectored or not

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

    r1343 r1346  
    4343#include <X11/Intrinsic.h>
    4444
     45#include "G4OpenGL.hh"
    4546#include <GL/glx.h>
    4647
    … …  
    5758  void SetView ();
    5859  void ShowView ();
     60  void drawText(const char * ,int x,int y,int z, int size);
    5961
    6062protected:
Note: See TracChangeset for help on using the changeset viewer.