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

Timestamp:

02/17/06 20:41:22 (18 years ago)

Author:

mattausch

Message:

added spatial hierarchy based merge tree

File:

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

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

@@ -71 +71 @@
 mRenderCostWeight(0.5),
 mUseRandomAxis(false),
-mTimeStamp(0)
+mTimeStamp(1)
 {
         bool randomize = false;
@@ -575 +575 @@
                                                 << "#RenderCostDecrease\n" << -costDecr << endl 
                                                 << "#TotalRenderCost\n" << mTotalCost << endl
-                                                << "#AvgRenderCost\n" << mTotalPvsSize / mBspStats.Leaves() << endl;
+                                                << "#AvgRenderCost\n" << (float)mTotalPvsSize / (float)mBspStats.Leaves() << endl;
                         }
 
@@ -766 +766 @@
         backData.mNode = interior->GetBack();
 
-        frontData.mNode->mTimeStamp = mTimeStamp;
-        backData.mNode->mTimeStamp = mTimeStamp ++;
+        interior->mTimeStamp = mTimeStamp ++;
+        //frontData.mNode->mTimeStamp = ++ mTimeStamp;
+        //backData.mNode->mTimeStamp = mTimeStamp;
 
         //DEL_PTR(leaf);
@@ -2966 +2967 @@
                 // the same leaves must not be part of two merge candidates
                 leaf->Mail();
+                
                 vector<BspLeaf *> neighbors;
-                FindNeighbors(leaf, neighbors, true);
-                //FindApproximateNeighbors(leaf, neighbors, true);
+                if (0)
+                        FindNeighbors(leaf, neighbors, true);
+                else
+                        FindApproximateNeighbors(leaf, neighbors, true);
                 vector<BspLeaf *>::const_iterator nit, nit_end = neighbors.end();