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

Timestamp:

12/30/05 12:08:15 (19 years ago)

Author:

mattausch

Message:

changed castlinesegment of vspbpstree
changed rayinfo ray classification for bsp tree
implemented shuffling

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -285 +285 @@
         */
         void SetupChildLinks(VspKdNode *b, VspKdNode *f);
-
         /** Replaces the pointer to oldChild with a pointer to newChild.
         */
         void ReplaceChildLink(VspKdNode *oldChild, VspKdNode *newChild);
- 
         /** Computes intersection of the ray with the node boundaries.
         */
@@ -568 +566 @@
         */
         float GetMemUsage() const;
-        
+        //?
         float GetRayMemUsage() const;
 
@@ -575 +573 @@
         void CollectLeaves(vector<VspKdLeaf *> &leaves) const;
 
-        /** Merges leaves of this tree according to some criteria.
-        */
-        int MergeLeaves();
+        /** Merges view cells created with this tree according to 
+                some (global) cost heuristics.
+        */
+        int MergeViewCells(const VssRayContainer &rays);
 
         /** Finds neighbours of this node.
@@ -604 +603 @@
         */
         void CollectViewCells(ViewCellContainer &viewCells) const;
-
         /** Refines view cells in a post processing step.
         */
@@ -612 +610 @@
         */
         void CollectMergeCandidates();
+
+        /** Collapses the tree with respect to the view cell partition.
+                @returns node of type leaf if the node could be collapsed, this node otherwise
+        */
+        VspKdNode *CollapseTree(VspKdNode *node);
 
 protected:
@@ -718 +721 @@
         */
         bool MergeViewCells(VspKdLeaf *l1, VspKdLeaf *l2);
-
-        /** Collapses the tree with respect to the view cell partition.
-                @returns node of type leaf if the node could be collapsed, this node otherwise
-        */
-        VspKdNode *CollapseTree(VspKdNode *node);
         
         /** Helper function revalidating the view cell leaf list after merge.