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

Timestamp:

01/02/09 23:07:07 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -2 +2 @@
 #include "Timer/PerfTimer.h"
 #include <stack>
+#include <string>
 
 using namespace std;
 
 
+// MAGIC of all bin exports
+#ifndef MAGIC 
+#define MAGIC 0x827923
+#endif
+
+#define VIEWCELLS_VERSION 1.0f
+
 namespace CHCDemoEngine
 {
 
+
 ViewCell *ViewCellsTree::GetViewCell(const Vector3 &point) const
 {
-        ViewCellsTreeNode *node = root;
+        ViewCellsTreeNode *node = mRoot;
 
         while (!node->IsLeaf()) 
         {
-                if (point[node->axis] < node->position)
-                        node = node->back;
+                if (point[node->mAxis] < node->mPosition)
+                        node = node->mBack;
                 else
-                        node = node->front;
+                        node = node->mFront;
         }
 
-        return node->viewCell;
+        return node->mViewCell;
 }
 
 
-bool ViewCellsTree::LoadFromFile(const string &filename)
+bool ViewCellsTree::LoadFromFile(const std::string &filename)
 {
-        cout << ("Info: Loading view cells from file '" + filename + "'" );
+        cout << "Info: Loading view cells from file '" + filename + "'";
 
         FILE *fr = fopen(filename.c_str(), "rb");
 
-        if (fr == NULL) {
-                Message("Error: Cannot open file for reading");
+        if (!fr) 
+        {
+                cerr << "Error: Cannot open file for reading" << endl;
                 return false;
         }
@@ -38 +48 @@
         bool result = _LoadFromFile(fr);
 
-        Debug << "Info: done. " << endl;
+        cout << "Info: done. " << endl;
         fclose(fr);
 
@@ -50 +60 @@
         fread(buffer, sizeof(int), 3, fr);
 
-        if (buffer[0] != MAGIC) {
-                Message( "Error: Wrong file type");
+        if (buffer[0] != MAGIC) 
+        {
+                cerr << "Error: Wrong file type" << endl;
                 return false;
         }
 
-        if (buffer[1] != (int)(1000*VIEWCELLS_VERSION)) {
-                Message( "Error: Wrong viewcells version" );
+        if (buffer[1] != (int)(1000 * VIEWCELLS_VERSION)) 
+        {
+                cerr << "Error: Wrong viewcells version" << endl;
                 return false;
         }
 
         // get the bounding box
-        fread(&box, sizeof(AxisAlignedBox3), 1, fr);
+        fread(&mBox, sizeof(AxisAlignedBox3), 1, fr);
 
         stack<ViewCellsTreeNode **> nodeStack;
 
-        nodeStack.push(&root);
+        nodeStack.push(&mRoot);
 
-        while(!nodeStack.empty()) {
+        while (!nodeStack.empty()) 
+        {
                 ViewCellsTreeNode *&node = *nodeStack.top();
                 nodeStack.pop();
-                node = new ViewCellsTreeNode;
-                fread(&node->axis, sizeof(int), 1, fr);
-                if (!node->IsLeaf()) {
-                        fread(&node->position, sizeof(float), 1, fr);
-                        nodeStack.push(&node->front);
-                        nodeStack.push(&node->back);
+                node = new ViewCellsTreeNode();
+
+                fread(&node->mAxis, sizeof(int), 1, fr);
+
+                if (!node->IsLeaf())
+                {
+                        fread(&node->mPosition, sizeof(float), 1, fr);
+                        nodeStack.push(&node->mFront);
+                        nodeStack.push(&node->mBack);
                 }
         }
@@ -83 +99 @@
 
 
-void ViewCellsTree::_ExportToFile(FILE *file)
-{
-        int buffer[256];
-        int i=0;
-        buffer[i++] = MAGIC;
-        buffer[i++] = VIEWCELLS_VERSION*1000;
-
-        fwrite(buffer, sizeof(int), i, file);
-
-        fwrite(&mMaxDepth, sizeof(float), 1, file);
-
-        fwrite(&box, sizeof(AxisAlignedBox3), 1, file);
-
-        stack<ViewCellsTreeNode *> nodeStack;
-
-        nodeStack.push(root);
-
-        while (!nodeStack.empty()) {
-                ViewCellsTreeNode *node = nodeStack.top();
-                nodeStack.pop();
-
-                fwrite(&node->axis, sizeof(int), 1, file);
-                if (!node->IsLeaf()) {
-                        fwrite(&node->position, sizeof(float), 1, file);
-                        nodeStack.push(node->front);
-                        nodeStack.push(node->back);
-                }
-        }
 }
-
-}