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

Timestamp:

09/08/05 18:45:51 (19 years ago)

Author:

mattausch

Message:

added viewcell loader

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -7 +7 @@
 #include "Environment.h"
 
-  
-bool
-Preprocessor::LoadViewcells(const string filename)
+
+Preprocessor::~Preprocessor()
 {
-  
-  return true;
+  // delete view cells
+  while (!mViewCells.empty())
+  {
+          DEL_PTR(mViewCells.back());
+          mViewCells.pop_back();
+  }
+
+  // delete psp tree
+  DEL_PTR(mBspTree);
 }
 
 bool
-Preprocessor::GenerateViewcells()
+Preprocessor::LoadViewCells(const string filename)
+{
+        X3dParser *parser = new X3dParser;
+
+        delete parser;
+
+        bool result = parser->ParseFile(filename, mViewCells);
+
+        if (result)
+        {
+                Exporter *exporter = Exporter::GetExporter(filename);
+
+                if (exporter) 
+                        exporter->ExportViewCells(&mViewCells);
+
+                GenerateViewCells();
+        }
+        return result;
+}
+
+bool
+Preprocessor::GenerateViewCells()
 {
         return BuildBspTree();
@@ -38 +65 @@
   bool result = parser->ParseFile(filename, &mSceneGraph->mRoot);
   
+  delete parser;
+
   return result;
 }
@@ -90 +119 @@
         {
         case BspTree::VIEWCELLS:
-
-                mViewcells.clear();
+                // derive view cells from the scene objects
+                //ViewCell::DeriveViewCells(objects, mViewCells, maxViewCells);
                 
-                // derive viewcells from the scene objects
-                ViewCell::DeriveViewCells(objects, mViewcells, maxViewCells);
-                
-                mBspTree->Construct(mViewcells);
+                mBspTree->Construct(mViewCells);
                 break;
         case BspTree::SCENE_GEOMETRY:
-                mBspTree->Construct(objects);
+                CLEAR_CONTAINER(mViewCells);
+                mBspTree->Construct(objects, &mViewCells);
+                break;
+        case BspTree::RAYS:
+                CLEAR_CONTAINER(mViewCells);
+                mBspTree->Construct(objects, &mViewCells);
                 break;
         default: