0030979: Visualization - introduce customized grid presentations

src/AIS/AIS_ViewController.cxx

@@ -27,6 +27,8 @@
 #include <V3d_Viewer.hxx>
 #include <WNT_HIDSpaceMouse.hxx>
 
+#include <iostream>
+
 // =======================================================================
 // function : AIS_ViewController
 // purpose  :
@@ -2246,6 +2248,12 @@ void AIS_ViewController::handleCameraActions (const Handle(AIS_InteractiveContex
     myGL.Orientation.ToFitAll = false;
   }
 
+  if (theView->Viewer()->Grid()->IsActive()
+   && theView->Viewer()->GridEcho())
+  {
+    theView->Viewer()->Grid()->Update();
+  }
+
   if (myGL.IsNewGesture)
   {
     if (myAnchorPointPrs1->HasInteractiveContext())

src/Aspect/Aspect_Grid.cxx

@@ -16,10 +16,10 @@
 IMPLEMENT_STANDARD_RTTIEXT(Aspect_Grid,Standard_Transient)
 
 Aspect_Grid::Aspect_Grid (const Standard_Real theXOrigin,
-			                    const Standard_Real theYOrigin,
-			                    const Standard_Real theAngle,
-			                    const Quantity_Color& theColor,
-			                    const Quantity_Color& theTenthColor)
+                          const Standard_Real theYOrigin,
+                          const Standard_Real theAngle,
+                          const Quantity_Color& theColor,
+                          const Quantity_Color& theTenthColor)
 : myRotationAngle (theAngle),
   myXOrigin (theXOrigin),
   myYOrigin (theYOrigin),
@@ -60,7 +60,7 @@ void Aspect_Grid::Rotate (const Standard_Real theAngle)
 }
 
 void Aspect_Grid::Translate (const Standard_Real theDx,
-				                     const Standard_Real theDy)
+                             const Standard_Real theDy)
 {
   myXOrigin += theDx;
   myYOrigin += theDy;
@@ -69,7 +69,7 @@ void Aspect_Grid::Translate (const Standard_Real theDx,
 }
 
 void Aspect_Grid::SetColors (const Quantity_Color& theColor,
-			                       const Quantity_Color& theTenthColor)
+                             const Quantity_Color& theTenthColor)
 {
   myColor = theColor;
   myTenthColor = theTenthColor;
@@ -77,16 +77,16 @@ void Aspect_Grid::SetColors (const Quantity_Color& theColor,
 }
 
 void Aspect_Grid::Colors (Quantity_Color& theColor,
-			                    Quantity_Color& theTenthColor) const
+                          Quantity_Color& theTenthColor) const
 {
   theColor = myColor;
   theTenthColor = myTenthColor;
 }
 
 void Aspect_Grid::Hit (const Standard_Real theX,
-			                 const Standard_Real theY,
-			                 Standard_Real& theGridX,
-			                 Standard_Real& theGridY) const
+                       const Standard_Real theY,
+                       Standard_Real& theGridX,
+                       Standard_Real& theGridY) const
 {
   if (myIsActive)
   {

src/Aspect/Aspect_Grid.hxx

@@ -86,6 +86,9 @@ public:
 
   //! Display the grid at screen.
   Standard_EXPORT virtual void Display() = 0;
+
+  //! 
+  Standard_EXPORT virtual void Update() = 0;
   
   //! Erase the grid from screen.
   Standard_EXPORT virtual void Erase() const = 0;

src/Aspect/Aspect_RectangularGrid.cxx

@@ -27,31 +27,35 @@ Aspect_RectangularGrid::Aspect_RectangularGrid(
                                const Standard_Real aFirstAngle,
                                const Standard_Real aSecondAngle,
                                const Standard_Real aRotationAngle)
-:Aspect_Grid(anXOrigin,anYOrigin,aRotationAngle),myXStep(aXStep),myYStep(aYStep),myFirstAngle(aFirstAngle),mySecondAngle(aSecondAngle)
-
+: Aspect_Grid (anXOrigin,anYOrigin,aRotationAngle),
+  myXStep (aXStep),
+  myYStep (aYStep),
+  myFirstAngle (aFirstAngle),
+  mySecondAngle (aSecondAngle)
 {
-  Standard_NumericError_Raise_if(!CheckAngle (aFirstAngle,mySecondAngle),
-                                 "networks are parallel");
-
-  Standard_NegativeValue_Raise_if(aXStep < 0. , "invalid x step");
-  Standard_NegativeValue_Raise_if(aYStep < 0. , "invalid y step");
-  Standard_NullValue_Raise_if(aXStep == 0. , "invalid x step");
-  Standard_NullValue_Raise_if(aYStep == 0. , "invalid y step");
+  Standard_NumericError_Raise_if (!CheckAngle (aFirstAngle, mySecondAngle),
+                                  "networks are parallel");
+  Standard_NegativeValue_Raise_if (aXStep < 0.0, "invalid x step");
+  Standard_NegativeValue_Raise_if (aYStep < 0.0, "invalid y step");
+  Standard_NullValue_Raise_if (aXStep == 0.0, "invalid x step");
+  Standard_NullValue_Raise_if (aYStep == 0.0, "invalid y step");
 }
 
 
 
-void Aspect_RectangularGrid::SetXStep(const Standard_Real aStep) {
-  Standard_NegativeValue_Raise_if(aStep < 0. , "invalid x step");
-  Standard_NullValue_Raise_if(aStep == 0. , "invalid y step");
+void Aspect_RectangularGrid::SetXStep (const Standard_Real aStep)
+{
+  Standard_NegativeValue_Raise_if (aStep < 0.0, "invalid x step");
+  Standard_NullValue_Raise_if (aStep == 0.0, "invalid y step");
   myXStep = aStep;
   Init();
   UpdateDisplay();
 }
 
-void Aspect_RectangularGrid::SetYStep(const Standard_Real aStep) {
-  Standard_NegativeValue_Raise_if(aStep < 0. , "invalid x step");
-  Standard_NullValue_Raise_if(aStep == 0. , "invalid y step");
+void Aspect_RectangularGrid::SetYStep (const Standard_Real aStep)
+{
+  Standard_NegativeValue_Raise_if (aStep < 0.0, "invalid x step");
+  Standard_NullValue_Raise_if (aStep == 0.0, "invalid y step");
   myYStep = aStep;
   Init();
   UpdateDisplay();
@@ -60,67 +64,72 @@ void Aspect_RectangularGrid::SetYStep(const Standard_Real aStep) {
 void Aspect_RectangularGrid::SetAngle (const Standard_Real anAngle1,
                                        const Standard_Real anAngle2)
 {
-  Standard_NumericError_Raise_if(!CheckAngle (anAngle1,anAngle2 ),
-                                 "axis are parallel");
+  Standard_NumericError_Raise_if (!CheckAngle (anAngle1,anAngle2),
+                                  "axis are parallel");
   myFirstAngle = anAngle1;
   mySecondAngle = anAngle2;
   Init();
   UpdateDisplay();
 }
 
-void Aspect_RectangularGrid::SetGridValues(
-	const Standard_Real theXOrigin,
-	const Standard_Real theYOrigin,
-	const Standard_Real theXStep,
-	const Standard_Real theYStep,
-	const Standard_Real theRotationAngle) {
-
+void Aspect_RectangularGrid::SetGridValues (
+  const Standard_Real theXOrigin,
+  const Standard_Real theYOrigin,
+  const Standard_Real theXStep,
+  const Standard_Real theYStep,
+  const Standard_Real theRotationAngle)
+{
   myXOrigin = theXOrigin;
   myYOrigin = theYOrigin;
-  Standard_NegativeValue_Raise_if(theXStep < 0. , "invalid x step");
-  Standard_NullValue_Raise_if(theXStep == 0. , "invalid x step");
+  Standard_NegativeValue_Raise_if (theXStep < 0.0, "invalid x step");
+  Standard_NullValue_Raise_if (theXStep == 0.0, "invalid x step");
   myXStep = theXStep;
-  Standard_NegativeValue_Raise_if(theYStep < 0. , "invalid y step");
-  Standard_NullValue_Raise_if(theYStep == 0. , "invalid y step");
+  Standard_NegativeValue_Raise_if (theYStep < 0.0, "invalid y step");
+  Standard_NullValue_Raise_if (theYStep == 0.0, "invalid y step");
   myYStep = theYStep;
   myRotationAngle = theRotationAngle;
   Init();
   UpdateDisplay();
 }
 
-void Aspect_RectangularGrid::Compute(const Standard_Real X,
-                         const Standard_Real Y,
-                         Standard_Real& gridX,
-                         Standard_Real& gridY) const {
+void Aspect_RectangularGrid::Compute (const Standard_Real X,
+                                      const Standard_Real Y,
+                                      Standard_Real& gridX,
+                                      Standard_Real& gridY) const
+{
     Standard_Real D1 = b1 * X - a1 * Y - c1;
     Standard_Real D2 = b2 * X - a2 * Y - c2;
-    Standard_Integer n1 = Standard_Integer ( Abs(D1)/myXStep + 0.5);
-    Standard_Integer n2 = Standard_Integer ( Abs(D2)/myYStep + 0.5);
-    Standard_Real offset1 = c1 + Standard_Real(n1) * Sign (myXStep , D1);
-    Standard_Real offset2 = c2 + Standard_Real(n2) * Sign (myYStep , D2);
-    Standard_Real Delta = a1*b2 - b1*a2;
-    gridX = ( offset2*a1 - offset1*a2) /Delta;
-    gridY = ( offset2*b1 - offset1*b2) /Delta;
+    Standard_Integer n1 = Standard_Integer (Abs (D1) / myXStep + 0.5);
+    Standard_Integer n2 = Standard_Integer (Abs (D2) / myYStep + 0.5);
+    Standard_Real offset1 = c1 + Standard_Real(n1) * Sign (myXStep, D1);
+    Standard_Real offset2 = c2 + Standard_Real(n2) * Sign (myYStep, D2);
+    Standard_Real Delta = a1 * b2 - b1 * a2;
+    gridX = (offset2 * a1 - offset1 * a2) / Delta;
+    gridY = (offset2 * b1 - offset1 * b2) / Delta;
 }
 
-Standard_Real Aspect_RectangularGrid::XStep() const {
+Standard_Real Aspect_RectangularGrid::XStep() const
+{
   return myXStep;
 }
 
-Standard_Real Aspect_RectangularGrid::YStep() const {
+Standard_Real Aspect_RectangularGrid::YStep() const
+{
   return myYStep;
 }
 
-Standard_Real Aspect_RectangularGrid::FirstAngle() const {
+Standard_Real Aspect_RectangularGrid::FirstAngle() const
+{
   return myFirstAngle;
 }
 
-Standard_Real Aspect_RectangularGrid::SecondAngle() const {
+Standard_Real Aspect_RectangularGrid::SecondAngle() const
+{
   return mySecondAngle;
 }
 
-void Aspect_RectangularGrid::Init () {
-
+void Aspect_RectangularGrid::Init()
+{
 //+zov Fixing CTS17856
 //  a1 = Cos (myFirstAngle + RotationAngle() ); 
 //  b1 = Sin (myFirstAngle + RotationAngle() );
@@ -132,28 +141,39 @@ void Aspect_RectangularGrid::Init () {
 
   Standard_Real angle1 = myFirstAngle + RotationAngle();
   Standard_Real angle2 = mySecondAngle + RotationAngle();
-  if ( angle1 != 0. ) {
-    a1 = -Sin (angle1); 
+  if (angle1 != 0.0)
+  {
+    a1 = -Sin (angle1);
     b1 = Cos (angle1);
     c1 = XOrigin() * b1 - YOrigin() * a1;
-  } else {
-    a1 = 0.; b1 = 1.; c1 = XOrigin();
+  }
+  else
+  {
+    a1 = 0.0;
+    b1 = 1.0;
+    c1 = XOrigin();
   }
 
-  if ( angle2 != 0. ) {
-    angle2 += M_PI / 2.;
-    a2 = -Sin (angle2); 
+  if (angle2 != 0.0)
+  {
+    angle2 += M_PI / 2.0;
+    a2 = -Sin (angle2);
     b2 = Cos (angle2);
     c2 = XOrigin() * b2 - YOrigin() * a2;
-  } else {
-    a2 = -1.; b2 = 0.; c2 = YOrigin();
+  }
+  else
+  {
+    a2 = -1.0;
+    b2 = 0.0;
+    c2 = YOrigin();
   }
 //-zov
 }
 
-Standard_Boolean Aspect_RectangularGrid::CheckAngle(const Standard_Real alpha,
-                                            const Standard_Real beta) const {
-  return (Abs( Sin(alpha) * Cos(beta + M_PI / 2.) - Cos(alpha) * Sin(beta + M_PI / 2.)) != 0) ;
+Standard_Boolean Aspect_RectangularGrid::CheckAngle (const Standard_Real alpha,
+                                                     const Standard_Real beta) const
+{
+  return (Abs (Sin (alpha) * Cos (beta + M_PI / 2.0) - Cos (alpha) * Sin (beta + M_PI / 2.0)) != 0);
 }
 
 //=======================================================================

src/Graphic3d/Graphic3d_ShaderManager.cxx

@@ -2183,3 +2183,104 @@ Handle(Graphic3d_ShaderProgram) Graphic3d_ShaderManager::getColoredQuadProgram()
 
   return aProgSrc;
 }
+
+Handle(Graphic3d_ShaderProgram) Graphic3d_ShaderManager::getGridProgram() const
+{
+  Handle(Graphic3d_ShaderProgram) aProgSrc = new Graphic3d_ShaderProgram();
+
+  Graphic3d_ShaderObject::ShaderVariableList aUniforms, aStageInOuts;
+  aStageInOuts.Append (Graphic3d_ShaderObject::ShaderVariable ("vec3 NearPoint", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
+  aStageInOuts.Append (Graphic3d_ShaderObject::ShaderVariable ("vec3 FarPoint", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
+  aStageInOuts.Append (Graphic3d_ShaderObject::ShaderVariable ("mat4 MVP", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
+  aUniforms.Append (Graphic3d_ShaderObject::ShaderVariable ("float uZNear", Graphic3d_TOS_FRAGMENT));
+  aUniforms.Append (Graphic3d_ShaderObject::ShaderVariable ("float uZFar", Graphic3d_TOS_FRAGMENT));
+  aUniforms.Append (Graphic3d_ShaderObject::ShaderVariable ("bool uIsDrawAxis", Graphic3d_TOS_FRAGMENT));
+
+  TCollection_AsciiString aSrcVert = TCollection_AsciiString()
+  + EOL"vec3 gridPlane[6] = vec3[] (vec3( 1,  1, 0), vec3(-1, -1, 0), vec3(-1,  1, 0),"
+    EOL"                            vec3(-1, -1, 0), vec3( 1,  1, 0), vec3( 1, -1, 0));"
+
+    EOL"vec3 UnprojectPoint (float aX, float anY, float aZ)"
+    EOL"{"
+    EOL"  vec4 anUnprojPnt = occModelWorldMatrixInverse * occWorldViewMatrixInverse * occProjectionMatrixInverse * vec4 (aX, anY, aZ, 1.0);"
+    EOL"  return anUnprojPnt.xyz / anUnprojPnt.w;"
+    EOL"}"
+
+    EOL"void main()"
+    EOL"{"
+    EOL"  vec3 aVertex = gridPlane[gl_VertexID];"
+    EOL"  NearPoint = UnprojectPoint (aVertex.x, aVertex.y, 0.0);"
+    EOL"  FarPoint  = UnprojectPoint (aVertex.x, aVertex.y, 1.0);"
+    EOL"  MVP = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix;"
+    EOL"  gl_Position = vec4 (aVertex, 1.0);"
+    EOL"}";
+
+  TCollection_AsciiString aSrcFrag = TCollection_AsciiString()
+  + EOL"vec4 grid (vec3 theFragPos3D, vec3 theColor, float theScale, bool theIsDrawAxis)"
+    EOL"{"
+    EOL"  vec2 aCoord = theFragPos3D.xy * theScale;"
+    EOL"  vec2 aDerivative = fwidth (aCoord);"
+    EOL"  vec2 aGrid = abs (fract (aCoord - 0.5) - 0.5) / aDerivative;"
+    EOL"  float aLine = min (aGrid.x, aGrid.y);"
+    EOL"  float aMinY = min (aDerivative.y, 1);"
+    EOL"  float aMinX = min (aDerivative.x, 1);"
+    EOL"  vec4 aColor = vec4 (theColor, round (1.0 - min (aLine, 1.0)));"
+    EOL"  if (uIsDrawAxis && theIsDrawAxis)"
+    EOL"  {"
+    EOL"    bool isYAxis = -aMinX < aCoord.x && aCoord.x < aMinX;"
+    EOL"    bool isXAxis = -aMinY < aCoord.y && aCoord.y < aMinY;"
+    EOL"    if (isXAxis && isYAxis) { aColor.xyz = vec3 (0.0, 0.0, 1.0); }"
+    EOL"    else if (isXAxis) { aColor.xyz = vec3 (1.0, 0.0, 0.0); }"
+    EOL"    else if (isYAxis) { aColor.xyz = vec3 (0.0, 1.0, 0.0); }"
+    EOL"  }"
+    EOL"  return aColor;"
+    EOL" }"
+
+    EOL"float computeDepth (vec3 thePos)"
+    EOL"{"
+    EOL"  vec4 aClipSpacePos = MVP * vec4 (thePos, 1.0);"
+    EOL"  return (aClipSpacePos.z / aClipSpacePos.w);"
+    EOL"}"
+
+    EOL"float computeLinearDepth (vec3 thePos)"
+    EOL"{"
+    EOL"  float aClipSpaceDepth = computeDepth (thePos) * 2.0 - 1.0;"
+    EOL"  float aLinearDepth = (2.0 * uZNear * uZFar) / (uZFar + uZNear - aClipSpaceDepth * (uZFar - uZNear));"
+    EOL"  return aLinearDepth / uZFar;"
+    EOL"}"
+
+    EOL"void main()"
+    EOL"{"
+    EOL"  float aParam = -NearPoint.z / (FarPoint.z - NearPoint.z);"
+    EOL"  vec3 aFragPos3D = NearPoint + aParam * (FarPoint - NearPoint);"
+    EOL"  float aLinearDepth = computeLinearDepth (aFragPos3D);"
+    // TODO : Compute scale
+    EOL"  vec4 aBigGridColor = grid (aFragPos3D, vec3 (0.8), 0.01, true);"
+    EOL"  vec4 aColor = aBigGridColor.a == 0.0"
+    EOL"              ? grid (aFragPos3D, vec3 (0.2), 0.1, false)"
+    EOL"              : aBigGridColor;"
+    EOL"  float aDepth = computeDepth (aFragPos3D);"
+    EOL"  float aFar  = gl_DepthRange.far;"
+    EOL"  float aNear = gl_DepthRange.near;"
+    EOL"  aDepth = ((aFar - aNear) * aDepth + aNear + aFar) * 0.5;"
+    EOL"  if (aColor.a == 0.0 || (-1.0 < aLinearDepth && aLinearDepth < 0.0))"
+    EOL"  {"
+    EOL"    discard;"
+    EOL"  };"
+    // TODO : Get actual background color
+    EOL"  vec4 aBackgroundColor = vec4 (0.0, 0.0, 0.0, 1.0);"
+    EOL"  if (abs (aLinearDepth) > 1.0)"
+    EOL"  {"
+    EOL"    float anInterpVal = float (aLinearDepth > 0.0) - sign (aLinearDepth) * clamp (1.0 / (abs (aLinearDepth) - 1.0), 0.5, 1.0);"
+    EOL"    aColor = mix (aColor, aBackgroundColor, anInterpVal);"
+    EOL"  }"
+    EOL"  gl_FragDepth = aDepth;"
+    EOL"  occFragColor = aColor;"
+    EOL"}";
+
+  defaultGlslVersion (aProgSrc, "grid", 0);
+  aProgSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));
+  aProgSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (aSrcFrag, Graphic3d_TOS_FRAGMENT, aUniforms, aStageInOuts));
+
+  return aProgSrc;
+}

src/Graphic3d/Graphic3d_ShaderManager.hxx

@@ -148,6 +148,9 @@ protected:
   //! Generates shader program to render correctly colored quad.
   Standard_EXPORT Handle(Graphic3d_ShaderProgram) getColoredQuadProgram() const;
 
+  //! Generates shader program to render grid.
+  Standard_EXPORT Handle(Graphic3d_ShaderProgram) getGridProgram() const;
+
   //! Prepare GLSL source for IBL generation used in PBR pipeline.
   Standard_EXPORT Handle(Graphic3d_ShaderProgram) getPBREnvBakingProgram (Standard_Integer theIndex) const;
 

src/OpenGl/OpenGl_ShaderManager.cxx

@@ -1361,6 +1361,27 @@ Standard_Boolean OpenGl_ShaderManager::preparePBREnvBakingProgram (Standard_Inte
   return Standard_True;
 }
 
+// =======================================================================
+// function : prepareGridProgram
+// purpose  :
+// =======================================================================
+Standard_Boolean OpenGl_ShaderManager::prepareGridProgram()
+{
+  Handle(Graphic3d_ShaderProgram) aProgramSrc = getGridProgram();
+
+  TCollection_AsciiString aKey;
+  if (!Create (aProgramSrc, aKey, myGridProgram))
+  {
+    myGridProgram = new OpenGl_ShaderProgram(); // just mark as invalid
+    return Standard_False;
+  }
+
+  myContext->BindProgram (myGridProgram);
+  myContext->BindProgram (Handle(OpenGl_ShaderProgram)());
+
+  return Standard_True;
+}
+
 // =======================================================================
 // function : GetBgCubeMapProgram
 // purpose  :

src/OpenGl/OpenGl_ShaderManager.hxx

@@ -225,6 +225,16 @@ public:
     return myContext->BindProgram (myPBREnvBakingProgram[theIndex]);
   }
 
+  //! Bind program for IBL maps generation in PBR pipeline.
+  Standard_Boolean BindGridProgram()
+  {
+    if (myGridProgram.IsNull())
+    {
+      prepareGridProgram();
+    }
+    return myContext->BindProgram (myGridProgram);
+  }
+
   //! Generates shader program to render environment cubemap as background.
   Standard_EXPORT const Handle(Graphic3d_ShaderProgram)& GetBgCubeMapProgram();
 
@@ -709,6 +719,8 @@ protected:
   Standard_Boolean IsPbrAllowed() const { return myShadingModel == Graphic3d_TypeOfShadingModel_Pbr
                                               || myShadingModel == Graphic3d_TypeOfShadingModel_PbrFacet; }
 
+  Standard_EXPORT Standard_Boolean prepareGridProgram();
+
 protected:
 
   //! Packed properties of light source
@@ -776,6 +788,7 @@ protected:
   Handle(Graphic3d_ShaderProgram)    myBgCubeMapProgram;       //!< program for background cubemap rendering
   Handle(Graphic3d_ShaderProgram)    myBgSkydomeProgram;       //!< program for background cubemap rendering
   Handle(Graphic3d_ShaderProgram)    myColoredQuadProgram;     //!< program for correct quad rendering
+  Handle(OpenGl_ShaderProgram)       myGridProgram;            //!< program for grid rendering
 
   Handle(OpenGl_ShaderProgram)       myStereoPrograms[Graphic3d_StereoMode_NB]; //!< standard stereo programs
 

src/OpenGl/OpenGl_View.cxx

@@ -2433,6 +2433,12 @@ void OpenGl_View::render (Graphic3d_Camera::Projection theProjection,
     aContext->core11fwd->glDisable (GL_LIGHTING);
   }
 
+  // ====================================
+  //      Step 3: Redraw grid
+  // ====================================
+
+  renderGrid();
+
   // =================================
   //      Step 3: Redraw main plane
   // =================================
@@ -2525,6 +2531,35 @@ void OpenGl_View::render (Graphic3d_Camera::Projection theProjection,
   }
 }
 
+// =======================================================================
+// function : renderGrid
+// purpose  :
+// =======================================================================
+void OpenGl_View::renderGrid()
+{
+  const Handle(OpenGl_Context)& aContext = myWorkspace->GetGlContext();
+
+  aContext->ShaderManager()->UpdateModelWorldStateTo (aContext->ModelWorldState.Current());
+  aContext->ShaderManager()->UpdateProjectionStateTo (aContext->ProjectionState.Current());
+  aContext->ShaderManager()->UpdateWorldViewStateTo (aContext->WorldViewState.Current());
+
+  aContext->core11fwd->glEnable (GL_BLEND);
+  aContext->core11fwd->glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+  if (aContext->ShaderManager()->BindGridProgram())
+  {
+    const Handle(OpenGl_ShaderProgram)& aProg = aContext->ActiveProgram();
+    aProg->SetUniform (aContext, "uZNear", GLfloat (aContext->Camera()->ZNear()));
+    aProg->SetUniform (aContext, "uZFar", GLfloat (aContext->Camera()->ZFar()));
+    // TODO : add param to draw command
+    aProg->SetUniform (aContext, "uIsDrawAxis", GLboolean (true));
+
+    aContext->ShaderManager()->PushState (aContext->ActiveProgram());
+    aContext->core20fwd->glDrawArrays (GL_TRIANGLES, 0, 6);
+    aContext->BindProgram (NULL);
+  }
+}
+
 // =======================================================================
 // function : InvalidateBVHData
 // purpose  :

src/OpenGl/OpenGl_View.hxx

@@ -390,6 +390,9 @@ protected: //! @name Rendering of GL graphics (with prepared drawing buffer).
                                               OpenGl_FrameBuffer*    theOitAccumFbo,
                                               const Standard_Boolean theToDrawImmediate);
 
+  //! Renders grid
+  Standard_EXPORT void renderGrid();
+
   //! Renders trihedron.
   void renderTrihedron (const Handle(OpenGl_Workspace) &theWorkspace);
 

src/V3d/V3d_CircularGrid.cxx

@@ -91,7 +91,8 @@ V3d_CircularGrid::~V3d_CircularGrid()
 
 void V3d_CircularGrid::SetColors (const Quantity_Color& aColor, const Quantity_Color& aTenthColor)
 {
-  if( myColor != aColor || myTenthColor != aTenthColor ) {
+  if( myColor != aColor || myTenthColor != aTenthColor )
+  {
     myColor = aColor;
     myTenthColor = aTenthColor;
     myCurAreDefined = Standard_False;
@@ -99,35 +100,40 @@ void V3d_CircularGrid::SetColors (const Quantity_Color& aColor, const Quantity_C
   }
 }
 
-void V3d_CircularGrid::Display ()
+void V3d_CircularGrid::Display()
 {
   myStructure->SetDisplayPriority (Graphic3d_DisplayPriority_AlmostBottom);
   myStructure->Display();
   UpdateDisplay();
 }
 
-void V3d_CircularGrid::Erase () const
+void V3d_CircularGrid::Update()
 {
-  myStructure->Erase ();
+  //
 }
 
-Standard_Boolean V3d_CircularGrid::IsDisplayed () const
+void V3d_CircularGrid::Erase() const
 {
-  return myStructure->IsDisplayed ();
+  myStructure->Erase();
 }
 
-void V3d_CircularGrid::UpdateDisplay ()
+Standard_Boolean V3d_CircularGrid::IsDisplayed() const
+{
+  return myStructure->IsDisplayed();
+}
+
+void V3d_CircularGrid::UpdateDisplay()
 {
   gp_Ax3 ThePlane = myViewer->PrivilegedPlane();
 
-  Standard_Real xl, yl, zl;
+  Standard_Real xl,  yl,  zl;
   Standard_Real xdx, xdy, xdz;
   Standard_Real ydx, ydy, ydz;
-  Standard_Real dx, dy, dz;
-  ThePlane.Location ().Coord (xl, yl, zl);
-  ThePlane.XDirection ().Coord (xdx, xdy, xdz);
-  ThePlane.YDirection ().Coord (ydx, ydy, ydz);
-  ThePlane.Direction ().Coord (dx, dy, dz);
+  Standard_Real dx,  dy,  dz;
+  ThePlane.Location  ().Coord (xl,  yl,  zl);
+  ThePlane.XDirection().Coord (xdx, xdy, xdz);
+  ThePlane.YDirection().Coord (ydx, ydy, ydz);
+  ThePlane.Direction ().Coord (dx,  dy,  dz);
 
   Standard_Boolean MakeTransform = !myCurAreDefined;
   if (!MakeTransform)
@@ -135,26 +141,28 @@ void V3d_CircularGrid::UpdateDisplay ()
     MakeTransform = (RotationAngle() != myCurAngle || XOrigin() != myCurXo || YOrigin() != myCurYo);
     if (!MakeTransform)
     {
-      Standard_Real curxl, curyl, curzl;
+      Standard_Real curxl,  curyl,  curzl;
       Standard_Real curxdx, curxdy, curxdz;
       Standard_Real curydx, curydy, curydz;
-      Standard_Real curdx, curdy, curdz;
-      myCurViewPlane.Location ().Coord (curxl, curyl, curzl);
+      Standard_Real curdx,  curdy,  curdz;
+      myCurViewPlane.Location   ().Coord (curxl,  curyl,  curzl);
       myCurViewPlane.XDirection ().Coord (curxdx, curxdy, curxdz);
       myCurViewPlane.YDirection ().Coord (curydx, curydy, curydz);
-      myCurViewPlane.Direction ().Coord (curdx, curdy, curdz);
-      if (xl != curxl || yl != curyl || zl != curzl ||
+      myCurViewPlane.Direction  ().Coord (curdx,  curdy,  curdz);
+      if (xl  != curxl  || yl  != curyl  || zl  != curzl  ||
           xdx != curxdx || xdy != curxdy || xdz != curxdz ||
           ydx != curydx || ydy != curydy || ydz != curydz ||
-          dx != curdx || dy != curdy || dz != curdz)
+          dx  != curdx  || dy  != curdy  || dz  != curdz)
+      {
         MakeTransform = Standard_True;
+      }
     }
   }
 
   if (MakeTransform)
   {
-    const Standard_Real CosAlpha = Cos (RotationAngle ());
-    const Standard_Real SinAlpha = Sin (RotationAngle ());
+    const Standard_Real CosAlpha = Cos (RotationAngle());
+    const Standard_Real SinAlpha = Sin (RotationAngle());
 
     gp_Trsf aTrsf;
     // Translation
@@ -168,23 +176,24 @@ void V3d_CircularGrid::UpdateDisplay ()
     gp_Trsf aTrsf2;
     aTrsf2.SetValues ( CosAlpha, SinAlpha, 0.0, -XOrigin(),
                       -SinAlpha, CosAlpha, 0.0, -YOrigin(),
-                            0.0,      0.0, 1.0, 0.0);
+                       0.0,      0.0,      1.0,  0.0 );
     aTrsf.Multiply (aTrsf2);
     myStructure->SetTransformation (new TopLoc_Datum3D (aTrsf));
 
-    myCurAngle = RotationAngle ();
-    myCurXo = XOrigin (), myCurYo = YOrigin ();
+    myCurAngle = RotationAngle();
+    myCurXo = XOrigin();
+    myCurYo = YOrigin();
     myCurViewPlane = ThePlane;
   }
 
   switch (myDrawMode)
   {
     case Aspect_GDM_Points:
-      DefinePoints ();
+      DefinePoints();
       myCurDrawMode = Aspect_GDM_Points;
       break;
     case Aspect_GDM_Lines:
-      DefineLines ();
+      DefineLines();
       myCurDrawMode = Aspect_GDM_Lines;
       break;
     case Aspect_GDM_None:
@@ -194,16 +203,15 @@ void V3d_CircularGrid::UpdateDisplay ()
   myCurAreDefined = Standard_True;
 }
 
-void V3d_CircularGrid::DefineLines ()
+void V3d_CircularGrid::DefineLines()
 {
-  const Standard_Real    aStep     = RadiusStep ();
-  const Standard_Real    aDivision = DivisionNumber ();
+  const Standard_Real    aStep     = RadiusStep();
+  const Standard_Real    aDivision = DivisionNumber();
   const Standard_Boolean toUpdate  = !myCurAreDefined
                                   || myCurDrawMode != Aspect_GDM_Lines
                                   || aDivision != myCurDivi
                                   || aStep     != myCurStep;
-  if (!toUpdate
-   && !myToComputePrs)
+  if (!toUpdate && !myToComputePrs)
   {
     return;
   }
@@ -214,33 +222,36 @@ void V3d_CircularGrid::DefineLines ()
   }
 
   myToComputePrs = Standard_False;
-  myGroup->Clear ();
+  myGroup->Clear();
 
-  const Standard_Integer Division = (Standard_Integer )( (aDivision >= DIVISION ? aDivision : DIVISION));
+  const Standard_Integer Division = (Standard_Integer )((aDivision >= DIVISION ? aDivision : DIVISION));
 
   Standard_Integer nbpnts = 2 * Division;
   // diametres
   Standard_Real alpha = M_PI / aDivision;
 
   myGroup->SetGroupPrimitivesAspect (new Graphic3d_AspectLine3d (myTenthColor, Aspect_TOL_SOLID, 1.0));
-  Handle(Graphic3d_ArrayOfSegments) aPrims1 = new Graphic3d_ArrayOfSegments(2*nbpnts);
-  const gp_Pnt p0(0., 0., -myOffSet);
-  for (Standard_Integer i=1; i<=nbpnts; i++) {
-    aPrims1->AddVertex(p0);
-    aPrims1->AddVertex(Cos(alpha*i)*myRadius, Sin(alpha*i)*myRadius, -myOffSet);
+  Handle(Graphic3d_ArrayOfSegments) aPrims1 = new Graphic3d_ArrayOfSegments (2 * nbpnts);
+  const gp_Pnt p0 (0.0, 0.0, -myOffSet);
+  for (Standard_Integer i = 1; i <= nbpnts; i++)
+  {
+    aPrims1->AddVertex (p0);
+    aPrims1->AddVertex (Cos (alpha * i) * myRadius, Sin (alpha * i) * myRadius, -myOffSet);
   }
-  myGroup->AddPrimitiveArray(aPrims1, Standard_False);
+  myGroup->AddPrimitiveArray (aPrims1, Standard_False);
 
   // circles
   nbpnts = 2 * Division + 1;
   alpha = M_PI / Division;
   Standard_Integer nblines = 0;
   TColgp_SequenceOfPnt aSeqLines, aSeqTenth;
-  for (Standard_Real r=aStep; r<=myRadius; r+=aStep, nblines++) {
-    const Standard_Boolean isTenth = (Modulus(nblines, 10) == 0);
-    for (Standard_Integer i=0; i<nbpnts; i++) {
-      const gp_Pnt pt(Cos(alpha*i)*r,Sin(alpha*i)*r,-myOffSet);
-      (isTenth? aSeqTenth : aSeqLines).Append(pt);
+  for (Standard_Real r = aStep; r <= myRadius; r += aStep, nblines++)
+  {
+    const Standard_Boolean isTenth = (Modulus (nblines, 10) == 0);
+    for (Standard_Integer i = 0; i < nbpnts; i++)
+    {
+      const gp_Pnt pt (Cos (alpha * i) * r, Sin (alpha * i) * r, -myOffSet);
+      (isTenth ? aSeqTenth : aSeqLines).Append (pt);
     }
   }
   if (aSeqTenth.Length())
@@ -248,37 +259,44 @@ void V3d_CircularGrid::DefineLines ()
     myGroup->SetGroupPrimitivesAspect (new Graphic3d_AspectLine3d (myTenthColor, Aspect_TOL_SOLID, 1.0));
     Standard_Integer n, np;
     const Standard_Integer nbl = aSeqTenth.Length() / nbpnts;
-    Handle(Graphic3d_ArrayOfPolylines) aPrims2 = new Graphic3d_ArrayOfPolylines(aSeqTenth.Length(),nbl);
-    for (np = 1, n=0; n<nbl; n++) {
-      aPrims2->AddBound(nbpnts);
-      for (Standard_Integer i=0; i<nbpnts; i++, np++)
-        aPrims2->AddVertex(aSeqTenth(np));
-  }
-    myGroup->AddPrimitiveArray(aPrims2, Standard_False);
+    Handle(Graphic3d_ArrayOfPolylines) aPrims2 = new Graphic3d_ArrayOfPolylines (aSeqTenth.Length(), nbl);
+    for (np = 1, n = 0; n < nbl; n++)
+    {
+      aPrims2->AddBound (nbpnts);
+      for (Standard_Integer i = 0; i < nbpnts; i++, np++)
+      {
+        aPrims2->AddVertex (aSeqTenth (np));
+      }
+    }
+    myGroup->AddPrimitiveArray (aPrims2, Standard_False);
   }
   if (aSeqLines.Length())
   {
     myGroup->SetPrimitivesAspect (new Graphic3d_AspectLine3d (myColor, Aspect_TOL_SOLID, 1.0));
     Standard_Integer n, np;
     const Standard_Integer nbl = aSeqLines.Length() / nbpnts;
-    Handle(Graphic3d_ArrayOfPolylines) aPrims3 = new Graphic3d_ArrayOfPolylines(aSeqLines.Length(),nbl);
-    for (np = 1, n=0; n<nbl; n++) {
+    Handle(Graphic3d_ArrayOfPolylines) aPrims3 = new Graphic3d_ArrayOfPolylines (aSeqLines.Length(), nbl);
+    for (np = 1, n = 0; n < nbl; n++)
+    {
       aPrims3->AddBound(nbpnts);
-      for (Standard_Integer i=0; i<nbpnts; i++, np++)
-        aPrims3->AddVertex(aSeqLines(np));
-  }
-    myGroup->AddPrimitiveArray(aPrims3, Standard_False);
+      for (Standard_Integer i = 0; i < nbpnts; i++, np++)
+      {
+        aPrims3->AddVertex (aSeqLines (np));
+      }
+    }
+    myGroup->AddPrimitiveArray (aPrims3, Standard_False);
   }
 
   myGroup->SetMinMaxValues (-myRadius, -myRadius, -myOffSet, myRadius, myRadius, -myOffSet);
-  myCurStep = aStep, myCurDivi = (Standard_Integer ) aDivision;
+  myCurStep = aStep;
+  myCurDivi = (Standard_Integer) aDivision;
 
   // update bounding box
   myStructure->CalculateBoundBox();
   myViewer->StructureManager()->Update (myStructure->GetZLayer());
 }
 
-void V3d_CircularGrid::DefinePoints ()
+void V3d_CircularGrid::DefinePoints()
 {
   const Standard_Real    aStep     = RadiusStep();
   const Standard_Real    aDivision = DivisionNumber();
@@ -286,8 +304,7 @@ void V3d_CircularGrid::DefinePoints ()
                                   || myCurDrawMode != Aspect_GDM_Points
                                   || aDivision != myCurDivi
                                   || aStep     != myCurStep;
-  if (!toUpdate
-   && !myToComputePrs)
+  if (!toUpdate && !myToComputePrs)
   {
     return;
   }
@@ -298,39 +315,43 @@ void V3d_CircularGrid::DefinePoints ()
   }
 
   myToComputePrs = Standard_False;
-  myGroup->Clear ();
+  myGroup->Clear();
 
-  Handle(Graphic3d_AspectMarker3d) MarkerAttrib = new Graphic3d_AspectMarker3d ();
+  Handle(Graphic3d_AspectMarker3d) MarkerAttrib = new Graphic3d_AspectMarker3d();
   MarkerAttrib->SetColor (myColor);
   MarkerAttrib->SetType (Aspect_TOM_POINT);
-  MarkerAttrib->SetScale (3.);
+  MarkerAttrib->SetScale (3.0);
 
-  const Standard_Integer nbpnts = Standard_Integer (2*aDivision);
-  Standard_Real r, alpha = M_PI / aDivision;
+  const Standard_Integer nbpnts = Standard_Integer (2 * aDivision);
+  Standard_Real alpha = M_PI / aDivision;
 
   // diameters
   TColgp_SequenceOfPnt aSeqPnts;
-  aSeqPnts.Append(gp_Pnt(0.0, 0.0, -myOffSet));
-  for (r=aStep; r<=myRadius; r+=aStep) {
-    for (Standard_Integer i=0; i<nbpnts; i++)
-      aSeqPnts.Append(gp_Pnt(Cos(alpha*i)*r, Sin(alpha*i)*r, -myOffSet));
+  aSeqPnts.Append (gp_Pnt (0.0, 0.0, -myOffSet));
+  for (Standard_Real r = aStep; r <= myRadius; r += aStep)
+  {
+    for (Standard_Integer i = 0; i < nbpnts; i++)
+    {
+      aSeqPnts.Append (gp_Pnt (Cos (alpha * i) * r, Sin (alpha * i) * r, -myOffSet));
+    }
   }
   myGroup->SetGroupPrimitivesAspect (MarkerAttrib);
   if (aSeqPnts.Length())
   {
     Standard_Real X,Y,Z;
     const Standard_Integer nbv = aSeqPnts.Length();
-    Handle(Graphic3d_ArrayOfPoints) Cercle = new Graphic3d_ArrayOfPoints (nbv);
-    for (Standard_Integer i=1; i<=nbv; i++)
+    Handle(Graphic3d_ArrayOfPoints) aCircle = new Graphic3d_ArrayOfPoints (nbv);
+    for (Standard_Integer i = 1; i <= nbv; i++)
     {
-      aSeqPnts(i).Coord(X,Y,Z);
-      Cercle->AddVertex (X,Y,Z);
+      aSeqPnts (i).Coord (X,Y,Z);
+      aCircle->AddVertex (X,Y,Z);
     }
-    myGroup->AddPrimitiveArray (Cercle, Standard_False);
+    myGroup->AddPrimitiveArray (aCircle, Standard_False);
   }
   myGroup->SetMinMaxValues (-myRadius, -myRadius, -myOffSet, myRadius, myRadius, -myOffSet);
 
-  myCurStep = aStep, myCurDivi = (Standard_Integer ) aDivision;
+  myCurStep = aStep;
+  myCurDivi = (Standard_Integer) aDivision;
 
   // update bounding box
   myStructure->CalculateBoundBox();
@@ -345,19 +366,22 @@ void V3d_CircularGrid::GraphicValues (Standard_Real& theRadius, Standard_Real& t
 
 void V3d_CircularGrid::SetGraphicValues (const Standard_Real theRadius, const Standard_Real theOffSet)
 {
-  if (! myCurAreDefined) {
+  if (!myCurAreDefined)
+  {
     myRadius = theRadius;
     myOffSet = theOffSet;
   }
-  if (myRadius != theRadius) {
+  if (myRadius != theRadius)
+  {
     myRadius = theRadius;
     myCurAreDefined = Standard_False;
   }
-  if (myOffSet != theOffSet) {
+  if (myOffSet != theOffSet)
+  {
     myOffSet = theOffSet;
     myCurAreDefined = Standard_False;
   }
-  if( !myCurAreDefined ) UpdateDisplay();
+  if (!myCurAreDefined) { UpdateDisplay(); }
 }
 
 //=======================================================================

src/V3d/V3d_CircularGrid.hxx

@@ -38,15 +38,17 @@ public:
   Standard_EXPORT virtual ~V3d_CircularGrid();
 
   Standard_EXPORT void SetColors (const Quantity_Color& aColor, const Quantity_Color& aTenthColor) Standard_OVERRIDE;
-  
+
   Standard_EXPORT void Display() Standard_OVERRIDE;
-  
+
+  Standard_EXPORT void Update() Standard_OVERRIDE;
+
   Standard_EXPORT void Erase() const Standard_OVERRIDE;
-  
+
   Standard_EXPORT Standard_Boolean IsDisplayed() const Standard_OVERRIDE;
-  
+
   Standard_EXPORT void GraphicValues (Standard_Real& Radius, Standard_Real& OffSet) const;
-  
+
   Standard_EXPORT void SetGraphicValues (const Standard_Real Radius, const Standard_Real OffSet);
   
   //! Dumps the content of me into the stream

src/V3d/V3d_RectangularGrid.cxx

@@ -91,7 +91,8 @@ V3d_RectangularGrid::~V3d_RectangularGrid()
 
 void V3d_RectangularGrid::SetColors (const Quantity_Color& aColor, const Quantity_Color& aTenthColor)
 {
-  if( myColor != aColor || myTenthColor != aTenthColor ) {
+  if( myColor != aColor || myTenthColor != aTenthColor )
+  {
     myColor = aColor;
     myTenthColor = aTenthColor;
     myCurAreDefined = Standard_False;
@@ -99,55 +100,69 @@ void V3d_RectangularGrid::SetColors (const Quantity_Color& aColor, const Quantit
   }
 }
 
-void V3d_RectangularGrid::Display ()
+void V3d_RectangularGrid::Display()
 {
   myStructure->SetDisplayPriority (Graphic3d_DisplayPriority_AlmostBottom);
   myStructure->Display();
   UpdateDisplay();
 }
 
-void V3d_RectangularGrid::Erase () const
+void V3d_RectangularGrid::Update()
 {
-  myStructure->Erase ();
+  SetXStep (XStep() + 1);
+  UpdateDisplay();
 }
 
-Standard_Boolean V3d_RectangularGrid::IsDisplayed () const
+void V3d_RectangularGrid::Erase() const
 {
-  return myStructure->IsDisplayed ();
+  myStructure->Erase();
 }
 
-void V3d_RectangularGrid::UpdateDisplay ()
+Standard_Boolean V3d_RectangularGrid::IsDisplayed() const
 {
-  gp_Ax3 ThePlane = myViewer->PrivilegedPlane ();
+  return myStructure->IsDisplayed();
+}
+
+void V3d_RectangularGrid::UpdateDisplay()
+{
+  gp_Ax3 ThePlane = myViewer->PrivilegedPlane();
 
   Standard_Boolean MakeTransform = Standard_False;
-  Standard_Real xl, yl, zl;
+  Standard_Real xl,  yl,  zl;
   Standard_Real xdx, xdy, xdz;
   Standard_Real ydx, ydy, ydz;
-  Standard_Real dx, dy, dz;
-  ThePlane.Location ().Coord (xl, yl, zl);
-  ThePlane.XDirection ().Coord (xdx, xdy, xdz);
-  ThePlane.YDirection ().Coord (ydx, ydy, ydz);
-  ThePlane.Direction ().Coord (dx, dy, dz);
-  if (! myCurAreDefined)
+  Standard_Real dx,  dy,  dz;
+  ThePlane.Location  ().Coord (xl,  yl,  zl);
+  ThePlane.XDirection().Coord (xdx, xdy, xdz);
+  ThePlane.YDirection().Coord (ydx, ydy, ydz);
+  ThePlane.Direction ().Coord (dx,  dy,  dz);
+  if (!myCurAreDefined)
+  {
     MakeTransform = Standard_True;
-  else {
+  }
+  else
+  {
     if (RotationAngle() != myCurAngle || XOrigin() != myCurXo || YOrigin() != myCurYo)
+    {
       MakeTransform = Standard_True;
-    if (! MakeTransform) {
-      Standard_Real curxl, curyl, curzl;
+    }
+    if (!MakeTransform)
+    {
+      Standard_Real curxl,  curyl,  curzl;
       Standard_Real curxdx, curxdy, curxdz;
       Standard_Real curydx, curydy, curydz;
-      Standard_Real curdx, curdy, curdz;
-      myCurViewPlane.Location ().Coord (curxl, curyl, curzl);
-      myCurViewPlane.XDirection ().Coord (curxdx, curxdy, curxdz);
-      myCurViewPlane.YDirection ().Coord (curydx, curydy, curydz);
-      myCurViewPlane.Direction ().Coord (curdx, curdy, curdz);
-      if (xl != curxl || yl != curyl || zl != curzl ||
+      Standard_Real curdx,  curdy,  curdz;
+      myCurViewPlane.Location  ().Coord (curxl,  curyl,  curzl);
+      myCurViewPlane.XDirection().Coord (curxdx, curxdy, curxdz);
+      myCurViewPlane.YDirection().Coord (curydx, curydy, curydz);
+      myCurViewPlane.Direction ().Coord (curdx,  curdy,  curdz);
+      if (xl  != curxl  || yl  != curyl  || zl  != curzl  ||
           xdx != curxdx || xdy != curxdy || xdz != curxdz ||
           ydx != curydx || ydy != curydy || ydz != curydz ||
-          dx != curdx || dy != curdy || dz != curdz)
+          dx  != curdx  || dy  != curdy  || dz  != curdz)
+      {
         MakeTransform = Standard_True;
+      }
     }
   }
 
@@ -167,33 +182,34 @@ void V3d_RectangularGrid::UpdateDisplay ()
     gp_Trsf aTrsf2;
     aTrsf2.SetValues ( CosAlpha, SinAlpha, 0.0, -XOrigin(),
                       -SinAlpha, CosAlpha, 0.0, -YOrigin(),
-                            0.0,      0.0, 1.0, 0.0);
+                       0.0,      0.0,      1.0,  0.0 );
     aTrsf.Multiply (aTrsf2);
     myStructure->SetTransformation (new TopLoc_Datum3D (aTrsf));
 
-    myCurAngle = RotationAngle ();
-    myCurXo = XOrigin (), myCurYo = YOrigin ();
+    myCurAngle = RotationAngle();
+    myCurXo = XOrigin();
+    myCurYo = YOrigin();
     myCurViewPlane = ThePlane;
   }
 
   switch (myDrawMode)
   {
     case Aspect_GDM_Points:
-      DefinePoints ();
+      DefinePoints();
       myCurDrawMode = Aspect_GDM_Points;
       break;
     case Aspect_GDM_Lines:
-      DefineLines ();
+      DefineLines();
       myCurDrawMode = Aspect_GDM_Lines;
       break;
     case Aspect_GDM_None:
       myCurDrawMode = Aspect_GDM_None;
       break;
-	}
-	myCurAreDefined = Standard_True;
+  }
+  myCurAreDefined = Standard_True;
 }
 
-void V3d_RectangularGrid::DefineLines ()
+void V3d_RectangularGrid::DefineLines()
 {
   const Standard_Real aXStep = XStep();
   const Standard_Real aYStep = YStep();
@@ -201,8 +217,7 @@ void V3d_RectangularGrid::DefineLines ()
                                  || myCurDrawMode != Aspect_GDM_Lines
                                  || aXStep != myCurXStep
                                  || aYStep != myCurYStep;
-  if (!toUpdate
-   && !myToComputePrs)
+  if (!toUpdate && !myToComputePrs)
   {
     return;
   }
@@ -221,27 +236,27 @@ void V3d_RectangularGrid::DefineLines ()
   TColgp_SequenceOfPnt aSeqLines, aSeqTenth;
 
   // verticals
-  aSeqTenth.Append(gp_Pnt(0., -myYSize, -zl));
-  aSeqTenth.Append(gp_Pnt(0.,  myYSize, -zl));
+  aSeqTenth.Append (gp_Pnt (0.0, -myYSize, -zl));
+  aSeqTenth.Append (gp_Pnt (0.0,  myYSize, -zl));
   for (nblines = 1, xl = aXStep; xl < myXSize; xl += aXStep, nblines++)
   {
-    TColgp_SequenceOfPnt &aSeq = (Modulus(nblines, 10) != 0)? aSeqLines : aSeqTenth;
-    aSeq.Append(gp_Pnt( xl, -myYSize, -zl));
-    aSeq.Append(gp_Pnt( xl,  myYSize, -zl));
-    aSeq.Append(gp_Pnt(-xl, -myYSize, -zl));
-    aSeq.Append(gp_Pnt(-xl,  myYSize, -zl));
+    TColgp_SequenceOfPnt &aSeq = (Modulus (nblines, 10) != 0) ? aSeqLines : aSeqTenth;
+    aSeq.Append (gp_Pnt ( xl, -myYSize, -zl));
+    aSeq.Append (gp_Pnt ( xl,  myYSize, -zl));
+    aSeq.Append (gp_Pnt (-xl, -myYSize, -zl));
+    aSeq.Append (gp_Pnt (-xl,  myYSize, -zl));
   }
 
   // horizontals
-  aSeqTenth.Append(gp_Pnt(-myXSize, 0., -zl));
-  aSeqTenth.Append(gp_Pnt( myXSize, 0., -zl));
+  aSeqTenth.Append (gp_Pnt (-myXSize, 0.0, -zl));
+  aSeqTenth.Append (gp_Pnt ( myXSize, 0.0, -zl));
   for (nblines = 1, yl = aYStep; yl < myYSize; yl += aYStep, nblines++)
   {
-    TColgp_SequenceOfPnt &aSeq = (Modulus(nblines, 10) != 0)? aSeqLines : aSeqTenth;
-    aSeq.Append(gp_Pnt(-myXSize,  yl, -zl));
-    aSeq.Append(gp_Pnt( myXSize,  yl, -zl));
-    aSeq.Append(gp_Pnt(-myXSize, -yl, -zl));
-    aSeq.Append(gp_Pnt( myXSize, -yl, -zl));
+    TColgp_SequenceOfPnt &aSeq = (Modulus (nblines, 10) != 0) ? aSeqLines : aSeqTenth;
+    aSeq.Append (gp_Pnt (-myXSize,  yl, -zl));
+    aSeq.Append (gp_Pnt ( myXSize,  yl, -zl));
+    aSeq.Append (gp_Pnt (-myXSize, -yl, -zl));
+    aSeq.Append (gp_Pnt ( myXSize, -yl, -zl));
   }
 
   if (aSeqLines.Length())
@@ -249,33 +264,36 @@ void V3d_RectangularGrid::DefineLines ()
     Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d (myColor, Aspect_TOL_SOLID, 1.0);
     myGroup->SetPrimitivesAspect (aLineAspect);
     const Standard_Integer nbv = aSeqLines.Length();
-    Handle(Graphic3d_ArrayOfSegments) aPrims = new Graphic3d_ArrayOfSegments(nbv);
-    Standard_Integer n = 1;
-    while (n<=nbv)
-      aPrims->AddVertex(aSeqLines(n++));
-    myGroup->AddPrimitiveArray(aPrims, Standard_False);
+    Handle(Graphic3d_ArrayOfSegments) aPrims = new Graphic3d_ArrayOfSegments (nbv);
+    for (Standard_Integer n = 1; n <= nbv; n++)
+    {
+      aPrims->AddVertex (aSeqLines (n));
+    }
+    myGroup->AddPrimitiveArray (aPrims, Standard_False);
   }
   if (aSeqTenth.Length())
   {
     Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d (myTenthColor, Aspect_TOL_SOLID, 1.0);
     myGroup->SetPrimitivesAspect (aLineAspect);
     const Standard_Integer nbv = aSeqTenth.Length();
-    Handle(Graphic3d_ArrayOfSegments) aPrims = new Graphic3d_ArrayOfSegments(nbv);
-    Standard_Integer n = 1;
-    while (n<=nbv)
-      aPrims->AddVertex(aSeqTenth(n++));
-    myGroup->AddPrimitiveArray(aPrims, Standard_False);
+    Handle(Graphic3d_ArrayOfSegments) aPrims = new Graphic3d_ArrayOfSegments (nbv);
+    for (Standard_Integer n = 1; n <= nbv; n++)
+    {
+      aPrims->AddVertex (aSeqTenth (n));
+    }
+    myGroup->AddPrimitiveArray (aPrims, Standard_False);
   }
 
-  myGroup->SetMinMaxValues(-myXSize, -myYSize, -myOffSet, myXSize, myYSize, -myOffSet);
-  myCurXStep = aXStep, myCurYStep = aYStep;
+  myGroup->SetMinMaxValues (-myXSize, -myYSize, -myOffSet, myXSize, myYSize, -myOffSet);
+  myCurXStep = aXStep;
+  myCurYStep = aYStep;
 
   // update bounding box
   myStructure->CalculateBoundBox();
   myViewer->StructureManager()->Update (myStructure->GetZLayer());
 }
 
-void V3d_RectangularGrid::DefinePoints ()
+void V3d_RectangularGrid::DefinePoints()
 {
   const Standard_Real aXStep = XStep();
   const Standard_Real aYStep = YStep();
@@ -300,14 +318,16 @@ void V3d_RectangularGrid::DefinePoints ()
   // horizontals
   Standard_Real xl, yl;
   TColgp_SequenceOfPnt aSeqPnts;
-  for (xl = 0.0; xl <= myXSize; xl += aXStep) {
-    aSeqPnts.Append(gp_Pnt( xl, 0.0, -myOffSet));
-    aSeqPnts.Append(gp_Pnt(-xl, 0.0, -myOffSet));
-    for (yl = aYStep; yl <= myYSize; yl += aYStep) {
-      aSeqPnts.Append(gp_Pnt( xl,  yl, -myOffSet));
-      aSeqPnts.Append(gp_Pnt( xl, -yl, -myOffSet));
-      aSeqPnts.Append(gp_Pnt(-xl,  yl, -myOffSet));
-      aSeqPnts.Append(gp_Pnt(-xl, -yl, -myOffSet));
+  for (xl = 0.0; xl <= myXSize; xl += aXStep)
+  {
+    aSeqPnts.Append (gp_Pnt ( xl, 0.0, -myOffSet));
+    aSeqPnts.Append (gp_Pnt (-xl, 0.0, -myOffSet));
+    for (yl = aYStep; yl <= myYSize; yl += aYStep)
+    {
+      aSeqPnts.Append (gp_Pnt ( xl,  yl, -myOffSet));
+      aSeqPnts.Append (gp_Pnt ( xl, -yl, -myOffSet));
+      aSeqPnts.Append (gp_Pnt (-xl,  yl, -myOffSet));
+      aSeqPnts.Append (gp_Pnt (-xl, -yl, -myOffSet));
     }
   }
   if (aSeqPnts.Length())
@@ -316,9 +336,9 @@ void V3d_RectangularGrid::DefinePoints ()
     Standard_Real X,Y,Z;
     const Standard_Integer nbv = aSeqPnts.Length();
     Handle(Graphic3d_ArrayOfPoints) Vertical = new Graphic3d_ArrayOfPoints (nbv);
-    for (i=1; i<=nbv; i++)
+    for (i = 1; i <= nbv; i++)
     {
-      aSeqPnts(i).Coord(X,Y,Z);
+      aSeqPnts (i).Coord (X,Y,Z);
       Vertical->AddVertex (X,Y,Z);
     }
 
@@ -327,8 +347,9 @@ void V3d_RectangularGrid::DefinePoints ()
     myGroup->AddPrimitiveArray (Vertical, Standard_False);
   }
 
-  myGroup->SetMinMaxValues(-myXSize, -myYSize, -myOffSet, myXSize, myYSize, -myOffSet);
-  myCurXStep = aXStep, myCurYStep = aYStep;
+  myGroup->SetMinMaxValues (-myXSize, -myYSize, -myOffSet, myXSize, myYSize, -myOffSet);
+  myCurXStep = aXStep;
+  myCurYStep = aYStep;
 
   // update bounding box
   myStructure->CalculateBoundBox();
@@ -344,24 +365,28 @@ void V3d_RectangularGrid::GraphicValues (Standard_Real& theXSize, Standard_Real&
 
 void V3d_RectangularGrid::SetGraphicValues (const Standard_Real theXSize, const Standard_Real theYSize, const Standard_Real theOffSet)
 {
-  if (! myCurAreDefined) {
+  if (! myCurAreDefined)
+  {
     myXSize = theXSize;
     myYSize = theYSize;
     myOffSet = theOffSet;
   }
-  if (myXSize != theXSize) {
+  if (myXSize != theXSize)
+  {
     myXSize = theXSize;
     myCurAreDefined = Standard_False;
   }
-  if (myYSize != theYSize) {
+  if (myYSize != theYSize)
+  {
     myYSize = theYSize;
     myCurAreDefined = Standard_False;
   }
-  if (myOffSet != theOffSet) {
+  if (myOffSet != theOffSet)
+  {
     myOffSet = theOffSet;
     myCurAreDefined = Standard_False;
   }
-  if( !myCurAreDefined ) UpdateDisplay();
+  if (!myCurAreDefined) { UpdateDisplay(); }
 }
 
 //=======================================================================

src/V3d/V3d_RectangularGrid.hxx

@@ -35,24 +35,26 @@ public:
   Standard_EXPORT V3d_RectangularGrid(const V3d_ViewerPointer& aViewer, const Quantity_Color& aColor, const Quantity_Color& aTenthColor);
 
   Standard_EXPORT virtual ~V3d_RectangularGrid();
-  
+
   Standard_EXPORT virtual void SetColors (const Quantity_Color& aColor, const Quantity_Color& aTenthColor) Standard_OVERRIDE;
-  
+
   Standard_EXPORT virtual void Display() Standard_OVERRIDE;
-  
+
+  Standard_EXPORT virtual void Update() Standard_OVERRIDE;
+
   Standard_EXPORT virtual void Erase() const Standard_OVERRIDE;
-  
+
   Standard_EXPORT virtual Standard_Boolean IsDisplayed() const Standard_OVERRIDE;
-  
+
   Standard_EXPORT void GraphicValues (Standard_Real& XSize, Standard_Real& YSize, Standard_Real& OffSet) const;
-  
+
   Standard_EXPORT void SetGraphicValues (const Standard_Real XSize, const Standard_Real YSize, const Standard_Real OffSet);
   
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
 protected:
-  
+
   Standard_EXPORT virtual void UpdateDisplay() Standard_OVERRIDE;
 
 private: