Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (19 diffs)

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

@@ -24 +24 @@
 #include "SamplingStrategy.h"
 #include "SceneGraph.h"
+
+#ifdef PERFTIMER  
 #include "Timer/PerfTimer.h"
-
+#endif // PERFTIMER
 
 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0
@@ -39 +41 @@
 
 
+#ifdef PERFTIMER  
 PerfTimer viewCellCastTimer;
 PerfTimer pvsTimer;
 PerfTimer objTimer;
-
+#endif
+  
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
@@ -66 +70 @@
 };
 
+
+
+struct SortableViewCellEntry {
+
+        SortableViewCellEntry() {}
+        SortableViewCellEntry(const float v, ViewCell *cell):mValue(v), mViewCell(cell) {}
+
+        float mValue;
+        ViewCell *mViewCell;
+
+  friend bool operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b);
+};
+
+
+inline bool
+operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b) {
+  return a.mValue < b.mValue;
+}
 
 ViewCellsManager::ViewCellsManager(ViewCellsTree *viewCellsTree):
@@ -1059 +1081 @@
         int id;
 
+#ifdef PERFTIMER  
         PerfTimer boxTimer;
 
         boxTimer.Start();
         boxTimer.Entry();
-        
+#endif  
         for (int i = 0; i < numBoxes; ++ i)
         {
@@ -1074 +1097 @@
 
 
+#ifdef PERFTIMER  
         boxTimer.Exit();
 
         Debug << numBoxes << " boxes loaded in " << boxTimer.TotalTime() << " secs" << endl;
+#endif
 }
 
@@ -1699 +1724 @@
 inline float EvalMergeCost(ViewCell *root, ViewCell *candidate)
 {
-        return root->GetPvs().GetPvsHomogenity(candidate->GetPvs());
+  return root->GetPvs().GetPvsHomogenity(candidate->GetPvs());
 }
 
@@ -1773 +1798 @@
 }
 
-
-struct SortableViewCellEntry {
-
-        SortableViewCellEntry() {}
-        SortableViewCellEntry(const float v, ViewCell *cell):mValue(v), mViewCell(cell) {}
-
-        float mValue;
-        ViewCell *mViewCell;
-
-        friend bool operator<(const SortableViewCellEntry &a, const SortableViewCellEntry &b) {
-                return a.mValue < b.mValue;
-        }
-};
 
 
@@ -2114 +2126 @@
         }
 
+#ifdef PERFTIMER  
         cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
         Debug << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
@@ -2119 +2132 @@
         cout << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
         Debug << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
-        
+#endif  
         return sum;
 }
@@ -2869 +2882 @@
         ViewCell::NewMail();
 
+#ifdef PERFTIMER  
         viewCellCastTimer.Entry();
-
+#endif
         static ViewCellContainer viewCells;
         static VssRay *lastVssRay = NULL;
@@ -2889 +2903 @@
         }
 
+#ifdef PERFTIMER  
         viewCellCastTimer.Exit();
-
+#endif
         mSamplesStat.mViewCells += (int)viewCells.size();
 
@@ -2908 +2923 @@
         Intersectable *terminationObj;
 
+#ifdef PERFTIMER  
         objTimer.Entry();
-
+#endif
         // obtain pvs entry (can be different from hit object)
         terminationObj = ray.mTerminationObject;
 
+#ifdef PERFTIMER  
         objTimer.Exit();
 
         pvsTimer.Entry();
-
+#endif
+        
         ViewCellContainer::const_iterator it = viewCells.begin();
 
@@ -2929 +2947 @@
         }
 
+#ifdef PERFTIMER  
         pvsTimer.Exit();
-
+#endif
+        
         mSamplesStat.mPvsContributions += ray.mPvsContribution;
         if (ray.mPvsContribution)
@@ -3460 +3480 @@
                                                            const float filterSize,
                                                            ObjectPvs &pvs,
-                                                           vector<AxisAlignedBox3> *filteredBoxes
+                                                           vector<AxisAlignedBox3> *filteredBoxes,
+                                                           const bool onlyNewObjects
                                                            )
 {
@@ -3480 +3501 @@
 
         if (!mUseKdPvs)
-        {       // first mark all objects from this pvs
-                while (pit.HasMoreEntries())    
-                        pit.Next()->Mail();
-        }
-
+        {
+          // first mark all objects from this pvs
+          while (pit.HasMoreEntries())  
+                pit.Next()->Mail();
+        }
+        
         int pvsSize = 0;
         int nPvsSize = 0;
@@ -3548 +3570 @@
 
                 pit = basePvs.GetIterator();
-
+                
+                if (onlyNewObjects) {
+                  while (pit.HasMoreEntries()) {
+                        // mail all objects from the original not to include them in the
+                        // resulting pvs
+                        Intersectable *obj = pit.Next(pvsData);
+                        obj->Mail();
+                  }
+                  pit = basePvs.GetIterator();
+                }
+                
                 while (pit.HasMoreEntries()) 
                 {               
@@ -3631 +3663 @@
                 stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
         }
-
+        
         //Debug << " nPvs size = " << pvs.GetSize() << endl;
 
-        if (!mUseKdPvs)
+        if (!mUseKdPvs && !onlyNewObjects)
         {
                 PvsData pvsData;
@@ -7162 +7194 @@
         CLEAR_CONTAINER(tmpRays);
 
+#ifdef PERFTIMER  
         cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
         Debug << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
-
         cout << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
         Debug << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
+#endif
         
         return sum;
@@ -7174 +7207 @@
 
 
-ViewCellsManager *ViewCellsManager::LoadViewCellsBinary(const string &filename, 
-                                                                                                                ObjectContainer &pvsObjects,
-                                                                                                                bool finalizeViewCells,
-                                                                                                                BoundingBoxConverter *bconverter)                                                                                                
-{
-        IN_STREAM stream(filename.c_str());
-
-        if (!stream.is_open())
+ViewCellsManager *
+ViewCellsManager::LoadViewCellsBinary(const string &filename, 
+                                                                          ObjectContainer &pvsObjects,
+                                                                          bool finalizeViewCells,
+                                                                          BoundingBoxConverter *bconverter)                                                                                              
+{
+  IN_STREAM stream(filename.c_str());
+  
+  if (!stream.is_open())
         {
                 Debug << "View cells loading failed: could not open file" << endl;