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

Timestamp:

11/08/05 19:00:49 (19 years ago)

Author:

mattausch

Message:

changed bsp splitplane choosing functions

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -15 +15 @@
   environment->GetIntValue("BspTree.Construction.samples", mBspConstructionSamples);
   environment->GetIntValue("ViewCells.PostProcessing.samples", mPostProcessSamples);
-  environment->GetIntValue("BspTree.visualizationSamples", mVisualizationSamples);
+  environment->GetIntValue("BspTree.Visualization.samples", mVisualizationSamples);
 
   mKdPvsDepth = 100;
@@ -728 +728 @@
         }
         // save rays for post processing
-        else if ((int)mSampleRays.size() < mPostProcessSamples) ||
-                        (((int)mSampleRays.size() < mVisualizationSamples))
+        else if (((int)mSampleRays.size() < mPostProcessSamples) ||
+                         ((int)mSampleRays.size() < mVisualizationSamples))
         {
                 mSampleRays.push_back(new Ray(ray));
@@ -747 +747 @@
         for (int i = 0; i < limit; ++i)
         {  
-                Ray *ray = mSamplesRays[i];
+                Ray *ray = mSampleRays[i];
 
                 // traverse leaves stored in the rays and compare and merge consecutive
@@ -842 +842 @@
         //-- some rays for output
         const int raysOut = min((int)mSampleRays.size(), mVisualizationSamples);
+        cout << "visualization using " << mVisualizationSamples << " samples" << endl;
         vector<Ray *> vcRays[leafOut];
 
@@ -882 +883 @@
                         ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
 
+                        //exporter->SetWireframe();
+                        exporter->SetFilled();
+
+                        Material m;//= RandomMaterial();
+                        m.mDiffuseColor = RgbColor(0, 1, 0);
+                        exporter->SetForcedMaterial(m);
+
+                        if (vc->GetMesh())
+                                exporter->ExportViewCell(vc);
+                        else
+                        {
+                                PolygonContainer cell;
+                                // export view cell geometry
+                                mBspTree->ConstructGeometry(vc, cell);
+                                exporter->ExportPolygons(cell);
+                                CLEAR_CONTAINER(cell);
+                        }
+
+                        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], 1000, RgbColor(0, 1, 0));
+
+                        m.mDiffuseColor = RgbColor(1, 0, 0);
+                        exporter->SetForcedMaterial(m);
+
                         exporter->SetWireframe();
+
+                        // output PVS of view cell
+                        for (; it != vc->GetPvs().mEntries.end(); ++ it) 
+                        {
+                                Intersectable *intersect = (*it).first;
+                                if (!intersect->Mailed())
+                                {
+                                        exporter->ExportIntersectable(intersect);
+                                        intersect->Mail();
+                                }                       
+                        }
+                                
+                        // output rest of the objects
+                        if (0)
+                        {
+                                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->SetForcedMaterial(m);
+                                                exporter->ExportIntersectable(objects[j]);
+                                                objects[j]->Mail();
+                                        }
+                        }
+                        DEL_PTR(exporter);
+                        cout << "finished" << endl;
+                }
+        }
+        else
+        {
+                ViewCellContainer viewCells;
+
+                mBspTree->CollectViewCells(viewCells);
+                stable_sort(viewCells.begin(), viewCells.end(), vc_gt);
+
+                int limit = min(leafOut, (int)viewCells.size()); 
+                
+                for (int i = 0; i < limit; ++ i)
+                {
+                        cout << "creating output for view cell " << i << " ... ";
+                        
+            Intersectable::NewMail();
+                        BspViewCell *vc = dynamic_cast<BspViewCell *>(viewCells[i]);
+
+                        cout << "creating output for view cell " << i << " ... ";
+                        // check whether we can add the current ray to the output rays
+                        for (int k = 0; k < raysOut; ++ k) 
+                        {
+                                Ray *ray = mSampleRays[k];
+
+                                for     (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
+                                {
+                                        BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
+
+                                        if (vc == leaf->GetViewCell()) 
+                                        {
+                                                vcRays[i].push_back(ray);
+                                        }
+                                }
+                        }
+
+                        //bspLeaves[j]->Mail();
+                        char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
+
+                        Exporter *exporter = Exporter::GetExporter(s);
+                        exporter->SetFilled();
+
+                        ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
+
+                        exporter->SetFilled();//Wireframe();
 
                         Material m;//= RandomMaterial();
@@ -899 +1000 @@
                         }
 
-                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() 
-                                        << ", piercing rays=" << (int)vcRays[i].size() << endl;
-
+                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() << endl;
+
+                        
                         // 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);
@@ -919 +1020 @@
                         }
                                 
-                        // output rest of the objects
-                        if (0)
-                        {
-                                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->SetForcedMaterial(m);
-                                                exporter->ExportIntersectable(objects[j]);
-                                                objects[j]->Mail();
-                                        }
-                        }
-                        DEL_PTR(exporter);
-                        cout << "finished" << endl;
-                }
-        }
-        else
-        {
-                ViewCellContainer viewCells;
-
-                mBspTree->CollectViewCells(viewCells);
-                stable_sort(viewCells.begin(), viewCells.end(), vc_gt);
-
-                int limit = min(leafOut, (int)viewCells.size()); 
-                
-                for (int i = 0; i < limit; ++ i)
-                {
-                        cout << "creating output for view cell " << i << " ... ";
-                        
-            Intersectable::NewMail();
-                        BspViewCell *vc = dynamic_cast<BspViewCell *>(viewCells[i]);
-
-                        cout << "creating output for view cell " << i << " ... ";
-                        // check whether we can add the current ray to the output rays
-                        for (int k = 0; k < raysOut; ++ k) 
-                        {
-                                Ray *ray = mSampleRays[k];
-
-                                for     (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
-                                {
-                                        BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
-
-                                        if (vc == leaf->GetViewCell()) 
-                                        {
-                                                vcRays[i].push_back(ray);
-                                        }
-                                }
-                        }
-
-                        //bspLeaves[j]->Mail();
-                        char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
-
-                        Exporter *exporter = Exporter::GetExporter(s);
-                        exporter->SetFilled();
-
-                        ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
-
-                        exporter->SetWireframe();
-
-                        Material m;//= RandomMaterial();
-                        m.mDiffuseColor = RgbColor(0, 1, 0);
-                        exporter->SetForcedMaterial(m);
-
-                        if (vc->GetMesh())
-                                exporter->ExportViewCell(vc);
-                        else
-                        {
-                                PolygonContainer cell;
-                                // export view cell
-                                mBspTree->ConstructGeometry(vc, cell);
-                                exporter->ExportPolygons(cell);
-                                CLEAR_CONTAINER(cell);
-                        }
-
-                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() << endl;
-
-                        
-                        // export rays piercing this view cell
-                        exporter->ExportRays(vcRays[i], 10000, RgbColor(0, 1, 0));
-
-                        m.mDiffuseColor = RgbColor(1, 0, 0);
-                        exporter->SetForcedMaterial(m);
-
-                        // output PVS of view cell
-                        for (; it != vc->GetPvs().mEntries.end(); ++ it) 
-                        {
-                                Intersectable *intersect = (*it).first;
-                                if (!intersect->Mailed())
-                                {
-                                        exporter->ExportIntersectable(intersect);
-                                        intersect->Mail();
-                                }                       
-                        }
-                                
                         DEL_PTR(exporter);
                         cout << "finished" << endl;