Changeset 399 for trunk/VUT

Timestamp:

11/10/05 01:09:53 (19 years ago)

Author:

mattausch

Message:

fixed pvs bug in bsp view cells

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (5 diffs)
• src/SamplingPreprocessor.cpp (modified) (5 diffs)
• src/ViewCellBsp.cpp (modified) (5 diffs)
• src/ViewCellBsp.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -56 +56 @@
 
 Sampling {
-        totalSamples    250000
+        totalSamples    100000
         samplesPerPass  3
 }
@@ -88 +88 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 100000
+                samples 50000
                 sideTolerance 0.005
         }
@@ -126 +126 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 1024
+        splitPlaneStrategy 8
         
-        maxPolyCandidates 200
+        maxPolyCandidates 50
         maxRayCandidates 0
         
@@ -134 +134 @@
                 # autopartition
                 maxRays 200
-                maxPolygons 5
+                maxPolygons 20
                 maxDepth 30
-                minPvs 50
+                minPvs -1
                 minArea -0.001
                 
@@ -158 +158 @@
                 exportSplits true
                 # how much samples should be used in visualization
-                samples 1000
+                samples 100000
         }
 }

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -192 +192 @@
                         
                         if (!ray.intersections.empty()) // second intersection found
-                                {
-                                        sampleContributions += 
-                                                AddObjectSamples(ray.intersections[0].mObject, ray);
-                                }
+                        {
+                                sampleContributions += 
+                                        AddObjectSamples(ray.intersections[0].mObject, ray);
+                        }
                 }
         }
@@ -475 +475 @@
                                         {
                                                 ProcessBspViewCells(ray,
-                                                                                        object,
+                                                                                        reverseSample ? NULL : object,
                                                                                         faceIndex,
                                                                                         passContributingSamples,
@@ -907 +907 @@
 
                         // export rays piercing this view cell
-                        exporter->ExportRays(vcRays[i], 1000, RgbColor(0, 1, 0));
+                        exporter->ExportRays(vcRays[i], 10000, RgbColor(0, 1, 0));
 
                         m.mDiffuseColor = RgbColor(1, 0, 0);
@@ -981 +981 @@
 
                         Exporter *exporter = Exporter::GetExporter(s);
-                        exporter->SetFilled();
-
-                        ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
-
+                        
                         exporter->SetFilled();//Wireframe();
 
@@ -1002 +999 @@
                         }
 
-                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() << endl;
+                        
+                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() 
+                                        << ", piercing rays=" << (int)vcRays[i].size() << endl;
 
                         
                         // export rays piercing this view cell
-                        exporter->ExportRays(vcRays[i], 10000, RgbColor(0, 1, 0));
-
+                        exporter->ExportRays(vcRays[i], 1000, RgbColor(0, 1, 0));
+        
                         m.mDiffuseColor = RgbColor(1, 0, 0);
                         exporter->SetForcedMaterial(m);
 
+                        ViewCellPvsMap::const_iterator it,
+                                it_end = vc->GetPvs().mEntries.end();
+
                         // output PVS of view cell
-                        for (; it != vc->GetPvs().mEntries.end(); ++ it) 
+                        for (it = vc->GetPvs().mEntries.begin(); it != it_end; ++ it) 
                         {
                                 Intersectable *intersect = (*it).first;
                                 if (!intersect->Mailed())
                                 {
+                                        Material m = RandomMaterial();
+                        
+                                        exporter->SetForcedMaterial(m);
+
                                         exporter->ExportIntersectable(intersect);
                                         intersect->Mail();

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -274 +274 @@
                 }
 
-                contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
+                if (ray->sourceObject.mObject)
+                        contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
 
                 if (contribution > 0)
@@ -281 +282 @@
                         ++ contributingSamples;
                 }
-
-                // warning: not ordered
+                // warning: intersections not ordered
                 ray->bspIntersections.push_back(Ray::BspIntersection((*it)->mMinT, this));
         }
@@ -1392 +1392 @@
                                 // assure that we only count a object 
                                 // once for the front and once for the back side of the plane
-                                AddToPvs(*ray->intersections[0].mObject, frontData.mPvs, backData.mPvs, 
-                                                 cf, frontId, backId, frontAndBackId);
+                                IncPvs(*ray->intersections[0].mObject, frontData.mPvs, backData.mPvs, 
+                                           cf, frontId, backId, frontAndBackId);
                         }
 
                         // the source object in the origin of the ray
-                        AddToPvs(*ray->sourceObject.mObject, frontData.mPvs, backData.mPvs, 
-                                         cf, frontId, backId, frontAndBackId);
+                        if (ray->sourceObject.mObject)
+                        {
+                                IncPvs(*ray->sourceObject.mObject, frontData.mPvs, backData.mPvs, 
+                                           cf, frontId, backId, frontAndBackId);
+                        }
 
                         // use #rays to approximate volume
@@ -1429 +1432 @@
 }
 
-void BspTree::AddToPvs(Intersectable &obj,
-                                           int &frontPvs,
-                                           int &backPvs,
-                                           const int cf, 
-                                           const int frontId, 
-                                           const int backId, 
-                                           const int frontAndBackId) const
+void BspTree::IncPvs(Intersectable &obj,
+                                         int &frontPvs,
+                                         int &backPvs,
+                                         const int cf, 
+                                         const int frontId, 
+                                         const int backId, 
+                                         const int frontAndBackId) const
 {
         if (cf == Ray::COINCIDENT) //TODO: really belongs to no pvs?
@@ -2311 +2314 @@
                         }
                 }
-                if (!ray->sourceObject.mObject->Mailed())
-                {
-                        ray->sourceObject.mObject->Mail();
-                        ++ pvsSize;
+                if (ray->sourceObject.mObject)
+                {
+                        if (!ray->sourceObject.mObject->Mailed())
+                        {
+                                ray->sourceObject.mObject->Mail();
+                                ++ pvsSize;
+                        }
                 }
         }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -730 +730 @@
         /** Computes the pvs of the front and back leaf with a given classification.
         */
-        void AddToPvs(Intersectable &obj, 
+        void IncPvs(Intersectable &obj, 
                                   int &frontPvs,
                                   int &backPvs,