Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -18,6 +18,14 @@ committal in the CVS repository !
|
||||
|
||||
History file for visualization/XXX sub-category (a template graphics system)
|
||||
---------------------------------------------------------------------------
|
||||
23 September 2020 Ben Morgan (visxxx-V10-06-00)
|
||||
- Remove no longer required include_directories
|
||||
|
||||
18 September 2020 John Allison (visXXX-V10-05-05)
|
||||
- Part of vis-V10-06-07.
|
||||
- G4XXXSGViewer.cc and G4XXXStoredViewer.cc:
|
||||
o CompareForKernelVisit; Force kernel visit if global parameters change.
|
||||
. GlobalMarkerScale and GlobalLineWidthScale.
|
||||
|
||||
18 June 2020 John Allison (visXXX-V10-05-04)
|
||||
- G4XXXSGSceneHandler.cc: Fix a debug statement.
|
||||
@@ -83,7 +91,7 @@ History file for visualization/XXX sub-category (a template graphics system)
|
||||
|
||||
3rd January 2011 John Allison (visXXX-V09-05-00)
|
||||
- Removed #ifdef ...XXXSG... protections.
|
||||
o No longer any reliance on imported tree code; own tree code example used.
|
||||
o No longer any reliance on imported tree code; own tree code example used.
|
||||
|
||||
11th November 2011 John Allison (visXXX-V09-04-01)
|
||||
- G4XXXSGSceneHandler.cc: Fixed compiler warnings.
|
||||
|
||||
@@ -14,27 +14,9 @@
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# List external includes needed.
|
||||
include_directories(${CLHEP_INCLUDE_DIRS})
|
||||
include_directories(${USOLIDS_INCLUDE_DIRS})
|
||||
|
||||
# List internal includes needed.
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/CSG/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/specific/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/graphics_reps/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/visualization/management/include)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/source/visualization/modeling/include)
|
||||
|
||||
#
|
||||
# Define the Geant4 Module.
|
||||
#
|
||||
include(Geant4MacroDefineModule)
|
||||
GEANT4_DEFINE_MODULE(NAME G4visXXX
|
||||
HEADERS
|
||||
G4XXX.hh
|
||||
|
||||
@@ -71,6 +71,7 @@ void G4XXXSGViewer::DrawView() {
|
||||
// /vis/viewer/rebuild, but if not, make decision and set flag only
|
||||
// if necessary...
|
||||
if (!fNeedKernelVisit) KernelVisitDecision();
|
||||
fLastVP = fVP;
|
||||
G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
|
||||
|
||||
ProcessView (); // Clears store and processes scene only if necessary.
|
||||
@@ -108,7 +109,6 @@ void G4XXXSGViewer::KernelVisitDecision () {
|
||||
|| CompareForKernelVisit(fLastVP)) {
|
||||
NeedKernelVisit (); // Sets fNeedKernelVisit.
|
||||
}
|
||||
fLastVP = fVP;
|
||||
}
|
||||
|
||||
G4bool G4XXXSGViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
|
||||
@@ -128,6 +128,8 @@ G4bool G4XXXSGViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
|
||||
// No need to visit kernel if cutaway planes change.
|
||||
(lastVP.IsExplode () != fVP.IsExplode ()) ||
|
||||
(lastVP.GetNoOfSides () != fVP.GetNoOfSides ()) ||
|
||||
(lastVP.GetGlobalMarkerScale() != fVP.GetGlobalMarkerScale()) ||
|
||||
(lastVP.GetGlobalLineWidthScale() != fVP.GetGlobalLineWidthScale()) ||
|
||||
(lastVP.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) ||
|
||||
(lastVP.GetDefaultVisAttributes()->GetColour() !=
|
||||
fVP.GetDefaultVisAttributes()->GetColour()) ||
|
||||
|
||||
@@ -72,6 +72,7 @@ void G4XXXStoredViewer::DrawView() {
|
||||
// /vis/viewer/rebuild, but if not, make decision and set flag only
|
||||
// if necessary...
|
||||
if (!fNeedKernelVisit) KernelVisitDecision();
|
||||
fLastVP = fVP;
|
||||
G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
|
||||
|
||||
ProcessView (); // Clears store and processes scene only if necessary.
|
||||
@@ -106,7 +107,6 @@ void G4XXXStoredViewer::KernelVisitDecision () {
|
||||
if (store.empty() || CompareForKernelVisit(fLastVP)) {
|
||||
NeedKernelVisit (); // Sets fNeedKernelVisit.
|
||||
}
|
||||
fLastVP = fVP;
|
||||
}
|
||||
|
||||
G4bool G4XXXStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
|
||||
@@ -126,6 +126,8 @@ G4bool G4XXXStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
|
||||
// No need to visit kernel if cutaway planes change.
|
||||
(lastVP.IsExplode () != fVP.IsExplode ()) ||
|
||||
(lastVP.GetNoOfSides () != fVP.GetNoOfSides ()) ||
|
||||
(lastVP.GetGlobalMarkerScale() != fVP.GetGlobalMarkerScale()) ||
|
||||
(lastVP.GetGlobalLineWidthScale() != fVP.GetGlobalLineWidthScale()) ||
|
||||
(lastVP.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) ||
|
||||
(lastVP.GetDefaultVisAttributes()->GetColour() !=
|
||||
fVP.GetDefaultVisAttributes()->GetColour()) ||
|
||||
|
||||
Reference in New Issue
Block a user