Import Geant4 11.0.0.beta source tree
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# Module : G4VRML
|
||||
# Package: Geant4.src.G4visualization.G4VRML
|
||||
#------------------------------------------------------------------------------
|
||||
# - G4VRML category build
|
||||
|
||||
geant4_global_library_target(COMPONENTS sources.cmake)
|
||||
|
||||
@@ -19,6 +19,12 @@ committal in the CVS repository !
|
||||
History file for visualization/VRML sub-category
|
||||
------------------------------------------------
|
||||
|
||||
07 June 2021 John Allison (VRML-V10-07-01)
|
||||
- Fix hidden function warning.
|
||||
|
||||
15 April 2021 Ben Morgan (VRML-V10-07-00)
|
||||
- Migrate build to modular CMake system
|
||||
|
||||
3 July 2020 John Allison (VRML-V10-06-02)
|
||||
- G4VRML1/2FileSceneHandler.cc:
|
||||
o Fix Unbuntu 20 compiler warning about ignoring return value
|
||||
|
||||
@@ -49,6 +49,8 @@ class G4VRML1FileSceneHandler: public G4VSceneHandler {
|
||||
public:
|
||||
G4VRML1FileSceneHandler(G4VRML1File& system, const G4String& name = "");
|
||||
virtual ~G4VRML1FileSceneHandler();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid(const G4Box&);
|
||||
void AddSolid(const G4Cons&);
|
||||
void AddSolid(const G4Tubs&);
|
||||
@@ -57,50 +59,19 @@ public:
|
||||
void AddSolid(const G4Sphere&);
|
||||
void AddSolid(const G4Para&);
|
||||
void AddSolid(const G4Torus&);
|
||||
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&);
|
||||
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);
|
||||
}
|
||||
|
||||
using G4VSceneHandler::AddCompound;
|
||||
|
||||
void BeginPrimitives(const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives();
|
||||
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive(const G4Polyline&);
|
||||
void AddPrimitive(const G4Polyhedron&);
|
||||
void AddPrimitive(const G4Text&);
|
||||
void AddPrimitive(const G4Circle&);
|
||||
void AddPrimitive(const G4Square&);
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -54,6 +54,8 @@ class G4VRML1SceneHandler: public G4VSceneHandler {
|
||||
public:
|
||||
G4VRML1SceneHandler(G4VRML1& system, const G4String& name = "");
|
||||
virtual ~G4VRML1SceneHandler();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid(const G4Box&);
|
||||
void AddSolid(const G4Cons&);
|
||||
void AddSolid(const G4Tubs&);
|
||||
@@ -62,50 +64,19 @@ public:
|
||||
void AddSolid(const G4Sphere&);
|
||||
void AddSolid(const G4Para&);
|
||||
void AddSolid(const G4Torus&);
|
||||
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&);
|
||||
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);
|
||||
}
|
||||
|
||||
using G4VSceneHandler::AddCompound;
|
||||
|
||||
void BeginPrimitives(const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives();
|
||||
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive(const G4Polyline&);
|
||||
void AddPrimitive(const G4Polyhedron&);
|
||||
void AddPrimitive(const G4Text&);
|
||||
void AddPrimitive(const G4Circle&);
|
||||
void AddPrimitive(const G4Square&);
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -49,6 +49,8 @@ class G4VRML2FileSceneHandler: public G4VSceneHandler {
|
||||
public:
|
||||
G4VRML2FileSceneHandler(G4VRML2File& system, const G4String& name = "");
|
||||
virtual ~G4VRML2FileSceneHandler();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid(const G4Box&);
|
||||
void AddSolid(const G4Cons&);
|
||||
void AddSolid(const G4Tubs&);
|
||||
@@ -57,50 +59,19 @@ public:
|
||||
void AddSolid(const G4Sphere&);
|
||||
void AddSolid(const G4Para&);
|
||||
void AddSolid(const G4Torus&);
|
||||
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&);
|
||||
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);
|
||||
}
|
||||
|
||||
using G4VSceneHandler::AddCompound;
|
||||
|
||||
void BeginPrimitives(const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives();
|
||||
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive(const G4Polyline&);
|
||||
void AddPrimitive(const G4Polyhedron&);
|
||||
void AddPrimitive(const G4Text&);
|
||||
void AddPrimitive(const G4Circle&);
|
||||
void AddPrimitive(const G4Square&);
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -52,6 +52,8 @@ class G4VRML2SceneHandler: public G4VSceneHandler {
|
||||
public:
|
||||
G4VRML2SceneHandler(G4VRML2& system, const G4String& name = "");
|
||||
virtual ~G4VRML2SceneHandler();
|
||||
|
||||
using G4VSceneHandler::AddSolid;
|
||||
void AddSolid(const G4Box&);
|
||||
void AddSolid(const G4Cons&);
|
||||
void AddSolid(const G4Tubs&);
|
||||
@@ -60,50 +62,19 @@ public:
|
||||
void AddSolid(const G4Sphere&);
|
||||
void AddSolid(const G4Para&);
|
||||
void AddSolid(const G4Torus&);
|
||||
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&);
|
||||
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);
|
||||
}
|
||||
|
||||
using G4VSceneHandler::AddCompound;
|
||||
|
||||
void BeginPrimitives(const G4Transform3D& objectTransformation);
|
||||
void EndPrimitives();
|
||||
|
||||
using G4VSceneHandler::AddPrimitive;
|
||||
void AddPrimitive(const G4Polyline&);
|
||||
void AddPrimitive(const G4Polyhedron&);
|
||||
void AddPrimitive(const G4Text&);
|
||||
void AddPrimitive(const G4Circle&);
|
||||
void AddPrimitive(const G4Square&);
|
||||
void AddPrimitive (const G4Polymarker& polymarker)
|
||||
{ G4VSceneHandler::AddPrimitive (polymarker); }
|
||||
void AddPrimitive (const G4Scale& scale)
|
||||
{ G4VSceneHandler::AddPrimitive (scale); }
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -1,12 +1,6 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# Module : G4VRML
|
||||
# Package: Geant4.src.G4visualization.G4VRML
|
||||
#------------------------------------------------------------------------------
|
||||
# - G4VRML module build definition
|
||||
|
||||
#
|
||||
# Module has optional sources
|
||||
#
|
||||
|
||||
# List those always built
|
||||
set(G4VIS_VRML_MODULE_HEADERS
|
||||
G4VRML1File.hh
|
||||
@@ -49,38 +43,23 @@ if(GEANT4_USE_NETWORKVRML)
|
||||
G4VRML2SceneHandler.cc
|
||||
G4VRML2Viewer.cc)
|
||||
|
||||
#
|
||||
# Add extra needed defs here
|
||||
#
|
||||
add_definitions(-DG4VIS_BUILD_VRML_DRIVER)
|
||||
endif()
|
||||
|
||||
#
|
||||
# Define the Geant4 Module.
|
||||
#
|
||||
geant4_define_module(NAME G4VRML
|
||||
HEADERS
|
||||
geant4_add_module(G4VRML
|
||||
PUBLIC_HEADERS
|
||||
${G4VIS_VRML_MODULE_HEADERS}
|
||||
SOURCES
|
||||
${G4VIS_VRML_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_VRML_MODULE_SOURCES})
|
||||
|
||||
# List any source specific properties here
|
||||
geant4_module_link_libraries(G4VRML
|
||||
PUBLIC
|
||||
G4geometrymng
|
||||
G4vis_management
|
||||
G4globman
|
||||
PRIVATE
|
||||
G4csg
|
||||
G4graphics_reps
|
||||
G4modeling)
|
||||
|
||||
Reference in New Issue
Block a user