Changeset 148

Timestamp:

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

Author:

mattausch

Message:

fixed

assumed visibility

Location:

trunk/VUT

Files:

• GtpVisibility/src/CoherentHierarchicalCullingManager.cpp (modified) (2 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.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

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -223 +223 @@
         else
         {       
-                // if not the shadow pass we interleave identification 
+                // for hierarchical culling, we interleave identification 
                 // and rendering of objects in _renderVisibibleObjects
+
+                // only for the shadow pass we use standard rendering
                 if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
                         mIlluminationStage == IRS_RENDER_TO_TEXTURE)
@@ -242 +244 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-        // visualization: apply standard rendering
-        if (mShowVisualization)
+        // visualization or shadow pass: apply standard rendering
+        if (mShowVisualization || (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
+                mIlluminationStage == IRS_RENDER_TO_TEXTURE))
         {       
                 IlluminationRenderStage savedStage = mIlluminationStage; 
         
-                // disable illumination stage so we have no shadow rendering
-                mIlluminationStage = IRS_NONE;
-        
+                if (mShowVisualization) 
+                        // disable illumination stage so we have no shadows in visualization
+                        mIlluminationStage = IRS_NONE;
+
+                // standard rendering for shadow maps because of performance
                 TerrainSceneManager::_renderVisibleObjects();
 
                 mIlluminationStage = savedStage;
         }
-        // normal rendering for shadow maps because of performance
-        else if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
-                         mIlluminationStage == IRS_RENDER_TO_TEXTURE)
-        {
-                TerrainSceneManager::_renderVisibleObjects();
-        }
-        else
+        else // the hierarchical culling algorithm
         {
                 //-- hierarchical culling