Changeset 651 for GTP/trunk

Timestamp:

02/18/06 18:02:12 (19 years ago)

Author:

mattausch

Message:

exporting / loading full merge hierarchy

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (4 diffs)
• src/ViewCell.cpp (modified) (9 diffs)
• src/ViewCell.h (modified) (4 diffs)
• src/ViewCellsManager.cpp (modified) (4 diffs)
• src/ViewCellsManager.h (modified) (2 diffs)
• src/ViewCellsParser.cpp (modified) (16 diffs)
• src/ViewCellsParserXerces.h (modified) (4 diffs)
• src/VssPreprocessor.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -36 +36 @@
         loadInitialSamples  false
         storeInitialSamples false
-        useViewSpaceBox false
+        useViewSpaceBox true
 #       testBeamSampling true
 }
@@ -185 +185 @@
 
         exportToFile false
-        loadFromFile false
+        loadFromFile true
 
         #type kdTree
         #type vspKdTree
-        type bspTree
-        #type vspBspTree
+        #type bspTree
+        type vspBspTree
         
         #type sceneDependent
@@ -288 +288 @@
 VspBspTree {
         Construction {
-                samples 500000
+                samples 50000
                 epsilon 0.00005
                 randomize false
@@ -420 +420 @@
                 minProbability 0.00001
                 maxRayContribution 9999
-                maxViewCells    100
+                maxViewCells    1000
 
                 # used for pvs criterium

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -1262 +1262 @@
 
         int totalPvs;
-        float totalRenderCost, float avgRenderCost, float expectedCost;
+        float totalRenderCost, avgRenderCost, expectedCost;
 
         float deviation = 0;
@@ -1270 +1270 @@
         ofstream stats;
         stats.open("mergeStats.log");
-
-        Debug << "here343" << endl;
 
         stats 
@@ -1347 +1345 @@
 
 
-/*float ViewCellsTree::ComputeVolume(ViewCell *vc)
+#if 0
+float ViewCellsTree::ComputeVolume(ViewCell *vc)
 {
         if (vc->IsLeaf())
@@ -1369 +1368 @@
                 return volume;
         }
-}*/
-
+}
+#endif
 
 void ViewCellsTree::SetRoot(ViewCell *root)
@@ -1621 +1620 @@
 
 
-void ViewCellsTree::PropagateUpPvs(ViewCell *vc)
+void ViewCellsTree::PropagatePvs(ViewCell *vc)
 {
         while (vc->GetParent())
@@ -1627 +1626 @@
                 vc->GetParent()->GetPvs().Merge(vc->GetPvs());
                 vc = vc->GetParent();
+        }
+
+        if (vc->IsLeaf())
+                return;
+
+        stack<ViewCell *> tstack;
+
+        tstack.push(vc);
+
+        while (!tstack.empty())
+        {
+                ViewCell *viewCell = tstack.top();
+                tstack.pop();
+
+                if (viewCell != vc)
+                {
+                        viewCell->GetPvs().Merge(vc->GetPvs());
+                }
+
+                if (!viewCell->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(viewCell);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }
+                }
         }
 }
@@ -1727 +1755 @@
 
 
+void ViewCellsTree::CreateUniqueViewCellsIds()
+{
+        stack<ViewCell *> tstack;
+
+        int currentId = 0;
+
+        tstack.push(mRoot);
+
+        while (!tstack.empty())
+        {
+                ViewCell *vc = tstack.top();
+                tstack.pop();
+
+                vc->SetId(currentId ++);
+
+                if (!vc->IsLeaf())
+                {
+                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tstack.push(*it);
+                        }
+                }
+        }
+}
+
+
 void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream)
 {
         ObjectPvsMap::iterator it, it_end = viewCell->GetPvs().mEntries.end();
-
-        if (0) // test with empty pvs
-        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
-        {
-                stream << (*it).first->GetId() << " ";
-        }
-
-        stream << "\" />" << endl;
 
         if (viewCell->IsLeaf())
@@ -1746 +1794 @@
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
-                stream << "</Leaf>" << endl;
+                if (0)// test with empty pvs
+                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
+                        {
+                                stream << (*it).first->GetId() << " ";
+                        }
+
+        
+                stream << "\" />" << endl;
+                //stream << " </Leaf>" << endl;
         }
         else
@@ -1757 +1813 @@
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
+
+                if (0)// test with empty pvs
+                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
+                        {
+                                stream << (*it).first->GetId() << " ";
+                        }
+
+                stream << "\" >" << endl;
 
                 ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

@@ -301 +301 @@
         */
         int RefineViewCells(const VssRayContainer &rays, const ObjectContainer &objects);
-
-  /** Assign colors to the viewcells so that they can be renderered interactively without
+        
+        /** Assign colors to the viewcells so that they can be renderered interactively without
           color flickering.
-  */
-  void AssignRandomColors();
+          */
+        void AssignRandomColors();
+
         /** Updates view cell stats for this particular view cell
         */
@@ -311 +312 @@
         
 
-  /** Get costs resulting from each merge step. */
-  void GetCostFunction(vector<float> &costFunction);
+        /** Get costs resulting from each merge step. */
+        void GetCostFunction(vector<float> &costFunction);
   
 
@@ -351 +352 @@
         ViewCell *GetActiveViewCell(ViewCell *vc) const;
 
-        /** Propagates pvs up the tree to the root.
-        */
-        void PropagateUpPvs(ViewCell *vc);
+        /** Propagates pvs up the tree to the root and downwards the tree.
+        */
+        void PropagatePvs(ViewCell *vc);
 
         bool Export(ofstream &stream);
@@ -366 +367 @@
 
         //float ComputeVolume(ViewCell *vc);
+
+        /** Assignes unique ids to view cells.
+        */
+        void CreateUniqueViewCellsIds();
+
 
 protected:

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -908 +908 @@
 void ViewCellsManager::CreateUniqueViewCellIds()
 {
-        for (int i = 0; i < (int)mViewCells.size(); ++ i)
-                mViewCells[i]->SetId(i);
+        if (ViewCellsTreeConstructed())
+                mViewCellsTree->CreateUniqueViewCellsIds();
+        else
+                for (int i = 0; i < (int)mViewCells.size(); ++ i)
+                        mViewCells[i]->SetId(i);
 }
 
@@ -2948 +2951 @@
 
         
-        if (0) // export view cells
+        if (1) // export view cells
         {       // hack pvs
                 int savedColorCode = mColorCode;
-                mColorCode = 1;
+                mColorCode = 0;
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.x3d");
                 
@@ -3169 +3172 @@
                                 exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
                         }
-
-                        
+                
 
                         if (1)
@@ -3195 +3197 @@
                 }
                 
-                
-
 
                 exporter->SetWireframe();

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -531 +531 @@
 protected:
 
-        struct TraversalData
-        {  
-                ViewCellInterior *mParentViewCell;
-                BspNode *mNode;
-                
-
-                TraversalData() {}
-                TraversalData(BspNode *node, ViewCellInterior *vc):
-                         mNode(node), mParentViewCell(vc)
-                {}
-   
-                bool operator<(const TraversalData &b) const 
-                {
-                        return mNode->mTimeStamp < b.mNode->mTimeStamp;
-                }
-        };
-
-        typedef priority_queue<TraversalData> TraversalQueue;
 
         /** HACK
@@ -765 +747 @@
 protected:
 
-        struct TraversalData
-        {  
-                ViewCellInterior *mParentViewCell;
-                BspNode *mNode;
-                
-
-                TraversalData() {}
-                TraversalData(BspNode *node, ViewCellInterior *vc):
-                         mNode(node), mParentViewCell(vc)
-                {}
-   
-                bool operator<(const TraversalData &b) const 
-                {
-                        return mNode->mTimeStamp < b.mNode->mTimeStamp;
-                }
-        };
-
-        typedef priority_queue<TraversalData> TraversalQueue;
-
+        
         /** Returns node of the spatial hierarchy corresponding to the view cell
                 if such a node exists.

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

@@ -70 +70 @@
   , mVspBspTree(NULL)
   , mBspTree(NULL)
+  , mViewCellsTree(NULL)
+  , mParseViewCells(true)
+  , mCurrentViewCell(NULL)
+  , mCurrentBspNode(NULL)
 {
         mObjects = objects;
@@ -89 +93 @@
   StrX lname(name);
   string element(lname.LocalForm());
-  if (element == "Interior")
-          EndBspInterior();
+
   if (element == "ViewCells")
           EndViewCells();
+
+  if (mParseViewCells)
+  {
+          if (element == "Interior")
+                  EndViewCellInterior();
+  }
+  else
+  {
+        if (element == "Interior")
+                  EndBspInterior();
+  }
 }
 
@@ -105 +119 @@
 }
 
+
+void ViewCellsParseHandlers::EndViewCellInterior()
+{
+        // go one up in the tree
+        if (mCurrentViewCell->GetParent())
+        {       cout << "]";
+                mCurrentViewCell = mCurrentViewCell->GetParent();
+        }
+}
 
 inline bool vlt(ViewCell *v1, ViewCell *v2)
@@ -151 +174 @@
         if (element == "Leaf") 
         {
+                cout << "l";
+                Debug << "leaf" << endl;
                 StartBspLeaf(attributes);
         }
@@ -163 +188 @@
 
         // decides the used view cell hierarchy
+        if (element == "ViewCells")
+        {
+                cout << "parsing view cells" << endl;
+                mParseViewCells = true;
+        }
+
         if (element == "Hierarchy")
         {
-                cout << "h";
+                cout << "parsing spatial hierarchy" << endl;
+                mParseViewCells = false;
                 StartHierarchy(attributes);
         }
@@ -172 +204 @@
         if (element == "ViewSpaceBox")
         {
-                cout << "vsb";
+                cout << "b";
                 StartViewSpaceBox(attributes);
         }
 
-        if (element == "ViewCell")
-        {
-                cout << "v";
-                StartViewCell(attributes);
-        }
 
         // use different methods for the given view cell hierarchy types
-        if (mViewCellsManager)
-        {
-                switch (mViewCellsManager->GetType())
-                {
-                case ViewCellsManager::BSP:
-                case ViewCellsManager::VSP_BSP:
-                        startBspElement(element, attributes);
-                        break;
+        if (!mParseViewCells)
+        {
+                if (mViewCellsManager)
+                {
+                        switch (mViewCellsManager->GetType())
+                        {
+                        case ViewCellsManager::BSP:
+                        case ViewCellsManager::VSP_BSP:
+                                startBspElement(element, attributes);
+                                break;
         
-                default:
-                        Debug << "not implemented" << endl;
-                        break;
+                        default:
+                                Debug << "not implemented" << endl;
+                                break;
+                        }
+                }
+        }
+        else
+        {
+                if (element == "Interior") 
+                {
+                        cout << "[";
+                        StartViewCellInterior(attributes);
+                }
+
+                if (element == "Leaf") 
+                {
+                        cout << "l";
+                        StartViewCellLeaf(attributes);
                 }
         }
@@ -209 +253 @@
 
 
-void ViewCellsParseHandlers::StartViewCell(AttributeList&  attributes)
+void ViewCellsParseHandlers::StartViewCell(ViewCell *viewCell, AttributeList&  attributes)
 {
         int len = attributes.getLength();
         vector<int> objIndices;
-  
-//hack!!
-        
-        ViewCell *viewCell = new ViewCellInterior();//mViewCellsManager->GenerateViewCell();
-        viewCell->mIsActive = true;
-
-        mViewCells.push_back(viewCell);
-        
+
         for (int i = 0; i < len; ++ i) 
         {
@@ -284 +321 @@
                         viewCell->SetId(id);
                 }
+                else if (attrName == "active")
+                {
+                        StrX attrValue(attributes.getValue(i));
+                        
+                        const char *ptr = attrValue.LocalForm();
+                        char *endptr = NULL;
+                        const bool isActive = (bool)strtol(ptr, &endptr, 10);
+
+                        viewCell->mIsActive = isActive;
+                }
+                else if (attrName == "mergecost")
+                {
+                        StrX attrValue(attributes.getValue(i));
+                        
+                        const char *ptr = attrValue.LocalForm();
+                        char *endptr = NULL;
+                        const float cost = (float)strtod(ptr, &endptr);
+
+                        viewCell->SetMergeCost(cost);
+                }
         }
 }
@@ -357 +414 @@
                 }
         }
-
+Debug << "here22" << endl;
         
         if (viewCellId >= 0) // valid view cell
@@ -368 +425 @@
                         lower_bound(mViewCells.begin(), mViewCells.end(), &dummyVc, vlt);
                         
-                ViewCellInterior *viewCell = dynamic_cast<ViewCellInterior *>(*vit);
-
-                // giant hack!!
-                BspViewCell *l = dynamic_cast<BspViewCell *>(mViewCellsManager->GenerateViewCell());
-                viewCell->SetupChildLink(l);
+                BspViewCell *viewCell = dynamic_cast<BspViewCell *>(*vit);
+
+                Debug << "here44" << endl;
 
                 if (viewCell->GetId() == viewCellId)
                 {
-                        leaf->SetViewCell(l);
-                        l->mLeaf = leaf;
+                        leaf->SetViewCell(viewCell);
+                        viewCell->mLeaf = leaf;
                 }
                 else
@@ -392 +447 @@
                         mVspBspTree->PropagateUpValidity(leaf);
                 }
-        }
+        }Debug << "here33" << endl;
 }
 
@@ -439 +494 @@
 
 
+void ViewCellsParseHandlers::StartViewCellLeaf(AttributeList& attributes)
+{
+        Debug << "here111" << endl;
+        BspViewCell *viewCell = new BspViewCell();
+
+        if (mCurrentViewCell) // replace front or (if not NULL) back child
+        {
+                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
+                interior->SetupChildLink(viewCell);
+        }
+        else // root
+        {
+                mViewCellsTree->SetRoot(viewCell);
+        }
+
+        StartViewCell(viewCell, attributes);
+
+        // collect leaves
+        mViewCells.push_back(viewCell);
+}
+
+
+void ViewCellsParseHandlers::StartViewCellInterior(AttributeList& attributes)
+{
+        Debug << "here222" << endl;
+        ViewCellInterior* interior = new ViewCellInterior();
+        
+        if (mCurrentViewCell) // replace NULL child of parent with current node
+        {
+                ViewCellInterior *current = dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
+
+                current->SetupChildLink(interior);
+        }
+        else
+        {
+                mViewCellsTree->SetRoot(interior);
+        }
+
+        mCurrentViewCell = interior;
+
+        StartViewCell(interior, attributes);
+}
+
+
 
 void ViewCellsParseHandlers::CreateViewCellsManager(const char *name)
@@ -448 +547 @@
                 mBspTree = new BspTree();
                 mBspTree->mBox = mViewSpaceBox;
-                mCurrentBspNode = mBspTree->GetRoot();
+                //mCurrentBspNode = mBspTree->GetRoot();
 
                 mViewCellsManager = new BspViewCellsManager(mBspTree);
@@ -457 +556 @@
 
                 mVspBspTree = new VspBspTree();
-                mCurrentBspNode = mVspBspTree->GetRoot();
+                //mCurrentBspNode = mVspBspTree->GetRoot();
 
                 mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
@@ -476 +575 @@
         }
 
+        mViewCellsTree = mViewCellsManager->GetViewCellsTree();
         mViewCellsManager->SetViewSpaceBox(mViewSpaceBox);
 }
@@ -625 +725 @@
    // assign new view cells manager
   *viewCells = handler.mViewCellsManager;
-
+  
   if (errorCount > 0)
     return false;

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParserXerces.h

@@ -17 +17 @@
 class BspTree;
 class ViewCellsManager;
+class ViewCellsTree;
 
 class ViewCellsParseHandlers: public HandlerBase
@@ -67 +68 @@
   VspKdTree *mVspKdTree;
   BspTree *mBspTree;
-  
+  ViewCellsTree *mViewCellsTree;
+
   BspNode *mCurrentBspNode;
+  ViewCell *mCurrentViewCell;
+
   ViewCellContainer mViewCells;
   ViewCellsManager *mViewCellsManager;
@@ -75 +79 @@
   AxisAlignedBox3 mViewSpaceBox;
 
+  bool mParseViewCells;
+
   // Handlers for X3D
   void StartBspLeaf(AttributeList& attributes);
@@ -80 +86 @@
   void EndBspInterior();
  
-  void StartViewCell(AttributeList&  attributes);
+  void StartViewCell(ViewCell *viewCell, AttributeList&  attributes);
   void EndViewCells();
-
+        
   void StartHierarchy(AttributeList& attributes);
 
   void startBspElement(string element, AttributeList& attributes);
   void StartViewSpaceBox(AttributeList&  attributes);
+
+  void StartViewCellLeaf(AttributeList& attributes);
+  void StartViewCellInterior(AttributeList& attributes);
+  void EndViewCellInterior();
+
+
   // -----------------------------------------------------------------------
   //  Handlers for the SAX ErrorHandler interface
   // -----------------------------------------------------------------------
+
   void warning(const SAXParseException& exc);
   void error(const SAXParseException& exc);

GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

@@ -568 +568 @@
   }
   else
-  {
-         
+  {      
           VssRayContainer dummies;
           mViewCellsManager->Visualize(mObjects, dummies);
           mViewCellsManager->ExportViewCells("test.xml");
   }
+
   VssTree *vssTree = NULL;
-
   
 
@@ -624 +623 @@
                 cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
                 cout << "#TotalSamples=" << totalSamples/1000
-                        << "k   #SampleContributions=" << passSampleContributions << " ("
+                        << "#SampleContributions=" << passSampleContributions << " ("
                         << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
                         << pvsSize/(float)mObjects.size() << endl