Import Geant4 11.4.0.beta source tree

source/graphics_reps/include/G4Colour.hh

@@ -91,8 +91,7 @@ class G4Colour {
 
 public: // With description
 
-  G4Colour (G4double r_ = 1., G4double g_ = 1., G4double b_ = 1.,
-            G4double a_ = 1.);
+  G4Colour (G4double r = 1., G4double gr = 1., G4double b = 1., G4double a = 1.);
 
   G4Colour (G4ThreeVector);
   // Converts the components of the 3-vector into red, green, blue.
@@ -167,10 +166,12 @@ private:
 
 };
 
-inline G4double G4Colour::GetRed   () const {return red;}
-inline G4double G4Colour::GetGreen () const {return green;}
-inline G4double G4Colour::GetBlue  () const {return blue;}
-inline G4double G4Colour::GetAlpha () const {return alpha;}
+// clang-format off
+inline G4double G4Colour::GetRed() const   {return red;}
+inline G4double G4Colour::GetGreen() const {return green;}
+inline G4double G4Colour::GetBlue() const  {return blue;}
+inline G4double G4Colour::GetAlpha() const {return alpha;}
+
 inline G4Colour G4Colour::White()   {return G4Colour(1.0, 1.0, 1.0);}
 inline G4Colour G4Colour::Gray()    {return G4Colour(0.5, 0.5, 0.5);}
 inline G4Colour G4Colour::Grey()    {return G4Colour(0.5, 0.5, 0.5);}
@@ -182,6 +183,7 @@ inline G4Colour G4Colour::Blue()    {return G4Colour(0.0, 0.0, 1.0);}
 inline G4Colour G4Colour::Cyan()    {return G4Colour(0.0, 1.0, 1.0);}
 inline G4Colour G4Colour::Magenta() {return G4Colour(1.0, 0.0, 1.0);}
 inline G4Colour G4Colour::Yellow()  {return G4Colour(1.0, 1.0, 0.0);}
+// clang-format on
 
 inline G4bool G4Colour::GetColor(const G4String& key, G4Colour& result)
 {return G4Colour::GetColour(key, result);}

source/graphics_reps/include/G4VGraphicsScene.hh

@@ -166,6 +166,12 @@ public: // With description
   // The concrete class should overload this or a null extent will be returned.
   // See G4VScenHandler for example.
 
+  // Utilities 
+  G4int GetMaxGeometryDepth() const {return fMaxGeometryDepth;}
+  void  SetMaxGeometryDepth(G4int maxDepth) {fMaxGeometryDepth = maxDepth;}
+
+protected:
+  G4int fMaxGeometryDepth = 0;
 };
 
 #endif

source/graphics_reps/include/G4VisAttributes.hh

@@ -143,6 +143,7 @@ public: // With description
 
 private:
 
+  // clang-format off
   G4bool      fVisible;            // Visibility flag
   G4bool      fDaughtersInvisible; // Make daughters invsibile.
   G4Colour    fColour;
@@ -160,6 +161,7 @@ private:
   G4double fStartTime, fEndTime;   // Time range.
   const std::vector<G4AttValue>*     fAttValues;  // For picking, etc.
   const std::map<G4String,G4AttDef>* fAttDefs;    // Corresponding definitions.
+  // clang-format on
 };
 
 #include "G4VisAttributes.icc"