Changeset 582 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

Timestamp:

02/02/06 19:16:39 (18 years ago)

Author:

mattausch

Message:

fixed bug in mergueue to find root of merge and sort out doube view cells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -325 +325 @@
         float GetDeviation(ViewCell *vc) const;
 
-        /** Recalculates this merge candidate and sets valid.
-        */
-        void SetMergeCandidateValid(MergeCandidate &mc) const;
+        /** Tries to set this merge candidate to valid. 
+                @returns false if both view cells are the same
+        */
+        bool ValidateMergeCandidate(MergeCandidate &mc) const;
 
         /** Merge view cells of leaves l1 and l2.
@@ -360 +361 @@
 
         /** Updates the current top level of view cells.
-        */
-        int UpdateMergedViewCells(ViewCellContainer &viewCells);
+                @returns number of newly merged view cells
+        */
+        int UpdateActiveViewCells(ViewCellContainer &viewCells);
 
         void ComputeCommonPvs(ViewCellInterior *interior);
+
+
+        /** Returns memory usage of view cells.
+        */
+        float GetMemUsage() const;
+
 
 
@@ -375 +383 @@
         
                 
-        ViewCellContainer mInactiveViewCells;
-        ViewCellContainer mActiveViewCells;
+        ViewCellContainer mMergedViewCells;
+        
 
         /// weights between variance and render cost increase (must be between zero and one)
@@ -389 +397 @@
         int mUseAreaForPvs;
 
-        int mNumViewCells;
+        int mNumActiveViewCells;
 
         /// minimal number of view cells
@@ -402 +410 @@
         MergeQueue mMergeQueue;
 
-        
+        float mMaxMemory;
 
 };