Changeset 754 for trunk/geant4/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

Timestamp:

Mar 11, 2008, 5:35:07 PM (16 years ago)

Author:

garnier

Message:

corrections pour Qt3 mises sous cvs

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLSceneHandler.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.52 2008/01/04 22:07:01 allison Exp $
+// $Id: G4OpenGLSceneHandler.cc,v 1.53 2008/02/01 06:26:45 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -467 +467 @@
 
   G4bool clipping = pViewer->fVP.IsSection() || pViewer->fVP.IsCutaway();
+
+  // Lighting disabled unless otherwise requested
+  glDisable (GL_LIGHTING);
 
   switch (drawing_style) {
@@ -494 +497 @@
       }
     }
-    glDisable (GL_LIGHTING);
     glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
     break;
@@ -526 +528 @@
     glDepthFunc (GL_LEQUAL);    //??? was GL_ALWAYS
     glDisable (GL_CULL_FACE);
-    glDisable (GL_LIGHTING);
     glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
     glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
@@ -604 +605 @@
                  // having glBegin/End pairs *inside* loop in the more
                  // usual case of no hidden line removal.
+
+      // Lighting disabled unless otherwise requested
+      glDisable (GL_LIGHTING);
 
       // Draw through stencil...
@@ -712 +716 @@
   glDisable (GL_STENCIL_TEST);  // Revert to default for next primitive.
   glDepthMask (1);              // Revert to default for next primitive.
+  glDisable (GL_LIGHTING);      // Revert to default for next primitive.
 }