Changeset 370 for trunk/VUT/GtpVisibilityPreprocessor

Timestamp:

11/02/05 17:57:29 (19 years ago)

Author:

mattausch

Message:

fixed specular bug in trees
added batched query manager
added t information to ray bsp leaves

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• scripts/default.env (modified) (5 diffs)
• src/Camera.cpp (modified) (1 diff)
• src/Ray.h (modified) (2 diffs)
• src/SamplingPreprocessor.cpp (modified) (5 diffs)
• src/ViewCellBsp.cpp (modified) (4 diffs)
• src/default.env (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -347 +347 @@
                         </File>
                 </Filter>
+                <File
+                        RelativePath=".\VTune\Preprocessor.vpj">
+                </File>
         </Files>
         <Globals>

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -56 +56 @@
 
 Sampling {
-        totalSamples    300000
+        totalSamples    1000000
         samplesPerPass  3
 }
@@ -82 +82 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 10000
+                samples 200000
                 sideTolerance 0.005
         }
@@ -120 +120 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 1024
+        splitPlaneStrategy 130
         
         maxCandidates 80
@@ -128 +128 @@
                 maxRays 200
                 maxPolygons 5
-                maxDepth 100
+                maxDepth 50
                 
                 # axis aligned splits
                 AxisAligned {
                         maxPolys 5000
-                        maxRays 5000
-                        maxObjects 2000
+                        maxRays 600
+                        maxObjects 20
                         maxCostRatio 0.9
                         ct_div_ci 0.5
@@ -145 +145 @@
         
         PostProcessing {
-                samples 100000
+                samples 200000
         }
                 

trunk/VUT/GtpVisibilityPreprocessor/src/Camera.cpp

@@ -132 +132 @@
   ray.kdLeaves.clear();
   ray.meshes.clear();
-  ray.bspLeaves.clear();
+  ray.bspIntersections.clear();
 
   ray.Init(mPosition, target, Ray::LOCAL_RAY);

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

@@ -56 +56 @@
   };
 
+  struct BspIntersection {
+    // the point of intersection
+    float mT;
+
+    BspLeaf *mLeaf;
+
+    BspIntersection(const float t, BspLeaf *l):
+        mT(t), mLeaf(l) {}
+
+    BspIntersection() {}
+
+    bool operator<(const BspIntersection &b) const {
+      return mT <b.mT; }
+  };
 
   // I should have some abstract cell data type !!! here
@@ -63 +77 @@
   
   vector<Intersection> intersections;
-  vector<BspLeaf *> bspLeaves;
+  vector<BspIntersection> bspIntersections;
   vector<KdLeaf *> kdLeaves;
   vector<MeshInstance *> meshes;

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -34 +34 @@
   ray.kdLeaves.clear();
   ray.meshes.clear();
-  ray.bspLeaves.clear();
+  ray.bspIntersections.clear();
 
   //  cout<<point<<" "<<direction<<endl;
@@ -124 +124 @@
  
         // object can be seen from the view cell => add to view cell pvs
-        for (j=0; j < ray.bspLeaves.size(); ++ j) 
-        {       // if ray not in unbounded space
-                if (ray.bspLeaves[j]->GetViewCell() != &mUnbounded)
+        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 += 
-                                ray.bspLeaves[j]->GetViewCell()->GetPvs().AddSample(obj);
+                                leaf->GetViewCell()->GetPvs().AddSample(obj);
         }
  
         // rays passing through this viewcell
         if (mPass > 1)
-                for (j=1; j < ((int)ray.bspLeaves.size() - 1); ++ j) 
-                {
-                        BspLeaf *leaf = ray.bspLeaves[j];
+                for (j=1; j < ((int)ray.bspIntersections.size() - 1); ++ j) 
+                {
+                        BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
 
                         if (leaf->GetViewCell() != &mUnbounded)
@@ -679 +681 @@
         int merged = 0;
         RayContainer::const_iterator rit, rit_end = rays.end();
-        vector<BspLeaf *>::const_iterator lit;
+        vector<Ray::BspIntersection>::const_iterator iit;
 
         for (rit = rays.begin(); rit != rays.end(); ++ rit)
@@ -685 +687 @@
                 // traverse leaves stored in the rays and compare and merge consecutive
                 // leaves (i.e., the neighbors in the tree)
-                if ((*rit)->bspLeaves.empty())
+                if ((*rit)->bspIntersections.empty())
                         continue;
 
-                lit = (*rit)->bspLeaves.begin();
-
-                BspLeaf *previousLeaf = *lit;
-                ++ lit;
-                
-                for (; lit != (*rit)->bspLeaves.end(); ++ lit)
-                {
-                        BspLeaf *leaf = *lit;
+                iit = (*rit)->bspIntersections.begin();
+
+                BspLeaf *previousLeaf = (*iit).mLeaf;
+                ++ iit;
+                
+                for (; iit != (*rit)->bspIntersections.end(); ++ iit)
+                {
+                        BspLeaf *leaf = (*iit).mLeaf;
 
                         if (mBspTree->ShouldMerge(leaf, previousLeaf))
@@ -784 +786 @@
                 Ray *ray = mSampleRays[k];
 
-                for (int j = 0; j < (int)ray->bspLeaves.size(); ++ j)
-                {
+                for (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
+                {
+                        BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
+
                         for (int i = 0; i < (int)bspLeaves.size(); ++ i)
                         {
-                                if (bspLeaves[i]->GetViewCell() == ray->bspLeaves[j]->GetViewCell()) 
+                                if (bspLeaves[i]->GetViewCell() == leaf->GetViewCell()) 
                                 {
                                         vcRays[i].push_back(*ray);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -321 +321 @@
                 }
 
-                ray->bspLeaves.push_back(this);
+                // warning: not ordered
+                ray->bspIntersections.push_back(Ray::BspIntersection((*it)->mMinT, this));
         }
 }
@@ -1621 +1622 @@
                         if (!leaf->mViewCell->Mailed())
                         {
-                                ray.bspLeaves.push_back(leaf);
+                                ray.bspIntersections.push_back(Ray::BspIntersection(maxt, leaf));
                                 leaf->mViewCell->Mail();
                                 ++ hits;
@@ -2299 +2300 @@
 
         BoundedRayContainer::const_iterator rit, rit_end = rays.end();
-        vector<BspLeaf *>::const_iterator lit;
+        vector<Ray::BspIntersection>::const_iterator iit;
 
         ViewCell::NewMail();
@@ -2307 +2308 @@
                 Ray *ray = (*rit)->mRay;
                 
-                for (lit = ray->bspLeaves.begin(); lit != ray->bspLeaves.end(); ++ lit)
-                {
-                        if ((*lit)->mViewCell->Mailed())
+                for (iit = ray->bspIntersections.begin(); iit != ray->bspIntersections.end(); ++ iit)
+                {
+                        BspViewCell *vc = (*iit).mLeaf->mViewCell;
+
+                        if (vc->Mailed())
                         {
-                                pvsSize += (*lit)->mViewCell->GetPvs().GetSize();
+                                pvsSize += vc->GetPvs().GetSize();
                         }
                 }

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -61 +61 @@
 
 ViewCells {
-        hierarchy kdTree
-        #hierarchy bspTree
+        #hierarchy kdTree
+        hierarchy bspTree
         # hierarchy sceneDependent
         
         height 5.0
         maxViewCells 0
+        
+        minPvsDif 100
+#       maxPvsSize 200
         
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
@@ -74 +77 @@
 }
 
-
-
-
 BspTree {
         Construction {
@@ -82 +82 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 100000
+                samples 10000
                 sideTolerance 0.005
         }
@@ -97 +97 @@
         # least ray splits     = 256
         # balanced rays        = 512
+        # pvs                  = 1024
 
         # least splits + balanced polygons
@@ -119 +120 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 130
+        splitPlaneStrategy 1024
         
         maxCandidates 80
         
         Termination {
-        # autopartition
-                maxRays 80
-                maxPolygons 0
+                # autopartition
+                maxRays 200
+                maxPolygons 5
                 maxDepth 100
                 
                 # axis aligned splits
                 AxisAligned {
-                        maxPolys 500
-                        maxRays 300
-                        maxObjects 20
+                        maxPolys 5000
+                        maxRays 5000
+                        maxObjects 2000
                         maxCostRatio 0.9
                         ct_div_ci 0.5
@@ -142 +143 @@
                 splitBorder 0.01
         }
+        
+        PostProcessing {
+                samples 100000
+        }
                 
         # if split polys are stored for visualization