Changeset 2206 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

03/07/07 18:35:10 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (6 diffs)

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

@@ -237 +237 @@
 mRoot(NULL),
 mTimeStamp(1),
-mIsInitialSubdivision(false)
+mIsInitialSubdivision(false),
+mCachedObjects(NULL)
 {
         ReadEnvironment();
@@ -1940 +1941 @@
 
 
-int BvHierarchy::CollectViewCells(const ObjectContainer &objects, 
-                                                                  ViewCellContainer &viewCells,
-                                                                  const bool setCounter,
-                                                                  const bool onlyUnmailedRays)// const
-{
-        ViewCell::NewMail();
-
+
+#if STORE_VIEWCELLS_WITH_BVH
+
+
+void BvHierarchy::ReleaseViewCells(const ObjectContainer &objects)
+{
         ObjectContainer::const_iterator oit, oit_end = objects.end();
 
-        // use mailing to avoid dublicates
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                (*oit)->DelViewCells();
+        }
+
+        DEL_PTR(mCachedObjects);
+}
+
+
+void BvHierarchy::AssociateViewCellsWithObjects(const ObjectContainer &objects)// const
+{
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
         const bool useMailBoxing = true;
 
-        int numRays = 0;
-        // loop through all object and collect view cell pvs of this node
+        mCachedObjects = new ObjectContainer();
+        
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
-                // use mailing to avoid duplicates
-                numRays += CollectViewCells(*oit, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
-        }
-
-        return numRays;
-}
-
-
-#if STORE_VIEWCELLS_WITH_BVH
-
-
-void BvHierarchy::ReleaseViewCells(const ObjectContainer &objects)
-{
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
-        {
-                (*oit)->DelViewCells();
-        }
-}
-
-
-void BvHierarchy::AssociateViewCellsWithObjects(const ObjectContainer &objects) const
-{
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-
-        const bool useMailBoxing = true;
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
-        {
-                ViewCell::NewMail();
-                // use mailing to avoid duplicates
-                AssociateViewCellsWithObject(*oit, useMailBoxing);
+                if (!(*oit)->GetOrCreateRays()->empty())
+                {
+                        ViewCell::NewMail();
+                        // use mailing to avoid duplicates
+                        AssociateViewCellsWithObject(*oit, useMailBoxing);
+                        
+                        mCachedObjects->push_back(*oit);
+                }
         }
 }
@@ -1996 +1984 @@
         if (!obj->GetOrCreateViewCells()->empty())
         {
-                cerr << "AssociateViewCellsWithObject: view cells cache not working" << endl;
+                cerr << "AssociateViewCellsWithObject: view cells cache error" << endl;
+                exit(0);
         }
 
@@ -2025 +2014 @@
         if (obj->GetOrCreateViewCells()->empty())
         {
-                //cerr << "h";//CountViewCells: view cells empty, view cells cache not working" << endl;
+                cerr << "h";//CountViewCells: view cells empty, view cells cache not working" << endl;
                 return CountViewCellsFromRays(obj);
         }
@@ -2188 +2177 @@
 }
 
+
+int BvHierarchy::CollectViewCells(const ObjectContainer &objects, 
+                                                                  ViewCellContainer &viewCells,
+                                                                  const bool setCounter,
+                                                                  const bool onlyUnmailedRays)// const
+{
+        ViewCell::NewMail();
+
+        // use mailing to avoid dublicates
+        const bool useMailBoxing = true;
+
+        int numRays = 0;
+
+        if (mCachedObjects)
+        {
+                ObjectContainer::const_iterator oit, oit_end = mCachedObjects->end();
+
+                // loop through all object and collect view cell pvs of this node
+                for (oit = mCachedObjects->begin(); oit != oit_end; ++ oit)
+                {
+                        // use mailing to avoid duplicates
+                        numRays += CollectViewCells(*oit, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
+                }
+        }
+        else
+        {
+                ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+                // loop through all object and collect view cell pvs of this node
+                for (oit = objects.begin(); oit != oit_end; ++ oit)
+                {
+                        // use mailing to avoid duplicates
+                        numRays += CollectViewCellsFromRays(*oit, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
+                }
+        }
+
+        return numRays;
+}
+
+
+int BvHierarchy::CountViewCells(const ObjectContainer &objects)// const
+{
+        int nViewCells = 0;
+
+        ViewCell::NewMail();
+        
+        if (mCachedObjects)
+        {
+                ObjectContainer::const_iterator oit, oit_end = mCachedObjects->end();
+
+                // loop through all object and collect view cell pvs of this node
+                for (oit = mCachedObjects->begin(); oit != oit_end; ++ oit)
+                {
+                        // use mailing to avoid duplicates
+                        nViewCells += CountViewCells(*oit);
+                }
+        }
+        else
+        {
+                ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+                // loop through all object and collect view cell pvs of this node
+                for (oit = objects.begin(); oit != oit_end; ++ oit)
+                {
+                        nViewCells += CountViewCellsFromRays(*oit);
+                }
+        }
+
+        return nViewCells;
+}
+
+
 #else
+
+int BvHierarchy::CollectViewCells(const ObjectContainer &objects, 
+                                                                  ViewCellContainer &viewCells,
+                                                                  const bool setCounter,
+                                                                  const bool onlyUnmailedRays)// const
+{
+        ViewCell::NewMail();
+
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        // use mailing to avoid dublicates
+        const bool useMailBoxing = true;
+
+        int numRays = 0;
+        // loop through all object and collect view cell pvs of this node
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                // use mailing to avoid duplicates
+                numRays += CollectViewCells(*oit, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
+        }
+
+        return numRays;
+}
+
+
+int BvHierarchy::CountViewCells(const ObjectContainer &objects)// const
+{
+        int nViewCells = 0;
+
+        ViewCell::NewMail();
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        // loop through all object and collect view cell pvs of this node
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                nViewCells += CountViewCells(*oit);
+        }
+
+        return nViewCells;
+}
+
 
 int BvHierarchy::CountViewCells(Intersectable *obj) //const
@@ -2274 +2376 @@
 #endif
 
-
-int BvHierarchy::CountViewCells(const ObjectContainer &objects)// const
-{
-        int nViewCells = 0;
-
-        ViewCell::NewMail();
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-
-        // loop through all object and collect view cell pvs of this node
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
-        {
-                nViewCells += CountViewCells(*oit);
-        }
-
-        return nViewCells;
-}