Changeset 1718 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/07/06 13:56:58 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1607 +1607 @@
                                                 const int entriesInPvs,
                                                 const float memoryCost,
-                                                const bool vsp)
+                                                const int viewSpaceSplits,
+                                                const int objectSpaceSplits)
 {
         stats << "#Pass\n" << 0 << endl
@@ -1614 +1615 @@
                    << "#TotalEntriesInPvs\n" << entriesInPvs << endl
                    << "#Memory\n" << memoryCost << endl
-                   << "#Vsp\n" << (vsp ? 1 : 0) << endl
+                   << "#ViewSpaceSplits\n" << viewSpaceSplits << endl
+                   << "#ObjectSpaceSplits\n" << objectSpaceSplits << endl
+                   << "#VspOspRatio\n" << (float)viewSpaceSplits / (float)objectSpaceSplits << endl
                    << endl;
 }
@@ -1782 +1785 @@
                                                                                 float &renderCost,
                                                                                 float &memory,
-                                                                                int &pvsEntries)
+                                                                                int &pvsEntries,
+                                                                                int &viewSpaceSplits,
+                                                                                int &objectSpaceSplits)
 {
         ViewCellContainer viewCells;
@@ -1844 +1849 @@
 
         memory = pvsEntries * ObjectPvs::GetEntrySize();
+
+        viewSpaceSplits = (int)viewCells.size();
+        objectSpaceSplits = (int)bvhNodes.size();
+
         //cout << "viewCells: " << (int)viewCells.size() << " nodes: " << (int)bvhNodes.size() << " rc: " << renderCost << " entries: " << pvsEntries << endl;
 
@@ -1857 +1866 @@
         int entriesInPvs = 1;
         int steps = 0;
+        int viewSpaceSplits = 0;
+        int objectSpaceSplits = 0;
 
         cout << "exporting vsposp stats ... " << endl;
@@ -1864 +1875 @@
         //-- first view cell
 
-        UpdateStats(stats, 2, totalRenderCost, entriesInPvs, memoryCost, true);
+        UpdateStats(stats, 2, totalRenderCost, entriesInPvs, memoryCost, viewSpaceSplits, objectSpaceSplits);
 
         //-- go through tree in the order of render cost decrease
@@ -1907 +1918 @@
                         entriesInPvs += entriesIncr;
                         // if (rcDecr <= 0)
-                        if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE) 
+                        if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
+                        {
+                                ++ viewSpaceSplits;
                                 cout << "v";//cout << "vsp t: " << timeStamp << " rc: " << rcDecr << " pvs: " << entriesIncr << endl;
+                        }
                         else
+                        {
+                                ++ objectSpaceSplits;
                                 cout << "o";//"osp t: " << timeStamp << " rc: " << rcDecr << " pvs: " << entriesIncr << endl;
+                        }
 
                         ++ steps;
@@ -1916 +1933 @@
                         if ((steps % 500) == 499)
                                 cout << steps << " steps taken" << endl;
+
                         const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();
-                        UpdateStats(stats, steps, totalRenderCost, entriesInPvs, memoryCost, false);
+                        UpdateStats(stats, steps, totalRenderCost, entriesInPvs, memoryCost, viewSpaceSplits, objectSpaceSplits);
                 }
 
@@ -2010 +2028 @@
         float memory;
         int pvsEntries;
+        int viewSpaceSplits;
+        int objectSpaceSplits;
 
         while (1)
         {
-                const int numSplits = ExtractStatistics(splits, 99999.0, renderCost, memory, pvsEntries);
+                const int numSplits = ExtractStatistics(splits, 
+                                                                                                99999.0, 
+                                                                                                renderCost, 
+                                                                                                memory, 
+                                                                                                pvsEntries,
+                                                                                                viewSpaceSplits,
+                                                                                                objectSpaceSplits);
                 
-                UpdateStats(splitsStats, numSplits, renderCost, pvsEntries, memory, 0);
+                UpdateStats(splitsStats, 
+                                        numSplits, 
+                                        renderCost, 
+                                        pvsEntries, 
+                                        memory, 
+                                        viewSpaceSplits, 
+                                        objectSpaceSplits);
+
                 splits += splitsStepSize;
 
@@ -2023 +2056 @@
 }
 
-}
+
+void HierarchyManager::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+{
+}
+
+}