Changeset 451 for trunk/VUT/GtpVisibilityPreprocessor/src

Timestamp:

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

Author:

mattausch

Message:

added viewcellsmanager to rsspreprocessor

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• RssPreprocessor.cpp (modified) (7 diffs)
• RssPreprocessor.h (modified) (1 diff)
• SamplingPreprocessor.cpp (modified) (1 diff)
• VssPreprocessor.cpp (modified) (1 diff)
• default.env (modified) (10 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;
-}

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.h

@@ -104 +104 @@
                         );
 
-  void
-  CastRay(const BspTree &tree, const VssRay & vssRay);
-
-  int
-  AddObjectSamples(Intersectable *obj, const Ray &ray);
-
-
-        
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -361 +361 @@
                 
                 float avgRayContrib = (passContributingSamples > 0) ? 
-                        passSampleContributions/(float)passContributingSamples : 0;
+                        passSampleContributions / (float)passContributingSamples : 0;
 
                 cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -489 +489 @@
   int pass = 0;
 
-  /// Rays used for post processing and visualizations.
+  /// Rays used for post processing and visualizations
   RayContainer storedRays;
   // cast view cell samples

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -144 +144 @@
 
 ViewCells {
-        #hierarchy kdTree
-        hierarchy vspTree
-        #hierarchy bspTree
-        # hierarchy sceneDependent
+        loadFromFile false
+        #type kdTree
+        type vspKdTree
+        #type bspTree
+        #type vspBspTree
+        
+        #type sceneDependent
         
         height 5.0
@@ -156 +159 @@
                 minPvs 10
                 maxPvs 150
-                samples 100000
-        }
-
+                # how much samples are used for post processing
+                samples 10
+        }
+
+        Visualization {
+                # how much samples are be used for visualization
+                samples 90000
+        }
         
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
@@ -168 +176 @@
 BspTree {
         Construction {
-                input fromSamples
-        #       input fromViewCells
-        #       input fromSceneGeometry
-                samples 150000
-                sideTolerance 0.005
+                samples 50000
+                epsilon 0.005
         }
 
@@ -209 +214 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 12
-        
-        maxPolyCandidates 70
-        maxRayCandidates 100
+        splitPlaneStrategy 1024
+        
+        maxPolyCandidates 50
+        maxRayCandidates 50
+        
+        maxTests 10000
         
         # factors for evaluating split plane costs
@@ -221 +228 @@
                 leastRaySplits 1.0
                 balancedRays 1.0
-                pvsFactor 1.0
+                pvs 1.0
                 leastSplits 1.0
                 balancedPolys 1.0
@@ -232 +239 @@
                 minPolygons -1
                 maxDepth 40
-                minPvs 35
+                minPvs 100
                 minArea 0.01
                 maxRayContribution 0.005
@@ -258 +265 @@
         # x3d visualization of the split planes
         exportSplits true
-                # how much samples should be used in visualization
-                samples 20000
         }
 }
@@ -274 +279 @@
 
         Construction {
-                samples 500000
-        }
-        
-        Termination {
-                maxDepth        30
-                minPvs          60
+                samples 100000
+        }
+        
+        Termination {
+                maxDepth                40
+                minPvs                  50
                 minRays         1
                 minSize         0.1
@@ -286 +291 @@
         }
         
-        maxTotalMemory  600
-        maxStaticMemory 600
+        maxTotalMemory  400
+        maxStaticMemory 200
 
         splitType regular
@@ -293 +298 @@
         ct_div_ci       0.0
 }
+
+VspBspTree {
+        Construction {
+                samples 100000
+                epsilon 0.005
+        }
+
+
+        # random polygon       = 1
+        # axis aligned         = 2
+        # least ray splits     = 256
+        # balanced rays        = 512
+        # pvs                  = 1024
+
+        splitPlaneStrategy 1024
+        
+        # maximal candidates for split planes
+        maxPolyCandidates 50
+        maxRayCandidates 50
+        
+        # maximal tested rays for split cost heuristics
+        maxTests 10000
+        
+        # factors for evaluating split plane costs
+        Factor {
+                leastRaySplits 1.0
+                balancedRays 1.0
+                pvs 1.0
+        }
+        
+        Termination {
+                # parameters used for autopartition
+                minRays 200
+                minPolygons -1
+                maxDepth 40
+                minPvs 100
+                minArea 0.01
+                maxRayContribution 0.005
+                #maxAccRayLength 100
+                
+                # used for pvs criterium
+                ct_div_ci 0.0
+        
+                # axis aligned splits
+                AxisAligned {
+                        minPolys 5000
+                        minRays 500
+                        minObjects 10
+                        maxCostRatio 0.9
+                        ct_div_ci 0.5
+                }
+        }
+        
+        AxisAligned {
+                splitBorder 0.01
+        }
+        
+        
+        Visualization {
+                # x3d visualization of the split planes
+                exportSplits true
+        }
+}