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/VRML/History
+15 -1
View File
@@ -1,4 +1,4 @@
$Id: History 96992 2016-05-19 15:20:48Z gcosmo $
$Id: History 101714 2016-11-22 08:53:13Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,20 @@ committal in the CVS repository !
History file for visualization/VRML sub-category
------------------------------------------------
19th November 2016 John Allison (VRML-V10-02-03)
- Fixed the GetColour() problem.
11th September 2016 John Allison (VRML-V10-02-02)
- GetColour/GetColor no longer takes an argument.
- Make sure applicable vis attributes are obtained.
// Get and check applicable vis attributes.
// fpVisAttribs = fpViewer->GetApplicableVisAttributes(fpVisAttribs);
// Note: the vis attributes may have been modified by the viewer. See
// code in G4VViewer::GetApplicableVisAttributes.
31st August 2016 John Allison (VRML-V10-02-01)
- Fix G4Orb and G4Ellipsoid hiding warnings.
19th May 2016 John Allison (VRML-V10-02-00)
- Fixed gcc-6.1 warnings.
source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
+10 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML1FileSceneHandler.hh 66870 2013-01-14 23:38:59Z adotti $
// $Id: G4VRML1FileSceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
//
// G4VRML1FileSceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -64,6 +64,12 @@ public:
void AddSolid ( const G4Polyhedra& polyhedra) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid(const G4VSolid&);
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
@@ -77,6 +83,9 @@ public:
void AddCompound ( const G4THitsMap<G4double> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void BeginPrimitives(const G4Transform3D& objectTransformation);
void EndPrimitives();
source/visualization/VRML/include/G4VRML1SceneHandler.hh
+11 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML1SceneHandler.hh 66373 2012-12-18 09:41:34Z gcosmo $
// $Id: G4VRML1SceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
//
// G4VRML1SceneHandler.hh
// Yasuhide Sawada & Satoshi Tanaka
@@ -69,7 +69,13 @@ public:
void AddSolid ( const G4Polyhedra& polyhedra) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid(const G4VSolid&);
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid(const G4VSolid&);
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
}
@@ -82,6 +88,9 @@ public:
void AddCompound ( const G4THitsMap<G4double> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void BeginPrimitives(const G4Transform3D& objectTransformation);
void EndPrimitives();
source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
+10 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML2FileSceneHandler.hh 66870 2013-01-14 23:38:59Z adotti $
// $Id: G4VRML2FileSceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
//
// G4VRML2FileSceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -64,6 +64,12 @@ public:
void AddSolid ( const G4Polyhedra& polyhedra) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid(const G4VSolid&);
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
@@ -77,6 +83,9 @@ public:
void AddCompound ( const G4THitsMap<G4double> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void BeginPrimitives(const G4Transform3D& objectTransformation);
void EndPrimitives();
source/visualization/VRML/include/G4VRML2SceneHandler.hh
+11 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML2SceneHandler.hh 66373 2012-12-18 09:41:34Z gcosmo $
// $Id: G4VRML2SceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
//
// G4VRML2SceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -67,7 +67,13 @@ public:
void AddSolid ( const G4Polyhedra& polyhedra) {
G4VSceneHandler::AddSolid (polyhedra);
}
void AddSolid(const G4VSolid&);
void AddSolid ( const G4Orb& orb ) {
G4VSceneHandler::AddSolid (orb);
}
void AddSolid ( const G4Ellipsoid& ellipsoid) {
G4VSceneHandler::AddSolid (ellipsoid);
}
void AddSolid(const G4VSolid&);
void AddCompound ( const G4VTrajectory& traj) {
G4VSceneHandler::AddCompound(traj);
}
@@ -80,6 +86,9 @@ public:
void AddCompound ( const G4THitsMap<G4double> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
G4VSceneHandler::AddCompound(hits);
}
void BeginPrimitives(const G4Transform3D& objectTransformation);
void EndPrimitives();
source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
+4 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML1SceneHandlerFunc.icc 96992 2016-05-19 15:20:48Z gcosmo $
// $Id: G4VRML1SceneHandlerFunc.icc 101714 2016-11-22 08:53:13Z gcosmo $
//
// G4VRML1SceneHandlerFunc.icc
// Satoshi Tanaka & Yasuhide Sawada
@@ -648,9 +648,10 @@ void G4VRML1SCENEHANDLER::VRMLEndModeling()
}
}
void G4VRML1SCENEHANDLER::SendMarkerColor ( const G4VMarker& mark )
void G4VRML1SCENEHANDLER::SendMarkerColor ( const G4VMarker& marker )
{
const G4Color& color = GetColor( mark );
fpVisAttribs = marker.GetVisAttributes();
const G4Color& color = GetColor();
fDest << "\t" << "Material {" << "\n";
fDest << "\t\t";
source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
+4 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VRML2SceneHandlerFunc.icc 96992 2016-05-19 15:20:48Z gcosmo $
// $Id: G4VRML2SceneHandlerFunc.icc 101714 2016-11-22 08:53:13Z gcosmo $
//
// G4VRML2SceneHandlerFunc.icc
// Satoshi Tanaka & Yasuhide Sawada
@@ -595,9 +595,10 @@ void G4VRML2SCENEHANDLER::VRMLEndModeling()
}
}
void G4VRML2SCENEHANDLER::SendMarkerColor ( const G4VMarker& mark )
void G4VRML2SCENEHANDLER::SendMarkerColor ( const G4VMarker& marker )
{
const G4Color& color = GetColor( mark );
fpVisAttribs = marker.GetVisAttributes();
const G4Color& color = GetColor();
fDest << "\t\t" << "appearance Appearance {" << "\n";
fDest << "\t\t\t" << "material Material {" << "\n";