Changeset 1707 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/01/06 23:20:53 (18 years ago)

Author:

mattausch

Message:

worked on full render cost evaluation
warning: some change sin render cost evaluation for pvs which could have bugs

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

@@ -21 +21 @@
 #include "OspTree.h"
 #include "BvHierarchy.h"
+#include "ViewCell.h"
 
 
@@ -1683 +1684 @@
         // reinstall old bv refs
         vector<BvhLeaf *> leaves;
-        mBvHierarchy->CollectLeaves(leaves);
+        mBvHierarchy->CollectLeaves(mBvHierarchy->GetRoot(), leaves);
         vector<BvhLeaf *>::const_iterator bit, bit_end = leaves.end();
 
@@ -1788 +1789 @@
 {
 public:
-        enum {VSP_NODE, BVH_NODE};
+        enum {VSP_NODE, BVH_NODE, VIEW_CELL};
 
         virtual float GetMergeCost() const = 0;
@@ -1850 +1851 @@
 
 
+class ViewCellWrapper: public HierarchyNodeWrapper
+{
+public:
+
+        ViewCellWrapper(ViewCell *vc): mViewCell(vc) {}
+        
+        int Type()  const { return VIEW_CELL; }
+
+        float GetMergeCost() const { return mViewCell->GetMergeCost(); };
+
+        bool IsLeaf() const { return mViewCell->IsLeaf(); }
+
+        void PushChildren(HierarchyNodeQueue &tQueue)
+        {
+                if (!mViewCell->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(mViewCell);
+
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tQueue.push(new ViewCellWrapper(*it));
+                        }
+                }
+        }
+
+        ViewCell *mViewCell;
+};
+
+
 void HierarchyManager::CollectBestSet(const int maxSplits,
                                                                           const float maxMemoryCost,
-                                                                          vector<VspNode *> &vspNodes,
+                                //                                        vector<VspNode *> &vspNodes,
+                                                                          ViewCellContainer &viewCells,
                                                                           vector<BvhNode *> &bvhNodes)
 {
         HierarchyNodeQueue tqueue;
-        tqueue.push(new VspNodeWrapper(mVspTree->GetRoot()));
+        //tqueue.push(new VspNodeWrapper(mVspTree->GetRoot()));
+        tqueue.push(new ViewCellWrapper(mVspTree->mViewCellsTree->GetRoot()));
         tqueue.push(new BvhNodeWrapper(mBvHierarchy->GetRoot()));
         
@@ -1869 +1903 @@
                 // because of the priority queue, this will be the optimal set of v
                 if (nodeWrapper->IsLeaf() || 
-                        ((vspNodes.size() + bvhNodes.size() + tqueue.size() + 1) >= maxSplits) ||
+                        ((viewCells.size() + bvhNodes.size() + tqueue.size() + 1) >= maxSplits) ||
                         (memCost > maxMemoryCost)
                         )
@@ -1875 +1909 @@
                         if (nodeWrapper->Type() == HierarchyNodeWrapper::VSP_NODE)
                         {
-                                VspNodeWrapper *vspNodeWrapper = dynamic_cast<VspNodeWrapper *>(nodeWrapper);
-                                vspNodes.push_back(vspNodeWrapper->mNode);
+                                ViewCellWrapper *viewCellWrapper = dynamic_cast<ViewCellWrapper *>(nodeWrapper);
+                                viewCells.push_back(viewCellWrapper->mViewCell);
                         }
                         else
@@ -1900 +1934 @@
                                                                                  int &pvsEntries)
 {
+        //vector<VspNode *> vspNodes;
+        ViewCellContainer viewCells;
+        vector<BvhNode *> bvhNodes;
+
+    CollectBestSet(maxSplits, maxMemoryCost, viewCells, bvhNodes);
+
+        vector<BvhNode *>::const_iterator bit, bit_end = bvhNodes.end();
+        
+        for (bit = bvhNodes.begin(); bit != bit_end; ++ bit)
+        {
+                mBvHierarchy->SetActive(*bit);
+        }
+
+        //vector<VspNode *>::const_iterator vit, vit_end = vspNodes.end();
+
+        ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
+
+        int numEntries = 0;
+        float pvsCost = 0.0f;
+
+        for (vit = viewCells.begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = *vit;
+                ObjectPvs pvs;
+                mVspTree->mViewCellsTree->GetPvs(vc, pvs);
+
+                BvhNode::NewMail();
+
+                // hack: should not be done here
+                ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
+
+                for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>((*oit).first);
+                        BvhLeaf *leaf = intersect->GetItem();
+                        BvhNode *activeNode = leaf->GetActiveNode();
+
+                        if (!activeNode->Mailed())
+                        {
+                                activeNode->Mail();
+
+                                ++ numEntries;
+                                pvsCost += mBvHierarchy->EvalAbsCost(leaf->mObjects);
+                        }
+                }
+        }
+
         /*TraversalQueue tqueue;
         tqueue.push(mRoot);