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

Timestamp:

01/04/09 16:06:56 (15 years ago)

Author:

mattausch

Message:

pvs seems to work now

File:

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

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

@@ -90 +90 @@
 {
         std::stack<BvhNode *> tStack;
-        tStack.push(bvh->GetRoot());
+        tStack.push(bvh->GetStaticRoot());
         
         while (!tStack.empty())
@@ -140 +140 @@
                 fread(&entries, sizeof(int), 1, fw);
 
-                for (int j=0; j < entries; ++ j) 
+                for (int j = 0; j < entries; ++ j) 
                 {
                         int objectId;
@@ -154 +154 @@
                         entities = bvh->GetGeometry(node, geometrySize);
 
+                        //if (node->IsLeaf() && (geometrySize != 1))
+                        //if (geometrySize != 1) cout << "Error!! " << geometrySize << endl;
                         for (int k = 0; k < geometrySize; ++ k)
                         {
@@ -175 +177 @@
 
         mViewCells.clear();
-        
+        int axes[] = {0, 0, 0};
+
         while (!nodeStack.empty()) 
         {
@@ -198 +201 @@
                         nodeStack.pop();
 
-                        AxisAlignedBox3 newBox = box;
-                        newBox.SetMin(node->mAxis, node->mPosition);
-
-                        nodeStack.push(
-                                pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mFront, newBox)
-                                );
-
-                        newBox = box;
-                        newBox.SetMax(node->mAxis, node->mPosition);
-
-                        nodeStack.push(
-                                pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mBack, newBox)
-                                );
+                        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);
+
+                        ++ axes[node->mAxis];
+
+                        if (node->mAxis == 1)
+                        {
+                                nodeStack.push(pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mBack, newBox2));
+                                nodeStack.push(pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mFront, newBox1));
+                        }
+                        else
+                        {
+                                nodeStack.push(pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mFront, newBox1));
+                                nodeStack.push(pair<ViewCellsTreeNode *, AxisAlignedBox3>(node->mBack, newBox2));
+                        }
                 }
         }
 
-        cout << "#of viewcells = " << id << endl;
-}
-
-
-}
+        cout << "#of viewcells = " << id << " " << axes[0] << " " << axes[1] << " " << axes[2] << endl;
+}
+
+
+}