Import Geant4 11.0.0.beta source tree

2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
@@ -139,6 +139,7 @@ public: // With description
  virtual void AddCompound (const G4VDigi&);
  virtual void AddCompound (const G4THitsMap<G4double>&);
  virtual void AddCompound (const G4THitsMap<G4StatDouble>&);
+  virtual void AddCompound (const G4Mesh&);

  //////////////////////////////////////////////////////////////
  // Functions for adding primitives.
@@ -201,6 +201,8 @@ public: // With description
        G4double         GetDisplayLightFrontRed () const;
        G4double         GetDisplayLightFrontGreen () const;
        G4double         GetDisplayLightFrontBlue () const;
+        G4bool           IsSpecialMeshRendering  () const;
+  const std::vector<G4ModelingParameters::PVNameCopyNo>& GetSpecialMeshVolumes() const;

  // Here Follow functions to evaluate useful quantities as a
  // function of the radius of the Bounding Extent of the object being
@@ -293,6 +295,8 @@ public: // With description
  void SetDisplayLightFrontRed (G4double);
  void SetDisplayLightFrontGreen (G4double);
  void SetDisplayLightFrontBlue (G4double);
+  void SetSpecialMeshRendering (G4bool);
+  void SetSpecialMeshVolumes   (const std::vector<G4ModelingParameters::PVNameCopyNo>&);

  // Command dumping functions.
  // For camera commands we need to provide the standard target point from
@@ -387,6 +391,8 @@ private:
  G4double     fDisplayLightFrontX, fDisplayLightFrontY, fDisplayLightFrontZ,
               fDisplayLightFrontT;
  G4double     fDisplayLightFrontRed, fDisplayLightFrontGreen, fDisplayLightFrontBlue;
+  G4bool       fSpecialMeshRendering;  // Request special rendering of parameterised volumes
+  std::vector<G4ModelingParameters::PVNameCopyNo> fSpecialMeshVolumes;  // If empty, all meshes.

  enum { // Constants for geometry mask in ParseGeometry and related functions.
    fNoValue     = 0,
@@ -295,6 +295,13 @@ inline G4int G4ViewParameters::GetNumberOfCloudPoints () const {
  return fNumberOfCloudPoints;
 }

+inline G4bool G4ViewParameters::IsSpecialMeshRendering () const
+{return fSpecialMeshRendering;}
+
+inline const std::vector<G4ModelingParameters::PVNameCopyNo>&
+G4ViewParameters::GetSpecialMeshVolumes() const
+{return fSpecialMeshVolumes;}
+
 inline void
 G4ViewParameters::SetDrawingStyle (G4ViewParameters::DrawingStyle style) {
  fDrawingStyle = style;
@@ -553,3 +560,10 @@ inline void G4ViewParameters::SetDisplayLightFrontGreen (G4double displayLightFr
 inline void G4ViewParameters::SetDisplayLightFrontBlue (G4double displayLightFrontBlue) {
  fDisplayLightFrontBlue = displayLightFrontBlue;
 }
+
+inline void G4ViewParameters::SetSpecialMeshRendering (G4bool smr)
+{fSpecialMeshRendering = smr;}
+
+inline void G4ViewParameters::SetSpecialMeshVolumes
+(const std::vector<G4ModelingParameters::PVNameCopyNo>& smvs)
+{fSpecialMeshVolumes = smvs;}
@@ -283,6 +283,18 @@ private:
  G4UIcommand* fpCommand;
 };

+class G4VisCommandSceneAddLocalAxes: public G4VVisCommandScene {
+public:
+  G4VisCommandSceneAddLocalAxes ();
+  virtual ~G4VisCommandSceneAddLocalAxes ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandSceneAddLocalAxes (const G4VisCommandSceneAddLocalAxes&);
+  G4VisCommandSceneAddLocalAxes& operator = (const G4VisCommandSceneAddLocalAxes&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandSceneAddLogicalVolume: public G4VVisCommandScene {
 public:
  G4VisCommandSceneAddLogicalVolume ();
@@ -51,6 +51,7 @@ private:
  G4UIcmdWithoutParameter* fpCommandDump;
  G4UIcmdWithABool*        fpCommandExtentForField;
  G4UIcommand*             fpCommandFindPath;
+  G4UIcmdWithoutParameter* fpCommandLocalAxes;
  G4UIcmdWithABool*        fpCommandShowExtent;
  G4UIcmdWithABool*        fpCommandVolumeForField;
 };
@@ -75,6 +75,8 @@ private:
  G4UIcommand*          fpCommandProjection;
  G4UIcmdWithAString*   fpCommandRotationStyle;
  G4UIcommand*          fpCommandSectionPlane;
+  G4UIcmdWithABool*     fpCommandSpecialMeshRendering;
+  G4UIcommand*          fpCommandSpecialMeshVolumes;
  G4UIcmdWithAString*   fpCommandStyle;
  G4UIcmdWith3VectorAndUnit* fpCommandTargetPoint;
  G4UIcommand*          fpCommandUpThetaPhi;
@@ -47,12 +47,6 @@
 #include "G4VRML2File.hh"
 #include "G4GMocrenFile.hh"

-// FIXME : avoid mix with QT/WT driver (should be done by cmake??)
-#if defined(G4VIS_USE_OPENGLWT)
-  // do not want GL2P2 in WT case
-  #undef G4VIS_BUILD_OPENGL_GL2PS
-#endif
-
 // Needing external packages or libraries...

 #ifdef G4VIS_USE_DAWN
@@ -79,10 +73,6 @@
 #include "G4OpenGLStoredQt.hh"
 #endif

-#ifdef G4VIS_USE_OPENGLWT
-#include "G4OpenGLImmediateWt.hh"
-#endif
-
 #ifdef G4VIS_USE_OIX
 #include "G4OpenInventorX.hh"
 #include "G4OpenInventorXtExtended.hh"
@@ -109,6 +99,22 @@
 #include "G4Qt3D.hh"
 #endif

+#ifdef G4VIS_USE_TOOLSSG_X11_GLES
+#include "G4ToolsSGX11GLES.hh"
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_WINDOWS_GLES
+#include "G4ToolsSGWindowsGLES.hh"
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_XT_GLES
+#include "G4ToolsSGXtGLES.hh"
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_QT_GLES
+#include "G4ToolsSGQtGLES.hh"
+#endif
+
 // The inline keyword prevents the compiler making an external
 // reference even though they cannot actually be inlined since they
 // are virtual functions.  This prevents a "multiple definition" error
@@ -211,10 +217,6 @@ G4VisExecutive::RegisterGraphicsSystems () {
 #endif
 #endif

-#ifdef G4VIS_USE_OPENGLWT
-  RegisterGraphicsSystem (new G4OpenGLImmediateWt);
-#endif
-
 // Register OI graphics system with super-abbreviated nickname
 #ifdef G4VIS_USE_OI
  G4VGraphicsSystem* oi  = 0;
@@ -243,6 +245,23 @@ G4VisExecutive::RegisterGraphicsSystems () {
 #ifdef G4VIS_USE_QT3D
  RegisterGraphicsSystem (new G4Qt3D);
 #endif
+
+#ifdef G4VIS_USE_TOOLSSG_X11_GLES
+  RegisterGraphicsSystem (new G4ToolsSGX11GLES);
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_WINDOWS_GLES
+  RegisterGraphicsSystem (new G4ToolsSGWindowsGLES);
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_XT_GLES
+  RegisterGraphicsSystem (new G4ToolsSGXtGLES);
+#endif
+
+#ifdef G4VIS_USE_TOOLSSG_QT_GLES
+  RegisterGraphicsSystem (new G4ToolsSGQtGLES);
+#endif
+
 }

 // See comments about inlining above.
@@ -186,12 +186,6 @@ public: // With description
  void RegisterEndOfRunUserVisAction
  (const G4String& name, G4VUserVisAction*,
   const G4VisExtent& = G4VisExtent());
-  void SetUserAction
-  (G4VUserVisAction* pVisAction,
-   const G4VisExtent& = G4VisExtent());
-  // SetUserAction is deprecated.  Use RegisterRunDurationUserVisAction
-  // or other of the above.
-  void SetUserActionExtent (const G4VisExtent&);  //Legacy: deprecated.

  G4bool RegisterGraphicsSystem (G4VGraphicsSystem*);
  // Register an individual graphics system.  Normally this is done in