Changeset 2524 for GTP


Ignore:
Timestamp:
07/03/07 22:05:03 (17 years ago)
Author:
bittner
Message:

demo updates

Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp

    r2360 r2524  
    11331133                                 "spatialMedian"); 
    11341134 
     1135   
     1136  RegisterOption("KdTree.pvsArea", 
     1137                                 optFloat, 
     1138                                 "kd_pvs_area=", 
     1139                                 "1e-4"); 
     1140 
    11351141  RegisterOption("KdTree.splitBorder", 
    11361142                 optFloat, 

  • GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.cpp

    r2332 r2524  
    1414 
    1515// $$JB HACK 
    16 #define KD_PVS_AREA (1e-5f) 
     16//#define KD_PVS_AREA (1e-4f) 
    1717 
    1818#define TYPE_INTERIOR -2 
    … …  
    6767  Environment::GetSingleton()->GetFloatValue("KdTree.Termination.ct_div_ci", mCt_div_ci); 
    6868  Environment::GetSingleton()->GetFloatValue("KdTree.splitBorder", mSplitBorder); 
     69  Environment::GetSingleton()->GetFloatValue("KdTree.pvsArea", mKdPvsArea); 
    6970 
    7071  Environment::GetSingleton()->GetBoolValue("KdTree.sahUseFaces", mSahUseFaces); 
    … …  
    125126  delete splitCandidates; 
    126127 
    127   float area = GetBox().SurfaceArea()*KD_PVS_AREA; 
     128  float area = GetBox().SurfaceArea()*mKdPvsArea; 
    128129 
    129130  SetPvsTerminationNodes(area); 
    … …  
    14041405        } 
    14051406 
    1406         float area = GetBox().SurfaceArea()*KD_PVS_AREA; 
     1407        float area = GetBox().SurfaceArea()*mKdPvsArea; 
    14071408         
    14081409        SetPvsTerminationNodes(area); 

  • GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.h

    r2332 r2524  
    614614  int mSplitMethod; 
    615615  bool mSahUseFaces; 
     616  float mKdPvsArea; 
    616617  /// root of the tree 
    617618  KdNode *mRoot; 

  • GTP/trunk/Lib/Vis/Preprocessing/src/demo1.env

    r2521 r2524  
    4040        totalSamples 250000000 
    4141#       totalSamples 2000000 
    42         samplesPerPass 1000000 
     42        samplesPerPass 500000 
    4343        samplesPerEvaluation 5000000 
    4444 
    … …  
    169169 
    170170KdTree { 
     171        pvsArea   5e-4 
    171172        sahUseFaces false 
    172173        Termination { 
    … …  
    202203 
    203204        useKdPvs true 
     205         
    204206        useKdPvsAfterFiltering true 
    205207        # samples used for view cell construction 

  • GTP/trunk/Lib/Vis/Preprocessing/src/run_demo1

    r2521 r2524  
    33 
    44#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    5 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=100000000" 
     5COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -total_samples=100000000" 
    66 
    77 
    … …  
    4949-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \ 
    5050-preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \ 
    51 -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog 
     51-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog \ 
     52demo1.env 
    5253 
Note: See TracChangeset for help on using the changeset viewer.