Changeset 346 for trunk/VUT/GtpVisibility

Timestamp:

10/21/05 20:28:11 (19 years ago)

Author:

mattausch

Message:

updated terrain removed debug messages from chc

Location:

trunk/VUT/GtpVisibility/src

Files:

• CoherentHierarchicalCullingManager.cpp (modified) (8 diffs)
• StopAndWaitCullingManager.cpp (modified) (1 diff)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -25 +25 @@
         unsigned int visiblePixels = 0;
         bool isAvailable = false;
-        Ogre::LogManager::getSingleton().logMessage("Coherent Hierarchical Culling\n");
+        //Ogre::LogManager::getSingleton().logMessage("Coherent Hierarchical Culling");
 
         //-- PART 1: process finished occlusion queries
@@ -37 +37 @@
                         
                         queryQueue.pop();
-
-                        std::stringstream d2; d2 << "fetch node from query queue " << node;
-                        Ogre::LogManager::getSingleton().logMessage(d2.str());
 
                         if (visiblePixels > mVisibilityThreshold)
@@ -63 +60 @@
                         mHierarchyInterface->GetQueue()->pop();
                                 
-                        std::stringstream d2; d2 << "fetch node from hierarchy queue " << node;
-                        Ogre::LogManager::getSingleton().logMessage(d2.str());
-
                         bool intersects = false;
 
@@ -87 +81 @@
                                 bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
                                         (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
-                                if (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId())
-                                {
-                                std::stringstream d2; d2 << "!!!!lastVisited: " << mHierarchyInterface->LastVisited(node) << " " << node;
-                                Ogre::LogManager::getSingleton().logMessage(d2.str());
-                                std::stringstream d; d << "!!!!!frameid: " << mHierarchyInterface->GetFrameId() << " " << node << "\n";
-                                Ogre::LogManager::getSingleton().logMessage(d.str());
-                                }
+                                
                                 // if we assume node to be visible in this frame => skip query 
                                 // TODO: check this (not the expected speed up)
@@ -105 +93 @@
                 // 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));
@@ -113 +103 @@
                                 // update node's visited flag
                                 mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
-
-                                std::stringstream d2; d2 << "lastVisited: " << mHierarchyInterface->LastVisited(node) << " " << node;
-                                Ogre::LogManager::getSingleton().logMessage(d2.str());
 
                                 // skip testing previously visible nodes without geometry
@@ -129 +116 @@
                                 if (wasVisible)
                                 {
-                                                std::stringstream d2; d2 << "traversing node " << node;
-                                        Ogre::LogManager::getSingleton().logMessage(d2.str());
                                         mHierarchyInterface->TraverseNode(node);
                                 }
@@ -162 +147 @@
 {
         // -- set node to be visible in this frame, then traverse it
-        std::stringstream d2; d2 << "skipping node " << node;
-                                        Ogre::LogManager::getSingleton().logMessage(d2.str());
         mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
         
-        mHierarchyInterface->SetNodeVisible(node, true);
         mHierarchyInterface->PullUpVisibility(node);                    
         mHierarchyInterface->TraverseNode(node);

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -19 +19 @@
                 bool intersects = false;
         
-                //if (mHierarchyInterface->HasGeometry(node) && (!mHierarchyInterface->IsLeaf(node))) ++ mNumFrustumCulledNodes;
-                                //      Ogre::LogManager::getSingleton().logMessage("no geometry");
-                        //else if (!mHierarchyInterface->IsLeaf(node)) ++ mNumQueriesIssued;//  Ogre::LogManager::getSingleton().logMessage("has geometry");
-/*if (!mHierarchyInterface->HasGeometry(node))
-                                        Ogre::LogManager::getSingleton().logMessage("no geometry");
-                                else    Ogre::LogManager::getSingleton().logMessage("has geometry");*/
                 if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                 {