Ignore:
Timestamp:
02/17/06 20:41:22 (19 years ago)
Author:
mattausch
Message:

added spatial hierarchy based merge tree

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

    r648 r650  
    7171mRenderCostWeight(0.5), 
    7272mUseRandomAxis(false), 
    73 mTimeStamp(0) 
     73mTimeStamp(1) 
    7474{ 
    7575        bool randomize = false; 
     
    575575                                                << "#RenderCostDecrease\n" << -costDecr << endl  
    576576                                                << "#TotalRenderCost\n" << mTotalCost << endl 
    577                                                 << "#AvgRenderCost\n" << mTotalPvsSize / mBspStats.Leaves() << endl; 
     577                                                << "#AvgRenderCost\n" << (float)mTotalPvsSize / (float)mBspStats.Leaves() << endl; 
    578578                        } 
    579579 
     
    766766        backData.mNode = interior->GetBack(); 
    767767 
    768         frontData.mNode->mTimeStamp = mTimeStamp; 
    769         backData.mNode->mTimeStamp = mTimeStamp ++; 
     768        interior->mTimeStamp = mTimeStamp ++; 
     769        //frontData.mNode->mTimeStamp = ++ mTimeStamp; 
     770        //backData.mNode->mTimeStamp = mTimeStamp; 
    770771 
    771772        //DEL_PTR(leaf); 
     
    29662967                // the same leaves must not be part of two merge candidates 
    29672968                leaf->Mail(); 
     2969                 
    29682970                vector<BspLeaf *> neighbors; 
    2969                 FindNeighbors(leaf, neighbors, true); 
    2970                 //FindApproximateNeighbors(leaf, neighbors, true); 
     2971                if (0) 
     2972                        FindNeighbors(leaf, neighbors, true); 
     2973                else 
     2974                        FindApproximateNeighbors(leaf, neighbors, true); 
    29712975                vector<BspLeaf *>::const_iterator nit, nit_end = neighbors.end(); 
    29722976 
Note: See TracChangeset for help on using the changeset viewer.