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

Timestamp:

10/10/05 04:19:59 (19 years ago)

Author:

mattausch

Message:

bsp viewcells now work

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -67 +67 @@
  
         // add object to view cell
-        for (j=0; j < ray.viewCells.size(); j++) 
+        for (j=0; j < ray.viewCells.size(); ++ j) 
         { 
                 ViewCell *vc = ray.viewCells[j];
+
+                for (int i = 0; i < 5; ++ i)
+                        if (vc == mViewCells[i])
+                                Debug << "adding sample to vc " << i << endl;
                 contributingSamples += vc->GetPvs().AddSample(obj);
         }
  
         if (mPass > 1)
-                for (j=1; j < ((int)ray.viewCells.size() - 1); j++) 
+                for (j=1; j < ((int)ray.viewCells.size() - 1); ++ j) 
                 {
             ray.viewCells[j]->AddPassingRay(ray, contributingSamples ? 1 : 0);
@@ -112 +116 @@
                 sampleContributions += AddObjectSamples(object, ray);
                                 
-                if (ray.intersections.size() > 0) // view cell found
+                if (ray.intersections.size() > 0) // second intersection found
                 {
                         sampleContributions += 
@@ -230 +234 @@
 
   int pvsOut = Min((int)objects.size(), 10);
-  
+  int vcPvsOut = Min((int)mViewCells.size(), 5);
+
   vector<Ray> rays[10];
-  
+  vector<Ray> vcRays[5];
+
   while (totalSamples < mTotalSamples) {
                 int passContributingSamples = 0;
@@ -330 +336 @@
                                         sampleContributions = CastRay(object, ray);
                                         
+                                        if (mViewCellsType == BSP_VIEW_CELLS) 
+                                        {
+                                                // check whether we can add this to the rays
+                                                for (int k = 0; k < ray.viewCells.size(); ++ k)
+                                                        for (int j = 0; j < vcPvsOut; ++ j) 
+                                                                if (mViewCells[j] == ray.viewCells[k]) 
+                                                                {
+                                                                        Debug << "Pushing back ray" << endl;
+                                                                        vcRays[j].push_back(ray);
+                                                                }
+                                        }
                                 }
                         } else {
@@ -350 +367 @@
                                 }
                         }
-                
+                        
                         passSamples++;
                         
@@ -369 +386 @@
                 int pvsSize = 0;
         
-                if (mViewCellsType == BSP_VIEW_CELLS)
-                {
+                if (mViewCellsType == BSP_VIEW_CELLS) {
                         for (i=0; i < mViewCells.size(); i++) {
                                 ViewCell *vc = mViewCells[i];
                                 pvsSize += vc->GetPvs().GetSize();
                         }
-                } else
-                {
+                } else  {
                         for (i=0; i < objects.size(); i++) {
                                 Intersectable *object = objects[i];
@@ -435 +450 @@
       if (mViewCellsType == BSP_VIEW_CELLS)
           {
-                   int limit = Min((int)mViewCells.size(), 1);
-
-                   //char s[64]; sprintf(s, "bsp-pvs%04d.x3d", k);
-                   Exporter *exporter = Exporter::GetExporter("bsp-pvs.x3d");
-                   exporter->SetFilled();
-
-                   Intersectable::NewMail();
-
-                   for (int j = 0; j < limit; ++ j)
-                   {                   
-                           // j random view cells
-                           int k = Random((int)mViewCells.size());
-
-                           Debug << "next vc: " << k << endl;
-                           ViewCellPvsMap::iterator it = mViewCells[k]->GetPvs().mEntries.begin();
+                   for (int j = 0; j < vcPvsOut; ++ j)
+                   {
+                           ViewCell *vc = mViewCells[j];
+
+                           Intersectable::NewMail();
+    
+                           char s[64]; sprintf(s, "bsp-pvs%04d.x3d", j);
+                           Exporter *exporter = Exporter::GetExporter(s);
+                           exporter->SetFilled();
+
+                           ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
 
                            Material m;//= RandomMaterial();
@@ -455 +466 @@
                            exporter->SetForcedMaterial(m);
 
-                           exporter->ExportViewCell(mViewCells[k]);
+                           exporter->ExportViewCell(vc);
+
+                           Debug << "pvs size: " << (int)vc->GetPvs().GetSize() << " of " << objects.size();
+                           Debug << " exporting rays: " << (int)vcRays[j].size() << endl;
+
+                           exporter->SetWireframe();
+                           
+                           m.mDiffuseColor = RgbColor(1, 0, 1);
+                           exporter->SetForcedMaterial(m);
+
+                           exporter->ExportBspTree(*mBspTree);
+                           exporter->ExportRays(vcRays[j], 1000, RgbColor(0, 1, 0));
 
                            m.mDiffuseColor = RgbColor(1, 0, 0);
                            exporter->SetForcedMaterial(m);
 
-                           Debug << "pvs size: " << mViewCells[k]->GetPvs().GetSize() << " of " << objects.size() << endl;
-
-                           for (; it != mViewCells[k]->GetPvs().mEntries.end(); ++ it) 
+                           // output pvs of view cell
+                           for (; it != vc->GetPvs().mEntries.end(); ++ it) 
                            {
                                    Intersectable *intersect = (*it).first;
@@ -469 +490 @@
                                            exporter->ExportIntersectable(intersect);
                                            intersect->Mail();
-                                   }
-                           
+                                   }                    
                            }
+
+                           // output rest of the objects
+                           if (1)
+                           {
+                                   Material m;//= RandomMaterial();
+                                   m.mDiffuseColor = RgbColor(0, 0, 1);
+                                   exporter->SetForcedMaterial(m);
+                 
+                                   for (int j = 0; j < objects.size(); ++ j)
+                                           if (!objects[j]->Mailed())
+                                           {
+                                                   exporter->ExportIntersectable(objects[j]);
+                                                   objects[j]->Mail();
+                                           }
+                           }
+                           DEL_PTR(exporter);
                    }
-                        
-                   // output rest of the objects
-                   Material m;//= RandomMaterial();
-                   m.mDiffuseColor = RgbColor(0, 0, 1);
-                   exporter->SetForcedMaterial(m);
-
-                   for (int j = 0; j < objects.size(); ++ j)
-                           if (!objects[j]->Mailed())
-                           {
-                                   exporter->ExportIntersectable(objects[j]);
-                                   objects[j]->Mail();
-                           }
-
-                   DEL_PTR(exporter);
           }       
 
@@ -529 +551 @@
   return true;
 }
-
-  
-
-