Changeset 3279 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/VisibilitySolutionLoader.cpp

Timestamp:

01/15/09 16:32:50 (16 years ago)

Author:

mattausch

Message:

problems with reimporting of my exported scenes

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/VisibilitySolutionLoader.cpp (modified) (5 diffs)

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

@@ -38 +38 @@
 
         ViewCellsTree *viewCellsTree = new ViewCellsTree();
-
         bool ok = viewCellsTree->_LoadFromFile(fr, viewCellsScaleFactor);
 
@@ -100 +99 @@
                 nodes.push_back(node);
 
-                if (!node->IsLeaf())
+                if (!node->IsVirtualLeaf())
                 {
                         BvhInterior *interior = static_cast<BvhInterior *>(node);
@@ -116 +115 @@
 
 
+bool VisibilitySolutionLoader::CreateIdSortedList2(BvhNode *n,
+                                                                                                   BvhNodeContainer &nodes)
+{
+        nodes.push_back(n);
+
+        if (!n->IsVirtualLeaf())
+        {
+                BvhInterior *interior = static_cast<BvhInterior *>(n);
+
+                BvhNode *front = interior->GetFront();
+                BvhNode *back = interior->GetBack();
+
+                CreateIdSortedList2(front, nodes);
+                CreateIdSortedList2(back, nodes);
+        }
+
+        return true;
+}
+
+
 bool VisibilitySolutionLoader::LoadPvs(FILE *fw, Bvh *bvh)
 {
         int number, entries;
-
         fread(&number, sizeof(int), 1, fw);
 
@@ -135 +153 @@
 
         BvhNodeContainer nodes;
-        CreateIdSortedList(bvh, nodes);
-        
+        CreateIdSortedList2(bvh->GetStaticRoot(), nodes);
+        //CreateIdSortedList(bvh, nodes);
+        ofstream outstream("test.log");
+
+        for (size_t i = 0; i < nodes.size(); ++ i)
+                outstream << "id " << nodes[i]->GetId() << endl;
+
+        outstream.close();
+        
+
         for (int i = 0; i < number; ++ i) 
         {
@@ -194 +220 @@
                         AxisAlignedBox3 newBox1 = box;
                         AxisAlignedBox3 newBox2 = box;
-                        /*if (node->mPosition < newBox.Min(node->mAxis))
-                                cout << "e: " << node->mPosition << " " << newBox.Min(node->mAxis) << endl;
-                        else if (node->mPosition > newBox.Min(node->mAxis))
-                                cout << "o: " << node->mPosition << " " << newBox.Min(node->mAxis) << endl;
-*/
+                
                         newBox1.SetMin(node->mAxis, node->mPosition);
                         newBox2.SetMax(node->mAxis, node->mPosition);