Changeset 574 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/25/06 01:44:46 (18 years ago)

Author:

mattausch

Message:

finished function for view cell construction
removed bsp rays from vspbspmanager

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (43 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -20 +20 @@
 ViewCellsManager::ViewCellsManager():
 mRenderer(NULL),
+mInitialSamples(0),
 mConstructionSamples(0),
 mPostProcessSamples(0),
@@ -35 +36 @@
 
 
-ViewCellsManager::ViewCellsManager(int constructionSamples):
-mConstructionSamples(constructionSamples),
-mRenderer(NULL),
-mPostProcessSamples(0),
-mVisualizationSamples(0),
-mTotalAreaValid(false),
-mTotalArea(0.0f),
-mViewCellsFinished(false),
-mMaxPvsSize(9999999),
-mMinPvsSize(0), // one means only empty view cells are invalid
-mMaxPvsRatio(1.0)
-{
-        mViewSpaceBox.Initialize();
-        ParseEnvironment();
-}
-
-
 void ViewCellsManager::ParseEnvironment()
 {
@@ -61 +45 @@
         environment->GetBoolValue("ViewCells.pruneEmptyViewCells", emptyViewCells);
         environment->GetBoolValue("ViewCells.processOnlyValidViewCells", mOnlyValidViewCells);
+
+        environment->GetIntValue("ViewCells.Construction.samples", mConstructionSamples);
+        environment->GetIntValue("ViewCells.PostProcess.samples", mPostProcessSamples);
+        environment->GetIntValue("ViewCells.Visualization.samples", mVisualizationSamples);
+
+        environment->GetIntValue("ViewCells.Construction.samplesPerPass", mSamplesPerPass);
 
         mMinPvsSize = emptyViewCells ? 1 : 0;
@@ -88 +78 @@
 
 
-int ViewCellsManager::CastPassSamples(int samplesPerPass, 
-                                                                          int sampleType, 
-                                                                          VssRayContainer *outRays) const
-{
-        VssRayContainer passSamples;
+int ViewCellsManager::CastPassSamples(const int samplesPerPass, 
+                                                                          const int sampleType, 
+                                                                          VssRayContainer &passSamples) const
+{
         SimpleRayContainer simpleRays;
 
@@ -102 +91 @@
         preprocessor->CastRays(simpleRays, passSamples);
 
-        const int numSamples = (int)passSamples.size();
-
+        return (int)passSamples.size();
+}
+
+
+/// helper function which destroys rays or copies them into the output ray container
+inline void addOutRays(VssRayContainer &rays, VssRayContainer *outRays)
+{
+        cout << "disposing samples ... ";
         if (outRays)
         {
-                while (!passSamples.empty())
-                        outRays->push_back(passSamples.back());
+                VssRayContainer::const_iterator it, it_end = rays.end();
+
+                for (it = rays.begin(); it != it_end; ++ it)
+                {
+                        outRays->push_back(*it);
+                }
         }
         else
         {
-                CLEAR_CONTAINER(passSamples);
-        }
-
-        return numSamples;
+                CLEAR_CONTAINER(rays);
+        }
+        cout << "finished" << endl;
 }
 
@@ -123 +121 @@
         SimpleRayContainer simpleRays;
         
-        VssRayContainer constructionSamples;
-
+        VssRayContainer initialSamples;
+
+        cout << "view cell construction: casting " << mInitialSamples << " initial samples ... ";
         //-- construction rays => we use uniform samples for this
-        CastPassSamples(mConstructionSamples, 
-                                        Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
-                                        &constructionSamples);
+        CastPassSamples(mInitialSamples, 
+                                        Preprocessor::DIRECTION_BASED_DISTRIBUTION,
+                                        //Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
+                                        initialSamples);
         
+        cout << "finished" << endl;
+
         // construct view cells
-        const int initialSamples = Construct(preprocessor->mObjects, constructionSamples);
-
-        numSamples += initialSamples;
-
-        if (outRays)
-        {
-                while (!constructionSamples.empty())
-                        outRays->push_back(constructionSamples.back());
-        }
-        else
-        {
-                CLEAR_CONTAINER(constructionSamples);
-        }
-
+        const int numInitialSamples = 
+                ConstructSubdivision(preprocessor->mObjects, initialSamples);
+
+        numSamples += numInitialSamples;
+
+        // rays can be passed or deleted
+        addOutRays(initialSamples, outRays);
+        
 
         //-- guided rays are used for further sampling
-        const int desiredImportanceSamples = 5000000;
-        const int importanceRayPerPass = 1000000;
-
-        const int n = desiredImportanceSamples; //+initialSamples;
+        const int n = mConstructionSamples; //+initialSamples;
+
+        bool dirSamples = false;
 
         while (numSamples < n)
         {
-                numSamples += CastPassSamples(importanceRayPerPass, 
-                                                                          Preprocessor::RSS_BASED_DISTRIBUTION, 
-                                                                          //Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION,
-                                                                          outRays);
+                cout << "casting " << mSamplesPerPass << " samples ... ";
+                VssRayContainer constructionSamples;
+
+                const int samplingType = 
+                        dirSamples ? 
+                                                Preprocessor::DIRECTION_BASED_DISTRIBUTION :
+                                                Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+
+                dirSamples = !dirSamples; // toggle sampling
+                numSamples += CastPassSamples(mSamplesPerPass, 
+                                                                          samplingType,
+                                                                          constructionSamples);
+
+                cout << "finished" << endl;
+
+                cout << "computing sample contribution for " << (int)constructionSamples.size() << " samples ... ";
+
+                // TODO: leak?
+                ComputeSampleContributions(constructionSamples, true, false);
+                cout << "finished" << endl;
+
+
+                addOutRays(constructionSamples, outRays);
+
+                cout << "total samples: " << numSamples << endl;
         }
         
@@ -165 +181 @@
 
         //-- construction rays => we use uniform samples for this
-        CastPassSamples(max(mPostProcessSamples, mVisualizationSamples),
-                                    Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION, 
-                                        &postProcessSamples);
+        CastPassSamples(mPostProcessSamples,
+                                    Preprocessor::DIRECTION_BASED_DISTRIBUTION, 
+                                        postProcessSamples);
         
+        cout << "starting post processing and visualization" << endl;
+
+        // store viewCells for postprocessing
+        const bool storeViewCells = true;
+        ComputeSampleContributions(postProcessSamples, true, storeViewCells);
         // merge the view cells
         PostProcess(preprocessor->mObjects, postProcessSamples);
-        // several visualizations
-        Visualize(preprocessor->mObjects, postProcessSamples);
-
-        if (outRays)
-        {
-                while (!postProcessSamples.empty())
-                        outRays->push_back(postProcessSamples.back());
-        }
-        else
-        {
-                CLEAR_CONTAINER(postProcessSamples);
-        }
+
+
+        //-- visualization
+        VssRayContainer visualizationSamples;
+
+        //-- construction rays => we use uniform samples for this
+        CastPassSamples(mVisualizationSamples,
+                                    Preprocessor::DIRECTION_BASED_DISTRIBUTION, 
+                                        visualizationSamples);
+
+        ComputeSampleContributions(visualizationSamples, true, storeViewCells);
+
+        //Debug << "visualizationsamples: " << mVisualizationSamples << " " << visualizationSamples.size() << endl;
+        // different visualizations
+        Visualize(preprocessor->mObjects, visualizationSamples);
+
+        addOutRays(visualizationSamples, outRays);
 
         return numSamples;
@@ -293 +319 @@
 float
 ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
-                                                                                         const bool addRays
+                                                                                         const bool addRays,
+                                                                                         const bool storeViewCells
                                                                                          )
 {
@@ -304 +331 @@
   float sum = 0.0f;
   for (it = rays.begin(); it != it_end; ++ it) {
-        sum += ComputeSampleContributions(*(*it), addRays);
+        sum += ComputeSampleContributions(*(*it), addRays, storeViewCells);
         //ComputeSampleContributions(*(*it), addRays);
         //      sum += (*it)->mPvsContribution;
@@ -466 +493 @@
 {
         mConstructionSamples = constructionSamples;
+}
+
+
+void ViewCellsManager::SetInitialSamples(const int initialSamples)
+{
+        mInitialSamples = initialSamples;
 }
 
@@ -554 +587 @@
 {
         mViewCells.clear();
-
         CollectViewCells();
 
@@ -610 +642 @@
 }
 
+
 float ViewCellsManager::ComputeSampleContributions(VssRay &ray,
-                                                                                                   const bool addRays)
+                                                                                                   const bool addRays,
+                                                                                                   const bool storeViewCells)
 {
         ViewCellContainer viewcells;
@@ -635 +669 @@
 
         // copy viewcells memory efficiently
-        const bool storeViewcells = !addRays;
-
-        if (storeViewcells)
+        //const bool storeViewcells = !addRays;
+
+        if (storeViewCells)
         {
                 ray.mViewCells.reserve(viewcells.size());
@@ -732 +766 @@
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
-                ExportColor(exporter, *it);
-                ExportVcGeometry(exporter, *it);
+                if (!mOnlyValidViewCells || (*it)->GetValid())
+                {
+                        ExportColor(exporter, *it);
+                        ExportVcGeometry(exporter, *it);
+                }
         }
 }
@@ -778 +815 @@
 
 
-BspViewCellsManager::BspViewCellsManager(BspTree *bspTree,
-                                                                                 int constructionSamples):
-ViewCellsManager(constructionSamples),
-mBspTree(bspTree)
-{
+BspViewCellsManager::BspViewCellsManager(BspTree *bspTree):
+ViewCellsManager(), mBspTree(bspTree)
+{
+        environment->GetIntValue("BspTree.Construction.samples", mInitialSamples);
 }
 
@@ -798 +834 @@
 
 
-int BspViewCellsManager::Construct(const ObjectContainer &objects,
-                                                                   const VssRayContainer &rays)
+int BspViewCellsManager::ConstructSubdivision(const ObjectContainer &objects,
+                                                                                          const VssRayContainer &rays)
 {
         // if view cells were already constructed
@@ -811 +847 @@
         VssRayContainer savedRays;
 
-        const int limit = min(mConstructionSamples, (int)rays.size());
+        const int limit = min(mInitialSamples, (int)rays.size());
 
         VssRayContainer::const_iterator it, it_end = rays.end();
@@ -846 +882 @@
 
         // recast rest of the rays
-        ComputeSampleContributions(savedRays);
+        ComputeSampleContributions(savedRays, true, false);
 
 
@@ -937 +973 @@
 
 
-        // $$JB we do not have connectivity information from the ray in the moment
-        // perhaps we could recast the rays or remember the cells traversed inside the
-        // vssray (which would on other hand create some overhead)
         //-- merge or subdivide view cells
         int merged = 0;
 
-        vector<BspIntersection>::const_iterator iit;
-        CLEAR_CONTAINER(mBspRays);
-        ConstructBspRays(rays, mPostProcessSamples);
-
-        for (int i = 0; i < (int)mBspRays.size(); ++ i)
-        {
-                BspRay *ray = mBspRays[i];
-
-                // traverse leaves stored in the rays and compare and merge consecutive
-                // leaves (i.e., the neighbors in the tree)
-                if (ray->intersections.size() < 2)
-                        continue;
-#if 0
-                iit = ray->intersections.begin();
-
-                BspLeaf *previousLeaf = (*iit).mLeaf;
-                ++ iit;
-
-                for (; iit != ray->intersections.end(); ++ iit)
-                {
-                        BspLeaf *leaf = (*iit).mLeaf;
-
-                        if (ShouldMerge(leaf, previousLeaf))
-                        {
-                                MergeBspLeafViewCells(leaf, previousLeaf);
-
-                                ++ merged;
-                        }
-
-                        previousLeaf = leaf;
-                }
-#endif
-        }
-
+        // TODO
+        
         //-- stats and visualizations
         cout << "finished" << endl;
@@ -984 +985 @@
         Debug << "Postprocessing: Merged " << merged << " view cells in "
                   << TimeDiff(startTime, GetTime()) *1e-3 << " secs"
-                  << "using " << (int)mBspRays.size() << " samples" << endl << endl;
-
-        CLEAR_CONTAINER(mBspRays);
+                  << "using " << (int)rays.size() << " samples" << endl << endl;
 
         // reset view cells and stats
@@ -997 +996 @@
 BspViewCellsManager::~BspViewCellsManager()
 {
-        CLEAR_CONTAINER(mBspRays);
 }
 
@@ -1012 +1010 @@
         if (!ViewCellsConstructed())
                 return;
-        CLEAR_CONTAINER(mBspRays);
-        ConstructBspRays(sampleRays, mVisualizationSamples);
-
+        
         if (1) // export view cells
         {
@@ -1070 +1066 @@
 
                 exporter->SetFilled();
-
-                // export rays
-                if (0)
-                {
-                        VssRayContainer outRays;
-
-                        int raysSize = min((int)mBspRays.size(), mVisualizationSamples);
-
-                        for (int i = 0; i < raysSize; ++ i)
-                                // only rays piercing geometry
-                                outRays.push_back(mBspRays[i]->vssRay);
-
-                        // export rays
-                        exporter->ExportRays(outRays, RgbColor(1, 1, 0));
-                }
 
                 if (mExportGeometry)
@@ -1345 +1326 @@
 
 
-int KdViewCellsManager::Construct(const ObjectContainer &objects,
+int KdViewCellsManager::ConstructSubdivision(const ObjectContainer &objects,
                                                                   const VssRayContainer &rays)
 {
@@ -1359 +1340 @@
 
         // cast rays
-        ComputeSampleContributions(rays);
+        ComputeSampleContributions(rays, true, false);
 
         EvaluateViewCellsStats();
@@ -1605 +1586 @@
 
 
-VspKdViewCellsManager::VspKdViewCellsManager(VspKdTree *vspKdTree,
-                                                                                         int constructionSamples):
-ViewCellsManager(constructionSamples),
-mVspKdTree(vspKdTree)
-{
+VspKdViewCellsManager::VspKdViewCellsManager(VspKdTree *vspKdTree):
+ViewCellsManager(), mVspKdTree(vspKdTree)
+{
+        environment->GetIntValue("VspKdTree.Construction.samples", mInitialSamples);
         mVspKdTree->SetViewCellsManager(this);
 }
@@ -1636 +1616 @@
 
 
-int VspKdViewCellsManager::Construct(const ObjectContainer &objects,
-                                                                         const VssRayContainer &rays)
+int VspKdViewCellsManager::ConstructSubdivision(const ObjectContainer &objects,
+                                                                                                const VssRayContainer &rays)
 {
         // if view cells already constructed
@@ -1647 +1627 @@
 
         GetRaySets(rays,
-                           mConstructionSamples,
+                           mInitialSamples,
                            constructionRays,
                            &savedRays);
@@ -1676 +1656 @@
         long startTime = GetTime();
         // recast rest of rays
-        ComputeSampleContributions(savedRays);
+        ComputeSampleContributions(savedRays, true, false);
 
         Debug << "Computed remaining ray contribution in " << TimeDiff(startTime, GetTime()) * 1e-3
@@ -1950 +1930 @@
 }
 
+
+
 /**************************************************************************/
 /*                   VspBspViewCellsManager implementation                */
@@ -1955 +1937 @@
 
 
-VspBspViewCellsManager::VspBspViewCellsManager(VspBspTree *vspBspTree,
-                                                                                           int constructionSamples):
-ViewCellsManager(constructionSamples),
-mVspBspTree(vspBspTree)
-{
+VspBspViewCellsManager::VspBspViewCellsManager(VspBspTree *vspBspTree):
+ViewCellsManager(), mVspBspTree(vspBspTree)
+{
+        environment->GetIntValue("VspBspTree.Construction.samples", mInitialSamples);
         mVspBspTree->SetViewCellsManager(this);
 }
@@ -1980 +1961 @@
 void VspBspViewCellsManager::CollectViewCells()
 {
-        mVspBspTree->CollectViewCells(mViewCells, mOnlyValidViewCells);
+        mVspBspTree->CollectViewCells(mViewCells, true);
 }
 
@@ -2003 +1984 @@
 
 
-int VspBspViewCellsManager::Construct(const ObjectContainer &objects,
+int VspBspViewCellsManager::ConstructSubdivision(const ObjectContainer &objects,
                                                                           const VssRayContainer &rays)
 {
@@ -2016 +1997 @@
         VssRayContainer sampleRays;
 
-        int limit = min (mConstructionSamples, (int)rays.size());
+        int limit = min (mInitialSamples, (int)rays.size());
 
         VssRayContainer constructionRays;
         VssRayContainer savedRays;
 
-        Debug << "construction samples: " << mConstructionSamples << " rays: " << (int)rays.size() << endl;
-        GetRaySets(rays, mConstructionSamples, constructionRays, &savedRays);
-
-        Debug << "construction rays: " << (int)constructionRays.size() << endl;
+        Debug << "samples used for subdivision: " << mInitialSamples << " rays: " << (int)rays.size() << endl;
+        GetRaySets(rays, mInitialSamples, constructionRays, &savedRays);
+
+        Debug << "initial rays: " << (int)constructionRays.size() << endl;
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
@@ -2075 +2056 @@
         cout << "Computing remaining ray contributions ... ";
         // recast rest of rays
-        ComputeSampleContributions(savedRays);
+        ComputeSampleContributions(savedRays, true, false);
         cout << "finished" << endl;
 
@@ -2116 +2097 @@
                   << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl << endl;
 
-        cout << "reseting view cell stats ... ";
-        ResetViewCells();
-        cout << "finished" << endl;
 
         //BspLeaf::NewMail();
         if (1) // export merged view cells
         {
+
+                cout << "reseting view cells ... ";
+                ResetViewCells();
+                cout << "finished" << endl;
+
                 Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
                 Debug << "\nView cells after merge:\n" << mViewCellsStats << endl;
@@ -2198 +2181 @@
 
         // check if new view cells turned invalid
+        SetValidity(mMinPvsSize, mMaxPvsSize); 
+        // update valid view space according to valid view cells
         mVspBspTree->ValidateTree();
-        ResetViewCells();
+
+        // recompute view cell statistics
+        mViewCellsStats.Reset();
+        EvaluateViewCellsStats();
+        // has to be recomputed
+        mTotalAreaValid = false;
 
 
@@ -2283 +2273 @@
         // collapse sibling leaves that share the same view cell
         mVspBspTree->CollapseTree();
-
+        // recompute view cell list and statistics
         ResetViewCells();
 
@@ -2447 +2437 @@
 #if 1
         //-- some rays for output
-        vector<BspRay *> bspRays;
-        mVspBspTree->ConstructBspRays(bspRays, rays);
-
-        const int raysOut = min((int)bspRays.size(), mVisualizationSamples);
+        const int raysOut = min((int)rays.size(), mVisualizationSamples);
+
 #endif
 
@@ -2459 +2447 @@
                 VssRayContainer vcRays;
                 Intersectable::NewMail();
-#if 0 // largest view cell pvs first
-                BspViewCell *vc = dynamic_cast<BspViewCell *>(mViewCells[i]);
-#else
-                BspViewCell *vc = dynamic_cast<BspViewCell *>
-                        (mViewCells[Random((int)mViewCells.size())]);
-#endif
-
-#if 1
-                // check whether we can add the current ray to the output rays
-                for (int k = 0; k < raysOut; ++ k)
-                {
-                        BspRay *ray = bspRays[k];
-                        for     (int j = 0; j < (int)ray->intersections.size(); ++ j)
+                BspViewCell *vc;
+        
+                if (0) // largest view cell pvs first
+                {
+                        vc = dynamic_cast<BspViewCell *>(mViewCells[i]);
+                }
+                else
+                {
+                        vc = dynamic_cast<BspViewCell *>
+                                (mViewCells[Random((int)mViewCells.size())]);
+                }
+
+        if (1)
+                {
+                        // check whether we can add the current ray to the output rays
+                        for (int k = 0; k < raysOut; ++ k)
                         {
-                                BspLeaf *leaf = ray->intersections[j].mLeaf;
-                                if (vc == leaf->GetViewCell())
-                                        vcRays.push_back(ray->vssRay);
+                                VssRay *ray = rays[k];
+                                for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
+                                {
+                                        BspViewCell *bspVc = dynamic_cast<BspViewCell *>(ray->mViewCells[j]);
+                                        BspLeaf *leaf = bspVc->mLeaves[0];
+                                        if (vc == bspVc)
+                                                vcRays.push_back(ray);
+                                }
                         }
                 }
-#endif
+
                 //bspLeaves[j]->Mail();
                 char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
@@ -2495 +2491 @@
                           << ", leaves=" << (int)vc->mLeaves.size() << endl;
 
+                
                 //-- export rays piercing this view cell
-#if 1
-                exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
-#endif
-#if 0
-                vector<BspLeaf *>::const_iterator lit, lit_end = vc->mLeaves.end();
-
-                for (lit = vc->mLeaves.begin(); lit != lit_end; ++ lit)
-                        exporter->ExportRays((*lit)->mVssRays);
-#endif
+                if (1)
+                {
+                        exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
+                }
+                else
+                {
+                        vector<BspLeaf *>::const_iterator lit, lit_end = vc->mLeaves.end();
+
+                        for (lit = vc->mLeaves.begin(); lit != lit_end; ++ lit)
+                                exporter->ExportRays((*lit)->mVssRays);
+                }
+
+        
                 m.mDiffuseColor = RgbColor(1, 0, 0);
                 exporter->SetForcedMaterial(m);
@@ -2513 +2514 @@
                 exporter->SetFilled();
 
+        
                 // output PVS of view cell
                 for (it = vc->GetPvs().mEntries.begin(); it != it_end; ++ it)
                 {
+                
                         Intersectable *intersect = (*it).first;
 
@@ -2528 +2531 @@
                 }
 
+                
                 DEL_PTR(exporter);
                 cout << "finished" << endl;
         }
 
-#if 1
-        CLEAR_CONTAINER(bspRays);
-#endif
         Debug << endl;
 }