Changeset 575

Timestamp:

01/25/06 11:08:35 (18 years ago)

Author:

mattausch

Message:

changed view cell parser. warning, not working yet!!

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (5 diffs)
• src/Preprocessor.cpp (modified) (2 diffs)
• src/Preprocessor.h (modified) (1 diff)
• src/ViewCellBsp.h (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (4 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/ViewCellsParser.cpp (modified) (12 diffs)
• src/ViewCellsParser.h (modified) (1 diff)
• src/ViewCellsParserXerces.h (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -13 +13 @@
 #;../data/vienna/vienna-plane.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
-#       filename ../data/atlanta/atlanta2.x3d
+        filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-        filename ../data/soda/soda5.dat
+#       filename ../data/soda/soda5.dat
 }
 
@@ -23 +23 @@
         useGlRenderer false
 #       type sampling
-        type vss
-#       type rss
-        detectEmptyViewSpace true
+#       type vss
+        type rss
+        detectEmptyViewSpace false
 }
 
@@ -303 +303 @@
         Termination {
                 # parameters used for autopartition
-                minRays                 300
+                minRays                 150
                 minPolygons             -1
                 maxDepth                30
@@ -309 +309 @@
                 #minProbability         0.0001
                 minProbability          -1
-                maxRayContribution      0.1
+                maxRayContribution      0.3
                 maxCostRatio            0.9
                 missTolerance           3
                 #maxAccRayLength        100
                 
-                maxViewCells            5000
+                maxViewCells            50000
                 
                 # used for pvs criterium
@@ -335 +335 @@
         PostProcess {
                 maxCostRatio 0.1
-                minViewCells 110
+                minViewCells 5000
                 useRaysForMerge false
                 exportMergeStats false

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -194 +194 @@
         environment->GetStringValue("ViewCells.type", viewCellsStr);
 
-        int initialSamples = 0;
-        
-        if (strcmp(viewCellsStr, "kdTree") == 0)
-        {
-                mViewCellsManager = new KdViewCellsManager(mKdTree);
-        }
-        else if (strcmp(viewCellsStr, "bspTree") == 0)
-        {
-                mBspTree = new BspTree();
-
-                Debug << "view cell type: Bsp" << endl;
-
-                mViewCellsManager = new BspViewCellsManager(mBspTree);
-        }
-        else if (strcmp(viewCellsStr, "vspBspTree") == 0)
-        {
-                mVspBspTree = new VspBspTree();
-
-                Debug << "view cell type: VspBsp" << endl;
-
-                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
-        }
-        else if (strcmp(viewCellsStr, "vspKdTree") == 0)
-        {
-                mVspKdTree = new VspKdTree();           
-        
-                mViewCellsManager = new VspKdViewCellsManager(mVspKdTree);
-        }
-        else if (strcmp(viewCellsStr, "sceneDependent") == 0)
-        {
-                //TODO
-                mBspTree = new BspTree();
-
-                Debug << "view cell type: Bsp" << endl;
-                
-                mViewCellsManager = new BspViewCellsManager(mBspTree);
-        }
-        else
-        {
-                cerr<<"Wrong view cells type" << viewCellsStr << endl;
-                exit(1);
-        }
+        mViewCellsManager = CreateViewCellsManager(viewCellsStr);
 
         float objRenderCost = 0, vcOverhead = 0, moveSpeed = 0;
@@ -272 +231 @@
 
         return true;
+}
+
+
+ViewCellsManager *Preprocessor::CreateViewCellsManager(const char *name)
+{
+        if (strcmp(name, "kdTree") == 0)
+        {
+                mViewCellsManager = new KdViewCellsManager(mKdTree);
+        }
+        else if (strcmp(name, "bspTree") == 0)
+        {
+                mBspTree = new BspTree();
+
+                Debug << "view cell type: Bsp" << endl;
+
+                mViewCellsManager = new BspViewCellsManager(mBspTree);
+        }
+        else if (strcmp(name, "vspBspTree") == 0)
+        {
+                mVspBspTree = new VspBspTree();
+
+                Debug << "view cell type: VspBsp" << endl;
+
+                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
+        }
+        else if (strcmp(name, "vspKdTree") == 0)
+        {
+                mVspKdTree = new VspKdTree();           
+        
+                mViewCellsManager = new VspKdViewCellsManager(mVspKdTree);
+        }
+        else if (strcmp(name, "sceneDependent") == 0)
+        {
+                //TODO
+                mBspTree = new BspTree();
+
+                Debug << "view cell type: Bsp" << endl;
+                
+                mViewCellsManager = new BspViewCellsManager(mBspTree);
+        }
+        else
+        {
+                cerr<<"Wrong view cells type" << name << endl;
+                exit(1);
+        }
+
+        return mViewCellsManager;
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -121 +121 @@
           VssRayContainer &vssRays) {};
 
+  ViewCellsManager *CreateViewCellsManager(const char *name);
+
   /// scene graph loaded from file
   SceneGraph *mSceneGraph;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -356 +356 @@
 class BspTree 
 {
+        friend class ViewCellsParseHandlers;
+
 public:
         

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -126 +126 @@
         //-- construction rays => we use uniform samples for this
         CastPassSamples(mInitialSamples, 
-                                        Preprocessor::DIRECTION_BASED_DISTRIBUTION,
-                                        //Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
+                                        //Preprocessor::DIRECTION_BASED_DISTRIBUTION,
+                                        Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
                                         initialSamples);
         
@@ -157 +157 @@
                                                 Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
 
-                dirSamples = !dirSamples; // toggle sampling
+                dirSamples = !dirSamples; // toggle sampling method
                 numSamples += CastPassSamples(mSamplesPerPass, 
                                                                           samplingType,
@@ -2679 +2679 @@
         mVspBspTree = new VspBspTree();
 
-        bool success = parser.ParseFile(filename, mVspBspTree, this, objects);
+        bool success ;//= parser.ParseFile(filename, &this, objects);
         mVspBspTree->RepairViewCellsLeafLists();
         mVspBspTree->mBox = GetViewSpaceBox();
@@ -2764 +2764 @@
         viewCell->SetArea(area);
 }
+
+
+
+ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
+{
+        //TODO
+        return NULL;// new VspBspViewCellsManager();
+}

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -688 +688 @@
 };
 
+
+class ViewCellsManagerFactory
+{
+
+public:
+
+        ViewCellsManager *Create(const string mName);
+
+};
+
 #endif

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParser.cpp

@@ -61 +61 @@
 //  StdInParseHandlers: Constructors and Destructor
 // ---------------------------------------------------------------------------
-ViewCellsParseHandlers::ViewCellsParseHandlers(VspBspTree *tree,
-                                                                                           ViewCellsManager *viewCells,
+ViewCellsParseHandlers::ViewCellsParseHandlers(ViewCellsManager **viewCells,
                                                                                            ObjectContainer *objects):
   mElementCount(0)
@@ -69 +68 @@
   , mSpaceCount(0)
 {
-        mVspBspTree = tree;
-        mCurrentNode = tree->GetRoot();
-        mViewCellsManager = viewCells;
         mObjects = objects;
-}
+        viewCells = &mViewCellsManager;
+        //mPreprocessor = preprocessor;
+}
+
 
 ViewCellsParseHandlers::~ViewCellsParseHandlers()
@@ -90 +89 @@
   string element(lname.LocalForm());
   if (element == "Interior")
-          EndInterior();
+          EndBspInterior();
   if (element == "ViewCells")
           EndViewCells();
@@ -96 +95 @@
 
 
-void ViewCellsParseHandlers::EndInterior()
+void ViewCellsParseHandlers::EndBspInterior()
 {
         // go one up in the tree
@@ -114 +113 @@
 void ViewCellsParseHandlers::EndViewCells()
 {
-        // sort view cells for easily finding id
+        // sort view cells to help associating view cells according to their id
         stable_sort(mViewCells.begin(), mViewCells.end(), vlt);
+}
+
+
+
+void ViewCellsParseHandlers::StartHierarchy(AttributeList&  attributes)
+{
+        int len = attributes.getLength();
+  
+        for (int i = 0; i < len; ++ i) 
+        {
+                string attrName(StrX(attributes.getName(i)).LocalForm());
+                
+                if (attrName == "name") 
+                {
+                        StrX attrValue(attributes.getValue(i));
+                        
+                        const char *ptr = attrValue.LocalForm();
+                        
+                        CreateViewCellsManager(ptr);
+                }
+        }
+}
+
+
+void ViewCellsParseHandlers::startBspElement(string element,
+                                                                                         AttributeList& attributes)
+{
+        if (element == "ViewCell")
+        {
+                cout << "v";
+                StartViewCell(attributes);
+        }
+
+        if (element == "Interior") 
+        {
+                cout << "[";
+                StartBspInterior(attributes);
+        }
+
+        if (element == "Leaf") 
+        {
+                StartBspLeaf(attributes);
+        }
 }
 
@@ -125 +167 @@
         string element(lname.LocalForm());
         
-        if (element == "ViewCell")
-        {
-                cout << "v";
-                StartViewCell(attributes);
-        }
-
-        if (element == "Interior") 
-        {
-                cout << "[";
-                StartInterior(attributes);
-        }
-
-        if (element == "Leaf") 
-        {
-                StartLeaf(attributes);
-        }
-
+        if (element == "Hierarchy")
+        {
+                cout << "h";
+                StartHierarchy(attributes);
+        }
+
+        switch (mViewCellsManager->GetType())
+        {
+        case ViewCellsManager::BSP:
+        case ViewCellsManager::VSP_BSP:
+                startBspElement(element, attributes);
+                break;
+        
+        default:
+                Debug << "not implemented" << endl;
+                break;
+
+        }
+        
         ++ mElementCount;
         mAttrCount += attributes.getLength();
@@ -228 +272 @@
 
 
-void ViewCellsParseHandlers::StartLeaf(AttributeList& attributes)
+void ViewCellsParseHandlers::StartBspLeaf(AttributeList& attributes)
 {
         BspLeaf * leaf = 
@@ -239 +283 @@
         else
         {
-                mVspBspTree->mRoot = leaf;
+                if (mViewCellsManager->GetType() == ViewCellsManager::BSP)
+                        mBspTree->mRoot = leaf;
+                else
+                        mVspBspTree->mRoot = leaf;
         }
 
@@ -282 +329 @@
         else
         {
-                leaf->SetViewCell(mVspBspTree->GetOrCreateOutOfBoundsCell());
-                leaf->SetTreeValid(false);
-                mVspBspTree->PropagateUpValidity(leaf);
-        }
-}
-
-
-void ViewCellsParseHandlers::StartInterior(AttributeList& attributes)
+                if (mViewCellsManager->GetType() == ViewCellsManager::VSP_BSP)
+                {
+                        leaf->SetViewCell(mVspBspTree->GetOrCreateOutOfBoundsCell());
+                        leaf->SetTreeValid(false);
+                        mVspBspTree->PropagateUpValidity(leaf);
+                }
+        }
+}
+
+
+void ViewCellsParseHandlers::StartBspInterior(AttributeList& attributes)
 {
         Plane3 plane;
@@ -318 +368 @@
         else
         {
-                mVspBspTree->mRoot = interior;
+                if (mViewCellsManager->GetType() == ViewCellsManager::BSP)
+                        mBspTree->mRoot = interior;
+                else
+                        mVspBspTree->mRoot = interior;
         }
 
         mCurrentNode = interior;
+}
+
+
+
+void ViewCellsParseHandlers::CreateViewCellsManager(const char *name)
+{
+        
+        if (strcmp(name, "bspTree") == 0)
+        {
+                mBspTree = new BspTree();
+
+                Debug << "view cell type: Bsp" << endl;
+
+                mCurrentNode = mBspTree->GetRoot();
+
+                mViewCellsManager = new BspViewCellsManager(mBspTree);
+        }
+        else if (strcmp(name, "vspBspTree") == 0)
+        {
+                mVspBspTree = new VspBspTree();
+
+                Debug << "view cell type: VspBsp" << endl;
+                mCurrentNode = mVspBspTree->GetRoot();
+
+                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
+        }
+        /*else if (strcmp(name, "vspKdTree") == 0)
+        {
+                mVspKdTree = new VspKdTree();           
+        
+                mViewCellsManager = VspKdViewCellsManager(mVspKdTree);
+        }*/
+        else
+        {
+                cerr<<"Wrong view cells type" << name << endl;
+                exit(1);
+        }
 }
 
@@ -380 +470 @@
 
 bool ViewCellsParser::ParseFile(const string filename, 
-                                                                VspBspTree *tree,
-                                                                ViewCellsManager *viewCells,
+                                                                ViewCellsManager **viewCells,
                                                                 ObjectContainer *objects)
 {
@@ -414 +503 @@
   //  to do.
   //
-  ViewCellsParseHandlers handler(tree, viewCells, objects);
+  ViewCellsParseHandlers handler(viewCells, objects);
   parser->setDocumentHandler(&handler);
   parser->setErrorHandler(&handler);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParser.h

@@ -15 +15 @@
   //bool ParseFile(const string filename, ViewCellsManager &viewCells);
   bool ParseFile(const string filename, 
-                                 VspBspTree *tree, 
-                                 ViewCellsManager *viewCells,
+                                 ViewCellsManager **viewCells,
                                  ObjectContainer *objects);
 };

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParserXerces.h

@@ -14 +14 @@
 
 class VspBspTree;
+class BspTree;
 class ViewCellsManager;
 
@@ -22 +23 @@
   //  Constructors and Destructor
   // -----------------------------------------------------------------------
-  ViewCellsParseHandlers(VspBspTree *tree, 
-                                                 ViewCellsManager *viewCellsManager,
+  ViewCellsParseHandlers(ViewCellsManager **viewCellsManager,
                                                  ObjectContainer *objects);
   ~ViewCellsParseHandlers();
@@ -61 +61 @@
   void resetDocument();
 
+  void CreateViewCellsManager(const char *name);
+
+
   VspBspTree *mVspBspTree;
+  BspTree *mBspTree;
+  
   BspNode *mCurrentNode;
   ViewCellContainer mViewCells;
@@ -68 +73 @@
 
   // Handlers for X3D
-  void StartLeaf(AttributeList& attributes);
-  void StartInterior(AttributeList& attributes);
-  void EndInterior();
+  void StartBspLeaf(AttributeList& attributes);
+  void StartBspInterior(AttributeList& attributes);
+  void EndBspInterior();
  
   void StartViewCell(AttributeList&  attributes);
   void EndViewCells();
 
+  void StartHierarchy(AttributeList& attributes);
+
+  void startBspElement(string element, AttributeList& attributes);
   // -----------------------------------------------------------------------
   //  Handlers for the SAX ErrorHandler interface