Changeset 1233 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h

Timestamp:

08/20/06 22:48:01 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h (modified) (8 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h

@@ -156 +156 @@
         
         
-        struct VspBspSplitCandidate
+        struct VspBspSubdivisionCandidate
         {  
                 /// the current split plane
@@ -172 +172 @@
                 float mRenderCostDecr;
 
-                VspBspSplitCandidate(): mPriority(0), mRenderCostDecr(0) 
+                VspBspSubdivisionCandidate(): mPriority(0), mRenderCostDecr(0) 
                 {};
 
-                VspBspSplitCandidate(const Plane3 &plane, const VspBspTraversalData &tData): 
+                VspBspSubdivisionCandidate(const Plane3 &plane, const VspBspTraversalData &tData): 
                 mSplitPlane(plane), mParentData(tData), mPriority(0), mRenderCostDecr(0) 
                 {}
@@ -190 +190 @@
                 }
 
-                friend bool operator<(const VspBspSplitCandidate &a, const VspBspSplitCandidate &b)
+                friend bool operator<(const VspBspSubdivisionCandidate &a, const VspBspSubdivisionCandidate &b)
                 {
                         return a.GetPriority() < b.GetPriority();
@@ -196 +196 @@
     };
 
-        typedef std::priority_queue<VspBspSplitCandidate> VspBspSplitQueue;
+        typedef std::priority_queue<VspBspSubdivisionCandidate> VspBspSplitQueue;
 
         /** Default constructor creating an empty tree.
@@ -402 +402 @@
         /** Evaluates candidate for splitting.
         */
-        void EvalSplitCandidate(VspBspSplitCandidate &splitData);
+        void EvalSubdivisionCandidate(VspBspSubdivisionCandidate &splitData);
 
         /** Computes priority of the traversal data and stores it in tData.
@@ -461 +461 @@
         */
         BspNode *Subdivide(VspBspSplitQueue &tQueue,
-                                           VspBspSplitCandidate &splitCandidate);
+                                           VspBspSubdivisionCandidate &splitCandidate);
 
         /** Constructs the tree from the given traversal data.
@@ -563 +563 @@
                 @param splitCandidates returns sorted list of split candidates
         */
-        void SortSplitCandidates(const RayInfoContainer &rays, 
+        void SortSubdivisionCandidates(const RayInfoContainer &rays, 
                                                          const int axis, 
                                                          float minBand, 
@@ -732 +732 @@
 
         /// sorted split candidates used for sweep-heuristics
-        vector<SortableEntry> *mLocalSplitCandidates;
+        vector<SortableEntry> *mLocalSubdivisionCandidates;
 
         /// box around the whole view domain