Changeset 86 for trunk/VUT/GtpVisibility/src

Timestamp:

05/06/05 01:39:32 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibility/src

Files:

• CoherentHierarchicalCullingManager.cpp (modified) (4 diffs)
• FrustumCullingManager.cpp (modified) (1 diff)
• HierarchyInterface.cpp (modified) (2 diffs)
• StopAndWaitCullingManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -1 +1 @@
 #include "CoherentHierarchicalCullingManager.h"
-//#include <windows.h>
+#include <windows.h>
 
 namespace GtpVisibility {
@@ -8 +8 @@
 {
         mNumFrustumCulledNodes = mNumQueryCulledNodes = 0;
-        //OutputDebugString("Coherent Culling\n");
+//      OutputDebugString("Coherent Culling\n");
 
         QueryQueue queryQueue;
-        
+        unsigned int visiblePixels = 0;
+        bool isAvailable = false;
+
         //-- PART 1: process finished occlusion queries
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
                 while (!queryQueue.empty() && 
-                           (queryQueue.front().second->ResultAvailable() || mHierarchyInterface->GetQueue()->empty()))
+                           queryQueue.front().second->GetQueryResult(visiblePixels, 
+                                                                        mHierarchyInterface->GetQueue()->empty()))
                 {
                         HierarchyNode *node = queryQueue.front().first;
-                                        
-                        // wait until result available
-                        unsigned int visiblePixels = queryQueue.front().second->GetQueryResult();
-                        
+                                                
                         queryQueue.pop();
 
@@ -67 +67 @@
                                 
                                 // identify nodes that we cannot skip queries for
-                                bool mustQuery = !wasVisible || mHierarchyInterface->HasGeometry(node) || mHierarchyInterface->IsLeaf(node);
+                                bool mustQuery = !wasVisible || mHierarchyInterface->HasGeometry(node) || 
+                                        mHierarchyInterface->IsLeaf(node);
 
                                 // reset node's visibility classification 
@@ -78 +79 @@
                                 if (mustQuery)
                                 {
-                                        queryQueue.push(QueryPair(node, mHierarchyInterface->IssueOcclusionQuery(node)));
+                                        queryQueue.push(QueryPair(node, 
+                                                mHierarchyInterface->IssueOcclusionQuery(node, wasVisible)));
                                 }
                                         

trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

@@ -1 +1 @@
 #include "FrustumCullingManager.h"
-//#include <windows.h>
+#include <windows.h>
 
 namespace GtpVisibility {

trunk/VUT/GtpVisibility/src/HierarchyInterface.cpp

@@ -8 +8 @@
 HierarchyInterface::HierarchyInterface(): 
 mFrameId(0), mNumTraversedNodes(0), mNumRenderedNodes(0), 
-mSceneRoot(0), mPreviousNode(0), mCurrentTestIdx(0)
+mSceneRoot(0), mPreviousNode(0), mCurrentTestIdx(0), mUseOptimization(true)
 {       
         mDistanceQueue = new DistanceQueue(GreaterDistance<HierarchyNode *>(this));
@@ -64 +64 @@
         return mNumRenderedNodes;
 }
+
+void HierarchyInterface::SetUseOptimization(bool useOptimization)
+{
+        mUseOptimization = useOptimization;
+}
+
 } // namespace GtpVisibility

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -1 +1 @@
 #include "StopAndWaitCullingManager.h"
-//#include <windows.h>
+#include <windows.h>
 
 namespace GtpVisibility {
@@ -35 +35 @@
                         }
 
+                        unsigned int visiblePixels = 0;
+
+                        mHierarchyInterface->IssueOcclusionQuery(node)->GetQueryResult(visiblePixels, true);
+
                         // node visible
-                        if (mHierarchyInterface->IssueOcclusionQuery(node)->GetQueryResult() > 
-                                mVisibilityThreshold)
+                        if (visiblePixels > mVisibilityThreshold)
                         {
                                 mHierarchyInterface->TraverseNode(node);