Changeset 1660 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

10/20/06 18:08:38 (18 years ago)

Author:

mattausch

Message:

added ratio for rc / storage

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• ViewCell.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)

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

@@ -272 +272 @@
                         << "#TotalRenderCost\n" << totalRenderCost << endl
                         << "#Memory\n" << memory << endl
-                        << "#RcPerMb\n" << renderCostPerStorage << endl
+                        << "#FpsPerMb\n" << renderCostPerStorage << endl
                         << "#VspOspRatio\n" << vspOspRatio << endl;
 }
@@ -417 +417 @@
         while (!(viewSpaceQueue.Empty() && objectSpaceQueue.Empty()))
         {
-                const float vspPriority = viewSpaceQueue.Empty() ? 0 : viewSpaceQueue.Top()->GetPriority();
-                const float ospPriority = objectSpaceQueue.Empty() ? 0 : objectSpaceQueue.Top()->GetPriority();
+                const float vspPriority = viewSpaceQueue.Empty() ? 0 : 
+                        viewSpaceQueue.Top()->GetPriority() / ((float)viewSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small);
+                const float ospPriority = objectSpaceQueue.Empty() ? 0 : 
+                        objectSpaceQueue.Top()->GetPriority() / ((float)objectSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small);
 
                 cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl;

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

@@ -385 +385 @@
                                 delete parser;
                         }
-                        else if (1)
+                        else if (0)
                         {
                                 ExportBinaryObj("../data/test.bin", mSceneGraph->GetRoot());

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

@@ -1506 +1506 @@
 {
          stats << "#Pass\n" << pass << endl
-                   << "#ViewCells\n" << viewCells << endl 
+                   << "#Splits\n" << viewCells << endl 
                    << "#RenderCostDecrease\n" << renderCostDecrease << endl // TODO
                    << "#TotalRenderCost\n" << totalRenderCost << endl

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

@@ -38 +38 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = false;
+const static bool CLAMP_TO_BOX = true;
 
 template <typename T> class myless