Changeset 593 for trunk/geant4/visualization/OpenGL/include/G4OpenGLSceneHandler.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/G4OpenGLSceneHandler.hh (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.20 2006/08/30 11:37:34 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4OpenGLSceneHandler.hh,v 1.23 2007/04/04 16:50:26 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 //
 // 
@@ -45 +45 @@
 #include "G4VSceneHandler.hh"
 #include "G4OpenGLViewer.hh"
+#include "G4OpenGLBitMapStore.hh"
+#include <map>
 
-// Base class for various OpenGLScene classes.
+class G4AttHolder;
+
+// Base class for various OpenGLSceneHandler classes.
 class G4OpenGLSceneHandler: public G4VSceneHandler {
 
+  friend class G4OpenGLViewer;
+
 public:
+  virtual void BeginPrimitives (const G4Transform3D& objectTransformation);
+  virtual void EndPrimitives ();
+  virtual void BeginPrimitives2D ();
+  virtual void EndPrimitives2D ();
   void AddPrimitive (const G4Polyline&);
+  void AddPrimitive (const G4Polymarker&);
   void AddPrimitive (const G4Text&);
   void AddPrimitive (const G4Circle&);
   void AddPrimitive (const G4Square&);
+  void AddPrimitive (const G4Scale&);
   void AddPrimitive (const G4Polyhedron&);
   void AddPrimitive (const G4NURBS&);
-  // Explicitly invoke base class methods to avoid warnings about
-  // hiding of base class methods...
-  void AddPrimitive(const G4Polymarker& polymarker) {
-    G4VSceneHandler::AddPrimitive (polymarker);
-  }
-  void AddPrimitive (const G4Scale& scale) {
-    G4VSceneHandler::AddPrimitive (scale);
-  }
 
+  void PreAddSolid (const G4Transform3D& objectTransformation,
+                    const G4VisAttributes&);
   void AddSolid (const G4Box&);
   void AddSolid (const G4Cons&);
@@ -89 +95 @@
   const G4Polyhedron* CreateCutawayPolyhedron ();
 
+  GLuint fPickName;
+  std::map<GLuint, G4AttHolder*> fPickMap;  // For picking.
+  void ClearAndDestroyAtts();  // Destroys att holders and clears pick map.
+
 private:
 
-  void AddCircleSquare (const G4VMarker&, G4int nSides);
-  /**************************************************
-  Not needed - but see note on future development in .cc.
-  void DrawScreenPolygon (G4double size,
-                          const G4Point3D& centre,
-                          G4int nSides);
-  // Draws in screen coordinates.
-  *********************************/
+  void AddCircleSquare (const G4VMarker&, G4OpenGLBitMapStore::Shape);
 
-  void DrawXYPolygon (G4double size,
-                      const G4Point3D& centre,
-                      G4int nSides);
+  void DrawXYPolygon
+  (G4OpenGLBitMapStore::Shape,
+   G4double size,
+   const G4Point3D& centre,
+   const G4VisAttributes* pApplicableVisAtts);
   // Draws in world coordinates a polygon in the screen plane knowing
   // viewpoint direction and up vector.
 
   static const GLubyte fStippleMaskHashed [128];
+
+  G4bool fProcessingPolymarker;
 };