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

Timestamp:

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

Author:

mattausch

Message:

debugged bsp

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -7 +7 @@
 #include "Environment.h"
 
+Preprocessor::Preprocessor():
+mKdTree(NULL),
+mBspTree(NULL)
+{
+}
 
 Preprocessor::~Preprocessor()
 {
-  // delete view cells
-  while (!mViewCells.empty())
-  {
-          DEL_PTR(mViewCells.back());
-          mViewCells.pop_back();
-  }
-
-  // delete psp tree
+  CLEAR_CONTAINER(mViewCells);
   DEL_PTR(mBspTree);
+  DEL_PTR(mKdTree);
 }
 
@@ -25 +24 @@
 {
         X3dParser *parser = new X3dParser;
-
-        delete parser;
 
         bool result = parser->ParseFile(filename, mViewCells);
@@ -32 +29 @@
         if (result)
         {
-                Exporter *exporter = Exporter::GetExporter(filename);
+                Exporter *exporter = Exporter::GetExporter("viewcells.x3d");
 
                 if (exporter) 
+                {
                         exporter->ExportViewCells(&mViewCells);
-
+                        delete exporter;
+                }
+
+                Debug << "Generating view cells" << endl;
                 GenerateViewCells();
+                Debug << "Generated view cells" << endl;
         }
+
+        DEL_PTR(parser);
+        
+
         return result;
 }
@@ -91 +97 @@
 Preprocessor::BuildBspTree()
 {
-        ObjectContainer objects;
-        mSceneGraph->CollectObjects(&objects);
-
+        DEL_PTR(mBspTree);
         mBspTree = new BspTree();
 
@@ -116 +120 @@
     }
 
+        ObjectContainer objects;
+        RayContainer rays;
+
         switch (constructionMethod)
         {
         case BspTree::VIEWCELLS:
+                Debug << "Construction method: view cells\n";
+
                 // derive view cells from the scene objects
-                //ViewCell::DeriveViewCells(objects, mViewCells, maxViewCells);
+                if (mViewCells.empty())         
+                {
+                        Debug << "View cells empty => generating new ones\n"; Debug.flush();
+                        mSceneGraph->CollectObjects(&objects);
+                        ViewCell::DeriveViewCells(objects, mViewCells, maxViewCells);
+                }
+
+                mBspTree->Construct(mViewCells);
+                break;
+        case BspTree::SCENE_GEOMETRY:
+                Debug << "Construction method: geometry\n";
+
+        CLEAR_CONTAINER(mViewCells); // we generate new view cells
+                mSceneGraph->CollectObjects(&objects);
+
+                mBspTree->Construct(objects, &mViewCells);
+                break;
+        case BspTree::RAYS:
+                Debug << "Construction method: rays\n";
+
+                CLEAR_CONTAINER(mViewCells); // we generate new view cells
                 
-                mBspTree->Construct(mViewCells);
-                break;
-        case BspTree::SCENE_GEOMETRY:
-                CLEAR_CONTAINER(mViewCells);
-                mBspTree->Construct(objects, &mViewCells);
-                break;
-        case BspTree::RAYS:
-                CLEAR_CONTAINER(mViewCells);
-                mBspTree->Construct(objects, &mViewCells);
+                mBspTree->Construct(rays, &mViewCells);
                 break;
         default:
+                Debug << "Error: Method not available\n";
                 break;
         }