Changeset 147 for trunk/VUT/GtpVisibility

Timestamp:

06/22/05 18:35:55 (20 years ago)

Author:

mattausch

Message:

fixed average fps + shadow maps

Location:

trunk/VUT/GtpVisibility

Files:

• include/CoherentHierarchicalCullingManager.h (modified) (2 diffs)
• src/CoherentHierarchicalCullingManager.cpp (modified) (5 diffs)
• src/FrustumCullingManager.cpp (modified) (1 diff)
• src/VisibilityManager.cpp (modified) (1 diff)

trunk/VUT/GtpVisibility/include/CoherentHierarchicalCullingManager.h

@@ -25 +25 @@
 
 protected:
-        /** Decides wether occlusion query should be issued depending on some 
+        /** Decides if node is considered to be visible depeding on the 
                 assumed visibility factor.
-                @returns if occlusion query should be issued
+                @returns if node is considered to be visible
         */
-        bool DecideQueryTest(HierarchyNode *node) const;
+        bool DecideVisible(HierarchyNode *node) const;
 
         unsigned int mAssumedVisibility;
@@ -35 +35 @@
                 mAssumedVisibility.
         */
-        unsigned int mThreshold;
+        int mThreshold;
 };
 

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -1 +1 @@
 #include "CoherentHierarchicalCullingManager.h"
-//#include <OgreLogManager.h>
+#include <OgreLogManager.h>
 
 namespace GtpVisibility {
@@ -55 +55 @@
                         if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                         {
-                                mNumFrustumCulledNodes ++;
+                                ++ mNumFrustumCulledNodes;
                                 
-                                if(mVisualizeCulledNodes)
+                                if (mVisualizeCulledNodes)
                                 {
                                         mHierarchyInterface->VisualizeCulledNode(node, FRUSTUM_CULLED);
@@ -79 +79 @@
                                 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
                                 // geometry not only in leaves => test for renderable geometry
                                 bool issueQuery = !wasVisible || 
-                                        (mHierarchyInterface->HasGeometry(node) && 
-                                        (!mAssumedVisibility || DecideQueryTest(node)));
-                                
-                                // reset node's visibility classification 
-                                mHierarchyInterface->SetNodeVisible(node, false);
+                                        (mHierarchyInterface->HasGeometry(node) && !assumeVisible);
+                                                                
+                                // reset node's visibility classification
+                                mHierarchyInterface->SetNodeVisible(node, !issueQuery && assumeVisible);
 
                                 // update node's visited flag
@@ -95 +96 @@
                                 if (issueQuery)
                                 {
-                                        mNumQueriesIssued ++;
+                                        ++ mNumQueriesIssued;
                                         
                                         queryQueue.push(QueryPair(node, mHierarchyInterface->
                                                 IssueOcclusionQuery(node, wasVisible)));
                                 }
-                                        
+                                
                                 // always traverse a node if it was visible
                                 if (wasVisible)
@@ -117 +118 @@
         mThreshold = 0;
 
-        if (mAssumedVisibility)
+        if (mAssumedVisibility > 0)
         {
-                mThreshold =  RAND_MAX / mAssumedVisibility;
+                mThreshold =  RAND_MAX - RAND_MAX / mAssumedVisibility;
         }
+        //std::stringstream d; d << "*** setting assumed vis: " << mAssumedVisibility; Ogre::LogManager::getSingleton().logMessage(d.str());
 }
 //-----------------------------------------------------------------------
-bool CoherentHierarchicalCullingManager::DecideQueryTest(HierarchyNode *node) const
+bool CoherentHierarchicalCullingManager::DecideVisible(HierarchyNode *node) const
 {
+        /*bool result = rand() < mThreshold;
+        std::stringstream d; d << "Assumed vis: " << mAssumedVisibility << ", result: " << result;
+        Ogre::LogManager::getSingleton().logMessage(d.str()); return result;*/
+        
         return rand() < mThreshold;
 }

trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

@@ -17 +17 @@
 
                 if (!mHierarchyInterface->CheckFrustumVisible(node))
-                {//if (mHierarchyInterface->mIsShadowPass)
-                        mNumFrustumCulledNodes ++;
+                {
+                        ++ mNumFrustumCulledNodes;
 
                         if (mVisualizeCulledNodes)

trunk/VUT/GtpVisibility/src/VisibilityManager.cpp

@@ -13 +13 @@
 mQueryManager(new DummyQueryManager(NULL)),
 mPreprocessingManager(new DummyPreprocessingManager(NULL)),
-mVisibilityEnvironment(visEnvironment)
+mVisibilityEnvironment(visEnvironment),
+mAssumedVisibility(0)
 {
         SetCullingManager(VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING);