Import Geant4 11.0.0.beta source tree
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# Module : G4FR
|
||||
# Package: Geant4.src.G4visualization.G4FR
|
||||
#------------------------------------------------------------------------------
|
||||
# - G4FR category build
|
||||
|
||||
geant4_global_library_target(COMPONENTS sources.cmake)
|
||||
|
||||
@@ -19,6 +19,12 @@ committal in the CVS repository !
|
||||
History file for visualization/FukuiRenderer sub-category
|
||||
---------------------------------------------------------
|
||||
|
||||
07 June 2021 John Allison (DAWN-V10-07-01)
|
||||
- Fix hidden function warning.
|
||||
|
||||
14 April 2021 Ben Morgan (DAWN-V10-07-00)
|
||||
- Migrate to modular CMake build
|
||||
|
||||
2 October 2020 John Allison (DAWN-V10-06-03)
|
||||
- G4FukuiRendererViewer.cc:
|
||||
o Fix "overlapping comparisons always evaluate to true".
|
||||
|
||||
@@ -54,25 +54,17 @@ public:
|
||||
virtual ~G4DAWNFILESceneHandler ();
|
||||
|
||||
//----- overriding base class methods
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive (const G4Polyline& line);
|
||||
void AddPrimitive (const G4Polyhedron& p);
|
||||
void AddPrimitive (const G4Text&);
|
||||
void AddPrimitive (const G4Circle&);
|
||||
void AddPrimitive (const G4Square&);
|
||||
|
||||
//----- explicitly invoke base class methods to avoid warnings about
|
||||
//----- hiding of base class methods.
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
virtual void BeginModeling () { G4VSceneHandler::BeginModeling ();}
|
||||
virtual void EndModeling () { G4VSceneHandler::EndModeling ();}
|
||||
|
||||
virtual void BeginPrimitives (const G4Transform3D& objectTransformation);
|
||||
virtual void EndPrimitives ();
|
||||
void BeginPrimitives (const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives ();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid ( const G4Box& box );
|
||||
void AddSolid ( const G4Cons& cons );
|
||||
void AddSolid ( const G4Tubs& tubs );
|
||||
@@ -81,37 +73,7 @@ public:
|
||||
void AddSolid ( const G4Sphere& sphere );
|
||||
void AddSolid ( const G4Para& para );
|
||||
void AddSolid ( const G4Torus& torus );
|
||||
void AddSolid ( const G4Polycone& polycone ) {
|
||||
G4VSceneHandler::AddSolid (polycone);
|
||||
}
|
||||
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 G4TessellatedSolid& tess ) {
|
||||
G4VSceneHandler::AddSolid (tess);
|
||||
}
|
||||
void AddSolid ( const G4VSolid& solid );
|
||||
void AddCompound ( const G4VTrajectory& traj) {
|
||||
G4VSceneHandler::AddCompound(traj);
|
||||
}
|
||||
void AddCompound ( const G4VHit& hit) {
|
||||
G4VSceneHandler::AddCompound(hit);
|
||||
}
|
||||
void AddCompound ( const G4VDigi& digi) {
|
||||
G4VSceneHandler::AddCompound(digi);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4double> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -57,25 +57,17 @@ public:
|
||||
virtual ~G4FukuiRendererSceneHandler ();
|
||||
|
||||
//----- overriding base class methods
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive (const G4Polyline& line);
|
||||
void AddPrimitive (const G4Polyhedron& p);
|
||||
void AddPrimitive (const G4Text&);
|
||||
void AddPrimitive (const G4Circle&);
|
||||
void AddPrimitive (const G4Square&);
|
||||
|
||||
//----- explicitly invoke base class methods to avoid warnings about
|
||||
//----- hiding of base class methods.
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
virtual void BeginModeling () { G4VSceneHandler::BeginModeling ();}
|
||||
virtual void EndModeling () { G4VSceneHandler::EndModeling ();}
|
||||
|
||||
virtual void BeginPrimitives (const G4Transform3D& objectTransformation);
|
||||
virtual void EndPrimitives ();
|
||||
void BeginPrimitives (const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives ();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid ( const G4Box& box );
|
||||
void AddSolid ( const G4Cons& cons );
|
||||
void AddSolid ( const G4Tubs& tubs );
|
||||
@@ -84,37 +76,7 @@ public:
|
||||
void AddSolid ( const G4Sphere& sphere );
|
||||
void AddSolid ( const G4Para& para );
|
||||
void AddSolid ( const G4Torus& torus );
|
||||
void AddSolid ( const G4Polycone& polycone) {
|
||||
G4VSceneHandler::AddSolid (polycone);
|
||||
}
|
||||
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 G4TessellatedSolid& tess ) {
|
||||
G4VSceneHandler::AddSolid (tess);
|
||||
}
|
||||
void AddSolid ( const G4VSolid& solid );
|
||||
void AddCompound ( const G4VTrajectory& traj) {
|
||||
G4VSceneHandler::AddCompound(traj);
|
||||
}
|
||||
void AddCompound ( const G4VHit& hit) {
|
||||
G4VSceneHandler::AddCompound(hit);
|
||||
}
|
||||
void AddCompound ( const G4VDigi& digi) {
|
||||
G4VSceneHandler::AddCompound(digi);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4double> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -1,12 +1,6 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# Module : G4FR
|
||||
# Package: Geant4.src.G4visualization.G4FR
|
||||
#------------------------------------------------------------------------------
|
||||
# - G4FR module build definition
|
||||
|
||||
#
|
||||
# Module has optional sources
|
||||
#
|
||||
|
||||
# List those always built
|
||||
set(G4VIS_DAWN_MODULE_HEADERS
|
||||
G4DAWNFILE.hh
|
||||
@@ -45,32 +39,21 @@ if(GEANT4_USE_NETWORKDAWN)
|
||||
add_definitions(-DG4VIS_BUILD_DAWN_DRIVER)
|
||||
endif()
|
||||
|
||||
#
|
||||
# Define the Geant4 Module.
|
||||
#
|
||||
geant4_define_module(NAME G4FR
|
||||
HEADERS
|
||||
geant4_add_module(G4FR
|
||||
PUBLIC_HEADERS
|
||||
${G4VIS_DAWN_MODULE_HEADERS}
|
||||
SOURCES
|
||||
${G4VIS_DAWN_MODULE_SOURCES}
|
||||
GRANULAR_DEPENDENCIES
|
||||
G4csg
|
||||
G4geometrymng
|
||||
G4globman
|
||||
G4graphics_reps
|
||||
G4hits
|
||||
G4intercoms
|
||||
G4modeling
|
||||
G4specsolids
|
||||
G4vis_management
|
||||
GLOBAL_DEPENDENCIES
|
||||
G4digits_hits
|
||||
G4geometry
|
||||
G4global
|
||||
G4graphics_reps
|
||||
G4intercoms
|
||||
G4modeling
|
||||
G4vis_management
|
||||
)
|
||||
${G4VIS_DAWN_MODULE_SOURCES})
|
||||
|
||||
geant4_module_link_libraries(G4FR
|
||||
PUBLIC
|
||||
G4geometrymng
|
||||
G4modeling
|
||||
G4vis_management
|
||||
G4globman
|
||||
PRIVATE
|
||||
G4csg
|
||||
G4graphics_reps
|
||||
G4hepgeometry)
|
||||
|
||||
# List any source specific properties here
|
||||
|
||||
Reference in New Issue
Block a user