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

Timestamp:

07/27/06 02:07:26 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -3985 +3985 @@
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
-                int pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                int pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
                 mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
 
-                pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
@@ -4589 +4589 @@
 {
         int numSamples;
-
+        
         Environment::GetSingleton()->GetIntValue("RenderSampler.samples", numSamples);
         cout << "samples" << numSamples << endl;
@@ -4607 +4607 @@
 
 
-        // counting the pvss
+        // for each sample:
+        //    find view cells associated with the samples
+        //    store the sample pvs with the pvs associated with the view cell
+        // for each view cell:
+        //    compute difference point sampled pvs - view cell pvs
+        //    export geometry with color coded pvs difference
+        
+    std::map<ViewCell *, ObjectPvs> sampleMap;
+
         vector<RenderCostSample>::const_iterator rit, rit_end = samples.end();
 
-        //std::map<ViewCell *, ObjectPvs> sampleMap;
-
+        for (rit = samples.begin(); rit != rit_end; ++ rit)
+        {
+                RenderCostSample sample = *rit;
+        
+                ViewCell *vc = GetViewCell(sample.mPosition);
+
+                std::map<ViewCell *, ObjectPvs>::iterator it = sampleMap.find(vc);
+
+                if (it == sampleMap.end())
+                {
+                        sampleMap[vc] = sample.mPvs;
+                }
+                else
+                {
+                        (*it).second.Merge(sample.mPvs);
+                }
+        }
+
+        // visualize the view cells
+        std::map<ViewCell *, ObjectPvs>::const_iterator vit, vit_end = sampleMap.end();
+
+        Material m;//= RandomMaterial();
+
+        for (vit = sampleMap.begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = (*vit).first;
+                
+                const int pvsVc = mViewCellsTree->GetPvsEntries(vc);
+                const int pvs2 = (*vit).second.GetSize();
+
+        m.mDiffuseColor.r = (float) (pvsVc - pvs2);
+                m.mDiffuseColor.b = 1.0f;
+                //exporter->SetForcedMaterial(m);
+
+//              ExportViewCellGeometry(exporter, vc, mClipPlane);
+
+/*      // counting the pvss
         for (rit = samples.begin(); rit != rit_end; ++ rit)
         {
@@ -4622 +4665 @@
                 
                 DEL_PTR(hMesh);
-#if 0
-                if (!sampleMap.find(vc))
-                        sampleMap.insert(vc, sample.mVisibleObjects);
-                else
-                        sampleMap[vc].Merge(Merge(sample.mVisibleObjects);
-#endif
+
+*/
         }
 }
@@ -5044 +5083 @@
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
-                int pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                int pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
                 mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
 
-                pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
+                pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }