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

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• BvhExporter.cpp (modified) (1 diff)
• ObjExporter.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (4 diffs)

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);