Changeset 593 for trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

Timestamp:

Nov 9, 2007, 3:32:25 PM (17 years ago)

Author:

garnier

Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

File:

• trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh (modified) (5 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.21 2006/08/30 11:43:57 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.24 2007/04/04 16:50:26 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 //
 // 
@@ -63 +63 @@
   void EndModeling ();
   void AddPrimitive (const G4Polyline&);
+  void AddPrimitive (const G4Polymarker&);
   void AddPrimitive (const G4Circle&);
   void AddPrimitive (const G4Square&);
-  void AddPrimitive (const G4Polymarker& polymarker);
-  // Explicitly invoke base class methods to avoid warnings about
-  // hiding of base class methods...
-  void AddPrimitive (const G4Text& text) {
-    G4OpenGLSceneHandler::AddPrimitive (text);
-  }
-  void AddPrimitive (const G4Polyhedron& polyhedron) {
-    G4OpenGLSceneHandler::AddPrimitive (polyhedron);
-  }
-  void AddPrimitive (const G4NURBS& nurbs) {
-    G4OpenGLSceneHandler::AddPrimitive (nurbs);
-  }
-  void AddPrimitive (const G4Scale& scale) {
-    G4OpenGLSceneHandler::AddPrimitive (scale);
-  }
+  void AddPrimitive (const G4Text&);
+  void AddPrimitive (const G4Scale&);
+  void AddPrimitive (const G4Polyhedron&);
+  void AddPrimitive (const G4NURBS&);
   void ClearStore ();
   void ClearTransientStore ();
@@ -98 +88 @@
   struct PO {
     PO(G4int id, const G4Transform3D& tr = G4Transform3D()):
-      fDisplayListId(id), fTransform(tr) {}
+      fDisplayListId(id), fTransform(tr), fPickName(0) {}
     G4int fDisplayListId;
     G4Transform3D fTransform;
+    GLuint fPickName;
   };
   std::vector<PO> fPOList; 
@@ -107 +98 @@
   struct TO {
     TO(G4int id, const G4Transform3D& tr = G4Transform3D()):
-      fDisplayListId(id), fTransform(tr),
-      fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {}
+      fDisplayListId(id), fTransform(tr), fPickName(0),
+      fStartTime(-G4OPENGL_DBL_MAX), fEndTime(G4OPENGL_DBL_MAX) {}
     G4int fDisplayListId;
     G4Transform3D fTransform;
+    GLuint fPickName;
     G4double fStartTime, fEndTime;  // Time range (e.g., for trajectory steps).
     G4Colour fColour;
@@ -119 +111 @@
   // A proper implementation would use geometry hierarchy.
   std::map <const G4VSolid*, G4int, std::less <const G4VSolid*> > fSolidMap;
+
+private:
+  G4bool fProcessing2D;
 };