Changeset 3287 for GTP/trunk/App

Timestamp:

01/19/09 20:49:54 (16 years ago)

Author:

mattausch

Message:

worked on videos - still problems with strange white pixels

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (4 diffs)
• plot_friendly (modified) (2 diffs)
• ps_memory_plot2 (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (1 diff)
• src/Pvs.h (modified) (1 diff)
• src/SkyPreetham.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (8 diffs)

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

@@ -17 +17 @@
 filename=city
 bvhname=city
-useLODs=1
+useLODs=0
 # shadow map size
 shadowSize=4096
 # the filenames given to recorded frames (+ number.bmp)
 #recordedFramesSuffix=frames/vienna_frame
-recordedFramesSuffix=frames_100_pgv/vienna_frame
+recordedFramesSuffix=vienna_frame
 #recordedFramesSuffix=frames_50_spgvu/vienna_frame
 # the filename for the statistics
@@ -49 +49 @@
 
 #visibilitySolutionInitialState=50000000
-visibilitySolutionInitialState=100000000
+#visibilitySolutionInitialState=300000000
+visibilitySolutionInitialState=500000000
 
 
@@ -99 +100 @@
 ## window options
 
-winWidth=800
-winHeight=600
+#winWidth=800
+#winHeight=600
 
-#winWidth=1024
-#winHeight=768
+winWidth=1024
+winHeight=768
 
 useFullScreen=0
@@ -127 +128 @@
 # skylight turbitity
 turbitity=3.0f
+#turbitity=2.0f
 #sky dome scale factor
 

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

@@ -7 +7 @@
 COMMAND3=./ps_memory_plot3
 
-PREFIX=pp_2
+#PREFIX=pp_2
+PREFIX=myvienna
 
 #FILES="$PREFIX-vfc.log $PREFIX_chc.log $PREFIX-vfc_pvs.log $PREFIX-chc++_b20.log $PREFIX-chc++_pvs_b20.log"
@@ -14 +15 @@
 #FILES="$PREFIX-chc++.log $PREFIX-chc++_b20.log"
 #FILES="$PREFIX-chc.log $PREFIX-vfc_pvs.log $PREFIX-vfc_pvs_smaller.log $PREFIX-chc++.log $PREFIX-chc++_pvs.log $PREFIX-chc++_pvs_smaller.log"
-FILES="$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"
+#FILES="$PREFIX-vfc.log $PREFIX-chc++.log $PREFIX-vfc_pvs.log"
 
 echo $FILES

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

@@ -24 +24 @@
 #echo set xrange \[4200:4600\] >> $FILE
 #echo set xrange \[100:400\] >> $FILE
-echo set xrange \[1:500\] >> $FILE
+echo set xrange \[1600:2100\] >> $FILE
+#echo set xrange \[3000:3500\] >> $FILE
 #echo set xrange \[1600:2000\] >> $FILE
 # echo set boxwidth 0.4 >> $FILE

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

@@ -1358 +1358 @@
 
         static char imageName[200];
-        sprintf(imageName, "%s_%05d.bmp", mSavedFrameSuffix.c_str(), mSavedFrameNumber);
+        sprintf(imageName, "%s_%05d.tga", mSavedFrameSuffix.c_str(), mSavedFrameNumber);
 
         ILstring fileName = ILstring(imageName);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Pvs.h

@@ -11 +11 @@
 class Bvh;
 
-#define USE_TIMESTAMPS
+//#define USE_TIMESTAMPS
 
 struct PvsEntry

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

@@ -296 +296 @@
                 ambient *= 1e-1f;
 
+        //  could be too blueish ...
+        ambient.x *= 1.3f;
+        ambient.y *= 1.2f;
+        ambient.z = max(max(ambient.z, ambient.x), ambient.y);
+
         // simulate the sun intensity by modulating the ambient term.
         ambient *= (10.0f - 9.0f * DotProd(sunDir, Vector3::UNIT_Z()));

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

@@ -386 +386 @@
 void LoadPompeiiFloor();
 
+void LoadOrUpdatePVSs(const Vector3 &pos);
+
+
+
 float pvsTotalSamples = .0f;
 float pvsTotalTime = .0f;
@@ -1214 +1218 @@
         SetupEyeView();
         
+
         // set frame related parameters for GPU programs
         GPUProgramParameters::InitFrame(camera, light);
@@ -1242 +1247 @@
         glEnableClientState(GL_VERTEX_ARRAY);
 
-        if (usePvs)
-        {
-                if (!viewCellsTree)     
-                {
-                        LoadVisibilitySolution();
-                        applicationTimer.Start();
-                        shotRays = visibilitySolutionInitialState;
-                }
-
-                if (viewCellsTree) LoadPvs();
-        }
+        if (usePvs) LoadOrUpdatePVSs(camera->GetPosition());
+
 
         // render with the specified method (forward rendering, forward + depth, deferred)
@@ -1335 +1331 @@
                 //if (traverser->GetType() == RenderTraverser::CULL_COLLECTOR)
                 //      ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
+
+                //renderState.LockCullFaceEnabled(true);
 
                 // actually render the scene geometry using the specified algorithm
@@ -1805 +1803 @@
 
                         // hack: load pvs on replay (remove later!)
-                        usePvs = true;
+                        //usePvs = true;
                 }
                 else
@@ -2534 +2532 @@
         renderState.SetUseAlphaToCoverage(false);
 
+        const Vector3 lightPos = light->GetDirection() * -1e3f;
+        if (usePvs) LoadOrUpdatePVSs(lightPos);
+
+
         // change CHC++ set of renderState variables 
         // this must be done for each change of camera because
@@ -2671 +2673 @@
 
 
-void LoadPvs()
+void UpdatePvs(const Vector3 &pos)
 {
         viewCell = viewCellsTree->GetViewCell(camera->GetPosition());
@@ -2798 +2800 @@
         staticObjects.push_back(myplane);
 }
+
+
+void LoadOrUpdatePVSs(const Vector3 &pos)
+{
+        if (!viewCellsTree)     
+        {
+                LoadVisibilitySolution();
+                applicationTimer.Start();
+                shotRays = visibilitySolutionInitialState;
+        }
+
+        if (viewCellsTree) UpdatePvs(pos);
+}