Changeset 262 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

09/09/05 15:03:48 (19 years ago)

Author:

mattausch

Message:

debugged bsp

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (14 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -11 +11 @@
 #include <time.h>
 #include <iomanip>
+#include "Exporter.h"
 
 #define INITIAL_COST 999999// unreachable high initial cost for heuristic evaluation
@@ -200 +201 @@
 mRoot(NULL), 
 mIsIncremential(false),
-mStorePolys(false)
+mStorePolys(true)
 {
         Randomize(); // initialise random generator for heuristics
@@ -279 +280 @@
             tStack.pop();
         
-                /// if we store
-                if (mStorePolys)
-                        Polygon3::DeletePolygons(&node->mPolygons);
+                /// if we stored the polygons
+                CLEAR_CONTAINER(node->mPolygons);
 
                 if (!node->IsLeaf())
@@ -365 +365 @@
         mTermMaxDepth = maxDepth;
         mStat.nodes = 1;
+        
         mBox.Initialize();      // initialise bsp tree bounding box
 }
@@ -438 +439 @@
         const int maxPolygons = 0;
         const int maxDepth = 99999;
+        
         InitTree(maxPolygons, maxDepth);
         
-
-        // tree is completely constructed before 
-        // view cells are not inserted one after another => better tree behaviour
+        // tree is completely constructed once before 
+        // view cells are inserted one after another => 
+        // global tree optimization possible
         if (!mIsIncremential)
         {
+                Debug << "Not incremential => constructing tree in advance\n";
                 // copy view cell meshes into one big polygon soup
                 PolygonContainer *polys = new PolygonContainer();
@@ -451 +454 @@
                 // construct tree from viewcell polygons
                 Construct(polys);
-        }
-
-        // insert all viewcells
+
+                Export("bsp.x3d");
+        }
+        
+        //-- insert all viewcells
         ViewCellContainer::const_iterator it;
 
+        int counter = 0;
+
+        Debug << "View cells insertion...\n"; Debug.flush();
         for (it = viewCells.begin(); it != viewCells.end(); ++ it)
         {
+                Debug << "Inserting view cell " << ++counter;
                 InsertViewCell(*it);
         }
+        Debug << "finished view cells insertion";
 }
 
@@ -465 +475 @@
 void BspTree::Construct(const ObjectContainer &objects, ViewCellContainer *viewCells)
 {
-#ifdef _DEBUG
-        Debug << "Constructing tree using object container\n";
-#endif
         // take termination criteria from globals
         InitTree(mTermMaxPolygons, mTermMaxDepth);
-
+        Debug << "HAHAHAHHA";Debug.flush();
         PolygonContainer *polys = new PolygonContainer();
         
@@ -490 +497 @@
 {
         std::stack<BspTraversalData> tStack;
-        // new root corresponding to unbounded space
-        BspTraversalData tData(new BspLeaf(), mRoot->GetParent(), polys, 0);
+        Debug << "HDDHDH"; Debug.flush();
+
+        BspTraversalData tData(new BspLeaf(), NULL, polys, 0);
 
         tStack.push(tData);
 
+        Debug << "Contructing tree using objects..."; Debug.flush();
         while (!tStack.empty()) 
         {
@@ -500 +509 @@
             tStack.pop();
 
+        
                 // subdivide leaf node
                 BspNode *root = Subdivide(tStack, tData);
 
-                if (!mRoot) // empty tree => new root
+                // empty tree => // new root corresponding to unbounded space
+                if (!mRoot) 
                         mRoot = root;
         }
+
+        Debug << "finished\n";
 }
 
@@ -543 +556 @@
 }
 
+bool BspTree::ProcessPolygons(PolygonContainer *polys, BspLeaf *leaf)
+{
+        bool result = false;
+
+        if (mStorePolys)
+        {
+                leaf->AddPolygons(polys);
+                result = true;
+        }
+        else
+                CLEAR_CONTAINER(*polys);
+
+        delete polys;
+        return result;
+}
+
 BspNode *BspTree::SubdivideNode(BspLeaf *leaf, 
                                                                 BspInterior *parent, 
@@ -554 +583 @@
         {
                 // add or delete remaining polygons
-                if (mStorePolys)
-                        leaf->AddPolygons(polys);
-                else
-                        Polygon3::DeletePolygons(polys);
-
-                delete polys;
+                ProcessPolygons(polys, leaf);
 
                 return leaf;
@@ -572 +596 @@
         Debug << node << endl;
 #endif
+
         // split polygon according to current plane
         int splits = 0;
@@ -795 +820 @@
         return mStorePolys;
 }
+
 void BspTree::EvaluateLeafStats(const BspTraversalData &data)
 {
@@ -929 +955 @@
 }
 
+bool BspTree::Export(const string filename)
+{
+        Exporter *exporter = Exporter::GetExporter(filename);
+
+        if (exporter) 
+        {
+                exporter->ExportBspTree(*this);
+                delete exporter;
+
+                return true;
+        }       
+
+        return false;
+}
 //} // GtpVisibilityPreprocessor