Changeset 670


Ignore:
Timestamp:
03/02/06 14:47:47 (18 years ago)
Author:
mattausch
Message:
 
Location:
GTP/trunk/Lib/Vis
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

    r657 r670  
    109109                                LinkIncremental="1" 
    110110                                SuppressStartupBanner="TRUE" 
    111                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)"" 
     111                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)"" 
    112112                                ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def" 
    113113                                GenerateDebugInformation="TRUE" 

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/egsr_test_script

    r668 r670  
    102102-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    103103-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    104 -bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     104-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    105105-view_cells_post_process_merge=false \ 
    106106-vsp_bsp_split_only_driving_axis=true \ 
    … …  
    136136-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    137137-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    138 -bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     138-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    139139-view_cells_construction_samples=0 \ 
    140140-view_cells_post_process_merge=false \ 
    … …  
    166166-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    167167-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    168 -bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     168-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    169169-view_cells_post_process_merge=false \ 
    170170-vsp_bsp_split_only_driving_axis=false \ 
    … …  
    186186 
    187187 
     188################################################################ 
     189#             vspbsptree - good merge                          # 
     190################################################################ 
     191 
     192# 
     193# use many samples for merge 
     194# 
     195 
     196METHOD=vsp-good-merge 
     197 
     198echo "$SCENE $METHOD" 
     199 
     200$PROGRAM $ENVIRONMENT \ 
     201-view_cells_type=vspBspTree \ 
     202-view_cells_construction_samples=8000000 \ 
     203-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     204-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     205-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     206-view_cells_post_process_merge=true \ 
     207-view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
     208 
     209mv debug.log $LOG_PREFIX-$METHOD-debug.log 
     210 
     211 
     212 
    188213 
    189214################################################################ 
    … …  
    195220# 
    196221 
     222METHOD=vsp-few-samples 
     223 
     224echo "$SCENE $METHOD" 
     225 
     226$PROGRAM $ENVIRONMENT \ 
     227-view_cells_type=vspBspTree \ 
     228-view_cells_term_max_view_cells=2500 \ 
     229-vsp_bsp_construction_samples=100000 \ 
     230-view_cells_construction_samples=0 \ 
     231-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     232-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     233-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     234-view_cells_post_process_merge=false \ 
     235-view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
     236 
     237mv debug.log $LOG_PREFIX-$METHOD-debug.log 
     238 
     239 
     240 
     241################################################################ 
     242#             vspbsptree - many samples                        # 
     243################################################################ 
     244 
     245# 
     246# use many samples for initial subdivision 
     247# 
     248 
    197249METHOD=vsp-many-samples 
    198250 
    … …  
    201253$PROGRAM $ENVIRONMENT \ 
    202254-view_cells_type=vspBspTree \ 
    203 -view_cells_term_max_view_cells=1000 \ 
    204 -vsp_bsp_construction_samples=100000 \ 
     255-view_cells_term_max_view_cells=2500 \ 
     256-vsp_bsp_construction_samples=2500000 \ 
     257-view_cells_construction_samples=0 \ 
     258-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     259-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     260-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
     261-view_cells_post_process_merge=false \ 
     262-view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
     263 
     264mv debug.log $LOG_PREFIX-$METHOD-debug.log 
     265 
     266 
     267 
     268################################################################ 
     269#             vspbsptree - many samples                        # 
     270################################################################ 
     271 
     272# 
     273# use many samples for initial subdivision but don't use split cost queue 
     274# 
     275 
     276METHOD=vsp-many-samples-no-split-queue 
     277 
     278echo "$SCENE $METHOD" 
     279 
     280$PROGRAM $ENVIRONMENT \ 
     281-view_cells_type=vspBspTree \ 
     282-view_cells_term_max_view_cells=2500 \ 
     283-vsp_bsp_construction_samples=2500000 \ 
     284-view_cells_construction_samples=0 \ 
    205285-view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    206286-view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    207287-vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    208288-view_cells_post_process_merge=true \ 
    209 -view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
    210  
    211 mv debug.log $LOG_PREFIX-$METHOD-debug.log 
    212  
    213  
    214 ################################################################ 
    215 #             vspbsptree - good merge                          # 
    216 ################################################################ 
    217  
    218 # 
    219 # use many samples for merge 
    220 # 
    221  
    222 METHOD=vsp-good-merge 
    223  
    224 echo "$SCENE $METHOD" 
    225  
    226 $PROGRAM $ENVIRONMENT \ 
    227 -view_cells_type=vspBspTree \ 
    228 -view_cells_construction_samples=8000000 \ 
    229 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    230 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    231 -vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    232 -view_cells_post_process_merge=true \ 
    233 -view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
    234  
    235 mv debug.log $LOG_PREFIX-$METHOD-debug.log 
    236  
    237  
    238  
    239  
    240 ################################################################ 
    241 #             vspbsptree - many samples                        # 
    242 ################################################################ 
    243  
    244 # 
    245 # use many samples for initial subdivision 
    246 # 
    247  
    248 METHOD=vsp-many-samples 
    249  
    250 echo "$SCENE $METHOD" 
    251  
    252 $PROGRAM $ENVIRONMENT \ 
    253 -view_cells_type=vspBspTree \ 
    254 -view_cells_term_max_view_cells=1000 \ 
    255 -vsp_bsp_construction_samples=2000000 \ 
    256 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    257 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    258 -vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    259 -view_cells_post_process_merge=true \ 
    260 -view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
    261  
    262 mv debug.log $LOG_PREFIX-$METHOD-debug.log 
    263  
    264  
    265 ################################################################ 
    266 #             vspbsptree - many samples                        # 
    267 ################################################################ 
    268  
    269 # 
    270 # use many samples for initial subdivision but don't use split cost queue 
    271 # 
    272  
    273 METHOD=vsp-many-samples-no-split-queue 
    274  
    275 echo "$SCENE $METHOD" 
    276  
    277 $PROGRAM $ENVIRONMENT \ 
    278 -view_cells_type=vspBspTree \ 
    279 -view_cells_term_max_view_cells=1000 \ 
    280 -vsp_bsp_construction_samples=2000000 \ 
    281 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    282 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    283 -vsp_bsp_subdivision_stats=$LOG_PREFIX-$METHOD-subdivisionStats.log \ 
    284 -view_cells_post_process_merge=true \ 
    285 -vsp_bsp_use_split_cost_queue=true \ 
    286 -view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
    287  
    288 mv debug.log $LOG_PREFIX-$METHOD-debug.log 
     289-vsp_bsp_use_split_cost_queue=false \ 
     290-view_cells_filename=$LOG_PREFIX-$METHOD-viewCells.x3d 
     291 
     292mv debug.log $LOG_PREFIX-$METHOD-debug.log 

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

    r667 r670  
    12761276        RegisterOption("ViewCells.evaluateViewCells", 
    12771277                                        optBool, 
    1278                                         "view_cells_evaluate_view_cells=", 
     1278                                        "view_cells_evaluate=", 
    12791279                                        "false"); 
    12801280 

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

    r667 r670  
    743743                                float cData = (float)tData.mPvs * tData.mProbability;; 
    744744 
    745                 float costDecr =  
    746                                         (cFront + cBack - cData) / mBox.GetVolume(); 
     745                float costDecr = (cFront + cBack - cData) / mBox.GetVolume(); 
    747746 
    748747                                mTotalCost += costDecr; 
    … …  
    943942    tData.mPriority = mBreathFirstSplits ?  
    944943                (float)-tData.mDepth : tData.mPvs * tData.mProbability; 
     944        //cout << "priority: " << tData.mPriority << endl; 
    945945} 
    946946 
    … …  
    13561356                sAxis = tData.mAxis; 
    13571357                 
     1358        //Debug << "use special axis: " << useSpecialAxis << endl; 
     1359        //Debug << "axis: " << sAxis << " drivingaxis: " << box.Size().DrivingAxis(); 
    13581360 
    13591361        for (axis = 0; axis < 3; ++ axis) 

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

    r666 r670  
    129129                float GetCost() const 
    130130                { 
     131                        //cout << "here " << mPriority << endl; 
    131132                        return mPriority; 
    132133                } 

  • GTP/trunk/Lib/Vis/shared/EvalStats/EvalStats.cpp

    r668 r670  
    9797                                  const int index) 
    9898{ 
    99         float denom = currentStats.mRenderCost ? currentStats.mRenderCost : 0.000001f; 
    100         float costRatio = firstStats.mRenderCost / denom; 
     99        float denom = firstStats.mRenderCost ? firstStats.mRenderCost : 0.000001f; 
     100        float costRatio = currentStats.mRenderCost / denom; 
    101101                         
    102102        denom = firstStats.mAvgRenderCost ? firstStats.mAvgRenderCost : 0.000001f; 
    103         float avgCostRatio = firstStats.mAvgRenderCost / denom; 
     103        float avgCostRatio = currentStats.mAvgRenderCost / denom; 
    104104 
    105105        statsOut << "#ViewCells\n" << index + 1 << endl 
    106                          << "#TotalRenderCostGain\n" << 100.0f - costRatio * 100.0f << endl 
    107                          << "#AvgRenderCostGain\n" << 100.0f - avgCostRatio * 100.0f << endl << endl; 
     106                         //<< "#TotalRenderCostGain\n" << 100.0f - costRatio * 100.0f << endl 
     107                         //<< "#AvgRenderCostGain\n" << 100.0f - avgCostRatio * 100.0f << endl << endl; 
     108                         << "#TotalRenderCostGain\n" << 100.0f * costRatio - 100.0f<< endl 
     109                         << "#AvgRenderCostGain\n" << 100.0f * avgCostRatio -100.0f << endl << endl; 
    108110} 
    109111 
    … …  
    163165        { 
    164166                cout << "writing output to file " << *sit << endl; 
    165  
    166167                ofstream statsOut((*sit).c_str()); 
    167168                ++ sit; 
    168169 
    169                 cout << "size here" << (*it).size() << endl; 
    170170                // compute size of output vector 
    171171                const int n = min((int)firstStats.size(), (int)(*it).size()); 
    … …  
    175175                        ComputeStats(statsOut, firstStats[i], (*it)[i], i); 
    176176                } 
    177                 cout << "here2 " << n << endl; 
     177                 
    178178                statsOut.close(); 
    179179        } 
Note: See TracChangeset for help on using the changeset viewer.