Changeset 2561

Timestamp:

12/10/07 12:18:49 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk

Files:

• App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp (modified) (1 diff)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgrePlatformHierarchyInterface.cpp (modified) (2 diffs)
• Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp (modified) (4 diffs)
• Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingPlusPlusManager.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -246 +246 @@
 
         /////
-        // test geometry boundaries instead bounding box
+        //-- test geometry boundaries instead bounding box
         mSceneMgr->getOption("TestGeometryBounds", &mTestGeometryBounds);
         setTestGeometryBounds(mTestGeometryBounds);

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgrePlatformHierarchyInterface.cpp

@@ -308 +308 @@
         // get next available test id
         GtpVisibility::OcclusionQuery *query = GetNextOcclusionQuery();
+        GtpVisibility::HierarchyNodeContainer::const_iterator nit, nit_end = nodes.end();
 
         //-- the actual query test
         query->BeginQuery();    
-
-        GtpVisibility::HierarchyNodeContainer::const_iterator nit, nit_end = nodes.end();
-
         mIsBoundingBoxQuery = true;
 
@@ -324 +322 @@
         
         mIsBoundingBoxQuery = false;
-
         query->EndQuery();
 

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

@@ -53 +53 @@
                         mQueryQueue.pop();
 
-                        // "invalid nodes" happen for hierarchies that have geometry
-                        // not neccessarily in the leaves:
                         // parent was tested invisible => remove children from queue
-
-                        if (1 && NodeInvalid(node))
-                                continue;
+                        // "invalid nodes" happen for hierarchies where interiors store geometry
+                        if (NodeInvalid(node)) continue;
 
                         // tested visible
@@ -66 +63 @@
                                 AssignAssumedVisibility(node);
 
-                                // for previously visible interior node which contains geometry: 
-                                // ensure that we did not already traverse this node 
-                                // (which means that the visibility flag is set)
+                                // traverse node if not already traversed in this frame 
+                                // (i.e., the visible flag is not set)
+                                // note: it is necessary to do this test because we query
+                                // previously visible interior node containing geometry 
+                                // without waiting for the result
                                 if (!mHierarchyInterface->IsNodeVisible(node))
                                         mHierarchyInterface->TraverseNode(node);
@@ -97 +96 @@
                                 
                         // parent was tested invisible => remove children from queue
-                        if (1 && NodeInvalid(node))
-                                continue;
+                        if (NodeInvalid(node)) continue;
 
                         bool intersects = false;
@@ -196 +194 @@
                     !mHierarchyInterface->IsNodeVisible(mHierarchyInterface->GetParent(node))
            );
-
-        
-        if (nodeInvalid)
-        {
-                CullingLogManager::GetSingleton()->LogMessage("node invalid");
-        }
-
         return nodeInvalid;
 }

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

@@ -63 +63 @@
                         HierarchyNode *node = mQueryQueue.front().first;
 
-                        // "invalid nodes" happen for hierarchies that store geometry in the interiors
                         // parent was tested invisible => remove children from queue
+                        // "invalid nodes" happen for hierarchies where interiors store geometry
                         if (NodeInvalid(node)) {mQueryQueue.pop(); continue;}
 
                         // during the wait time we issue nodes from visible queue
-                        while (1 && !mVisibleNodes.empty() && !resultAvailable)
+                        while (!mVisibleNodes.empty() && !resultAvailable)
                         {
                                 HierarchyNode *vn = mVisibleNodes.front();
@@ -90 +90 @@
                                 AssignAssumedVisibility(node);
 
-                                // for previously visible interior node which contains geometry: 
-                                // ensure that we did not already traverse this node 
-                                // (which means that the visibility flag is set)
+                                // traverse node if not already traversed in this frame 
+                                // (i.e., the visible flag is not set)
+                                // note: it is necessary to do this test because we query
+                                // previously visible interior node containing geometry without
+                                // waiting for the result
                                 if (!mHierarchyInterface->IsNodeVisible(node))
                                         mHierarchyInterface->TraverseNode2(node);
@@ -299 +301 @@
          );
 
-        /*if (nodeInvalid)
-                CullingLogManager::GetSingleton()->LogMessage("node invalid");
-        */
-
         return nodeInvalid;
 }