Changeset 3289

Timestamp:

01/20/09 23:34:39 (16 years ago)

Author:

mattausch

Message:

siggraph submission deadline

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (2 diffs)
• src/VisibilitySolutionLoader.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (4 diffs)

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

@@ -27 +27 @@
 statsFilename=mystats
 #walkThroughSuffix=walkthrough_pp_1
-walkThroughSuffix=walkthrough_vienna
-#walkThroughSuffix=path_pp
+#walkThroughSuffix=walkthrough_vienna
 
 # use potentially visible sets?
@@ -153 +152 @@
 
 # static geometry
-#filename=PowerPlantM
-#bvhname=PowerPlantM
-#keyForwardMotion=500.0f
-#mouseMotion=10.0f
-#visibilitySolution=power-plant-2c-xx-1000b-pgv2
+filename=PowerPlantM
+bvhname=PowerPlantM
+keyForwardMotion=500.0f
+mouseMotion=10.0f
+visibilitySolution=power-plant-2c-xx-1000b-pgv2
 #visibilitySolution=power-plant-2c-xx-1000d-pgv
-#visibilitySolution=power-plant-2c-xx-1000b-spgvu
-#camPosition=-1320.57 -6306.34 3603
-#camDirection=0.292156 0.9556 0.0383878
-#viewCellsScaleFactor=0.05f
+visibilitySolution=power-plant-2c-xx-1000b-spgvu
+camPosition=-1320.57 -6306.34 3603
+camDirection=0.292156 0.9556 0.0383878
+viewCellsScaleFactor=0.05f
 
-#camPosition=763.554 -10254.5 2604
-#camDirection=-0.0975121 0.994494 0.0383878
-#useSkylightForIllum=1
-#skyDomeScaleFactor=1000.0f
+camPosition=763.554 -10254.5 2604
+camDirection=-0.0975121 0.994494 0.0383878
+useSkylightForIllum=1
+skyDomeScaleFactor=1000.0f
 
+camPosition=1145.31 413.602 186.678
+camDirection=-0.917729 -0.397207 -0
+#lightDirection=0.509293 0.784034 -0.35484
+lightDirection=0.360937 0.0267167 -0.932207
 
-#camPosition=1145.31 413.602 186.678
-#camDirection=-0.917729 -0.397207 -0
-#lightDirection=0.509293 0.784034 -0.35484
+#walkThroughSuffix=path_pp
+walkThroughSuffix=walkthrough_pp_1

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

@@ -36 +36 @@
         fread(&totalTime, sizeof(float), 1, fr);
 
+        cout << "visibity solution created with " << totalSamples << " in " << totalTime << " secs" << endl;
         cout << "loading view cells" << endl;
 
@@ -155 +156 @@
 
         BvhNodeContainer nodes;
-        CreateIdSortedList2(bvh->GetStaticRoot(), nodes);
-        //CreateIdSortedList(bvh, nodes);
+        //CreateIdSortedList2(bvh->GetStaticRoot(), nodes);
+        CreateIdSortedList(bvh, nodes);
 
         const int tenpercent = number / 10;

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

@@ -1785 +1785 @@
                         (renderMethod == RENDER_DEPTH_PASS_DEFERRED)
                         );
-                
                 break;
         case GLUT_KEY_F8:
@@ -1799 +1798 @@
                 {
                         cout << "replaying path" << endl;
-
                         currentReplayFrame = -1;
 
@@ -1809 +1807 @@
                         cout << "finished replaying path" << endl;
                 }
-
                 break;
         case GLUT_KEY_F11:
@@ -1824 +1821 @@
                         DEL_PTR(walkThroughRecorder);
                 }
-
                 break;
         case GLUT_KEY_F12: