Changeset 453 for trunk/VUT

Timestamp:

12/06/05 01:08:18 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• ViewCell.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• VspKdTree.cpp (modified) (3 diffs)
• VspKdTree.h (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -12 +12 @@
 struct Triangle3;
 class BspLeaf;
+class VspKdTree;
+class VspKdTreeLeaf;
 
 /**
@@ -58 +60 @@
 };
 
+class VspKdViewCell: public ViewCell
+{
+public:
+        VspKdViewCell(): mVspKdLeaves(0) {}
+        VspKdViewCell(Mesh *mesh): 
+        ViewCell(mesh), mVspKdLeaves(0) {}
+
+        float GetSize() {return 0;}
+        /// Leaves which hold this view cell.
+        vector<VspKdTreeLeaf *> mVspKdLeaves;
+};
 #endif

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -1681 +1681 @@
                 return false;
 
-        int fdiff = fvc->GetPvs().Diff(bvc->GetPvs());
+        const int fdiff = fvc->GetPvs().Diff(bvc->GetPvs());
 
         if (fvc->GetPvs().GetSize() + fdiff < mMaxPvs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -25 +25 @@
 #include "Ray.h"
 #include "RayInfo.h"
-
+#include "ViewCellsManager.h"
+#include "ViewCell.h"
 
 // Static variables
@@ -269 +270 @@
         for (it = mRays.begin(); it != mRays.end(); ++ it)
                 rays.push_back((*it).mRay);
+}
+
+ViewCell *VspKdTreeLeaf::GetViewCell()
+{
+        return mViewCell;
 }
 
@@ -1873 +1879 @@
 {}
 
-int MergeCandidate::ComputePvsDifference() const
-{
-        return 0;
-}
-
 float MergeCandidate::EvaluateMergeCost() const
 {
-        return 0;
-}
+        // pvs difference
+        VspKdViewCell *vc1 = dynamic_cast<VspKdViewCell *>(mLeaf1->GetViewCell());
+        VspKdViewCell *vc2 = dynamic_cast<VspKdViewCell *>(mLeaf2->GetViewCell());
+
+        const int diff1 = vc1->GetPvs().Diff(vc2->GetPvs());
+        
+        //const int diff2 = vc2->GetPvs().Diff(vc1->GetPvs());
+        //const float simDiff = (float)max(diff1, diff2);
+
+        const float oldCost = 
+                vc1->GetSize() * vc1->GetPvs().GetSize() + 
+                vc2->GetSize() * vc2->GetPvs().GetSize();
+
+        const float mergedPvsCost = 
+                (diff1 + vc1->GetPvs().GetSize()) *
+                (vc1->GetSize() + vc2->GetSize());
+
+        return mergedPvsCost / oldCost;
+}

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -49 +49 @@
         /** Computes PVS difference between the leaves.
         */
-        int ComputePvsDifference() const;
+        //int ComputePvsDifference() const;
 
         /** Evaluates the merge costs of this leaf.
@@ -57 +57 @@
         friend bool operator<(const MergeCandidate &leafa, const MergeCandidate &leafb) 
         {
-                return leafa.ComputePvsDifference() < leafb.ComputePvsDifference();
+                return leafa.EvaluateMergeCost() < leafb.EvaluateMergeCost();
         }
 };
@@ -322 +322 @@
 
         static int mailID;
+
+        /** Returns view cell.
+        */
+        ViewCell *GetViewCell();
 
 protected: