Changeset 639 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

02/14/06 17:13:42 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (10 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 0
+#define SAMPLE_AFTER_SUBDIVISION 1
 
 
@@ -115 +115 @@
 
 /// helper function which destroys rays or copies them into the output ray container
-inline void addOutRays(VssRayContainer &rays, VssRayContainer *outRays)
+inline void disposeRays(VssRayContainer &rays, VssRayContainer *outRays)
 {
         cout << "disposing samples ... ";
@@ -132 +132 @@
         else
         {
-                CLEAR_CONTAINER(rays);
-        }
+                VssRayContainer::const_iterator it, it_end = rays.end();
+
+                for (it = rays.begin(); it != it_end; ++ it)
+                {
+                        //(*it)->Unref();
+                        if (!(*it)->IsActive())
+                                delete (*it);
+                }
+        }
+
         cout << "finished" << endl;
         Debug << "disposed " << n << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -162 +170 @@
 
         // rays can be passed or deleted
-        addOutRays(initialSamples, outRays);
+        disposeRays(initialSamples, outRays);
         
 
@@ -196 +204 @@
 
 
-                addOutRays(constructionSamples, outRays);
+                disposeRays(constructionSamples, outRays);
 
                 cout << "total samples: " << numSamples << endl;
@@ -236 +244 @@
         Visualize(preprocessor->mObjects, visualizationSamples);
 
-        addOutRays(visualizationSamples, outRays);
+        disposeRays(visualizationSamples, outRays);
 
         return numSamples;
@@ -3056 +3064 @@
                                                                                   const VssRayContainer &rays)
 {
-        const int leafOut = 10;
+        const int leafOut = 20;
 
         ViewCell::NewMail();
 
-        cout << "visualization using " << mVisualizationSamples << " samples" << endl;
+        cout << "visualization using " << (int)rays.size() << " samples" << endl;
+        Debug << "visualization using " << (int)rays.size() << " samples" << endl;
         Debug << "\nOutput view cells: " << endl;
 
@@ -3066 +3075 @@
         if (0)
                 stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
-
+        
         int limit = min(leafOut, (int)mViewCells.size());
 
-        int raysOut;
+        int raysOut = 0;
 
         //-- some rays for output
-        if (1)
-                raysOut = min((int)rays.size(), mVisualizationSamples);
-
         for (int i = 0; i < limit; ++ i)
         {
                 cout << "creating output for view cell " << i << " ... ";
 
-                VssRayContainer vcRays;
-                Intersectable::NewMail();
+        
                 ViewCell *vc;
         
@@ -3086 +3091 @@
                         vc = mViewCells[i];
                 else
-                        vc = mViewCells[Random((int)mViewCells.size())];
-
-                vector<ViewCell *> leaves;
-                mViewCellsTree->CollectLeaves(vc, leaves);
-
-        if (1)
-                {
-                        // check whether we can add the current ray to the output rays
-                        for (int k = 0; k < raysOut; ++ k)
-                        {
-                                VssRay *ray = rays[k];
-                                for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
-                                {
-                                        ViewCell *rayvc = ray->mViewCells[j];
-
-                                        if (leaves[0] == rayvc)
-                                                vcRays.push_back(ray);
-                                }
-                        }
-                }
+                        vc = mViewCells[(int)RandomValue(0, (float)mViewCells.size() - 1)];
 
                 //bspLeaves[j]->Mail();
                 char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
                 Exporter *exporter = Exporter::GetExporter(s);
+                
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
+
+                if (1 || mExportRays)
+                {
+                        if (1)
+                        {
+                                VssRayContainer vcRays;
+                VssRayContainer collectRays;
+
+                                raysOut = min((int)rays.size(), 100);
+
+                                // collect intial view cells
+                                ViewCellContainer leaves;
+                                mViewCellsTree->CollectLeaves(vc, leaves);
+
+                                ViewCellContainer::const_iterator vit, vit_end = leaves.end();
+       
+                                for (vit = leaves.begin(); vit != vit_end; ++ vit)
+                                {
+                                        BspLeaf *vcLeaf = dynamic_cast<BspViewCell *>(*vit)->mLeaf;
+                                
+                                        VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
+
+                                        for (rit = vcLeaf->mVssRays.begin(); rit != rit_end; ++ rit)
+                                        {
+                                                collectRays.push_back(*rit);
+                                        }
+                                }
+
+                                VssRayContainer::const_iterator rit, rit_end = collectRays.end();
+
+                                for (rit = collectRays.begin(); rit != rit_end; ++ rit)
+                                {
+                                        float p = RandomValue(0.0f, (float)collectRays.size());
+                        
+                                        if (p < raysOut)
+                                                vcRays.push_back(*rit);
+                                }
+                                //-- export rays piercing this view cell
+                                exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
+                        }
+
+                        
+
+                        if (0)
+                        {
+                                VssRayContainer vcRays;
+                                raysOut = min((int)rays.size(), mVisualizationSamples);
+                                // check whether we can add the current ray to the output rays
+                                for (int k = 0; k < raysOut; ++ k)
+                                {
+                                        VssRay *ray = rays[k];
+                                        for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
+                                        {
+                                                ViewCell *rayvc = ray->mViewCells[j];
+        
+                                                if (rayvc == vc)
+                                                        vcRays.push_back(ray);
+                                        }
+                                }       
+                                
+                                //-- export rays piercing this view cell
+                                exporter->ExportRays(vcRays, RgbColor(1, 1, 0));
+                        }
+
+                }
+                
+                
+
+
                 exporter->SetWireframe();
 
@@ -3117 +3174 @@
 
                 ExportViewCellGeometry(exporter, vc);
-
-
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc)
-                          << ", piercing rays=" << (int)vcRays.size() << endl;
-                        //  << ", leaves=" << (int)vc->mLeaves.size() << endl;
-
-                
-                //-- export rays piercing this view cell
+        
+
+                m.mDiffuseColor = RgbColor(1, 0, 0);
+            exporter->SetForcedMaterial(m);
+
+                exporter->SetFilled();
+
+
                 if (1)
                 {
-                        exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
+                        ObjectPvsMap::const_iterator oit,
+                                oit_end = vc->GetPvs().mEntries.end();
+
+
+                        exporter->SetFilled();
+
+                        Intersectable::NewMail();
+        
+                        // output PVS of view cell
+                        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                        {               
+                                Intersectable *intersect = (*oit).first;
+
+                                if (!intersect->Mailed())
+                                {
+                                        //m = RandomMaterial();
+                                        //exporter->SetForcedMaterial(m);
+
+                                        exporter->ExportIntersectable(intersect);
+                                        intersect->Mail();
+                                }
+                        }
                 }
                 else
                 {
-
-                        ViewCellContainer leaves;
-                        mViewCellsTree->CollectLeaves(vc, leaves);
-
-                        ViewCellContainer::const_iterator lit, lit_end = leaves.end();
-
-                        for (lit = leaves.begin(); lit != lit_end; ++ lit)
-                        {
-                                BspLeaf *l = dynamic_cast<BspViewCell *>(*lit)->mLeaf;
-                                exporter->ExportRays(l->mVssRays);
-                        }
-                }
-
-        
-                m.mDiffuseColor = RgbColor(1, 0, 0);
-                exporter->SetForcedMaterial(m);
-
-                ObjectPvsMap::const_iterator it,
-                        it_end = vc->GetPvs().mEntries.end();
-
-                exporter->SetFilled();
-
-        
-                // output PVS of view cell
-                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();
-                        }
-                }
-
-                
+                        exporter->ExportGeometry(objects);
+                }
+
                 DEL_PTR(exporter);
                 cout << "finished" << endl;