Changeset 570 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/23/06 18:34:47 (18 years ago)

Author:

mattausch

Message:

construction method for view cells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (11 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -88 +88 @@
 
 
-int ViewCellsManager::Construct(VssRayContainer &rays)
-{
-/*      VssPreprocessor preprocessor;
-
-        VssRayContainer vssRays;
-        preprocessor->GenerateVssRays(mConstructionSamples, vssRays);
-        Construct(preprocessor->mObjects, vssRays);
-
-        // add rays to output rays
-        while (!vssRays.empty)
-        {
-                rays.push_back(vssRays.back());
-                vssRays.pop_back();
-        }
-
-        const int importanceRays = 1000000;
-        preprocessor->GenerateVssRays(max(importanceRays, mPostProcessSamples);
-
-        PostProcess(preprocesor->mObjects, importanceRays);
+int ViewCellsManager::Construct(Preprocessor *preprocessor, VssRayContainer *outRays)
+{
+        SimpleRayContainer simpleRays;
+        VssRayContainer constructionRays;
+
+        preprocessor->GenerateRays(mConstructionSamples,
+                                                           Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION,
+                                                           simpleRays);
+
+        Construct(preprocessor->mObjects, constructionRays);
+
+        int numRays = (int)simpleRays.size();
+
+        static Ray traversalRay;
+
+        // shoot simple ray and add it to construction rays
+        while (!simpleRays.empty())
+        {
+                SimpleRay sray = simpleRays.back();
+
+                // TODO: shoot into kdtree
+                constructionRays.push_back(new VssRay(traversalRay));
+
+                if (outRays)
+                        outRays->push_back(constructionRays.back());
+
+                simpleRays.pop_back();
+        }
+
+        if (!outRays)
+                CLEAR_CONTAINER(constructionRays);
+
+        // guided rays
+        VssRayContainer importanceRays;
+        const int desiredImportanceRays = max(1000000, mPostProcessSamples);
+        preprocessor->GenerateRays(desiredImportanceRays,
+                                                           Preprocessor::RSS_BASED_DISTRIBUTION,
+                                                           simpleRays);
+
+        numRays += (int)simpleRays.size();
+
+        // shoot simple ray and add it to construction rays
+        while (!simpleRays.empty())
+        {
+                SimpleRay sray = simpleRays.back();
+
+                // TODO: shoot into kdtree
+                importanceRays.push_back(new VssRay(traversalRay));
+
+                if (outRays)
+                        outRays->push_back(importanceRays.back());
+
+                simpleRays.pop_back();
+        }
+
+        if (!outRays)
+                CLEAR_CONTAINER(importanceRays);
+
+        // merge the view cells
+        PostProcess(preprocessor->mObjects, importanceRays);
+
         Visualize(preprocessor->mObjects, importanceRays);
 
-        // add rays to output rays
-        while (!importanceRays.empty)
-        {
-                rays.push_back(importanceRays.back());
-                importanceRays.pop_back();
-        }
-*/
-        return (int)rays.size();
+
+        return numRays;
 }
 
@@ -130 +166 @@
           return false;
         }
-  
+
   return true;
 }
@@ -144 +180 @@
 void
 ViewCellsManager::SetValidity(
-                                                          int minPvsSize, 
+                                                          int minPvsSize,
                                                           int maxPvsSize) const
 {
   ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-  
+
   for (it = mViewCells.begin(); it != it_end; ++ it) {
         SetValidity(*it, minPvsSize, maxPvsSize);
@@ -161 +197 @@
 {
   sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
-  
+
   int start = mViewCells.size()*minValid;
   int end = mViewCells.size()*maxValid;
-  
+
   for (int i=0; i < mViewCells.size(); i++)
         mViewCells[i]->SetValid(i >= start && i <= end);
@@ -542 +578 @@
 }
 
-float
-ViewCellsManager::ComputeSampleContributions(VssRay &ray,
-                                                                                         const bool addRays
-                                                                                         )
-{
-  ViewCellContainer viewcells;
-
-  ray.mPvsContribution = 0;
-  ray.mRelativePvsContribution = 0.0f;
-
- static Ray hray;
+float ViewCellsManager::ComputeSampleContributions(VssRay &ray,
+                                                                                                   const bool addRays)
+{
+        ViewCellContainer viewcells;
+
+        ray.mPvsContribution = 0;
+        ray.mRelativePvsContribution = 0.0f;
+
+        static Ray hray;
         hray.Init(ray);
         //hray.mFlags |= Ray::CULL_BACKFACES;
@@ -567 +601 @@
         CastLineSegment(origin, termination, viewcells);
         //Debug << "constribution: " << (int)viewcells.size() << endl;
-        CastLineSegment(origin, termination, viewcells);
-
-  //Debug << "constribution: " << (int)viewcells.size() << endl;
-
-  // copy viewcells memory efficiently
-  const bool storeViewcells = !addRays;
-
-  if (storeViewcells)
-  {
-        ray.mViewCells.reserve(viewcells.size());
-        ray.mViewCells = viewcells;
-  }
-
-  ViewCellContainer::const_iterator it = viewcells.begin();
+
+        // copy viewcells memory efficiently
+        const bool storeViewcells = !addRays;
+
+        if (storeViewcells)
+        {
+                ray.mViewCells.reserve(viewcells.size());
+                ray.mViewCells = viewcells;
+        }
+
+        ViewCellContainer::const_iterator it = viewcells.begin();
 
 
@@ -605 +636 @@
           }
         }
-  
-  return ray.mRelativePvsContribution;
+
+        return ray.mRelativePvsContribution;
 }
 
@@ -1568 +1599 @@
 }
 
+
 int VspKdViewCellsManager::Construct(const ObjectContainer &objects,
                                                                          const VssRayContainer &rays)
@@ -1934 +1966 @@
 }
 
-
-
+<<<<<<< .mine
+
+=======
+
+
+>>>>>>> .r569
 int VspBspViewCellsManager::Construct(const ObjectContainer &objects,
                                                                           const VssRayContainer &rays)
@@ -2268 +2304 @@
   // validy update in preprocessor for all managers)
   return ViewCellsManager::ViewPointValid(viewPoint);
-  
+
   //    return mViewSpaceBox.IsInside(viewPoint) &&
   //               mVspBspTree->ViewPointValid(viewPoint);
@@ -2508 +2544 @@
                         importance = (float)vc->GetPvs().GetSize() /
                                 (float)mViewCellsStats.maxPvs;
+
                 }
                 break;