Changeset 2689 for GTP/trunk

Timestamp:

05/19/08 18:55:38 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/demo1.env (modified) (1 diff)
• scripts/run_demo_vienna (modified) (2 diffs)
• scripts/run_gvs_vps.sh (modified) (1 diff)
• src/GlRenderer.cpp (modified) (2 diffs)
• src/GvsPreprocessor.cpp (modified) (4 diffs)
• src/IntersectableWrapper.cpp (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)

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

@@ -170 +170 @@
 
 KdTree {
-        pvsArea   1e-3
+        pvsArea   1e-4
         sahUseFaces false
         Termination {

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

@@ -8 +8 @@
 
 
-SCENE=../data/vienna/vienna_cropped.obj
-#SCENE=../data/vienna/city_full.obj
+#SCENE=../data/vienna/vienna_cropped.obj
+SCENE=../data/vienna/city_full.obj
 
 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
@@ -36 +36 @@
 -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
 -preprocessor_detect_empty_viewspace- \
+-preprocessor_use_vbos- \
 -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog \
 -view_cells_random_viewpoint_list=$VIEWPOINTS \

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

@@ -30 +30 @@
 -scene_filename=$SCENE \
 -preprocessor=gvs \
--preprocessor_use_vbos- \
+-preprocessor_use_vbos+ \
 -gvs_epsilon=0.0001 \
 -gvs_total_samples=1000000 \
 -gvs_samples_per_pass=1000000 \
 -gvs_initial_samples=16 \
--gvs_max_viewcells=20 \
--gvs_min_contribution=50 \
+-gvs_max_viewcells=1 \
+-gvs_min_contribution=100 \
 -gvs_per_viewcell=true \
 -gvs_stats=$LOG_PREFIX-gvsStats.log \

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

@@ -122 +122 @@
                 mViewPoint = Vector3(440.295, 196.959, -781.302);
                 mViewDirection = Vector3(-0.0566328, 0, -0.998395);
+
+                mViewPoint = Vector3(680.682, 189.552, -278.177);
+                mViewDirection = Vector3(0.942709, -0, -0.333584);
         }
 
@@ -138 +141 @@
         mUseGlLists = false;
 
-        bool mUseVbos;
         Environment::GetSingleton()->GetBoolValue("Preprocessor.useVbos", mUseVbos);
 

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

@@ -951 +951 @@
         AxisAlignedBox3 box = mCurrentViewCell->GetMesh()->mBox;
         
-        //vector<KdLeaf *> leaves;
-        //mKdTree->GetBoxIntersections(box, leaves);
-
         ObjectContainer kdobjects;
         mKdTree->CollectKdObjects(box, kdobjects);
@@ -964 +961 @@
                 KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
                 
-                //mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
                 mCurrentViewCell->GetPvs().AddSampleDirtyCheck(kdInt, 1.0f);
-
-                mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
+                //if (SHOW_QT_VISUALIZATION) mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
 
                 myobjects.clear();
@@ -989 +984 @@
 
                                         mTrianglePvs.push_back(triObj);
-                                        mGenericStats = mTrianglePvs.size();
+                                        mGenericStats = (int)mTrianglePvs.size();
                                 }
                         }                       
@@ -1029 +1024 @@
                 {
                         TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
-             
                         // the triangle itself intersects => add object
                         if (box.Intersects(triObj->GetItem()))

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

@@ -210 +210 @@
                                         static_cast<TriangleIntersectable *>(leaf->mObjects[i]);
                                 
-                                // check if already rendered
+                                // check if already accounted for
                                 if (!obj->Mailed())
                                 {

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

@@ -257 +257 @@
         RenderScene();
 
+        glFlush();
+
         query->EndQuery();
         glDisable(GL_STENCIL_TEST); 
@@ -307 +309 @@
                         // render pvs once
                         RenderPvs(pvs);
+
+                        glFlush();
 
                         //mUseForcedColors = false;

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

@@ -390 +390 @@
                         //rendererWidget->SetWindowTitle("Global Visualization");
 
-                        if (0 && !rendererWidget->GetUseVbos()) // viewer not working with vbo
+                        if (1 && !rendererWidget->GetUseVbos()) // viewer not working with vbo
                         {
                                 cout << "starting the qt viewer" << endl;