Changeset 1006 for GTP/trunk/Lib/Vis/Preprocessing/src/FromPointVisibilityTree.cpp

Timestamp:

06/09/06 01:26:46 (18 years ago)

Author:

mattausch

Message:

started viewspace-objectspace subdivision
removed memory leaks

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/FromPointVisibilityTree.cpp (modified) (3 diffs)

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

@@ -124 +124 @@
         Environment::GetSingleton()->GetIntValue("FromPointVisibilityTree.nodePriorityQueueType", mNodePriorityQueueType);
 
-        Environment::GetSingleton()->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMerge", mEmptyViewCellsMergeAllowed);
         
         char subdivisionStatsLog[100];
@@ -160 +159 @@
         Debug << "use random axis: " << mUseRandomAxis << endl;
         Debug << "priority queue type: " << mNodePriorityQueueType << endl;
-        Debug << "empty view cells merge: " << mEmptyViewCellsMergeAllowed << endl;
+        
         Debug << "octree: " << mCirculatingAxis << endl;
         Debug << "minband: " << mMinBand << endl;
@@ -3707 +3706 @@
                                 MergeCandidate mc(leaf->GetViewCell(), (*nit)->GetViewCell());
 
-                                // dont't merge view cells if they are empty and not front and back leaf of the same parent
-                                // in the tree?
-                                if (mEmptyViewCellsMergeAllowed ||
-                                        !leaf->GetViewCell()->GetPvs().Empty() || 
+                                if (!leaf->GetViewCell()->GetPvs().Empty() || 
                                         !(*nit)->GetViewCell()->GetPvs().Empty() ||
                     leaf->IsSibling(*nit))