Changeset 2532 for GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Timestamp:

07/06/07 03:19:45 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Files:

• GtpVisibility.vcproj (modified) (1 diff)
• RandomUpdateCullingManager.cpp (modified) (5 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj

@@ -72 +72 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include""
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"

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

@@ -104 +104 @@
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
                                 {
+                                        int nodesTested = 0;
+
                                         // use different algorithm for finding random candidates
+#if 1
                                         HierarchyNodeContainer mynodes;
                                         mHierarchyInterface->CollectLeaves(node, mynodes);
@@ -112 +115 @@
                                         HierarchyNodeContainer::const_iterator nit, nit_end = mynodes.end();
 
-                                        int nodesTested = 0;
                                         for (nit = mynodes.begin(); nit != nit_end; ++ nit)
                                         {
@@ -120 +122 @@
                                                         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);
 
@@ -130 +139 @@
                                                 mHierarchyInterface->IssueNodeOcclusionQuery(node, mTestGeometryForVisibleLeaves);
                                         }
-                
+
                                         //std::stringstream d; d << "rc: " << mRandomCandidates << " tested: " << nodesTested << " of " << (int)mynodes.size();
                                         //CullingLogManager::GetSingleton()->LogMessage(d.str());
 
+#else
+                                        
+                                        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
+                                        
                                         mHierarchyInterface->RenderNodeRecursive(node);
+
+                                        // bail out here, recursion has finished
                                         continue;
                                 }
@@ -171 +204 @@
                                         const bool testGeometry = wasVisible && mHierarchyInterface->IsLeaf(node) && mTestGeometryForVisibleLeaves;
 
-                                        // previously invisible node
-#if TODO        
-                                        if (!mHierarchyInterface->IsNodeVisible(node))
-                                        {
-                                                // batch queries so we can test invisible nodes
-                                        }
-#endif
                                         queryQueue.push(QueryPair(node, mHierarchyInterface->
                                                 IssueNodeOcclusionQuery(node, testGeometry)));