Changeset 1179 for GTP/trunk

Timestamp:

08/02/06 17:40:16 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (4 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsManager.h (modified) (1 diff)
• VspOspTree.cpp (modified) (3 diffs)

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

@@ -251 +251 @@
                                                         float &contribution)
 {
-        Debug << "here9 "<< endl;
-        Debug << "here2 " << mVolume << endl;
         const bool result = mPvs.AddSample(sample, pdf, contribution);
-        Debug << "here4" << endl;
-        // update pvs size scalar
-        //mPvsSize = mPvs.GetSize();
-        mPvsSizeValid = false; // recompute pvs size
+        
+        mPvsSizeValid = false; // have to recompute pvs size
 
         return result;
@@ -1526 +1522 @@
 
                         ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
-Debug << "\nhere92" << endl;
+
                         for (it = interior->mChildren.begin(); it != it_end; ++ it)
                         {
-                                Debug << "here15" << endl;
                                 ViewCell *vc = *it;
 
@@ -1543 +1538 @@
                         }
 
-Debug << "\nhere1005" << endl;
+
                         const float costDecr = (parentCost - childCost) / vol;
 
@@ -1734 +1729 @@
         if (vc->mPvsSizeValid)
         {
-                Debug << "here5"<<endl;
                 return vc->mPvsSize;
         }
         
-        Debug << "here2"<<endl;
-
         // if no valid pvs size stored as a scalar => 
         // compute current pvs size of interior from it's leaf nodes

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

@@ -4879 +4879 @@
 
         long startTime;
-Debug << "here601" << endl;
+
         //mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
         mHierarchyManager->Construct2(constructionRays, objects, &mViewSpaceBox);
@@ -5726 +5726 @@
 }
 
-
+#if 0
 void VspOspViewCellsManager::EvalViewCellPartition()
 {
-        Debug << "here23" << endl;
         int samplesPerPass;
         int numSamples;
@@ -5799 +5798 @@
         disposeRays(evaluationSamples, NULL);
 }
-
+#endif
 //////////////////////////////////
 /*ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)

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

@@ -1011 +1011 @@
 
 protected:
-        
+#if 0
         virtual void EvalViewCellPartition();
-
+#endif
         /** Exports view cell geometry.
         */

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

@@ -3345 +3345 @@
 {
         RayInfoContainer usedRays;
-int mMaxTests = 5000; // HACK
-//      if (mMaxTests < (int)tData.mRays->size())
-//      {
-//              GetRayInfoSets(*tData.mRays, mMaxTests, usedRays);
-//      }
-//      else
-//      {
+        int mMaxTests = 500000; // HACK
+
+        if (mMaxTests < (int)tData.mRays->size())
+        {
+                GetRayInfoSets(*tData.mRays, mMaxTests, usedRays);
+        }
+        else
+        {
                 usedRays = *tData.mRays;
-//      }
+        }
 
         // go through the lists, count the number of objects left and right
@@ -4605 +4606 @@
         mOspTree.PreprocessRays(sampleRays, rays);
 
-        // add first candidate for view space partition
+        // create new root
         KdLeaf *kdleaf = new KdLeaf(NULL, 0);
         kdleaf->mObjects = objects;
-
         mOspTree.mRoot = kdleaf;
         
+        // add first candidate for view space partition
+
         // TODO matt: this is something different than pvs size.
         const int pvsSize = mOspTree.ComputePvsSize(objects);
@@ -4631 +4633 @@
 
         mOspTree.mTotalCost = (float)objects.size();
-        Debug << "total cost here553: " << mOspTree.mTotalCost << endl;
         mOspTree.EvalSubdivisionStats(*oSplitCandidate);