Changeset 2542 for GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp

Timestamp:

08/20/07 12:51:12 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp

@@ -106 +106 @@
                                         int nodesTested = 0;
 
-#if 1
-                                        // test a certain ratio of random candidates
-                                        HierarchyNodeContainer mynodes;
-                                        mHierarchyInterface->CollectLeaves(node, mynodes);
-
-                                        const int p = mRandomCandidates * RAND_MAX / (int)mynodes.size();
-
-                                        HierarchyNodeContainer::const_iterator nit, nit_end = mynodes.end();
-
-                                        for (nit = mynodes.begin(); nit != nit_end; ++ nit)
+                                        if(1)
                                         {
-                                                HierarchyNode *leaf = *nit;
-
-                                                if (rand() > p)
-                                                        continue;
+                                                // test a certain ratio of random candidates
+                                                HierarchyNodeContainer mynodes;
+                                                mHierarchyInterface->CollectLeaves(node, mynodes);
+
+                                                const int p = mRandomCandidates * RAND_MAX / (int)mynodes.size();
+
+                                                HierarchyNodeContainer::const_iterator nit, nit_end = mynodes.end();
+
+                                                for (nit = mynodes.begin(); nit != nit_end; ++ nit)
+                                                {
+                                                        HierarchyNode *leaf = *nit;
+
+                                                        if (rand() > p)
+                                                                continue;
+
+                                                        bool intersects = false;
+                                                        const bool frustumCulled = !mHierarchyInterface->CheckFrustumVisible(leaf, intersects);
+
+                                                        // don't test in these cases ...
+                                                        if (frustumCulled || intersects)
+                                                                continue;
+
+                                                        ++ nodesTested;
+
+                                                        mHierarchyInterface->SetNodeVisible(leaf, false);
+
+                                                        // update node's visited flag: this is important as we are not testing
+                                                        // all nodes in the hierarchy in this mode
+                                                        mHierarchyInterface->PullUpLastVisited(leaf, mHierarchyInterface->GetFrameId());
+                                                        // issue the query
+                                                        mHierarchyInterface->IssueNodeOcclusionQuery(node, mTestGeometryForVisibleLeaves);
+                                                }
+
+                                                //std::stringstream d; d << "rc: " << mRandomCandidates << " tested: " << nodesTested << " of " << (int)mynodes.size();
+                                                //CullingLogManager::GetSingleton()->LogMessage(d.str());
+                                        }
+                                        else
+                                        {
+                                                // always test one random candidate
+                                                HierarchyNode *leaf = mHierarchyInterface->GetRandomLeaf(node);
 
                                                 bool intersects = false;
                                                 const bool frustumCulled = !mHierarchyInterface->CheckFrustumVisible(leaf, intersects);
 
-                                                // don't test in these cases ...
-                                                if (frustumCulled || intersects)
+                                                if (frustumCulled || intersects) // don't test in these cases ...
                                                         continue;
-                
+
                                                 ++ nodesTested;
-                                                
+
                                                 mHierarchyInterface->SetNodeVisible(leaf, false);
 
@@ -137 +163 @@
                                                 mHierarchyInterface->PullUpLastVisited(leaf, mHierarchyInterface->GetFrameId());
                                                 // issue the query
-                                                mHierarchyInterface->IssueNodeOcclusionQuery(node, mTestGeometryForVisibleLeaves);
+                                                mHierarchyInterface->IssueNodeOcclusionQuery(leaf, mTestGeometryForVisibleLeaves);
                                         }
 
-                                        //std::stringstream d; d << "rc: " << mRandomCandidates << " tested: " << nodesTested << " of " << (int)mynodes.size();
-                                        //CullingLogManager::GetSingleton()->LogMessage(d.str());
-
-#else
-                                        // always test one random candidate
-                                        HierarchyNode *leaf = mHierarchyInterface->GetRandomLeaf(node);
-                                        
-                                        bool intersects = false;
-                                        const bool frustumCulled = !mHierarchyInterface->CheckFrustumVisible(leaf, intersects);
-
-                                        if (frustumCulled || intersects) // don't test in these cases ...
-                                                continue;
-
-                                        ++ nodesTested;
-
-                                        mHierarchyInterface->SetNodeVisible(leaf, false);
-
-                                        // update node's visited flag: this is important as we are not testing
-                                        // all nodes in the hierarchy in this mode
-                                        mHierarchyInterface->PullUpLastVisited(leaf, mHierarchyInterface->GetFrameId());
-                                        // issue the query
-                                        mHierarchyInterface->IssueNodeOcclusionQuery(leaf, mTestGeometryForVisibleLeaves);
-
-#endif
-                                        
+                                        // render the whole subtree
                                         mHierarchyInterface->RenderNodeRecursive(node);