Changeset 2381 for GTP/trunk/Lib

Timestamp:

05/16/07 11:59:26 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/gi_final.env (modified) (1 diff)
• scripts/gi_final.sh (modified) (6 diffs)
• src/TestPreprocessor.vcproj (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env

@@ -20 +20 @@
         detectEmptyViewSpace true
         loadMeshes false
+        
         # internal raycaster
-        rayCastMethod 0  
+        #rayCastMethod 0  
         # intel raycaster
-        #rayCastMethod 1
+        rayCastMethod 1
+        
         exportVisibility false
         applyVisibilityFilter false

GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh

@@ -18 +18 @@
 SCENE_PATH=../data/Arena
 
+#SCENE=PompeiiOne
+#SCENE_PATH=../data/pompeii
+
 #SCENE=soda
 #SCENE_PATH=../data/soda
 
-ENVIRONMENT=gi_final2.env
+ENVIRONMENT=gi_final.env
 LOG_PREFIX=../scripts/tests/gi/$SCENE
 
@@ -28 +31 @@
 SCENE_FILENAME=$SCENE_PATH/$SCENE.$EXT
 
-OBJ_WEIGHT=70
+OBJ_WEIGHT=20
 
 #######################################################
@@ -132 +135 @@
 USE_HEUR=false
 
-METHOD=int-$USE_HEUR-$OBJ_WEIGHT-nosah
+METHOD=int-$USE_HEUR-$OBJ_WEIGHT
 
 echo "$SCENE $METHOD"
@@ -149 +152 @@
   -hierarchy_construction_min_avg_rays_per_object=0 \
   -hierarchy_construction_max_avg_rays_per_object=0 \
-  -bvh_use_sah=false \
+  -bvh_use_sah=true \
   -vsp_use_cost_heuristics=$USE_HEUR
 
@@ -161 +164 @@
 METHOD=seq-$NODES-$USE_HEUR-$OBJ_WEIGHT
  
-#echo "$SCENE $METHOD"
-#$PROGRAM $ENVIRONMENT \
+echo "$SCENE $METHOD"
+$PROGRAM $ENVIRONMENT \
  -scene_filename=$SCENE_FILENAME \
  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \
@@ -176 +179 @@
  -bvh_term_max_leaves=$NODES
 
-#sh movefiles.sh $LOG_PREFIX-$METHOD
+sh movefiles.sh $LOG_PREFIX-$METHOD
 

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -231 +231 @@
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"
+                                LargeAddressAware="2"
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"

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

@@ -952 +952 @@
 
         VssRayContainer postProcessSamples;
-        cout << "casting " << mPostProcessSamples << " post processing samples ... ";
+        cout << "casting " << mPostProcessSamples << " post process samples ..." << endl;
         
         CastPassSamples(mPostProcessSamples, mStrategies, postProcessSamples);
 
-        cout << "finished" << endl;
+        cout << "finished post process sampling" << endl;
         cout << "starting post processing and visualization" << endl;