Changeset 1340 for trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.26 2009/04/08 16:55:44 lgarnier Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLStoredViewer.cc,v 1.29 2010/10/06 10:05:52 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -88 +88 @@
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (lastVP.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
+      (lastVP.GetDefaultVisAttributes()->GetColour() !=
+       fVP.GetDefaultVisAttributes()->GetColour())                ||
+      (lastVP.GetDefaultTextVisAttributes()->GetColour() !=
+       fVP.GetDefaultTextVisAttributes()->GetColour())            ||
       (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ())||
       (lastVP.IsPicking ()          != fVP.IsPicking ())
@@ -165 +169 @@
         glMultMatrixd (oglt.GetGLMatrix ());
         if (fVP.IsPicking()) glLoadName(to.fPickName);
-        G4Colour& c = to.fColour;
+        const G4Colour& c = to.fColour;
+        const G4Colour& bg = fVP.GetBackgroundColour();
         G4double bsf = 1.;  // Brightness scaling factor.
         if (fFadeFactor > 0. && to.fEndTime < fEndTime)
           bsf = 1. - fFadeFactor *
             ((fEndTime - to.fEndTime) / (fEndTime - fStartTime));
-        glColor3d(bsf * c.GetRed (), bsf * c.GetGreen (), bsf * c.GetBlue ());
+        glColor3d
+          (bsf * c.GetRed() + (1. - bsf) * bg.GetRed(),
+           bsf * c.GetGreen() + (1. - bsf) * bg.GetGreen(),
+           bsf * c.GetBlue() + (1. - bsf) * bg.GetBlue());
         glCallList (to.fDisplayListId);
         glPopMatrix();