Changeset 649 for GTP

Timestamp:

02/16/06 18:29:36 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (1 diff)
• src/ViewCell.cpp (modified) (2 diffs)
• src/ViewCell.h (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (9 diffs)
• src/ViewCellsManager.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -177 +177 @@
         Construction {
                 samples 0
-                samplesPerPass 500000
+                samplesPerPass 50000
         }
 

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

@@ -50 +50 @@
         return (float)pvs;
 }
-
-
 
 
@@ -1413 +1411 @@
 
 
+void ViewCellsTree::ExportStats()
+{
+
+}
 
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

@@ -108 +108 @@
         int Type() const;
 
-  void SetParent(ViewCellInterior *parent);
+        void SetParent(ViewCellInterior *parent);
 
         /** Adds a passing ray to the passing ray container.
@@ -357 +357 @@
         bool Export(ofstream &stream);
 
+        /** Export statistics of this view cell tree.
+        */
+        void ExportStats();
 
 protected:

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

@@ -1182 +1182 @@
         backData.mNode = interior->GetBack();
         
+        interior->mTimeStamp = leaf->mTimeStamp;
         frontData.mNode->mTimeStamp = mTimeStamp;
         backData.mNode->mTimeStamp = mTimeStamp ++;
 
+        Debug << "time stamp: " << mTimeStamp << endl;
         //DEL_PTR(leaf);
         return interior;

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

@@ -1032 +1032 @@
 
         // recast rest of the rays
-        ComputeSampleContributions(savedRays, true, false);
+        if (SAMPLE_AFTER_SUBDIVISION)
+                ComputeSampleContributions(savedRays, true, false);
 
 
@@ -1143 +1144 @@
         int merged;
         
+        cout << "starting post processing using " << mPostProcessSamples << " samples ... ";
+        long startTime = GetTime();
+        
+        VssRayContainer postProcessRays;
+        GetRaySets(rays, mPostProcessSamples, postProcessRays);
+
         if (mMergeViewCells)
         {
-                cout << "starting post processing using " << mPostProcessSamples << " samples ... ";
-                long startTime = GetTime();
-        
-                VssRayContainer postProcessRays;
-                GetRaySets(rays, mPostProcessSamples, postProcessRays);
-
+                Debug << "constructing visibility based merge tree" << endl;
                 merged = mViewCellsTree->ConstructMergeTree(rays, objects);
-
-                //-- stats and visualizations
-                cout << "finished" << endl;
-                cout << "merged " << merged << " view cells in "
-                         << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
-
-                Debug << "Postprocessing: Merged " << merged << " view cells in "
-                        << TimeDiff(startTime, GetTime()) *1e-3 << " secs"
-                        << "using " << (int)rays.size() << " samples" << endl << endl;
-        }
+        }
+        else
+        {
+                Debug << "constructing spatial merge tree" << endl;
+                // create spatial merge hierarchy
+                merged = ConstructSpatialMergeTree();
+        }
+
+        //-- stats and visualizations
+        cout << "finished" << endl;
+        cout << "merged " << merged << " view cells in "
+                 << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
+
+        Debug << "Postprocessing: Merged " << merged << " view cells in "
+                << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl << endl;
+        
 
     // reset view cells and stats
@@ -1674 +1682 @@
 
 
-void BspViewCellsManager::CreateMergeHierarchy()
+int BspViewCellsManager::ConstructSpatialMergeTree()
 {
         TraversalQueue tQueue;
 
         tQueue.push(TraversalData(mBspTree->GetRoot(), NULL));
+
+        int merged = 0;
+
+        int numViewCells = (int)mViewCells.size();
+
+        float var = 0;
+        float dev = 0;
+        int totalPvs = 0;
+        float totalRenderCost = 0;
+        float avgRenderCost = 0;
+        float expCost = 0;
+
+        //-- compute statistics values of initial view cells
+        EvaluateRenderStatistics(totalRenderCost,
+                                                     expCost,
+                                                         dev,
+                                                         var,
+                                                         totalPvs,
+                                                         avgRenderCost);
+
+        Debug/*mStats*/ << "#Pass\n" << 0 << endl
+                   << "#Merged\n" << merged << endl 
+                   << "#ViewCells\n" << numViewCells << endl 
+                   << "#RenderCostIncrease\n" << 0 << endl
+                   << "#TotalRenderCost\n" << totalRenderCost << endl
+                   << "#CurrentPvs\n" << 0 << endl
+                   << "#ExpectedCost\n" << expCost << endl
+                   << "#AvgRenderCost\n" << avgRenderCost << endl
+                   << "#Deviation\n" << dev << endl
+                   << "#TotalPvs\n" << totalPvs << endl
+                   << "#PvsSizeDecrease\n0" << endl
+                   << "#Volume\n0" << endl
+                   //<< "#Siblings\n" << mergeStats.siblings << endl
+                   << endl;
+        
 
         while (!tQueue.empty())
@@ -1689 +1732 @@
                         ViewCell *viewCell = dynamic_cast<BspLeaf *>(tData.mNode)->GetViewCell();
                         viewCell->SetMergeCost((float)tData.mNode->mTimeStamp);
+
+                        Debug << "leaf time stamp: " << tData.mNode->mTimeStamp << endl;
 
                         if (tData.mParentViewCell)
                         {
                                 tData.mParentViewCell->SetupChildLink(viewCell);
-                                // probagate up pvs
+                                // propagate up pvs: could be redone as propagepvs, which propagates pvs up and down
                                 mViewCellsTree->PropagateUpPvs(viewCell);
                         }
@@ -1701 +1746 @@
                         BspInterior *interior = dynamic_cast<BspInterior *>(tData.mNode);
                         ViewCellInterior *viewCellInterior = new ViewCellInterior();
+
+                        ++ merged;
+                        -- numViewCells;
+
+                        avgRenderCost = totalPvs / numViewCells;
+
+                        Debug//mStats 
+                                << "#Pass\n" << 0 << endl
+                                << "#Merged\n" << merged << endl 
+                                << "#ViewCells\n" << numViewCells << endl 
+                << "#RenderCostIncrease\n" << 0 << endl
+                                << "#TotalRenderCost\n" << totalRenderCost << endl
+                                << "#CurrentPvs\n" << 0 << endl
+                << "#ExpectedCost\n" << 0 << endl
+                                << "#AvgRenderCost\n" << avgRenderCost << endl
+                                << "#Deviation\n" << dev << endl
+                                << "#TotalPvs\n" << totalPvs << endl
+                                << "#PvsSizeDecrease\n" << 0 << endl
+                                << "#Volume\n" << 0 << endl
+                                << endl;
+
+                        Debug << "interior time stamp: " << tData.mNode->mTimeStamp << endl;
+
                         viewCellInterior->SetMergeCost((float)tData.mNode->mTimeStamp);
 
@@ -1711 +1779 @@
                 }
         }
+
+        return merged;
 }
 
@@ -2838 +2908 @@
 
 
-void VspBspViewCellsManager::CreateMergeHierarchy()
+int VspBspViewCellsManager::ConstructSpatialMergeTree()
 {
         TraversalQueue tQueue;
-
         tQueue.push(TraversalData(mVspBspTree->GetRoot(), NULL));
+
+        int merged = 0;
 
         while (!tQueue.empty())
@@ -2864 +2935 @@
                         BspInterior *interior = dynamic_cast<BspInterior *>(tData.mNode);
                         ViewCellInterior *viewCellInterior = new ViewCellInterior();
-                        
+                        ++ merged;
+
                         tQueue.push(TraversalData(interior->GetBack(), viewCellInterior));
                         tQueue.push(TraversalData(interior->GetFront(), viewCellInterior));
@@ -2872 +2944 @@
                 }
         }
+        return merged;
 }
 

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

@@ -353 +353 @@
 
 
-        virtual void CreateMergeHierarchy() {};
+        virtual int ConstructSpatialMergeTree() { return 0;};
         
         virtual bool EqualToSpatialNode(ViewCell *viewCell) const { return false;}
@@ -529 +529 @@
         bool ExportViewCells(const string filename);
 
-        void CreateMergeHierarchy();
+        int ConstructSpatialMergeTree();
 
 
@@ -815 +815 @@
         void PrepareLoadedViewCells();
 
-        void CreateMergeHierarchy();
+        int ConstructSpatialMergeTree();
+
         /// the view space partition BSP tree.
         VspBspTree *mVspBspTree;