lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
+6 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredSceneHandler.cc 96669 2016-04-29 12:03:24Z gcosmo $
// $Id: G4OpenGLStoredSceneHandler.cc 99312 2016-09-13 09:47:18Z gcosmo $
//
//
// Andrew Walkden 10th February 1997
@@ -205,7 +205,9 @@ G4bool G4OpenGLStoredSceneHandler::AddPrimitivePreamble(const G4Polyhedron& visi
G4bool G4OpenGLStoredSceneHandler::AddPrimitivePreambleInternal(const G4Visible& visible, bool isMarker, bool isPolyline)
{
const G4Colour& c = GetColour (visible);
// Get applicable vis attributes for all primitives.
fpVisAttribs = fpViewer->GetApplicableVisAttributes(visible.GetVisAttributes());
const G4Colour& c = GetColour ();
G4double opacity = c.GetAlpha ();
G4bool transparency_enabled = true;
@@ -362,10 +364,8 @@ end_of_display_list_reuse_test:
TO to(fDisplayListId, fObjectTransformation);
if (isPicking) to.fPickName = fPickName;
to.fColour = c;
const G4VisAttributes* pVA =
fpViewer->GetApplicableVisAttributes(visible.GetVisAttributes());
to.fStartTime = pVA->GetStartTime();
to.fEndTime = pVA->GetEndTime();
to.fStartTime = fpVisAttribs->GetStartTime();
to.fEndTime = fpVisAttribs->GetEndTime();
to.fMarkerOrPolyline = isMarkerOrPolyline;
fTOList.push_back(to);
// For transient objects, colour, transformation, are kept in