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

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/MeshKdTree.cpp (modified) (9 diffs)

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

@@ -19 +19 @@
 {
   mRoot = new MeshKdLeaf;
-  mSplitCandidates = NULL;
+  mSubdivisionCandidates = NULL;
 }
 
@@ -177 +177 @@
 
 void
-MeshKdTree::SortSplitCandidates(
+MeshKdTree::SortSubdivisionCandidates(
                             MeshKdLeaf *node,
                             const int axis
                             )
 {
-  mSplitCandidates->clear();
+  mSubdivisionCandidates->clear();
   
   int requestedSize = 2*(int)node->mFaces.size();
   // creates a sorted split candidates array
-  if (mSplitCandidates->capacity() > 500000 &&
-      requestedSize < (int)(mSplitCandidates->capacity()/10) ) {
-    delete mSplitCandidates;
-    mSplitCandidates = new vector<SortableEntry>;
-  }
-  
-  mSplitCandidates->reserve(requestedSize);
+  if (mSubdivisionCandidates->capacity() > 500000 &&
+      requestedSize < (int)(mSubdivisionCandidates->capacity()/10) ) {
+    delete mSubdivisionCandidates;
+    mSubdivisionCandidates = new vector<SortableEntry>;
+  }
+  
+  mSubdivisionCandidates->reserve(requestedSize);
   
   vector<int>::const_iterator fi;
@@ -202 +202 @@
     AxisAlignedBox3 box = mMesh->GetFaceBox(*fi);
     
-    mSplitCandidates->push_back(SortableEntry(SortableEntry::FACE_MIN,
+    mSubdivisionCandidates->push_back(SortableEntry(SortableEntry::FACE_MIN,
                                              box.Min(axis),
                                              *fi)
@@ -208 +208 @@
     
     
-    mSplitCandidates->push_back(SortableEntry(SortableEntry::FACE_MAX,
+    mSubdivisionCandidates->push_back(SortableEntry(SortableEntry::FACE_MAX,
                                              box.Max(axis),
                                              *fi)
@@ -214 +214 @@
   }
   
-  stable_sort(mSplitCandidates->begin(), mSplitCandidates->end());
+  stable_sort(mSubdivisionCandidates->begin(), mSubdivisionCandidates->end());
 }
 
@@ -229 +229 @@
 {
 
-  SortSplitCandidates(node, axis);
+  SortSubdivisionCandidates(node, axis);
   
   // go through the lists, count the number of objects left and right
@@ -247 +247 @@
   vector<SortableEntry>::const_iterator ci;
 
-  for(ci = mSplitCandidates->begin();
-      ci != mSplitCandidates->end();
+  for(ci = mSubdivisionCandidates->begin();
+      ci != mSubdivisionCandidates->end();
       ci++) {
     switch ((*ci).type) {
@@ -409 +409 @@
 MeshKdTree::Construct()
 {
-  if (!mSplitCandidates)
-    mSplitCandidates = new vector<SortableEntry>;
+  if (!mSubdivisionCandidates)
+    mSubdivisionCandidates = new vector<SortableEntry>;
   
   // first construct a leaf that will get subdivide
@@ -418 +418 @@
   
   // remove the allocated array
-  delete mSplitCandidates;
-  mSplitCandidates = NULL;
+  delete mSubdivisionCandidates;
+  mSubdivisionCandidates = NULL;
   
   return true;