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

Timestamp:

09/12/05 02:07:02 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -23 +23 @@
 Preprocessor::LoadViewCells(const string filename)
 {
-        X3dParser *parser = new X3dParser;
-
-        bool result = parser->ParseFile(filename, mViewCells);
-
-        if (result)
-        {
-                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;
+        return X3dParser().ParseFile(filename, mViewCells);
 }
 
@@ -51 +29 @@
 Preprocessor::GenerateViewCells()
 {
-        return BuildBspTree();
+        // TODO
+        // HACK: derive view cells from the scene objects
+        ObjectContainer objects;
+
+        int maxViewCells = 0;
+        environment->GetIntValue("BspTree.maxViewCells", maxViewCells);
+
+        mSceneGraph->CollectObjects(&objects);
+        ViewCell::DeriveViewCells(objects, mViewCells, maxViewCells);
+
+        return true;
 }
 
@@ -94 +82 @@
 }
 
+
 bool
 Preprocessor::BuildBspTree()
@@ -100 +89 @@
         mBspTree = new BspTree();
 
-        char constructionMethodStr[64];
-        int maxViewCells = 0;
-
-        environment->GetIntValue("BspTree.maxViewCells", maxViewCells);
-        environment->GetStringValue("BspTree.constructionMethod", constructionMethodStr);
-
-        int constructionMethod = BspTree::VIEWCELLS;
-        
-        if (strcmp(constructionMethodStr, "viewCells") == 0)
-                constructionMethod = BspTree::VIEWCELLS;
-        else if (strcmp(constructionMethodStr, "sceneGeometry") == 0)
-                constructionMethod = BspTree::SCENE_GEOMETRY;
-        else if (strcmp(constructionMethodStr, "rays") == 0)
-                constructionMethod = BspTree::RAYS;
-        else 
-        {
-                cerr << "Wrong bsp construction method " << constructionMethodStr << endl;
-                exit(1);
-    }
-
         ObjectContainer objects;
         RayContainer rays;
 
-        switch (constructionMethod)
+        switch (BspTree::sConstructionMethod)
         {
-        case BspTree::VIEWCELLS:
+        case BspTree::VIEW_CELLS:
                 Debug << "Construction method: view cells\n";
-
-                // derive view cells from the scene objects
-                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;
@@ -142 +103 @@
 
         CLEAR_CONTAINER(mViewCells); // we generate new view cells
+
                 mSceneGraph->CollectObjects(&objects);
-
                 mBspTree->Construct(objects, &mViewCells);
                 break;
@@ -149 +110 @@
                 Debug << "Construction method: rays\n";
 
-                CLEAR_CONTAINER(mViewCells); // we generate new view cells
-                
+                CLEAR_CONTAINER(mViewCells); // we generate new view cells      
                 mBspTree->Construct(rays, &mViewCells);
                 break;