Changeset 2772 for GTP/trunk

Timestamp:

06/18/08 18:02:05 (17 years ago)

Author:

mattausch

Message:

added randomization of the first invokation

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Bvh.h (modified) (1 diff)
• CHCPlusPlusTraverser.cpp (modified) (6 diffs)
• CHCPlusPlusTraverser.h (modified) (1 diff)
• OcclusionQuery.h (modified) (3 diffs)
• RenderTraverser.cpp (modified) (1 diff)
• common.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h

@@ -345 +345 @@
         */
         virtual ~BvhInterior() { if (mBack) delete mBack; if (mFront) delete mFront;}
-        /** Returns split axis of this interior node.
-        */
-        //inline int GetAxis() { return (int)mAxis; }
-        /** Returns position of the split axis.
-        */
-        //inline float GetPosition() {return (float)mPosition;}
 
 
 protected:
 
-        /// the position of the split plane
-        //float mPosition;
-        
         BvhNode *mBack;
         BvhNode *mFront;

GTP/trunk/App/Demos/Vis/CHC_revisited/CHCPlusPlusTraverser.cpp

@@ -10 +10 @@
 CHCPlusPlusTraverser::CHCPlusPlusTraverser()
 {
+}
+
+
+void CHCPlusPlusTraverser::HandleQueryResult(OcclusionQuery *query)
+{
+        // wait until result available
+        int visiblePixels = query->GetQueryResult();
+
+        int visible = visiblePixels > mVisibilityThreshold;
+
+        BvhNode *node = query->GetFrontNode();
+
+        if (visible)
+        {
+                // node was previously invisible
+                if (!node->IsVisible())
+                        node->SetAssumedVisibleFrameId(mFrameId + mAssumedVisibleFrames);
+                else
+                        // randomize first invokation
+                        node->SetAssumedVisibleFrameId(mFrameId + Random(mAssumedVisibleFrames + 1));
+
+                mBvh->MakeParentsVisible(node);
+                TraverseNode(node);
+        }
+        else
+        {
+                ++ mStats.mNumQueryCulledNodes;
+        }
+
+        node->SetVisible(visible);
 }
 
@@ -35 +65 @@
                         mQueryQueue.pop();
 
-                        // wait until result available
-                        int visiblePixels = query->GetQueryResult();
-
-                        if (visiblePixels > mVisibilityThreshold)
-                        {
-                                BvhNode *node = query->GetFrontNode();
-
-                                node->SetVisible(true);
-                                mBvh->MakeParentsVisible(node);
-                                TraverseNode(node);
-                        }
-                        else
-                        {
-                                ++ mStats.mNumQueryCulledNodes;
-                        }
+                        HandleQueryResult(query);
                 }       
 
@@ -78 +94 @@
                                         // identify nodes that we cannot skip queries for
                                         const bool testFeasible = (!wasVisible || (node->IsVirtualLeaf() && (node->GetAssumedVisibleFrameId() <= mFrameId)));
-                                                 
 
                                         // update node's visited flag
@@ -86 +101 @@
                                         if (testFeasible)
                                         {
-                                                // reset node's visibility classification 
-                                                node->SetVisible(false);
-
                                                 if (!wasVisible)
                                                 {
@@ -129 +141 @@
         }
 
+
         //////////////
         //-- issue remaining previously visible node queries
@@ -146 +159 @@
                 mQueryQueue.pop();
 
-                // wait until result available
-                int visiblePixels = query->GetQueryResult();
-
-                if (visiblePixels > mVisibilityThreshold)
-                {
-                        BvhNode *node = query->GetFrontNode();
-
-                        node->SetVisible(true);
-                        mBvh->MakeParentsVisible(node);
-                }
-                else
-                {
-                        ++ mStats.mNumQueryCulledNodes;
-                }
+                HandleQueryResult(query);
         }
 }

GTP/trunk/App/Demos/Vis/CHC_revisited/CHCPlusPlusTraverser.h

@@ -26 +26 @@
 
         void IssueMultiQueries();
+        /** Handles the result of an occlusion query.
+        */
+        void HandleQueryResult(OcclusionQuery *query);
 
 

GTP/trunk/App/Demos/Vis/CHC_revisited/OcclusionQuery.h

@@ -31 +31 @@
         
         unsigned int GetQueryId() const;
-        /** Returns the first added node.
+        /** Returns the first node of the multiquery
         */
         inline BvhNode *GetFrontNode() const { return mNodes[0]; }
@@ -40 +40 @@
         */
         inline void AddNode(BvhNode *node) { mNodes.push_back(node); }
+        /** Convenience method that sets up a single node query.
+        */
+        inline void SetNode(BvhNode *node) { Reset(); AddNode(node); }
 
-
+        
 protected:
 
@@ -47 +50 @@
         
         
-        ////////////
+        ///////
         //-- members
 
-        float mPFail;
+        //float mPFail;
         /// all nodes that are tested with the same query
         BvhNodeContainer mNodes; 
         // the query associated with this test
         unsigned int mQueryId;
-        /// type of the query
-        bool mIsVisibleQuery;
 };
 

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp

@@ -128 +128 @@
 
         OcclusionQuery *query = mQueryHandler.RequestQuery();
-        query->Reset();
-        query->AddNode(node);
+
+        query->SetNode(node);
 
         query->BeginQuery();
 
         if (wasVisible)
-        {
-                node->SetAssumedVisibleFrameId(mFrameId + 10);
                 ++ mStats.mNumPreviouslyVisibleNodeQueries;
-        }
 
         // if this node is a previous visible leaf:

GTP/trunk/App/Demos/Vis/CHC_revisited/common.cpp

@@ -59 +59 @@
 
 
-void Randomize(const unsigned int seed)
+void Randomize(unsigned int seed)
 {
         srand(seed);