Changeset 87 for trunk/VUT/GtpVisibility

Timestamp:

05/09/05 01:24:02 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibility

Files:

• include/CullingManager.h (modified) (1 diff)
• include/DistanceQueue.h (modified) (1 diff)
• include/HierarchyInterface.h (modified) (1 diff)
• include/OcclusionQuery.h (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (5 diffs)
• src/CullingManager.cpp (modified) (2 diffs)
• src/FrustumCullingManager.cpp (modified) (1 diff)
• src/StopAndWaitCullingManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/include/CullingManager.h

@@ -38 +38 @@
         */
         unsigned int GetNumQueryCulledNodes();
+        /** Returns number of issued occlusion queries.
+        */
+        unsigned int GetNumQueriesIssued();
+        /** basic initializations on beginning of each frame, e.g., 
+                resets statistics.
+        */
+        void InitFrame();
 
 protected:
-
+        
         unsigned int mNumQueryCulledNodes;
         unsigned int mNumFrustumCulledNodes;
         unsigned int mVisibilityThreshold;
+        unsigned int mNumQueriesIssued;
 
         HierarchyInterface *mHierarchyInterface;

trunk/VUT/GtpVisibility/include/DistanceQueue.h

@@ -25 +25 @@
         bool operator() (T v1, T v2) const
         {
-                return mHierarchyInterface->HasGreaterDistance(v1, v2);
+                return mHierarchyInterface->GetSquaredDistance(v1) > mHierarchyInterface->GetSquaredDistance(v2);
         }
                 

trunk/VUT/GtpVisibility/include/HierarchyInterface.h

@@ -59 +59 @@
         */
         DistanceQueue *GetQueue();
-        /** Returns true if node 1 has greater distance to the view
-                plane than node 2.
-                @param node1 the first node to be compared
-                @param node2 the second node to be compared
+        /** Returns distance of the node to the view plane.
+                @param node1 the hierarchy node
         */                      
-        virtual bool HasGreaterDistance(HierarchyNode *node1, HierarchyNode *node2) const = 0;
+        virtual float GetSquaredDistance(HierarchyNode *node) const = 0;
         /** Checks if the node is visible from the current view frustum.
                 @param node the current node

trunk/VUT/GtpVisibility/include/OcclusionQuery.h

@@ -20 +20 @@
                 @remark the query counts the number of visible pixels between it's begin and end
         */
-        virtual void BeginQuery() const = 0;
+        virtual void BeginQuery() = 0;
         /** Ends occlusion query.
         */
-        virtual void EndQuery() const = 0;
+        virtual void EndQuery() = 0;
 };
 

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -7 +7 @@
 void CoherentHierarchicalCullingManager::RenderScene()
 {
-        mNumFrustumCulledNodes = mNumQueryCulledNodes = 0;
-//      OutputDebugString("Coherent Culling\n");
+        InitFrame();
 
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;
         bool isAvailable = false;
-
+        
         //-- PART 1: process finished occlusion queries
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
@@ -21 +20 @@
                                                                         mHierarchyInterface->GetQueue()->empty()))
                 {
+            //if (mHierarchyInterface->GetQueue()->empty())OutputDebugString("empty\n");
+                                                                
                         HierarchyNode *node = queryQueue.front().first;
                                                 
@@ -35 +36 @@
                         }
                 }
-
+                
                 //-- PART 2: hierarchical traversal
                 if (!mHierarchyInterface->GetQueue()->empty())
@@ -67 +68 @@
                                 
                                 // identify nodes that we cannot skip queries for
-                                bool mustQuery = !wasVisible || mHierarchyInterface->HasGeometry(node) || 
-                                        mHierarchyInterface->IsLeaf(node);
+                                // geometry not only in leaves => test for renderable geometry
+                                bool issueQuery = !wasVisible || mHierarchyInterface->HasGeometry(node);
+                                        //mHierarchyInterface->IsLeaf(node);
 
                                 // reset node's visibility classification 
@@ -76 +78 @@
                                 mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
                         
-                                // skip testing previously visible interior nodes
-                                if (mustQuery)
+                                // skip testing previously visible nodes without geometry
+                                if (issueQuery)
                                 {
-                                        queryQueue.push(QueryPair(node, 
-                                                mHierarchyInterface->IssueOcclusionQuery(node, wasVisible)));
+                                        mNumQueriesIssued ++;
+
+                                        queryQueue.push(QueryPair(node, mHierarchyInterface->
+                                                IssueOcclusionQuery(node, wasVisible)));
                                 }
                                         

trunk/VUT/GtpVisibility/src/CullingManager.cpp

@@ -6 +6 @@
 CullingManager::CullingManager():
 mHierarchyInterface(NULL), mVisibilityThreshold(0), mNumQueryCulledNodes(0), 
-mNumFrustumCulledNodes(0)
+mNumFrustumCulledNodes(0), mNumQueriesIssued(0)
 {
 }
@@ -29 +29 @@
         return mNumQueryCulledNodes;
 }
+//-----------------------------------------------------------------------
+unsigned int CullingManager::GetNumQueriesIssued()
+{
+        return mNumQueriesIssued;
+}
+//-----------------------------------------------------------------------
+void CullingManager::InitFrame()
+{
+        mNumFrustumCulledNodes = mNumQueryCulledNodes = mNumQueriesIssued = 0;
+}
 } // namespace GtpVisibility

trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

@@ -7 +7 @@
 void FrustumCullingManager::RenderScene()
 {
-        mNumFrustumCulledNodes = mNumQueryCulledNodes = 0;
-        //OutputDebugString("Frustum Culling\n");
+        InitFrame();
 
         while (!mHierarchyInterface->GetQueue()->empty())

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -7 +7 @@
 void StopAndWaitCullingManager::RenderScene()
 {
-        mNumFrustumCulledNodes = mNumQueryCulledNodes = 0;
-        //OutputDebugString("Stop and Wait Culling\n");
-
+        InitFrame();
+                        
         while (!mHierarchyInterface->GetQueue()->empty())
         {
                 HierarchyNode *node = mHierarchyInterface->GetQueue()->top();
                 mHierarchyInterface->GetQueue()->pop();
-                
+                        
                 // interesting for visualization purpose
                 mHierarchyInterface->SetNodeVisible(node, false);
@@ -35 +34 @@
                         }
 
+                        mNumQueriesIssued ++;
+
                         unsigned int visiblePixels = 0;