Changeset 2672

Timestamp:

05/02/08 17:49:52 (16 years ago)

Author:

mattausch

Message:

added obj version of full city

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• data/vienna/city_full.bn (deleted)
• data/vienna/city_full.rar (added)
• scripts/run_demo_vienna (modified) (1 diff)
• src/ObjParser.cpp (modified) (3 diffs)
• src/ViewCellsParser.cpp (modified) (2 diffs)

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/city_full3.obj
 #VIEWCELLS=../data/vienna/vienna_cropped-seq-3000-false-20-viewcells.xml.gz
 VIEWCELLS=../data/vienna/vienna_cropped-57000-viewcells.xml.gz

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

@@ -259 +259 @@
                                         break;
                                 default:
-                                        float x, y, z; //cout << "v";   
+                                        
+                                        float x, y, z;
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
                                         vertices.push_back(Vector3(x,y,z));
-
+                                        //cout <<"v " << x << " " << y << " "<< z << " ";
                                 }
                                 break;
@@ -286 +287 @@
 
                                         //////////
-                                        // construct the triangles given in the current line
+                                        // construct triangles from indices in the current line
 
                                         vector<Triangle3> triangles;
@@ -295 +296 @@
                                         for (tit = triangles.begin(); tit != tit_end; ++ tit)
                                         {
-                                          // test if it is a valid triangle
+                                          // test if the triangle is valid (i.e., not degenerated)
                                           if (!TriangleValid(*tit))
-                                            continue;
+                                                  continue;
 
                                           TriangleIntersectable *obj = new TriangleIntersectable(*tit); 

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

@@ -499 +499 @@
         else
         {
+                const int n = 1000;
                 // parse view space hierarchy
                 switch (mCurrentState)
                 {
                 case PARSE_VIEWSPACE_HIERARCHY:
-                        if ((++ nViewCells % 1000) == 0)
+                        if ((++ nViewCells % n) == 0)
                         {
                                 cout << "\r" << nViewCells << " view cells parsed\r";
@@ -511 +512 @@
                         break;
                 case PARSE_OBJECTSPACE_HIERARCHY:
-                        if ((++ nObjects % 10000) == 0)
+                        if ((++ nObjects % n) == 0)
                                 cout <<"\r" << nObjects << " objects parsed\r";