Changeset 593 for trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

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/src/G4OpenGLImmediateSceneHandler.cc (modified) (9 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.24 2006/09/04 12:03:25 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.27 2007/04/04 16:50:26 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 //
 // 
@@ -47 +47 @@
 #include "G4OpenGLTransform3D.hh"
 #include "G4Polyline.hh"
+#include "G4Polymarker.hh"
+#include "G4Text.hh"
 #include "G4Circle.hh"
 #include "G4Square.hh"
-
-G4OpenGLImmediateSceneHandler::G4OpenGLImmediateSceneHandler (G4VGraphicsSystem& system,
-                                                const G4String& name):
-G4OpenGLSceneHandler (system, fSceneIdCount++, name)
+#include "G4Scale.hh"
+#include "G4Polyhedron.hh"
+
+G4OpenGLImmediateSceneHandler::G4OpenGLImmediateSceneHandler
+(G4VGraphicsSystem& system,const G4String& name):
+  G4OpenGLSceneHandler (system, fSceneIdCount++, name)
 {}
 
@@ -62 +66 @@
 void G4OpenGLImmediateSceneHandler::AddPrimitivePreamble(const G4Visible& visible)
 {
+  if (fpViewer->GetViewParameters().IsPicking()) {
+    glLoadName(++fPickName);
+    fPickMap[fPickName] = 0;
+  }
+
   const G4Colour& c = GetColour (visible);
   glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
@@ -72 +81 @@
 }
 
+void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
+{
+  AddPrimitivePreamble(polymarker);
+  G4OpenGLSceneHandler::AddPrimitive(polymarker);
+}
+
+void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Text& text)
+{
+  // Note: colour is still handled in
+  // G4OpenGLSceneHandler::AddPrimitive(const G4Text&).
+  AddPrimitivePreamble(text);
+  G4OpenGLSceneHandler::AddPrimitive(text);
+}
+
 void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Circle& circle)
 {
@@ -84 +107 @@
 }
 
+void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Scale& scale)
+{
+  AddPrimitivePreamble(scale);
+  G4OpenGLSceneHandler::AddPrimitive(scale);
+}
+
+void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron)
+{
+  // Note: colour is still handled in
+  // G4OpenGLSceneHandler::AddPrimitive(const G4Polyhedron&).
+  AddPrimitivePreamble(polyhedron);
+  G4OpenGLSceneHandler::AddPrimitive(polyhedron);
+}
+
+void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4NURBS& nurbs)
+{
+  // Note: colour is still handled in
+  // G4OpenGLSceneHandler::AddPrimitive(const G4NURBS&).
+  AddPrimitivePreamble(nurbs);
+  G4OpenGLSceneHandler::AddPrimitive(nurbs);
+}
+
 void G4OpenGLImmediateSceneHandler::BeginPrimitives
 (const G4Transform3D& objectTransformation) {
-  G4VSceneHandler::BeginPrimitives (objectTransformation);
+  G4OpenGLSceneHandler::BeginPrimitives (objectTransformation);
   glPushMatrix();
   G4OpenGLTransform3D oglt (objectTransformation);
@@ -110 +155 @@
   glFlush ();
 
-  G4VSceneHandler::EndPrimitives ();
+  G4OpenGLSceneHandler::EndPrimitives ();
 }
 
 void G4OpenGLImmediateSceneHandler::BeginPrimitives2D()
 {
-  G4VSceneHandler::BeginPrimitives2D();
+  G4OpenGLSceneHandler::BeginPrimitives2D();
 
   // Push current 3D world matrices and load identity to define screen
@@ -122 +167 @@
   glPushMatrix();
   glLoadIdentity();
-  glOrtho (-1., 1., -1., 1., -DBL_MAX, DBL_MAX);
+  glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
   glMatrixMode (GL_MODELVIEW);
   glPushMatrix();
@@ -139 +184 @@
   glFlush ();
 
-  G4VSceneHandler::EndPrimitives2D ();
+  G4OpenGLSceneHandler::EndPrimitives2D ();
 }
 
@@ -151 +196 @@
 
 void G4OpenGLImmediateSceneHandler::ClearTransientStore () {
+
   G4VSceneHandler::ClearTransientStore ();
+
   // Make sure screen corresponds to graphical database...
   if (fpViewer) {