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

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (13 diffs)

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

@@ -196 +196 @@
 
 
-        mLocalSplitCandidates = new vector<SortableEntry>;
+        mLocalSubdivisionCandidates = new vector<SortableEntry>;
 
         Debug << endl;
@@ -230 +230 @@
 {
         DEL_PTR(mRoot);
-        DEL_PTR(mLocalSplitCandidates);
+        DEL_PTR(mLocalSubdivisionCandidates);
 }
 
@@ -639 +639 @@
 
         // compute first split candidate
-        VspBspSplitCandidate splitCandidate;
+        VspBspSubdivisionCandidate splitCandidate;
         splitCandidate.mParentData = tData;
 
-        EvalSplitCandidate(splitCandidate);
+        EvalSubdivisionCandidate(splitCandidate);
 
         tQueue.push(splitCandidate);
@@ -742 +742 @@
                         << "#ViewCells\n" << viewCells << endl
                         << "#RenderCostDecrease\n" << renderCostDecr << endl 
-                        << "#SplitCandidateCost\n" << splitCandidateCost << endl
+                        << "#SubdivisionCandidateCost\n" << splitCandidateCost << endl
                         << "#TotalRenderCost\n" << totalRenderCost << endl
                         << "#AvgRenderCost\n" << avgRenderCost << endl;
@@ -895 +895 @@
 // subdivide node using a split plane queue
 BspNode *VspBspTree::Subdivide(VspBspSplitQueue &tQueue,
-                                                           VspBspSplitCandidate &splitCandidate)
+                                                           VspBspSubdivisionCandidate &splitCandidate)
 {
         VspBspTraversalData &tData = splitCandidate.mParentData;
@@ -953 +953 @@
         
                 //-- push the new split candidates on the stack
-                VspBspSplitCandidate frontCandidate;
+                VspBspSubdivisionCandidate frontCandidate;
                 frontCandidate.mParentData = tFrontData;
 
-                VspBspSplitCandidate backCandidate;
+                VspBspSubdivisionCandidate backCandidate;
                 backCandidate.mParentData = tBackData;
 
-                EvalSplitCandidate(frontCandidate);
-                EvalSplitCandidate(backCandidate);
+                EvalSubdivisionCandidate(frontCandidate);
+                EvalSubdivisionCandidate(backCandidate);
         
                 tQueue.push(frontCandidate);
@@ -1042 +1042 @@
 
 /*
-void VspBspTree::EvalSplitCandidate(VspBspTraversalData &tData,
-                                                                        VspBspSplitCandidate &splitData)
+void VspBspTree::EvalSubdivisionCandidate(VspBspTraversalData &tData,
+                                                                        VspBspSubdivisionCandidate &splitData)
 {
         VspBspTraversalData frontData;
@@ -1065 +1065 @@
 */
 
-void VspBspTree::EvalSplitCandidate(VspBspSplitCandidate &splitCandidate)
+void VspBspTree::EvalSubdivisionCandidate(VspBspSubdivisionCandidate &splitCandidate)
 {
         VspBspTraversalData frontData;
@@ -1306 +1306 @@
 
 
-void VspBspTree::SortSplitCandidates(const RayInfoContainer &rays, 
+void VspBspTree::SortSubdivisionCandidates(const RayInfoContainer &rays, 
                                                                          const int axis, 
                                                                          float minBand, 
                                                                          float maxBand)
 {
-        mLocalSplitCandidates->clear();
+        mLocalSubdivisionCandidates->clear();
 
         int requestedSize = 2 * (int)(rays.size());
         // creates a sorted split candidates array
-        if (mLocalSplitCandidates->capacity() > 500000 &&
-                requestedSize < (int)(mLocalSplitCandidates->capacity() / 10) )
-        {
-        delete mLocalSplitCandidates;
-                mLocalSplitCandidates = new vector<SortableEntry>;
-        }
-
-        mLocalSplitCandidates->reserve(requestedSize);
+        if (mLocalSubdivisionCandidates->capacity() > 500000 &&
+                requestedSize < (int)(mLocalSubdivisionCandidates->capacity() / 10) )
+        {
+        delete mLocalSubdivisionCandidates;
+                mLocalSubdivisionCandidates = new vector<SortableEntry>;
+        }
+
+        mLocalSubdivisionCandidates->reserve(requestedSize);
 
         if (0)
@@ -1339 +1339 @@
                 if (0) ClipValue(pos, minBand, maxBand);
                 
-                mLocalSplitCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMin : SortableEntry::ERayMax, 
+                mLocalSubdivisionCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMin : SortableEntry::ERayMax, 
                                                                         pos, (*ri).mRay));
 
@@ -1347 +1347 @@
                 if (0) ClipValue(pos, minBand, maxBand);
 
-                mLocalSplitCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMax : SortableEntry::ERayMin, 
+                mLocalSubdivisionCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMax : SortableEntry::ERayMin, 
                                                                         pos, (*ri).mRay));
         }
 
-        stable_sort(mLocalSplitCandidates->begin(), mLocalSplitCandidates->end());
+        stable_sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
 }
 
@@ -1380 +1380 @@
         const float maxBand = minBox + mMaxBand * sizeBox;
 
-        SortSplitCandidates(usedRays, axis, minBand, maxBand);
+        SortSubdivisionCandidates(usedRays, axis, minBand, maxBand);
 
         // go through the lists, count the number of objects left and right
@@ -1442 +1442 @@
         Intersectable::NewMail();
 
-        vector<SortableEntry>::const_iterator ci, ci_end = mLocalSplitCandidates->end();
-
-        for (ci = mLocalSplitCandidates->begin(); ci != ci_end; ++ ci)
+        vector<SortableEntry>::const_iterator ci, ci_end = mLocalSubdivisionCandidates->end();
+
+        for (ci = mLocalSubdivisionCandidates->begin(); ci != ci_end; ++ ci)
         {
                 VssRay *ray;