Changeset 3245 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ViewCellsTree.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/ViewCellsTree.cpp (modified) (5 diffs)

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

@@ -76 +76 @@
 
         // get the bounding box
+        // exchange x and y coordinates and recompute box
         fread(&mBox, sizeof(AxisAlignedBox3), 1, fr);
 
@@ -81 +82 @@
         Vector3 v2(mBox.Max().x, -mBox.Max().z, mBox.Max().y);
         
-        Vector3 newMin = v1;
-        Vector3 newMax = v2;
+        mBox.Initialize();
 
-        Minimize(newMin, v2);
-        Maximize(newMax, v1);
-
-        mBox.SetMin(newMin);
-        mBox.SetMax(newMax);
+        mBox.Include(v1);
+        mBox.Include(v2);
 
         stack<ViewCellsTreeNode **> nodeStack;
@@ -96 +93 @@
 
         int numViewCells = 0;
+
+        int axes[] = {0, 0, 0};
 
         while (!nodeStack.empty()) 
@@ -108 +107 @@
                 fread(&axis, sizeof(int), 1, fr);
 
-                // exchange y and z axis like we have to do for the scene
+                // exchange y and z axis like for whole scene
                 if (axis == 2) axis = 1;
                 else if (axis == 1) axis = 2;
@@ -114 +113 @@
                 node->mAxis = axis;
 
-                if (node->mAxis > 2 || node->mAxis < -1) cout << "a " << node->mAxis << " ";
-
                 if (!node->IsLeaf())
                 {
-                        float pos;
-                        fread(&pos, sizeof(float), 1, fr);
+                        ++ axes[node->mAxis];
 
-                        if (axis == 1) pos = -pos;
-                        node->mPosition = pos;
-                        
-                        nodeStack.push(&node->mFront);
-                        nodeStack.push(&node->mBack);
+                        float mypos;
+                        fread(&mypos, sizeof(float), 1, fr);
+                        // changed coordinate system must be considered also here
+                        if (node->mAxis == 1) 
+                        {
+                                node->mPosition = -mypos;
+
+                                nodeStack.push(&node->mBack);
+                                nodeStack.push(&node->mFront);
+                                //cout << mypos << " ";
+                        }
+                        else
+                        {
+                                node->mPosition = mypos;
+                                
+                                nodeStack.push(&node->mFront);
+                                nodeStack.push(&node->mBack);
+                        }
                 }
         }
 
-        cout << "loaded " << numViewCells << " view cells" << endl;
+        cout << "\nloaded " << numViewCells << " view cells" << " " << axes[0] << " " << axes[1] << " " << axes[2] << endl;
         return true;
 }