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

Timestamp:

10/19/06 20:30:21 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (2 diffs)
• HierarchyManager.cpp (modified) (5 diffs)
• HierarchyManager.h (modified) (2 diffs)
• OspTree.cpp (modified) (1 diff)

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

@@ -1069 +1069 @@
         const float ratio = newRenderCost / oldRenderCost;
 
-//#ifdef _DEBUG
+#ifdef _DEBUG
         Debug << "\n§§§§ bvh eval const decrease §§§§" << endl
                   << "back pvs: " << (int)objectsBack.size() << " front pvs: " << (int)objectsFront.size() << " total pvs: " << nTotalObjects << endl 
@@ -1075 +1075 @@
                   << "old rc: " << oldRenderCost / viewSpaceVol << " new rc: " << newRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << oldRenderCost / viewSpaceVol - newRenderCost / viewSpaceVol << endl;
-//#endif
+#endif
 
         return ratio;

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

@@ -252 +252 @@
                                                 mHierarchyStats.mPvsEntries,
                                                 memoryCost,
-                                                1.0f / (mHierarchyStats.mTotalCost * memoryCost)
+                                                1.0f / (mHierarchyStats.mTotalCost * memoryCost),
+                                                (float)mVspTree->mVspStats.Leaves() / (float)GetObjectSpaceSubdivisionLeaves()
                                                 );
 }
@@ -262 +263 @@
                                                                                    const int pvsEntries,
                                                                                    const float memory,
-                                                                                   const float renderCostPerStorage)
+                                                                                   const float renderCostPerStorage,
+                                                                                   const float vspOspRatio)
 {
         mSubdivisionStats
@@ -270 +272 @@
                         << "#TotalRenderCost\n" << totalRenderCost << endl
                         << "#Memory\n" << memory << endl
-                        << "#RcPerMb\n" << renderCostPerStorage << endl;
+                        << "#RcPerMb\n" << renderCostPerStorage << endl
+                        << "#VspOspRatio\n" << vspOspRatio << endl;
 }
 
@@ -696 +699 @@
         mHierarchyStats.mRenderCostDecrease = sc->GetRenderCostDecrease();
 
+        static float memoryCount = 0;
+
+        if (mHierarchyStats.mMemory > memoryCount)
+        {
+                memoryCount += 100000;
+                cout << "\nstorage cost: " << mHierarchyStats.mMemory / (1024.0f * 1024.0f) << ", steps: " << mHierarchyStats.Leaves() << endl;
+        }
+
         // output stats
         EvalSubdivisionStats();
@@ -878 +889 @@
                         !(steps < minSteps))
                 {
-                        cout << "breaking on " << sc->GetRenderCostDecrease() << " smaller than " << minRenderCostDecr << endl;
+                        //cout << "breaking on " << sc->GetRenderCostDecrease() << " smaller than " << minRenderCostDecr << endl;
                         break;
                 }

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

@@ -315 +315 @@
                                                          const int totalPvsEntries, 
                                                          const float memory,
-                                                         const float renderCostPerStorage);
+                                                         const float renderCostPerStorage,
+                                                         const float vspOspRatio);
 
         bool AddSampleToPvs(Intersectable *obj, 
@@ -376 +377 @@
         /** After the suddivision has ended, do some final tasks.
         */
-        void FinishObjectSpaceSubdivision(const ObjectContainer &objects, const bool removeRayRefs = true) const;
+        void FinishObjectSpaceSubdivision(const ObjectContainer &objects, 
+                                                                          const bool removeRayRefs = true) const;
 
         /** Returns depth of object space subdivision.

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

@@ -715 +715 @@
                 ratio = minRenderCost / totalRenderCost;
         }
-
+#if _DEBUG
         Debug << "\n§§§§ eval local cost §§§§" << endl
                   << "old rc: " << totalRenderCost / viewSpaceVol << " new rc: " << minRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << (totalRenderCost - minRenderCost) / viewSpaceVol  << endl;
-
+#endif
         return ratio;
 }