Changeset 451 for trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

Timestamp:

12/05/05 13:47:58 (19 years ago)

Author:

mattausch

Message:

added viewcellsmanager to rsspreprocessor

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp (modified) (7 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -9 +9 @@
 #include "VssRay.h"
 #include "RssTree.h"
-#include "ViewCellBsp.h"
+#include "ViewCellsManager.h"
 
 static bool useViewSpaceBox = true;//true;
@@ -378 +378 @@
   int totalSamples = 0;
 
+  /// Rays used for post processing and visualizations.
+  RayContainer storedRays;
 
   AxisAlignedBox3 *box = new AxisAlignedBox3(mKdTree->GetBox());
@@ -407 +409 @@
   RssTree *rssTree = NULL;
 
-  RayContainer bspRays;
-
   while (totalSamples < mInitialSamples) {
         int passContributingSamples = 0;
@@ -423 +423 @@
           Vector3 direction = GetDirection(viewpoint, mViewSpaceBox);
                         
-          sampleContributions = CastRay(viewpoint, direction, mVssRays);
+          CastRay(viewpoint, direction, mVssRays);
                         
                         
@@ -473 +473 @@
         ExportPvs("rss-pvs-initial.x3d", rssTree);
   }
-  
+
+  // construct view cells
+  mViewCellsManager->Construct(mObjects, mVssRays, mViewSpaceBox);
+
   rssTree = new RssTree;
   // viewcells = Construct(mVssRays);
@@ -550 +553 @@
         }
 
+        //-- prepare traversal rays for view cell intersections
+        RayContainer passRays;
+
+        VssRayContainer::const_iterator it, it_end = vssRays.end();
+        
+        for (it = vssRays.begin(); it != it_end; ++ it)
+                passRays.push_back(new Ray(*(*it)));
+        
+        int sampleContributions = 0;
+        int contributingSamples = 0;
+
+        /// compute view cell contribution of rays
+        mViewCellsManager->ComputeSampleContributions(passRays,
+                                                                                                  sampleContributions, 
+                                                                                                  contributingSamples);
+        
+        //-- save rays for post processing
+        if (((int)storedRays.size() < mViewCellsManager->GetPostProcessSamples()) ||
+                ((int)storedRays.size() < mViewCellsManager->GetVisualizationSamples()))
+        {
+                RayContainer::const_iterator it, it_end = passRays.end();
+
+                for (it = passRays.begin(); it != it_end; ++ it)
+                        storedRays.push_back(new Ray(*(*it)));
+        }
+        else
+        {
+                CLEAR_CONTAINER(passRays);
+        }
+
         samples+=num;
         float pvs = rssTree->GetAvgPvsSize();
@@ -575 +608 @@
 }
 
-void
-RssPreprocessor::CastRay(const BspTree &tree, const VssRay & vssRay)
-{
-  //-- cast ray to BSP tree to get intersection with view cells
-  Ray ray(vssRay);
-  mBspTree->CastRay(ray);
-                                
-  //if (0 && ray.sourceObject.mObject)
-  //sampleContributions += 
-  //AddObjectSamples(ray.sourceObject.mObject, ray);
-                        
-  if (!ray.intersections.empty()) // second intersection found
-  {
-          //sampleContributions += 
-          AddObjectSamples(ray.intersections[0].mObject, ray);
-  }
-}
-
-int
-RssPreprocessor::AddObjectSamples(Intersectable *obj, const Ray &ray)
-{
-  int contributingSamples = 0;
-  int j;
- 
-  // object can be seen from the view cell => add to view cell pvs
-  for (j=0; j < ray.bspIntersections.size(); ++ j)
-        {       
-          BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
-          // if ray not in unbounded space
-/*        if (leaf->GetViewCell() != &mUnbounded)
-                contributingSamples += 
-                  leaf->GetViewCell()->GetPvs().AddSample(obj);*/
-        }
- 
-  // rays passing through this viewcell
-  if (mPass > 1)
-        for (j=1; j < ((int)ray.bspIntersections.size() - 1); ++ j) 
-          {
-                BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
-                
-        /*      if (leaf->GetViewCell() != &mUnbounded)
-                  leaf->GetViewCell()->
-                        AddPassingRay(ray, contributingSamples ? 1 : 0);*/
-          }
-  
-  return contributingSamples;
-}