Changeset 452 for trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

Timestamp:

12/05/05 20:33:53 (19 years ago)

Author:

mattausch

Message:

started to add view cell merging to vsp kd tree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -33 +33 @@
 #include "RayInfo.h"
 #include "Containers.h"
+
+class VspKdTreeLeaf;
+
+/**
+        Candidate for leaf merging based on priority.
+*/
+class MergeCandidate
+{  
+public:
+        VspKdTreeLeaf *mLeaf1;
+        VspKdTreeLeaf *mLeaf2;
+
+        MergeCandidate(VspKdTreeLeaf *l1, VspKdTreeLeaf *l2);
+
+        /** Computes PVS difference between the leaves.
+        */
+        int ComputePvsDifference() const;
+
+        /** Evaluates the merge costs of this leaf.
+        */
+        float EvaluateMergeCost() const;
+
+        friend bool operator<(const MergeCandidate &leafa, const MergeCandidate &leafb) 
+        {
+                return leafa.ComputePvsDifference() < leafb.ComputePvsDifference();
+        }
+};
+
+
 
 /**
@@ -294 +323 @@
         static int mailID;
 
-
 protected:
 
@@ -306 +334 @@
         RayInfoContainer mRays;
         bool mValidPvs;
-        
+
+        ViewCell *mViewCell;
 private:
         int mPvsSize;
@@ -453 +482 @@
         void CollectLeaves(vector<VspKdTreeLeaf *> &leaves) const;
 
+        /** Merges leaves of this tree according to some criteria.
+        */
+        void MergeLeaves();
+
+        /** Finds neighbours of this node.
+                @param n the input node
+                @param neighbours the neighbors of the input node
+                @param onlyUnmailed if only unmailed neighbors are collected
+        */
+        int FindNeighbors(VspKdTreeLeaf *n, 
+                                          vector<VspKdTreeLeaf *> &neighbors, 
+                                          bool onlyUnmailed);
+
 protected:
 
@@ -547 +589 @@
 
 protected:
+        
+
         /////////////////////////////
         // The core pointer
@@ -610 +654 @@
         float mTermMaxRayContribution;
 
-
         bool mOnlyDrivingAxis;
+
+        typedef std::pair<VspKdTreeLeaf *, VspKdTreeLeaf *> LeafPair;
+
         /////////////////////////////
         VspKdStatistics mStat;