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

Timestamp:

01/13/09 10:43:20 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• BvhExporter.cpp (modified) (5 diffs)
• ObjExporter.cpp (modified) (4 diffs)
• ResourceManager.cpp (modified) (1 diff)
• SceneEntityConverter.cpp (modified) (1 diff)
• SkyPreetham.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)

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

@@ -61 +61 @@
 
                 ConstructTriangleRangeMap(bvh, interior->GetFront(), first, m);
-                ConstructTriangleRangeMap(bvh, interior->GetBack(), m, last);
+                int newFirst = m + 1;
+                ConstructTriangleRangeMap(bvh, interior->GetBack(), newFirst, last);
 
                 mTriangleRangeMap[node] = pair<int, int>(first, last);
@@ -68 +69 @@
         {
                 //first = currentIdx;
-                last = first + bvh->CountTriangles(node);
+                last = first + bvh->CountTriangles(node) - 1;
                 //currentIdx = last;
 
@@ -91 +92 @@
          buffer[0] = MAGIC;
          buffer[1] = BVH_VERSION * 1000;
-         //buffer[2] = triangles.size();
          buffer[3] = 0; // construction method
          buffer[4] = 1; // termination leaves
          buffer[5] = bvh->CountNumNodes(bvh->GetStaticRoot());
 
-         fwrite(buffer, sizeof(int), 6, fw);
-
-         int first, last;
+         int first = 0, last;
          ConstructTriangleRangeMap(bvh, bvh->GetStaticRoot(), first, last);
 
-         BvhNodeContainer nodes;
-         bvh->CollectNodes(bvh->GetStaticRoot(), nodes);
+         BvhLeafContainer nodes;
+         bvh->CollectLeaves(bvh->GetStaticRoot(), nodes);
 
          vector<int> triangles;
 
-         BvhNodeContainer::const_iterator it, it_end = nodes.end();
+         BvhLeafContainer::const_iterator it, it_end = nodes.end();
 
          for (it = nodes.begin(); it != it_end; ++ it)
@@ -113 +111 @@
 
                  int f = mTriangleRangeMap[node].first;
-                 int b = mTriangleRangeMap[node].second;
+                 int l = mTriangleRangeMap[node].second;
 
-                 for (int i = f; i < b; ++ i)
+                 for (int i = f; i <= l; ++ i)
                  {
                          triangles.push_back(i);
@@ -121 +119 @@
          }
 
+         buffer[2] = (int)triangles.size();
+         fwrite(buffer, sizeof(int), 6, fw);
+
          cout << "writing " << (int)triangles.size() << " triangle ids ..." << endl;
 
          // export sorted triangle IDs
-         for (int i = 0; i < (int)triangles.size(); ++i) 
+         for (size_t i = 0; i < triangles.size(); ++ i) 
          {
                  fwrite(&triangles[i], sizeof(int), 1, fw);

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

@@ -25 +25 @@
         Vector3 *vertices = geom->GetVertices(numVertices);
 
+        char str[100];
+
         //cout << "vtx: " << numVertices << endl;
         for (int i = 0; i < numVertices; ++ i)
         {
                 Vector3 v = vertices[i];
-                ostream << "v " << v.x << " " << v.y << " " << v.z << endl;
+                sprintf(str, "v %f %f %f\n", v.x, v.z, -v.y);
+                ostream << str;
         }
 
@@ -73 +76 @@
                  {
                          ShapeContainer::iterator sit, send;
-
                          entities[i]->GetLODLevel(0, sit, send);
 
@@ -79 +81 @@
                          {
                                  Geometry *geom = (*sit)->GetGeometry();
+                                 
+                                 int dummy;
+                                 if (!geom->GetVertices(dummy))
+                                 {
+                                         cerr << "error: geometry was deleted on loading, exporting obj failed" << endl;
+                                         return false;
+                                 }
+
                                  numVertices += WriteGeometry(geom, ostream);
                          }
@@ -89 +99 @@
          for (int i = 0; i < numVertices; i += 3)
          {
-                 ostream << "f " << i << " " << i + 1 << " " << i + 2 << endl;
+                 ostream << "f " << i + 2 << " " << i + 2 << " " << i + 3 << endl;
          }
 

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

@@ -382 +382 @@
         }
 
-        const bool delGeometry = true;
-        //const bool delGeometry = false;
+        //const bool delGeometry = true;
+        const bool delGeometry = false;
         return new Geometry(vertices, normals, texcoords, vertexCount, delGeometry, NULL);//tangents);
 }

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

@@ -115 +115 @@
         }
 
+
         Geometry *geom = new Geometry(vertices, normals, tex, 6, true, NULL);
 

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

@@ -109 +109 @@
 
         // scale the sky dome so no intersection with the scene is visible
-        //const float scaleFactor = 80.0f;
-        const float scaleFactor = 1000.0f;
+        const float scaleFactor = 80.0f;
+        //const float scaleFactor = 1000.0f;
 
         position.z -= 3.0f * scaleFactor;

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

@@ -595 +595 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-#if 1
 
         AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
 
+        cout << "here34 " << pompeiiBox << endl;
+        
+#if 0
         // todo: dispose texture
         Texture *floorTex = new Texture(model_path + "stairs.c.01.tif");
@@ -722 +724 @@
 
 
-        //ObjExporter().Export(model_path + "mycity.obj", bvh);
-        //BvhExporter().Export(model_path + "mycity.bvh", bvh);
+        //ObjExporter().Export(model_path + "myvienna.obj", bvh);
+        //BvhExporter().Export(model_path + "myvienna.bv", bvh);
 
 
@@ -1366 +1368 @@
                         ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
 
+                //for (size_t i = 0; i < staticObjects.size(); ++ i)
+                //      staticObjects[i]->Render(&renderState);
+                
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();