Import Geant4 5.0.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VRML1SceneHandlerFunc.icc,v 1.10 2002/06/23 03:31:50 stanaka Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4VRML1SceneHandlerFunc.icc,v 1.11 2002/11/10 05:10:12 stanaka Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// G4VRML1SceneHandlerFunc.icc
// Satoshi Tanaka & Yasuhide Sawada
@@ -619,13 +619,11 @@ G4double G4VRML1SCENEHANDLER::GetMarkerHalfSize ( const G4VMarker& mark )
if ( extent_radius_3d <= 0.0 ) { extent_radius_3d = 1.0 ; }
//----- get marker radius in 3D units
if ( size == mark.GetWorldSize() ) {
if ( mark.GetWorldSize() > 0.0 ) {
// get mark radius in 3D units
size = 0.5 * mark.GetWorldSize() ;
} else if ( size == mark.GetScreenSize() ) {
} else if ( mark.GetScreenSize() > 0.0 ) {
// local
double mark_radius_2d = 0.5 * mark.GetScreenSize() ;
@@ -638,6 +636,7 @@ G4double G4VRML1SCENEHANDLER::GetMarkerHalfSize ( const G4VMarker& mark )
// local
double mark_radius_2d \
= fpViewer->GetViewParameters().GetDefaultMarker().GetScreenSize();
mark_radius_2d *= 0.1 ; // Magic number?
// get mark radius in 3D units
size \