Changeset 3244 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ViewCellsTree.cpp

Timestamp:

01/03/09 17:32:10 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ViewCellsTree.cpp (modified) (8 diffs)

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

@@ -24 +24 @@
         while (!node->IsLeaf()) 
         {
+                //cout << "pt: " << point[node->mAxis] << " " << node->mPosition << endl;
                 if (point[node->mAxis] < node->mPosition)
                         node = node->mBack;
@@ -29 +30 @@
                         node = node->mFront;
         }
+
+        //cout << "vc: " << node->mViewCell->GetBox() << " pvs " << node->mViewCell->mPvs.Size() << endl;
 
         return node->mViewCell;
@@ -36 +39 @@
 bool ViewCellsTree::LoadFromFile(const std::string &filename)
 {
-        cout << "Info: Loading view cells from file '" + filename + "'";
+        cout << "Loading view cells from file '" + filename + "'";
 
         FILE *fr = fopen(filename.c_str(), "rb");
@@ -48 +51 @@
         bool result = _LoadFromFile(fr);
 
-        cout << "Info: done. " << endl;
+        cout << "finished loading view cells. " << endl;
         fclose(fr);
 
@@ -58 +61 @@
 {
         int buffer[256]; 
-        fread(buffer, sizeof(int), 3, fr);
+        fread(buffer, sizeof(int), 2, fr);
 
         if (buffer[0] != MAGIC) 
@@ -75 +78 @@
         fread(&mBox, sizeof(AxisAlignedBox3), 1, fr);
 
+        Vector3 v1(mBox.Min().x, -mBox.Min().z, mBox.Min().y);
+        Vector3 v2(mBox.Max().x, -mBox.Max().z, mBox.Max().y);
+        
+        Vector3 newMin = v1;
+        Vector3 newMax = v2;
+
+        Minimize(newMin, v2);
+        Maximize(newMax, v1);
+
+        mBox.SetMin(newMin);
+        mBox.SetMax(newMax);
+
         stack<ViewCellsTreeNode **> nodeStack;
+        nodeStack.push(&mRoot);
 
-        nodeStack.push(&mRoot);
+        cout << "view cells bounds " << mBox << endl;
+
+        int numViewCells = 0;
 
         while (!nodeStack.empty()) 
@@ -85 +103 @@
                 node = new ViewCellsTreeNode();
 
-                fread(&node->mAxis, sizeof(int), 1, fr);
+                ++ numViewCells;
+
+                int axis;
+                fread(&axis, sizeof(int), 1, fr);
+
+                // exchange y and z axis like we have to do for the scene
+                if (axis == 2) axis = 1;
+                else if (axis == 1) axis = 2;
+
+                node->mAxis = axis;
+
+                if (node->mAxis > 2 || node->mAxis < -1) cout << "a " << node->mAxis << " ";
 
                 if (!node->IsLeaf())
                 {
-                        fread(&node->mPosition, sizeof(float), 1, fr);
+                        float pos;
+                        fread(&pos, sizeof(float), 1, fr);
+
+                        if (axis == 1) pos = -pos;
+                        node->mPosition = pos;
+                        
                         nodeStack.push(&node->mFront);
                         nodeStack.push(&node->mBack);
@@ -95 +129 @@
         }
 
+        cout << "loaded " << numViewCells << " view cells" << endl;
         return true;
 }