Changeset 580 for trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

Timestamp:

02/01/06 19:29:59 (18 years ago)

Author:

mattausch

Message:

implemented variance
started implementing merge history

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp (modified) (29 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -30 +30 @@
 // Static variables
 int VspKdLeaf::sMailId = 0;
-int MergeCandidate::sMaxPvsSize = 150;
-float MergeCandidate::sOverallCost = Limits::Small;
+int VspKdMergeCandidate::sMaxPvsSize = 150;
+float VspKdMergeCandidate::sOverallCost = Limits::Small;
 #define USE_FIXEDPOINT_T 0
 
@@ -430 +430 @@
         environment->GetFloatValue("VspKdTree.PostProcess.maxCostRatio", mMergeMaxCostRatio);
         environment->GetIntValue("VspKdTree.PostProcess.maxPvsSize",
-                                                         MergeCandidate::sMaxPvsSize);
+                                                         VspKdMergeCandidate::sMaxPvsSize);
 
         environment->GetBoolValue("VspKdTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
@@ -2173 +2173 @@
         vc->SetArea(GetBBox(leaf).SurfaceArea());
 
-        vc->mLeaves.push_back(leaf);
+        vc->mLeaf = leaf;
 
         for (it = leaf->GetRays().begin(); it != it_end; ++ it)
@@ -2200 +2200 @@
         // if merge was unsuccessful
         if (!vc) return false;
-
+// TODO
+#if VC_HISTORY
         // set new size of view cell
         vc->SetVolume(fVc->GetVolume() + bVc->GetVolume());
@@ -2223 +2224 @@
                 vc->mLeaves.push_back(*it);
         }
-
+#endif
         vc->Mail();
 
@@ -2235 +2236 @@
 void VspKdTree::CollectMergeCandidates()
 {
-        MergeCandidate::sOverallCost = 0;
+        VspKdMergeCandidate::sOverallCost = 0;
         vector<VspKdLeaf *> leaves;
 
@@ -2256 +2257 @@
                 // no leaf is part of two merge candidates
                 leaf->Mail();
-                MergeCandidate::sOverallCost += 
+                VspKdMergeCandidate::sOverallCost += 
                         vc->GetVolume() * vc->GetPvs().GetSize();
                 vector<VspKdLeaf *> neighbors;
@@ -2266 +2267 @@
                 for (nit = neighbors.begin(); nit != nit_end; ++ nit)
                 {
-                        mMergeQueue.push(MergeCandidate(leaf, *nit));
+                        mMergeQueue.push(VspKdMergeCandidate(leaf, *nit));
                 }
         }
@@ -2273 +2274 @@
 void VspKdTree::CollectMergeCandidates(const vector<VspKdRay *> &rays)
 {
-        MergeCandidate::sOverallCost = 0;
+        VspKdMergeCandidate::sOverallCost = 0;
 
         vector<VspKdIntersection>::const_iterator iit;
@@ -2299 +2300 @@
                         leaf->Mail
                         // TODO: how to sort out doubles?
-                        MergeCandidate mc = MergeCandidate(leaf, previousLeaf);
+                        VspKdMergeCandidate mc = VspKdMergeCandidate(leaf, previousLeaf);
                         mMergeQueue.push(mc);
 
-                        MergeCandidate::sOverallCost += mc.GetLeaf1Cost();
-                        MergeCandidate::sOverallCost += mc.GetLeaf2Cost();
+                        VspKdMergeCandidate::sOverallCost += mc.GetLeaf1Cost();
+                        VspKdMergeCandidate::sOverallCost += mc.GetLeaf2Cost();
 
                         previousLeaf = leaf;
@@ -2321 +2322 @@
         while (!mMergeQueue.empty() && (vcSize > mMergeMinViewCells) &&
                    (mMergeQueue.top().GetMergeCost() < 
-                    mMergeMaxCostRatio * MergeCandidate::sOverallCost))
+                    mMergeMaxCostRatio * VspKdMergeCandidate::sOverallCost))
         {
                 //Debug << "mergecost: " << mergeQueue.top().GetMergeCost() / 
-                //MergeCandidate::sOverallCost << " " << mMergeMaxCostRatio << endl;
-                MergeCandidate mc = mMergeQueue.top();
+                //VspKdMergeCandidate::sOverallCost << " " << mMergeMaxCostRatio << endl;
+                VspKdMergeCandidate mc = mMergeQueue.top();
                 mMergeQueue.pop();
 
@@ -2340 +2341 @@
                         -- vcSize;
                         // increase absolute merge cost
-                        MergeCandidate::sOverallCost += mc.GetMergeCost();
+                        VspKdMergeCandidate::sOverallCost += mc.GetMergeCost();
                 }
                 // merge candidate not valid, because one of the leaves was already
@@ -2378 +2379 @@
 
                         VspKdViewCell *viewCell = leaf->GetViewCell();
-
+#if VC_HISTORY
                         if (!viewCell->Mailed())
                         {
@@ -2386 +2387 @@
 
                         viewCell->mLeaves.push_back(leaf);
+#endif
                 }
                 else
@@ -2468 +2470 @@
         while (!mMergeQueue.empty())
         {
-                MergeCandidate mc = mMergeQueue.top();
+                VspKdMergeCandidate mc = mMergeQueue.top();
                 mMergeQueue.pop();
 
@@ -2501 +2503 @@
 
 
-float GetShuffledVcCost(VspKdLeaf *leaf, VspKdViewCell *vc1, VspKdViewCell *vc2)
+float EvalShuffleCost(VspKdLeaf *leaf, VspKdViewCell *vc1, VspKdViewCell *vc2)
 {
         const int pvs1 = SubtractedPvsSize(vc1->GetPvs(), *leaf->mPvs);
@@ -2521 +2523 @@
 {
         // compute new pvs and area
+        //      TODO
+#if VC_HISTORY
         vc1->GetPvs().SubtractPvs(*leaf->mPvs);
         vc2->GetPvs().AddPvs(*leaf->mPvs);
@@ -2537 +2541 @@
 
         leaf->SetViewCell(vc2);  // finally change view cell
+#endif
 }
 
@@ -2554 +2559 @@
 
         // the view cell should not be empty after the shuffle
-        if (vc1->mLeaves.size() > 1)
-                shuffledCost1 = GetShuffledVcCost(leaf1, vc1, vc2);
+//todo
+        /*      if (vc1->mLeaves.size() > 1)
+                shuffledCost1 = EvalShuffleCost(leaf1, vc1, vc2);
         if (vc2->mLeaves.size() > 1)
-                shuffledCost2 = GetShuffledVcCost(leaf2, vc2, vc1);
-
-        // shuffling unsuccessful
+                shuffledCost2 = EvalShuffleCost(leaf2, vc2, vc1);
+
+*/      // shuffling unsuccessful
         if ((oldCost <= shuffledCost1) && (oldCost <= shuffledCost2))
                 return false;
@@ -2581 +2587 @@
 
 /*********************************************************************/
-/*                MergeCandidate implementation                      */
+/*                VspKdMergeCandidate implementation                      */
 /*********************************************************************/
 
 
-MergeCandidate::MergeCandidate(VspKdLeaf *l1, VspKdLeaf *l2):
+VspKdMergeCandidate::VspKdMergeCandidate(VspKdLeaf *l1, VspKdLeaf *l2):
 mMergeCost(0),
 mLeaf1(l1),
@@ -2595 +2601 @@
 }
 
-float MergeCandidate::GetLeaf1Cost() const
+float VspKdMergeCandidate::GetLeaf1Cost() const
 {
         VspKdViewCell *vc = mLeaf1->GetViewCell();
@@ -2601 +2607 @@
 }
 
-float MergeCandidate::GetLeaf2Cost() const
+float VspKdMergeCandidate::GetLeaf2Cost() const
 {
         VspKdViewCell *vc = mLeaf2->GetViewCell();
@@ -2607 +2613 @@
 }
 
-void MergeCandidate::EvalMergeCost()
+void VspKdMergeCandidate::EvalMergeCost()
 {
         //-- compute pvs difference
@@ -2630 +2636 @@
 }
 
-void MergeCandidate::SetLeaf1(VspKdLeaf *l)
+void VspKdMergeCandidate::SetLeaf1(VspKdLeaf *l)
 {
         mLeaf1 = l;
 }
 
-void MergeCandidate::SetLeaf2(VspKdLeaf *l)
+void VspKdMergeCandidate::SetLeaf2(VspKdLeaf *l)
 {
         mLeaf2 = l;
@@ -2641 +2647 @@
 
 
-VspKdLeaf *MergeCandidate::GetLeaf1()
+VspKdLeaf *VspKdMergeCandidate::GetLeaf1()
 {
         return mLeaf1;
@@ -2647 +2653 @@
 
 
-VspKdLeaf *MergeCandidate::GetLeaf2()
+VspKdLeaf *VspKdMergeCandidate::GetLeaf2()
 {
         return mLeaf2;
@@ -2653 +2659 @@
 
 
-bool MergeCandidate::Valid() const
+bool VspKdMergeCandidate::Valid() const
 {
         return
@@ -2661 +2667 @@
 
 
-float MergeCandidate::GetMergeCost() const
+float VspKdMergeCandidate::GetMergeCost() const
 {
         return mMergeCost;
@@ -2667 +2673 @@
 
 
-void MergeCandidate::SetValid()
+void VspKdMergeCandidate::SetValid()
 {
         mLeaf1Id = mLeaf1->GetViewCell()->mMailbox;