Changeset 399 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

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

Author:

mattausch

Message:

fixed pvs bug in bsp view cells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (5 diffs)

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();