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

Timestamp:

02/12/07 19:00:37 (17 years ago)

Author:

mattausch

Message:

changed pvs loading: loading objects in a first pass

File:

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

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

@@ -103 +103 @@
   , nObjects(0)
 {
-        // pvs objects empty => have to create new ones
-        mCreatePvsObjects = mPvsObjects.empty();
-
+        // q: can we assume that the objects are sorted?
+        
         // sort objects so we can search in them
         //if (!is_sorted(mPvsObjects.begin(), mPvsObjects.end(), ilt))
@@ -111 +110 @@
 
         //if (!is_sorted(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt))
-                sort(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt);
+        //      sort(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt);
 }
 
@@ -407 +406 @@
 
 
-void ViewCellsParseHandlers::ReplaceBvhPvs(ViewCell *vc)
-{
-        //cout << "exchanging pvs" << endl;
-        ObjectPvs newPvs;
-
-        ObjectPvsIterator pit = vc->GetPvs().GetIterator();
-
-        BvhLeaf *dummyInst = new BvhLeaf(AxisAlignedBox3());
-
-        ObjectContainer oldIntersectables;
-
-        // output PVS of view cell
-        while (pit.HasMoreEntries())
-        {               
-                ObjectPvsEntry entry = pit.Next();
-
-                Intersectable *intersect = entry.mObject;
-                oldIntersectables.push_back(intersect);
-
-                DummyIntersectable *dummyIntersect = static_cast<DummyIntersectable *>(intersect);
-
-                const int objId = dummyIntersect->GetItem();    
-                dummyInst->SetId(objId);
-
-                vector<BvhLeaf *>::iterator oit =
-                        lower_bound(mBvhLeaves.begin(), 
-                                                mBvhLeaves.end(), 
-                                                dummyInst, ilt);        
-
-                if ((oit != mBvhLeaves.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
-                        //cout << (*oit)->GetId() << " ";
-                        
-                        newPvs.AddSample(*oit, 1.0f);
-                }
-                else
-                {
-                        Debug << "exchangePvs error: object with id " << objId << " does not exist" << endl;
-                }
-        }
-
-        //newPvs.SimpleSort();
-        delete dummyInst;
-        vc->SetPvs(newPvs);
-
-        CLEAR_CONTAINER(oldIntersectables);
-}
-
-
-void ViewCellsParseHandlers::ReplacePvs()
-{
-        // sort the pvs entries
-        sort(mPvsObjects.begin(), mPvsObjects.end(), ilt);
-
-        ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
-        
-        //cout << "viewcells : " << mViewCells.size() << endl;
-        for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
-        {
-                ReplaceBvhPvs(*vit);
-        }
-}
-
-
 void ViewCellsParseHandlers::StartViewCellHierarchyElement(const std::string &element,
                                                                                                                    AttributeList& attributes)
@@ -513 +445 @@
         {               
                 Debug << "\nparsing view space hierarchy" << endl;
-                cout << "\nparsing view space hierarchy" << endl;
+                cout  << "\nparsing view space hierarchy" << endl;
+
                 mCurrentState = PARSE_VIEWSPACE_HIERARCHY;
                 StartViewSpaceHierarchy(attributes);
@@ -521 +454 @@
         if (element == "ObjectSpaceHierarchy")
         {
-                cout << "\nparsing object space hierarchy" << endl;
+                cout  << "\nparsing object space hierarchy" << endl;
                 Debug << "\nparsing object space hierarchy" << endl;
 
@@ -540 +473 @@
         case PARSE_VIEWSPACE_HIERARCHY:
                 if ((++ nViewCells % 1000) == 0)
-                        cout<<"\r"<<nViewCells<<" view cells parsed\r";
+                        cout << "\r" << nViewCells << " view cells parsed\r";
                 
                 StartViewSpaceHierarchyElement(element, attributes);
@@ -546 +479 @@
         case PARSE_OBJECTSPACE_HIERARCHY:
                 if ((++ nObjects % 1000) == 0)
-                 cout<<"\r"<< nObjects <<" objects parsed\r";
+                        cout <<"\r" << nObjects << " objects parsed\r";
                 
                 StartObjectSpaceHierarchyElement(element, attributes);
@@ -577 +510 @@
         }
 
+#if 1
         // TODO: 
         // 1) find objects and add them to pvs
@@ -583 +517 @@
 
         vector<int>::const_iterator it, it_end = objIndices.end();
+        
+        pair<ObjectContainer::const_iterator, ObjectContainer::const_iterator> result;
+
         for (it = objIndices.begin(); it != it_end; ++ it)
         {
-                if (mCreatePvsObjects)
-                {
-                        // pvs entries will be created => just use dummy proxy
-                        pvs.AddSample(new DummyIntersectable(*it), 1);
+                const int objId = *it;  
+                dummyInst.SetId(objId);
+
+                // equal indeces possible!
+                result = equal_range(mPvsObjects.begin(), 
+                                                         mPvsObjects.end(), 
+                                                         (Intersectable *)&dummyInst, 
+                                                         ilt);  
+
+                ObjectContainer::const_iterator eit = result.first;
+
+                for (; eit != result.second; ++ eit)
+                {
+                        pvs.AddSample(*eit, 1.0f);
+                }
+        }
+
+#else
+
+        // 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(mPvsObjects.begin(), 
+                                                                                mPvsObjects.end(), 
+                                                                                (Intersectable *)&dummyInst, ilt);      
+
+                if ((oit != mPvsObjects.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
                 {
-                        const int objId = *it;  
-                        dummyInst.SetId(objId);
-
-                        ObjectContainer::iterator oit = 
-                                                                lower_bound(mPvsObjects.begin(), 
-                                                                                        mPvsObjects.end(), 
-                                                                                        (Intersectable *)&dummyInst, ilt);      
-
-                        if ((oit != mPvsObjects.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
-                        {
-                                //Debug << "x";
-                                //Debug << "StartViewCellPvs error: object with id " << objId << " does not exist" << endl;
-                        }
-                }
-        }
+                        Debug << "x";
+                        //Debug << "StartViewCellPvs error: object with id " << objId << " does not exist" << endl;
+                }
+        }
+#endif
 }
 
@@ -1287 +1244 @@
                 if (attrName == "objects")
                 {
-                        StartBvhLeafObjects(objects, ptr);
+                        if (!mPreprocessorObjects.empty())
+                                StartBvhLeafObjects(objects, ptr);
                 }
         }
@@ -1298 +1256 @@
         {
                 BvhInterior *interior = static_cast<BvhInterior *>(mCurrentBvhNode);
+
                 leaf = new BvhLeaf(box, interior, (int)objects.size());
                 interior->ReplaceChildLink(NULL, leaf);
@@ -1309 +1268 @@
         leaf->mObjects = objects;
         BvHierarchy::AssociateObjectsWithLeaf(leaf);
-        
-        if (mCreatePvsObjects)
-        {
-                // Temp matt: leaves should already have right id
-                if (0) leaf->SetId((int)mBvhLeaves.size());
-                
-                mPvsObjects.push_back(leaf);    
-        }
 }
 
@@ -1336 +1287 @@
 
         MeshInstance dummyInst(NULL);
-
         vector<int>::const_iterator it, it_end = objIndices.end();
 
@@ -1344 +1294 @@
                 dummyInst.SetId(objId);
 
-                ObjectContainer::iterator oit =
-                        lower_bound(mPvsObjects.begin(), 
-                                                mPvsObjects.end(), 
+                ObjectContainer::const_iterator oit =
+                        lower_bound(mPreprocessorObjects.begin(), 
+                                                mPreprocessorObjects.end(), 
                                                 (Intersectable *)&dummyInst, 
                                                 ilt);   
                                                         
-                if ((oit != mPvsObjects.end()) && ((*oit)->GetId() == objId))
+                if ((oit != mPreprocessorObjects.end()) && ((*oit)->GetId() == objId))
                 {
                         objects.push_back(*oit);