Changeset 3250

Timestamp:

01/06/09 01:13:47 (15 years ago)

Author:

mattausch

Message:

generated some results on vienna and pp

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (3 diffs)
• plot_friendly (modified) (3 diffs)
• ps_memory_plot2 (modified) (1 diff)
• src/SkyPreetham.cpp (modified) (1 diff)
• src/ViewCellsTree.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (2 diffs)
• walkthrough_1.log (added)
• walkthrough_pp_1.log (added)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -7 +7 @@
 # misc stuff
 
-#filename=vienna_full_hp
-filename=city
+filename=vienna_full_hp
+#filename=city
 useLODs=1
 # shadow map size
@@ -17 +17 @@
 statsFilename=mystats.log
 
-# use potentially viible sets?
+# use potentially visible sets?
 usePvs=0
 
@@ -61 +61 @@
 ## powerplant options
 
-#filename=PowerPlantM
+filename=PowerPlantM
 
-#keyForwardMotion=200.0f
-#mouseMotion=1.0f;
-#visibilitySolution=power-plant-2c-xx-1000b-pgv2
-#camPosition=-1320.57 -6306.34 3603
-#camDirection=0.292156 0.9556 0.0383878
+keyForwardMotion=500.0f
+mouseMotion=3.0f;
+visibilitySolution=power-plant-2c-xx-1000b-pgv2
+camPosition=-1320.57 -6306.34 3603
+camDirection=0.292156 0.9556 0.0383878
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/plot_friendly

@@ -1 +1 @@
 #!/bin/sh
 
-PREFIX=vienna
 
 #COMMAND1=../cmxplot
@@ -8 +7 @@
 COMMAND3=./ps_memory_plot3
 
+PREFIX=pp
 
-
-FILES="chc_f.log chc++_f-rmb.log chc++_f.log"
+#FILES="$PREFIX-vfc.log $PREFIX_chc.log $PREFIX-vfc_pvs.log $PREFIX-chc++_b20.log $PREFIX-chc++_pvs_b20.log"
+FILES="$PREFIX-vfc.log $PREFIX-chc.log $PREFIX-vfc_pvs.log $PREFIX-chc++.log $PREFIX-chc++_pvs.log"
+#FILES="$PREFIX-vfc.log $PREFIX-vfc_pvs.log $PREFIX-chc++.log $PREFIX-chc++_pvs.log"
+#FILES="$PREFIX-chc++.log $PREFIX-chc++_b20.log"
 
 echo $FILES
@@ -17 +19 @@
 
 
-$COMMAND2 $STYLE FRAMES FPS $FILES
-./showplot $PREFIX-frames_fps
+#$COMMAND2 $STYLE FRAMES FPS $FILES
+#./showplot $PREFIX-frames_fps
 
 $COMMAND2 $STYLE FRAMES TIME $FILES

GTP/trunk/App/Demos/Vis/FriendlyCulling/ps_memory_plot2

@@ -19 +19 @@
 echo set xlabel \"$2\" >> $FILE 
 echo set ylabel \"$3\" >> $FILE
-#echo set yrange \[0:2000\] >> $FILE
 
+#echo set xrange \[14200:14550\] >> $FILE
+#echo set xrange \[100:20000\] >> $FILE
+#echo set xrange \[4200:4600\] >> $FILE
+echo set xrange \[100:400\] >> $FILE
+#echo set xrange \[1600:2000\] >> $FILE
 # echo set boxwidth 0.4 >> $FILE
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

@@ -110 +110 @@
         // scale the sky dome so no intersection with the scene is visible
         //const float scaleFactor = 80.0f;
-        const float scaleFactor = 200.0f;
+        const float scaleFactor = 500.0f;
 
         position.z -= 3.0f * scaleFactor;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ViewCellsTree.cpp

@@ -14 +14 @@
 #define VIEWCELLS_VERSION 1.0f
 
+// hack: this has to be set to 0.05f for powerplant, to 1 otherwise
 static const float sScale = 0.05f;
+//static const float sScale = 1.0f;
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -582 +582 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-#if 1
+#if 0
         LoadModel("hbuddha.dem", dynamicObjects);
 
@@ -617 +617 @@
         resourceManager->mUseSpecialColors = false;
 
-
-/*      int cityEntities = LoadModel("vienna_full_hp.dem", dynamicObjects);
-        
-        for (int i = (int)dynamicObjects.size() - cityEntities; i < (int)dynamicObjects.size(); ++ i)
-                dynamicObjects[i]->GetTransform()->SetMatrix(transl);
-*/
 
         ///////////