Changeset 348

Timestamp:

10/25/05 00:01:57 (19 years ago)

Author:

mattausch

Message:

fixed bug in chc when geometry is not in leaves

Location:

trunk/VUT

Files:

• GtpVisibility/src/CoherentHierarchicalCullingManager.cpp (modified) (3 diffs)
• work/iv/TestCullingIVApplication.cpp (modified) (1 diff)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -40 +40 @@
                         if (visiblePixels > mVisibilityThreshold)
                         {
+                                // ensure that we only traverse once if geometry in node
+                                if (!mHierarchyInterface->IsNodeVisible(node))
+                                        mHierarchyInterface->TraverseNode(node);
                                 mHierarchyInterface->PullUpVisibility(node);
-                                mHierarchyInterface->TraverseNode(node);
                         }
                         else
                         {       
+                                mHierarchyInterface->SetNodeVisible(node, false);
+
                                 ++ mNumQueryCulledNodes;
                                 
-                                if(mVisualizeCulledNodes)
+                                if (mVisualizeCulledNodes)
                                 {
                                         mHierarchyInterface->VisualizeCulledNode(node, QUERY_CULLED);
@@ -83 +87 @@
                                 
                                 // if we assume node to be visible in this frame => skip query 
-                                // TODO: check this (not the expected speed up)
-                                if (wasVisible && (mAssumedVisibility > 0) &&  DecideVisible(node) && mHierarchyInterface->HasGeometry(node))
+                                bool skipQuery = wasVisible && (mAssumedVisibility > 0) && 
+                                        DecideVisible(node) && mHierarchyInterface->HasGeometry(node);
+
+                                //if (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId())
+                                //      Ogre::LogManager::getSingleton().logMessage("error");
+                                
+                                if (skipQuery)
                                 {
                                         SkipQuery(node);
@@ -93 +102 @@
                 // identify nodes that we cannot skip queries for
                                 // geometry not only in leaves => test for renderable geometry
-                                // we also need to test if node was processed in current frame, otherwise
-                                // node is tested several times because of priority queue
-                                bool issueQuery = (mHierarchyInterface->LastVisited(node) != mHierarchyInterface->GetFrameId())
-                                                && (!wasVisible || mHierarchyInterface->HasGeometry(node));
+                                bool issueQuery = !wasVisible || mHierarchyInterface->HasGeometry(node);
                                                         
                                 // reset node's visibility classification
-                                mHierarchyInterface->SetNodeVisible(node, false);
+                                // set visibe if geometry in node so we only traverse once
+                                mHierarchyInterface->SetNodeVisible(node, wasVisible && issueQuery);
 
                                 // update node's visited flag

trunk/VUT/work/iv/TestCullingIVApplication.cpp

@@ -92 +92 @@
         mSceneMgr->setOption("NodeVizScale", &scale);
         // HACK: change this to relative path
-        String path = "D:/svn/trunk/VUT/Ogre/resources/";
+        String path = "E:/svn/gametools/trunk/VUT/Ogre/resources/";
                 
         SceneNode *node1 = mSceneMgr->getRootSceneNode()->createChildSceneNode("Node1");