Changeset 2706 for GTP

Timestamp:

05/24/08 15:48:02 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_vienna (modified) (2 diffs)
• src/GlRenderer.cpp (modified) (2 diffs)
• src/QtInterface/QtGlRenderer.cpp (modified) (4 diffs)
• src/main.cpp (modified) (5 diffs)

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

@@ -10 +10 @@
 #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/city_full_hp.obj
+SCENE=../data/vienna/vienna_rep.obj
 
 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
@@ -40 +40 @@
 -preprocessor_detect_empty_viewspace+ \
 -preprocessor_use_vbos- \
--preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog \
+-preprocessor_ray_cast_method=3 \
 -view_cells_random_viewpoint_list=$VIEWPOINTS \
 demo1.env

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

@@ -544 +544 @@
                 glVertex3f(t->mVertices[1].x, t->mVertices[1].y, t->mVertices[1].z);
                 glVertex3f(t->mVertices[2].x, t->mVertices[2].y, t->mVertices[2].z);
-
         }
 
@@ -591 +590 @@
 
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
+
         // handle dynamic objects
         DynamicObjectsContainer::const_iterator dit, dit_end = p->mDynamicObjects.end();

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

@@ -556 +556 @@
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
 
-        // handle dynamic objects
+        // handle dynamic objects in pvss
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicPvsObjects.end();
 
@@ -564 +564 @@
         }
 
-        // handle dynamic objects
+        // show placed dynamic objects as wireframe
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
         dit, dit_end = p->mDynamicObjects.end();
@@ -570 +570 @@
         for (dit = p->mDynamicObjects.begin(); dit != dit_end; ++ dit)
         {
+                glColor3f(0, 1, 0);
+                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                 _RenderDynamicObject(*dit);
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
         }
 
@@ -2712 +2715 @@
         glPopMatrix();
 
-        //updateGL();
-
         int hits;
         // finally release the rendering context again 

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

@@ -61 +61 @@
 static string GetViewPointsListName(const string &filename)
 {
-        string viewCellPointsFile;
-
         char buff[200];
         Environment::GetSingleton()->GetStringValue("ViewCells.randomViewPointsList", buff);
-
-        string vpList(buff);
-
-        if (vpList == "")
+        string viewCellPointsFile = buff;
+
+        if (viewCellPointsFile == "")
         {
                 // if not specified, take file that has same prefix as scene file
@@ -78 +75 @@
                         viewCellPointsFile = ReplaceSuffix(filename, ".x3d", ".vc");
         }
-        else
-        {
-                viewCellPointsFile = vpList;
-        }
 
         return viewCellPointsFile;
@@ -234 +227 @@
 
         
-        
         // export objects as obj
         if (preprocessor->mExportObj)
@@ -245 +237 @@
                 else
                 {
-
                         const string objname = GetInternFilename(filename, ".obj");
 
@@ -281 +272 @@
                         cout << "successfully loaded " << viewCellPointsFile << endl;
                 else
-                        cerr << "error: file << " << viewCellPointsFile << " not found" << endl;
+                        cerr << "error: file " << viewCellPointsFile << " not found" << endl;
         }