Changeset 3242 for GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter

Timestamp:

01/02/09 17:29:48 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• VisibilitySolutionConverter.cpp (modified) (9 diffs)
• VisibilitySolutionConverter.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -246 +246 @@
 
         // update bvh bounding boxes with loaded geometry
-        UpdateNodeBox(mRoot);
+        UpdateBvh(mRoot);
+
+        cout << "bvh: " << mRoot->first << " " << mRoot->last << " bb: " << mRoot->box << endl;
 
         cout << "writing scene" << endl;
@@ -331 +333 @@
                                 default:
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                                        //const float scale = 5e-3f;
-                                        const float scale = 0.1f;
+                                        const float scale = 1.0f;
+                                        //const float scale = 0.1f;
                                         tempVertices.push_back(CHCDemoEngine::Vector3(x * scale, y * scale, z * scale));
                                         //cout <<"v " << x << " " << y << " "<< z << " ";
@@ -395 +397 @@
 
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                                        const float scale = 0.1f;
+                                        const float scale = 1.0f;
                                         vertices.push_back(CHCDemoEngine::Vector3(x * scale, y * scale, z * scale));
                                         break;
@@ -558 +560 @@
         vector<TexCoord> _texCoords;
 
+        CHCDemoEngine::AxisAlignedBox3 testBox;
+        testBox.Initialize();
+
+        for (int i = 0; i < vertices.size(); ++ i)
+        {
+                testBox.Include(vertices[i]);
+        }
+
+        cout << "testbox: " << testBox << endl;
+
         mGeometry.reserve(mBvhLeaves.size());
 
@@ -580 +592 @@
                 LoadShape(_vertices, _normals, _texCoords);
                 
-                node->geometry = mGeometry.back();
+                // we store geometry in our bvh => change first and last pointer
+                // fromt triangles to geometry
+                node->first = (int)mGeometry.size() - 1;
+                node->last = (int)mGeometry.size() - 1;
 
                 _vertices.clear();
@@ -639 +654 @@
         leaf->box.Initialize();
 
-        Geometry *geom = leaf->geometry;
+        Geometry *geom = mGeometry[leaf->first];
 
         for (size_t i = 0; i < geom->mVertexCount; ++ i)
@@ -842 +857 @@
         int nodeType;
 
-        if (!node->IsLeaf())
+        if (node->IsLeaf())
                 nodeType = TYPE_LEAF;
         else 
@@ -856 +871 @@
 
         stream.write(reinterpret_cast<char *>(&bMin), sizeof(CHCDemoEngine::Vector3));
-        stream.write(reinterpret_cast<char *>(&bMin), sizeof(CHCDemoEngine::Vector3));
-}
-
-
-void VisibilitySolutionConverter::UpdateNodeBox(BvhNode *node)
+        stream.write(reinterpret_cast<char *>(&bMax), sizeof(CHCDemoEngine::Vector3));
+}
+
+
+void VisibilitySolutionConverter::UpdateBvh(BvhNode *node)
 {
         if (!node->IsLeaf())
         {
                 BvhInterior *interior = (BvhInterior *)node;
+
+                UpdateBvh(interior->front);
+                UpdateBvh(interior->back);
+
+                interior->first = min(interior->front->first, interior->back->first);
+                interior->last = max(interior->front->last, interior->back->last);
+                
                 node->box = Union(interior->front->box, interior->back->box);
-
-                UpdateNodeBox(interior->front);
-                UpdateNodeBox(interior->back);
         }
         else
         {
                 UpdateLeafBox((BvhLeaf *)node);
+                //cout << "bb: " << node->box << endl;
         }
 }
@@ -883 +903 @@
 
         if (!stream.is_open()) return NULL;
-
-        cout << "loading bvh" << endl;
 
         WriteNextNode(stream, mRoot);

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

@@ -68 +68 @@
 struct BvhLeaf: public BvhNode
 {
-        Geometry *geometry;
-
-        BvhLeaf(): BvhNode(), geometry(NULL) {}
+        BvhLeaf(): BvhNode() {}
 };
 
@@ -141 +139 @@
 
         void UpdateLeafBox(BvhLeaf *leaf);
-
-        void UpdateNodeBox(BvhNode *node);
+        /** Prepare bvh for exporting.
+        */
+        void UpdateBvh(BvhNode *node);
 
 

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

@@ -23 +23 @@
         }
         
-        //std::cin.get();
         cout << "conversion successful" << endl;
+
+        std::cin.get();
 
         return 0;