Changeset 148 for trunk/VUT/GtpVisibility/src

Timestamp:

06/23/05 00:56:37 (19 years ago)

Author:

mattausch

Message:

fixed

assumed visibility

File:

• trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -64 +64 @@
                         else
                         {
-                                // if intersects near plane => skip occlusion query because wrong results possible
-                                if (intersects)
+                                // identify previously visible nodes
+                                bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
+                                        (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
+
+                                // if node is assumed to be visible in this frame => skip query
+                                // if intersects near plane => also skip query because wrong results possible
+                                bool assumeVisible = intersects ||
+                                        (wasVisible && (mAssumedVisibility > 0) && 
+                                         mHierarchyInterface->HasGeometry(node) && DecideVisible(node));        
+
+                                if (assumeVisible)
                                 {
-                                        // update octant's visited flag
+                                        // update node's visited flag
                                         mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
 
@@ -76 +85 @@
                                 }
 
-                                // identify previously visible nodes
-                                bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
-                                        (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
-                                // if visibility is assumed to be true in this frame
-                                bool assumeVisible = wasVisible && (mAssumedVisibility > 0) && DecideVisible(node);
-
-                                // identify nodes that we cannot skip queries for
+                // identify nodes that we cannot skip queries for
                                 // geometry not only in leaves => test for renderable geometry
-                                bool issueQuery = !wasVisible || 
-                                        (mHierarchyInterface->HasGeometry(node) && !assumeVisible);
+                                bool issueQuery = !wasVisible || mHierarchyInterface->HasGeometry(node);
                                                                 
                                 // reset node's visibility classification
-                                mHierarchyInterface->SetNodeVisible(node, !issueQuery && assumeVisible);
+                                mHierarchyInterface->SetNodeVisible(node, false);
 
                                 // update node's visited flag