Changeset 3273 for GTP/trunk/App/Demos/Vis

Timestamp:

01/13/09 12:43:51 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VisibilitySolutionConverter/VisibilitySolutionConverter.cpp (modified) (4 diffs)
• default.env (modified) (1 diff)
• src/BvhExporter.cpp (modified) (1 diff)
• src/ObjExporter.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.cpp

@@ -52 +52 @@
 {
         vector<string> triples;
+
         char *next_token;
 
@@ -60 +61 @@
         {
                 string s(pch);
-                //s += "\n",
                 triples.push_back(s);
                 
@@ -66 +66 @@
         }
 
+        // throw away last symbol (\n)
+        triples.back().resize(triples.back().size() - 1);
+
         vector<int> indices;
         vector<int> nIndices;
         vector<int> tIndices;
 
-        char seps[] = " /\t\n";
+        char seps[] = " ";
+        char seps2[] = "/";
 
         for (size_t i = 0; i < triples.size(); ++ i)
         {
-                static int dummy = 0;
-
                 size_t found;
-                found = triples[i].find_first_of(seps);
+                found = triples[i].find_first_of(seps2);
                 size_t prevfound = 0;
-                // vertex, normal, texture indices
+
+                // extract vertex, normal, texture indices
                 string str = triples[i].substr(prevfound, found);
 
                 int index = (int)strtol(str.c_str(), NULL, 10) - 1;
-
                 int tIndex = index;
                 int nIndex = index;     
                 
-                prevfound = found;
-                found = triples[i].find_first_of(seps, found + 1);  
+                // try to extract texture and normal indices
+                prevfound = found + 1;
+                found = triples[i].find_first_of(seps2, prevfound);  
 
                 if (found != string::npos)
@@ -97 +100 @@
                         if (idx > 0) tIndex = idx;
                 }
-
-                if ((found + 1) < triples[i].size())
+                
+                if (found != string::npos)
                 {
                         str = triples[i].substr(found + 1);

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

@@ -7 +7 @@
 # misc stuff
 
-#filename=vienna_full_hp
-#bvhname=vienna_full_hp
-filename=newvienna
-bvhname=newvienna
+filename=vienna_full_hp
+bvhname=vienna_full_hp
+#filename=newvienna
+#bvhname=newvienna
 #filename=procedural_pompeii_area6_hires/pompeii_full
 #filename=procedural_pompeii_area6_hires/pompeii_part

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

@@ -99 +99 @@
          ConstructTriangleRangeMap(bvh, bvh->GetStaticRoot(), first, last);
 
-         BvhLeafContainer nodes;
-         bvh->CollectLeaves(bvh->GetStaticRoot(), nodes);
+         BvhNodeContainer nodes;
+         bvh->CollectVirtualLeaves(bvh->GetStaticRoot(), nodes);
 
          vector<int> triangles;
 
-         BvhLeafContainer::const_iterator it, it_end = nodes.end();
+         BvhNodeContainer::const_iterator it, it_end = nodes.end();
 
          for (it = nodes.begin(); it != it_end; ++ it)

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

@@ -53 +53 @@
          int numVertices = 0;
 
-         BvhLeafContainer nodes;
-         bvh->CollectLeaves(bvh->GetStaticRoot(), nodes);
+         BvhNodeContainer nodes;
+         bvh->CollectVirtualLeaves(bvh->GetStaticRoot(), nodes);
 
          cout << "writing " << nodes.size() << " objects ..." << endl; 
 
-         BvhLeafContainer::const_iterator it, it_end = nodes.end();
+         BvhNodeContainer::const_iterator it, it_end = nodes.end();
 
          int j = 0;
@@ -99 +99 @@
          for (int i = 0; i < numVertices; i += 3)
          {
-                 ostream << "f " << i + 2 << " " << i + 2 << " " << i + 3 << endl;
+                 ostream << "f " << i + 1 << " " << i + 2 << " " << i + 3 << endl;
          }
 

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

@@ -148 +148 @@
 bool useSkylightForIllum = true;
 
+bool showFPS = true;
+
 static int globalVisibleId = 0;
 
@@ -724 +726 @@
 
 
-        //ObjExporter().Export(model_path + "myvienna.obj", bvh);
-        //BvhExporter().Export(model_path + "myvienna.bv", bvh);
+        ObjExporter().Export(model_path + "myvienna.obj", bvh);
+        BvhExporter().Export(model_path + "myvienna.bv", bvh);
 
 
@@ -1709 +1711 @@
                 if (!usePvs) SceneEntity::SetCurrentVisibleId(-1);
                 break;
+        case ',':
+                // show / hide FPS
+                showFPS = !showFPS;
+                break;
+        
         default:
                 return;
@@ -2422 +2429 @@
                 
                 if (!showAlgorithmTime)
-                        sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);
+                {
+                        if (showFPS)
+                                sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);
+                }
                 else
                         sprintf(msg[7], "%s:  %6.1f ms", alg_str[renderMode], rTime);