Ignore:
Timestamp:
11/09/06 13:36:30 (18 years ago)
Author:
mattausch
Message:

resolved coflicts
improved memory constant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

    r1727 r1732  
    204204        int mTimeStamp; 
    205205 
    206         int mPvsEntriesIncr; 
    207         float mMemoryIncr; 
    208         float mRenderCostDecr; 
     206        //int mPvsEntriesIncr; 
     207        //float mMemoryIncr; 
     208        //float mRenderCostDecr; 
    209209 
    210210        ///////////////////////////////////// 
     
    327327 
    328328        /// Rays piercing this leaf. 
    329         VssRayContainer mVssRays; 
     329        //VssRayContainer mVssRays; 
    330330        /// objects 
    331331        ObjectContainer mObjects; 
     
    954954        int mMinRaysForVisibility; 
    955955 
     956        /// constant value for driving the heuristics 
     957        float mMemoryConst; 
     958 
    956959        int mMaxTests; 
    957960}; 
Note: See TracChangeset for help on using the changeset viewer.