Changeset 2717 for GTP/trunk

Timestamp:

05/27/08 16:38:18 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_vienna (modified) (1 diff)
• src/GvsPreprocessor.cpp (modified) (2 diffs)
• src/QtInterface/QtGlRenderer.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_vienna

@@ -8 +8 @@
 
 
-#SCENE=../data/vienna/vienna_cropped.obj
+SCENE=../data/vienna/vienna_cropped.obj
 #SCENE=../data/vienna/city_full.obj
 #SCENE=../data/vienna/city_full_hp.obj
-SCENE=../data/vienna/vienna_rep.obj
+#SCENE=../data/vienna/vienna_rep.obj
 
 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz

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

@@ -484 +484 @@
         mGvsStats.mBorderSamples += castRays;
 
-        //CLEAR_CONTAINER(invalidSamples);
-        
-        //cout << "here3 cast rays: " << castRays << endl;
+        
         return castRays;
 }
@@ -1201 +1199 @@
         app << "#TotalSamples\n" << mTotalSamples << endl;
 
+        app << "#AvgPvs: " << mPvsCost / mViewCells << endl;
         app << "#TotalTrianglePvs\n" << mTotalTrianglePvs << endl;
         

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -241 +241 @@
 
         // use shading
-        if (1)//mSnapErrorFrames)
+        if (mSnapErrorFrames)
         {
                 glEnable(GL_NORMALIZE);
@@ -275 +275 @@
 
                 glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-                //glEnable(GL_COLOR_MATERIAL);
+                glEnable(GL_COLOR_MATERIAL);
 
                 GLfloat lmodel_ambient[] = {0.3f, 0.3f, 0.3f, 1.0f};