0029365: Visualization, TKOpenGl - do not include hidden structures to Rendered withi...

OpenGl_Layer::UpdateCulling() now considers structure as culled in case if it has Hidden state.

diff --git a/src/OpenGl/OpenGl_FrameStats.cxx b/src/OpenGl/OpenGl_FrameStats.cxx
index 17b040d9dcc228077d72dbf8613de01f5f67cf60..c321dabf9a2c7dff4938c028d58e2c465f988fb3 100644 (file)
--- a/src/OpenGl/OpenGl_FrameStats.cxx
+++ b/src/OpenGl/OpenGl_FrameStats.cxx
@@ -304,11 +304,14 @@ void OpenGl_FrameStats::FrameEnd (const Handle(OpenGl_Workspace)& theWorkspace)
                                        || (aBits & Graphic3d_RenderingParams::PerfCounters_Points)    != 0;
   const Standard_Boolean toCountElems   = (aBits & Graphic3d_RenderingParams::PerfCounters_GroupArrays) != 0 || toCountTris || toCountMem;
   const Standard_Boolean toCountGroups  = (aBits & Graphic3d_RenderingParams::PerfCounters_Groups)      != 0 || toCountElems;
-  const Standard_Boolean toCountStructs = (aBits & Graphic3d_RenderingParams::PerfCounters_Structures)  != 0 || toCountGroups;
-  
-  if (toCountStructs)
+  const Standard_Boolean toCountStructs = (aBits & Graphic3d_RenderingParams::PerfCounters_Structures)  != 0
+                                       || (aBits & Graphic3d_RenderingParams::PerfCounters_Layers)      != 0 || toCountGroups;
+
+  myCountersTmp[Counter_NbLayers] = theWorkspace->View()->LayerList().Layers().Size();
+  if (toCountStructs
+   || (aBits & Graphic3d_RenderingParams::PerfCounters_Layers)    != 0)
   {
-    myCountersTmp[Counter_NbLayers] = theWorkspace->View()->LayerList().Layers().Size();
+    const Standard_Integer aViewId = theWorkspace->View()->Identification();
     for (OpenGl_SequenceOfLayers::Iterator aLayerIter (theWorkspace->View()->LayerList().Layers()); aLayerIter.More(); aLayerIter.Next())
     {
       const Handle(OpenGl_Layer)& aLayer = aLayerIter.Value();
@@ -320,9 +323,9 @@ void OpenGl_FrameStats::FrameEnd (const Handle(OpenGl_Workspace)& theWorkspace)
       myCountersTmp[Counter_NbStructsNotCulled] += aLayer->NbStructuresNotCulled();
       if (toCountGroups)
       {
-        updateStructures (aLayer->CullableStructuresBVH().Structures(), toCountStructs, toCountTris, toCountMem);
-        updateStructures (aLayer->CullableTrsfPersStructuresBVH().Structures(), toCountStructs, toCountTris, toCountMem);
-        updateStructures (aLayer->NonCullableStructures(), toCountStructs, toCountTris, toCountMem);
+        updateStructures (aViewId, aLayer->CullableStructuresBVH().Structures(), toCountElems, toCountTris, toCountMem);
+        updateStructures (aViewId, aLayer->CullableTrsfPersStructuresBVH().Structures(), toCountElems, toCountTris, toCountMem);
+        updateStructures (aViewId, aLayer->NonCullableStructures(), toCountElems, toCountTris, toCountMem);
       }
     }
   }
@@ -387,7 +390,8 @@ void OpenGl_FrameStats::FrameEnd (const Handle(OpenGl_Workspace)& theWorkspace)
 // function : updateStructures
 // purpose  :
 // =======================================================================
-void OpenGl_FrameStats::updateStructures (const OpenGl_IndexedMapOfStructure& theStructures,
+void OpenGl_FrameStats::updateStructures (Standard_Integer theViewId,
+                                          const OpenGl_IndexedMapOfStructure& theStructures,
                                           Standard_Boolean theToCountElems,
                                           Standard_Boolean theToCountTris,
                                           Standard_Boolean theToCountMem)
@@ -395,7 +399,8 @@ void OpenGl_FrameStats::updateStructures (const OpenGl_IndexedMapOfStructure& th
   for (OpenGl_IndexedMapOfStructure::Iterator aStructIter (theStructures); aStructIter.More(); aStructIter.Next())
   {
     const OpenGl_Structure* aStruct = aStructIter.Value();
-    if (aStruct->IsCulled())
+    if (aStruct->IsCulled()
+    || !aStruct->IsVisible (theViewId))
     {
       if (theToCountMem)
       {

diff --git a/src/OpenGl/OpenGl_FrameStats.hxx b/src/OpenGl/OpenGl_FrameStats.hxx
index 0ed9361aee35dfdb3118a1cd6409ca71a7eca92e..adcbb019862517d6c5968ca072d9d1ad60c9d39b 100644 (file)
--- a/src/OpenGl/OpenGl_FrameStats.hxx
+++ b/src/OpenGl/OpenGl_FrameStats.hxx
@@ -136,7 +136,8 @@ public:
 protected:
 
   //! Updates counters for structures.
-  Standard_EXPORT virtual void updateStructures (const OpenGl_IndexedMapOfStructure& theStructures,
+  Standard_EXPORT virtual void updateStructures (Standard_Integer theViewId,
+                                                 const OpenGl_IndexedMapOfStructure& theStructures,
                                                  Standard_Boolean theToCountElems,
                                                  Standard_Boolean theToCountTris,
                                                  Standard_Boolean theToCountMem);

diff --git a/src/OpenGl/OpenGl_Layer.cxx b/src/OpenGl/OpenGl_Layer.cxx
index 2879617c1024275376e1ba459e2f87d618cc2b42..a564d9b8e11c62b1409d8c88f0550a0c10b4ba60 100644 (file)
--- a/src/OpenGl/OpenGl_Layer.cxx
+++ b/src/OpenGl/OpenGl_Layer.cxx
@@ -483,7 +483,8 @@ void OpenGl_Layer::updateBVH() const
 // function : UpdateCulling
 // purpose  :
 // =======================================================================
-void OpenGl_Layer::UpdateCulling (const OpenGl_BVHTreeSelector& theSelector,
+void OpenGl_Layer::UpdateCulling (const Standard_Integer theViewId,
+                                  const OpenGl_BVHTreeSelector& theSelector,
                                   const Standard_Boolean theToTraverse)
 {
   updateBVH();
@@ -583,8 +584,11 @@ void OpenGl_Layer::UpdateCulling (const OpenGl_BVHTreeSelector& theSelector,
         const OpenGl_Structure* aStruct = isTrsfPers
                                         ? myBVHPrimitivesTrsfPers.GetStructureById (aIdx)
                                         : myBVHPrimitives.GetStructureById (aIdx);
-        aStruct->MarkAsNotCulled();
-        ++myNbStructuresNotCulled;
+        if (aStruct->IsVisible (theViewId))
+        {
+          aStruct->MarkAsNotCulled();
+          ++myNbStructuresNotCulled;
+        }
         if (aHead < 0)
         {
           break;

diff --git a/src/OpenGl/OpenGl_Layer.hxx b/src/OpenGl/OpenGl_Layer.hxx
index 636ec6fbb673e41da7417e7da4c9f1cc7abd33b1..613e46d776802150f9a0bce048d6269b64faeb7f 100644 (file)
--- a/src/OpenGl/OpenGl_Layer.hxx
+++ b/src/OpenGl/OpenGl_Layer.hxx
@@ -124,7 +124,8 @@ public:
 
   //! Update culling state - should be called before rendering.
   //! Traverses through BVH tree to determine which structures are in view volume.
-  void UpdateCulling (const OpenGl_BVHTreeSelector& theSelector,
+  void UpdateCulling (const Standard_Integer theViewId,
+                      const OpenGl_BVHTreeSelector& theSelector,
                       const Standard_Boolean theToTraverse);
 
   //! Returns TRUE if layer is empty or has been discarded entirely by culling test.

diff --git a/src/OpenGl/OpenGl_LayerList.cxx b/src/OpenGl/OpenGl_LayerList.cxx
index 4bcd58ac1404cff925fb3a559c08e7079ca2cd4e..6a0856d6b9ac559042ce63eb1efc9281f834adfb 100644 (file)
--- a/src/OpenGl/OpenGl_LayerList.cxx
+++ b/src/OpenGl/OpenGl_LayerList.cxx
@@ -516,6 +516,7 @@ void OpenGl_LayerList::SetLayerSettings (const Graphic3d_ZLayerId        theLaye
 void OpenGl_LayerList::UpdateCulling (const Handle(OpenGl_Workspace)& theWorkspace,
                                       const Standard_Boolean theToDrawImmediate)
 {
+  const Standard_Integer aViewId = theWorkspace->View()->Identification();
   const OpenGl_BVHTreeSelector& aSelector = theWorkspace->View()->BVHTreeSelector();
   for (OpenGl_IndexedLayerIterator anIts (myLayers); anIts.More(); anIts.Next())
   {
@@ -525,7 +526,7 @@ void OpenGl_LayerList::UpdateCulling (const Handle(OpenGl_Workspace)& theWorkspa
       continue;
     }
 
-    aLayer.UpdateCulling (aSelector, theWorkspace->IsCullingEnabled());
+    aLayer.UpdateCulling (aViewId, aSelector, theWorkspace->IsCullingEnabled());
   }
 }