Changeset 1305 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

08/31/06 16:47:41 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -709 +709 @@
                 // finally evaluate statistics for this leaf
                 EvaluateLeafStats(tData);
-
+                // detach subdivision candidate: this leaf is no candidate for
+                // splitting anymore
+                tData.mNode->SetSubdivisionCandidate(NULL); 
                 // detach node so it won't get deleted
                 tData.mNode = NULL;
@@ -2691 +2693 @@
                         {
                                 leaf->Mail();
-                                dirtyList.push_back(leaf->GetSubdivisionCandidate());Debug << "here87700" << endl;
-                                Debug << "here166 candidate: " << leaf->GetSubdivisionCandidate() << endl;
-                                Debug << "here120 candidate: " << leaf->GetSubdivisionCandidate() << " type: " << leaf->GetSubdivisionCandidate()->Type() << endl;
-                                Debug << "here877" << endl;
+                                if (leaf->GetSubdivisionCandidate()) // a candidate still attached to this node
+                                {
+                                        dirtyList.push_back(leaf->GetSubdivisionCandidate());
+                                }
                         }
                         break;
                 }
-                break;
         default:
                 break;
@@ -2794 +2795 @@
                                 obj->Mail();
                                 obj->mCounter = 0;
-
                                 ++ pvsSize;
                         }
-
                         ++ obj->mCounter;       
                         break;
@@ -2815 +2814 @@
                                 leaf->Mail();
                                 leaf->mCounter = 0;
-
                                 pvsSize += (int)leaf->mObjects.size();
                         }
-
                         ++ leaf->mCounter;      
                         break;
@@ -2864 +2861 @@
                 {
                         BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-
                         if (!leaf->Mailed())
                         {
@@ -2928 +2924 @@
         ray.GetSampleData(isTermination, pt, &obj, &node);
 
-        if (!obj) 
-                return 0;
+        if (!obj) return 0;
 
         int pvs = 0;
@@ -2977 +2972 @@
         leaf->Mail();
 
-        int pvs = 0;
-        pvs += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
+        int pvs = (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
 
         ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
@@ -2985 +2979 @@
         {
                 Intersectable *obj = *oit;
-
                 if (!obj->Mailed())
                 {
@@ -2996 +2989 @@
 }
 
-}
+
+}