0029331: Visualization, TKOpenGl - make OpenGl_PrimitiveArray::IsFillDrawMode() as...

diff --git a/src/OpenGl/OpenGl_CappingAlgo.cxx b/src/OpenGl/OpenGl_CappingAlgo.cxx
index 61206dd8b12e4c82c70b1b541c3375489637af36..a729da3620143c459fddd017ed4c936c7e35bf4e 100755 (executable)
--- a/src/OpenGl/OpenGl_CappingAlgo.cxx
+++ b/src/OpenGl/OpenGl_CappingAlgo.cxx
@@ -228,7 +228,5 @@ Standard_Boolean OpenGl_CappingAlgoFilter::ShouldRender (const Handle(OpenGl_Wor
     return Standard_False;
   }
 
-  const OpenGl_PrimitiveArray* aPArray = dynamic_cast<const OpenGl_PrimitiveArray*> (theGlElement);
-  return aPArray != NULL
-      && aPArray->IsFillDrawMode();
+  return theGlElement->IsFillDrawMode();
 }

diff --git a/src/OpenGl/OpenGl_Element.hxx b/src/OpenGl/OpenGl_Element.hxx
index 74890eeb943aa30faa58d07770d0b8c397f5d966..1df5afec6906f5111f48540dad34bbda6462d324 100644 (file)
--- a/src/OpenGl/OpenGl_Element.hxx
+++ b/src/OpenGl/OpenGl_Element.hxx
@@ -54,6 +54,11 @@ public:
     theElement = NULL;
   }
 
+public:
+
+  //! Return TRUE if primitive type generates shaded triangulation (to be used in filters).
+  virtual Standard_Boolean IsFillDrawMode() const { return false; }
+
 public:
 
   //! Render element if it passes the filtering procedure. This method should

diff --git a/src/OpenGl/OpenGl_LayerList.cxx b/src/OpenGl/OpenGl_LayerList.cxx
index aa361ac2e0ce27bd67d8e77a4440adabdb5ca595..e2b733b046564e5ea627a00521a3759574ef611a 100644 (file)
--- a/src/OpenGl/OpenGl_LayerList.cxx
+++ b/src/OpenGl/OpenGl_LayerList.cxx
@@ -805,9 +805,7 @@ Standard_Boolean OpenGl_LayerList::OpenGl_OpaqueFilter::ShouldRender (const Hand
     return Standard_False;
   }
 
-  const OpenGl_PrimitiveArray* aPArray = dynamic_cast<const OpenGl_PrimitiveArray*> (theGlElement);
-  if (aPArray == NULL
-  || !aPArray->IsFillDrawMode())
+  if (!theGlElement->IsFillDrawMode())
   {
     return Standard_True;
   }
@@ -836,9 +834,7 @@ Standard_Boolean OpenGl_LayerList::OpenGl_TransparentFilter::ShouldRender (const
     return Standard_False;
   }
 
-  const OpenGl_PrimitiveArray* aPArray = dynamic_cast<const OpenGl_PrimitiveArray*> (theGlElement);
-  if (aPArray == NULL
-  || !aPArray->IsFillDrawMode())
+  if (!theGlElement->IsFillDrawMode())
   {
     return dynamic_cast<const OpenGl_AspectFace*> (theGlElement) != NULL;
   }

diff --git a/src/OpenGl/OpenGl_PrimitiveArray.hxx b/src/OpenGl/OpenGl_PrimitiveArray.hxx
index 5f1fa934c9fbfa6f7e0a179175bfad22251200de..ddeff49591734eceb10061f2a502a1e5a82bca43 100644 (file)
--- a/src/OpenGl/OpenGl_PrimitiveArray.hxx
+++ b/src/OpenGl/OpenGl_PrimitiveArray.hxx
@@ -53,10 +53,10 @@ public:
   Standard_EXPORT virtual ~OpenGl_PrimitiveArray();
 
   //! Render primitives to the window
-  Standard_EXPORT virtual void Render  (const Handle(OpenGl_Workspace)& theWorkspace) const;
+  Standard_EXPORT virtual void Render  (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE;
 
   //! Release OpenGL resources (VBOs)
-  Standard_EXPORT virtual void Release (OpenGl_Context* theContext);
+  Standard_EXPORT virtual void Release (OpenGl_Context* theContext) Standard_OVERRIDE;
 
   //! Return true if VBOs initialization has been performed.
   //! VBO initialization is performed during first Render() call.
@@ -70,7 +70,7 @@ public:
   GLint DrawMode() const { return myDrawMode; }
 
   //! Return TRUE if primitive type generates shaded triangulation.
-  Standard_Boolean IsFillDrawMode() const { return myIsFillType; }
+  virtual Standard_Boolean IsFillDrawMode() const Standard_OVERRIDE { return myIsFillType; }
 
   //! @return indices array
   const Handle(Graphic3d_IndexBuffer)& Indices() const { return myIndices; }