Changeset 1551 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

Timestamp:

10/02/06 19:07:38 (18 years ago)

Author:

mattausch

Message:

updated view cells loading. probably no optimal for performance

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp (modified) (16 diffs)

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

@@ -260 +260 @@
 {
         // sort view cells to help associating view cells according to their id
-        stable_sort(mViewCells.begin(), mViewCells.end(), vlt);
+        //stable_sort(mViewCells.begin(), mViewCells.end(), vlt);
 
         // not parsing view cells anymore
@@ -393 +393 @@
         {
                 cout << "[";
-                StartViewCellInterior(attributes);
+                StartViewCell(attributes, false);
         }
 
@@ -399 +399 @@
         {
                 cout << "l";
-                StartViewCellLeaf(attributes);
+                StartViewCell(attributes, true);
         }
 }
@@ -464 +464 @@
 
 
-void ViewCellsParseHandlers::StartViewCellPvs(ViewCell *viewCell, 
-                                                                                          AttributeList&  attributes)
-{
-        int len = attributes.getLength();
+void ViewCellsParseHandlers::StartViewCellPvs(ObjectPvs &pvs, const char *ptr)
+{
+        // handle obect indices
         vector<int> objIndices;
-
-        for (int i = 0; i < len; ++ i) 
-        {
-                string attrName(StrX(attributes.getName(i)).LocalForm());
-                
-                if (attrName == "pvs") 
-                {
-                        StrX attrValue(attributes.getValue(i));
+        char *endptr;
                         
-                        // handle coordIndex
-                        objIndices.clear();
-                        const char *ptr = attrValue.LocalForm();
-                        char *endptr;
-                        
-                        while (1)
-                        {
-                                const int index = strtol(ptr, &endptr, 10);
-
-                                if (ptr == endptr) break;
-
-                                objIndices.push_back(index);
-
-                                ptr = endptr;
-                        }
-
-                        //TODO: find objects and add them to pvs
-                        // TODO: get view cell with specified id
-                        MeshInstance dummyInst(NULL);
-
-                        vector<int>::const_iterator it, it_end = objIndices.end();
-                        for (it = objIndices.begin(); it != it_end; ++ it)
-                        {
-                                const int objId = *it;  
-                                dummyInst.SetId(objId);
-
-                                ObjectContainer::iterator oit =
-                                        lower_bound(mObjects->begin(), 
-                                                                mObjects->end(), 
-                                                                (Intersectable *)&dummyInst, ilt);      
-                                                        
-                                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
-                                {
-                                        // $$JB we should store a float a per object which corresponds
-                                        // to sumof pdfs, i.e. its relative visibility
-                                        // temporarily set to 1.0f
-                                        viewCell->GetPvs().AddSample(*oit, 1.0f);                               
-                                }
-                                else
-                                {
-                                        cout << "error: object with id " << objId << " does not exist" << endl;
-                                }
-                        }
-                }
-                else if (attrName == "id") 
-                {
-                        StrX attrValue(attributes.getValue(i));
-                        
-                        const char *ptr = attrValue.LocalForm();
-                        char *endptr = NULL;
-                        const int id = strtol(ptr, &endptr, 10);
-
-                        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);
-
-                        if (isActive)
-                                viewCell->SetActive();
-                }*/
-                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);
+        while (1)
+        {       // read object ids
+                const int index = strtol(ptr, &endptr, 10);
+                if (ptr == endptr) 
+                        break;
+                objIndices.push_back(index);
+                ptr = endptr;
+        }
+
+        // TODO: 
+        // 1) find objects and add them to pvs
+        // 2) get view cell with specified id
+        MeshInstance dummyInst(NULL);
+
+        vector<int>::const_iterator it, it_end = objIndices.end();
+        for (it = objIndices.begin(); it != it_end; ++ it)
+        {
+                const int objId = *it;  
+                dummyInst.SetId(objId);
+
+                ObjectContainer::iterator oit =
+                        lower_bound(mObjects->begin(), 
+                        mObjects->end(), 
+                        (Intersectable *)&dummyInst, ilt);      
+
+                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
+                {
+                        // $$JB we should store a float a per object which corresponds
+                        // to sumof pdfs, i.e. its relative visibility
+                        // temporarily set to 1.0f
+                        pvs.AddSample(*oit, 1.0f);                              
+                }
+                else
+                {
+                        cout << "error: object with id " << objId << " does not exist" << endl;
                 }
         }
@@ -705 +658 @@
         }
 
+        ///////////
         //-- find associated view cell
 
@@ -728 +682 @@
         {
                 // TODO: get view cell with specified id
-                ViewCellInterior dummyVc;
-                dummyVc.SetId(viewCellId);
-
-                ViewCellContainer::iterator vit =
-                        lower_bound(mViewCells.begin(), mViewCells.end(), &dummyVc, vlt);
-                        
-                BspViewCell *viewCell = dynamic_cast<BspViewCell *>(*vit);
+                ViewCellsMap::iterator vit = mViewCells.find(viewCellId);
+                BspViewCell *viewCell = dynamic_cast<BspViewCell *>((*vit).second);
         
                 if (viewCell->GetId() == viewCellId)
@@ -740 +689 @@
                         // create new view cell for bsp nodes
                         leaf->SetViewCell(viewCell);
-                        viewCell->mLeaf = leaf;
+                        viewCell->mLeaves.push_back(leaf);
                 }
                 else
@@ -793 +742 @@
 
 
-void ViewCellsParseHandlers::StartViewCellLeaf(AttributeList& attributes)
-{
-        ViewCellLeaf *viewCell = new ViewCellLeaf();
-
-        if (mCurrentViewCell) // replace front or (if not NULL) back child
-        {
-                ViewCellInterior *interior = 
-                        dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
-                interior->SetupChildLink(viewCell);
-        }
-        else // root
-        {
-                mViewCellsTree->SetRoot(viewCell);
-        }
-
-        StartViewCellPvs(viewCell, attributes);
-
-        // collect leaves
-        mViewCells.push_back(viewCell);
-}
-
-
-void ViewCellsParseHandlers::StartViewCellInterior(AttributeList& attributes)
-{
-        ViewCellInterior* interior = new ViewCellInterior();
+ViewCell *ViewCellsParseHandlers::GetOrCreateViewCell(const int id, const bool isLeaf)
+{
+        ViewCellsMap::iterator vit = mViewCells.find(id);
+
+        if (vit != mViewCells.end())
+        {
+                return (*vit).second;
+        }
+        else
+        {
+                ViewCell *vc;
+                if (isLeaf)
+                {
+                        vc = new ViewCellLeaf();
+                }
+                else
+                {
+                        vc = new ViewCellInterior();
+                }
+
+                vc->SetId(id);
+                mViewCells[id] = vc;
+                return vc;
+        }
+}
+
+
+void ViewCellsParseHandlers::StartViewCell(AttributeList& attributes, const bool isLeaf)
+{
+        ViewCell *viewCell = NULL;
         
-        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;
-
-        StartViewCellPvs(interior, attributes);
+        const int len = attributes.getLength();
+        float mergeCost;
+        ObjectPvs pvs;
+
+        for (int i = 0; i < len; ++ i) 
+        {
+                const string attrName(StrX(attributes.getName(i)).LocalForm());
+        
+                if (attrName == "id") 
+                {
+                        const StrX attrValue(attributes.getValue(i));
+                        const char *ptr = attrValue.LocalForm();
+                        char *endptr = NULL;
+                        const int id = strtol(ptr, &endptr, 10);
+
+                        // create new view cell, otherwise use reference.
+                        viewCell = GetOrCreateViewCell(id, isLeaf);
+                        
+                        if (mCurrentViewCell) // replace front or (if not NULL) back child
+                        {       
+                                ViewCellInterior *interior = 
+                                        dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
+                                interior->SetupChildLink(viewCell);
+                        }
+                        else 
+                        {       // set the new root
+                                mViewCellsTree->SetRoot(viewCell);
+                        }
+                        
+                        if (!isLeaf)
+                        {
+                                mCurrentViewCell = viewCell;
+                        }
+                }
+                if (attrName == "pvs") 
+                {
+                        StrX attrValue(attributes.getValue(i));
+                        const char *ptr = attrValue.LocalForm();
+
+                        // note: id must come before pvs! 
+                        // otherwise view cell is undefined
+                        StartViewCellPvs(pvs, ptr);
+                }
+                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);
+
+                        if (isActive)
+                        {
+                                // TODO
+                        }
+                }
+                else if (attrName == "mergecost")
+                {
+                        StrX attrValue(attributes.getValue(i));
+                        
+                        const char *ptr = attrValue.LocalForm();
+                        char *endptr = NULL;
+                        mergeCost = (float)strtod(ptr, &endptr);
+                }
+        }
+
+        viewCell->SetMergeCost(mergeCost);
+        viewCell->SetPvs(pvs);
 }
 
@@ -841 +848 @@
         {
                 cout << "hierarchy type: Bsp" << endl;
-
                 mVspBspTree = new VspBspTree();
 
@@ -847 +853 @@
                 mVspBspTree->mBox = mViewSpaceBox;
 
-                ViewCellContainer::iterator vit, vit_end = mViewCells.end();
-
-                // reset view cells using the current node type
+                ViewCellsMap::iterator vit, vit_end = mViewCells.end();
+
+                // remove view cells and exchange them with the 
+                // view cells specialized for the current hierarchy node type
                 for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        ViewCell *vc = *vit;
-
+                        ViewCell *vc = (*vit).second;
+                        if (!vc->IsLeaf()) // exchange only leaves
+                                continue;
                         BspViewCell *bspVc = new BspViewCell();
+                        bspVc->SetId(vc->GetId());
                         bspVc->SetPvs(vc->GetPvs());
-                        bspVc->SetId(vc->GetId());
 
                         if (vc->IsRoot())
@@ -868 +876 @@
 
                         DEL_PTR(vc);
-                        (*vit) = bspVc;
+                        (*vit).second = bspVc;
                 }
         }
@@ -874 +882 @@
         {
                 cout << "hierarchy type: Vsp" << endl;
-
                 mVspTree = new VspTree();
 
@@ -880 +887 @@
                 mVspTree->mBoundingBox = mViewSpaceBox;
 
-                ViewCellContainer::iterator vit, vit_end = mViewCells.end();
+                ViewCellsMap::iterator vit, vit_end = mViewCells.end();
 
                 // reset view cells using the current node type
                 for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        ViewCell *vc = *vit;
+                        ViewCell *vc = (*vit).second;
 
                         VspViewCell *vspVc = new VspViewCell();
                         vspVc->SetPvs(vc->GetPvs());
                         vspVc->SetId(vc->GetId());
+
+                        if (!vc->IsLeaf()) // exchange only leaves
+                                continue;
 
                         if (vc->IsRoot())
@@ -901 +911 @@
                         
                         DEL_PTR(vc);
-                        (*vit) = vspVc;
+                        (*vit).second = vspVc;
                 }
 
@@ -970 +980 @@
         }
 
-        //-- find associated view cell
+        /////////////
+        //-- find view cell associated with the id
+
         int viewCellId;
         
@@ -989 +1001 @@
         }
         
-        if (viewCellId >= 0) // valid view cell
+        if (viewCellId >= 0) // valid view cell found
         {
                 // TODO: get view cell with specified id
-                ViewCellInterior dummyVc;
+                /*ViewCellInterior dummyVc;
                 dummyVc.SetId(viewCellId);
 
-                //cout << "\nsearching view cell with id " << viewCellId << endl;
                 ViewCellContainer::iterator vit =
                         lower_bound(mViewCells.begin(), mViewCells.end(), &dummyVc, vlt);
-                        
+                */
+                ViewCellsMap::iterator vit = mViewCells.find(viewCellId);
                 if (vit == mViewCells.end())
                         cout << "error: view cell " << viewCellId << " not found" << endl;
         
-                VspViewCell *viewCell = dynamic_cast<VspViewCell *>(*vit);
+                VspViewCell *viewCell = dynamic_cast<VspViewCell *>((*vit).second);
                 
                 if (viewCell->GetId() == viewCellId)
                 {
                         leaf->SetViewCell(viewCell);
-                        viewCell->mLeaf = leaf;
+                        viewCell->mLeaves.push_back(leaf);
                 }
                 else