Changeset 1142 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

07/19/06 00:26:49 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (2 diffs)

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

@@ -1677 +1677 @@
 
 
-int ViewCellsTree::CountKdPvs(const ViewCellLeaf *vc) const
-{
-        ObjectPvsMap::const_iterator oit, oit_end = vc->GetPvs().mEntries.end();
-
+int ViewCellsTree::GetPvsSize(ViewCell *vc) const
+{
         int pvsSize = 0;
 
         Intersectable::NewMail();
 
-        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
-        {
-                Intersectable *obj = (*oit).first;
-
-/*              KdLeaf *leaf = ;
-
-                        pvsSize += ((int)leaf->mObjects.size() - (int)leaf->mMultipleObjects.size());
-
-                        //-- handle objects of several kd leaves separately
-                        ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
-
-                        for (oit = leaf->mMultipleObjects.begin(); oit != oit_end; ++ oit)
-                        {
-                                Intersectable *object = *oit;
-
-                                // object not previously in left pvs
-                                if (!object->Mailed())
-                                {
-                                        object->Mail();
-                                        ++ pvsSize;
-                                }
-                        }               
-                }*/
-        }
-
-        return pvsSize;
-}
-
-
-int ViewCellsTree::GetPvsSize(ViewCell *vc, const bool countKdPvs) const
-{
-        int pvsSize = 0;
-
-        Intersectable::NewMail();
-
-        //////////////////////////
-        // for interiors, pvs can be stored using different methods
+        ////////////////////////////////////////////////
+        //-- for interiors, pvs can be stored using different methods
+        ///////////////////////////////////////////////
 
         switch (mViewCellsStorage)
@@ -1730 +1694 @@
                         if (vc->IsLeaf())
                         {
-                                if (countKdPvs)
-                                        pvsSize = vc->GetPvs().CountPvs();
-                                else
-                                        pvsSize = CountKdPvs(dynamic_cast<ViewCellLeaf *>(vc));
-                                break;
+                                pvsSize = vc->GetPvs().CountPvs();
                         }