Changeset 1661 for GTP/trunk/Lib/Vis

Timestamp:

10/20/06 18:39:36 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -563 +563 @@
                 mVspTree->PrepareConstruction(sampleRays, *viewSpaceRays);
 
+        /////////
+        //-- new stats
+
         mHierarchyStats.mTotalCost = mVspTree->mTotalCost;
         mHierarchyStats.mPvsEntries = mVspTree->EvalPvsEntriesSize(*viewSpaceRays);
+        mHierarchyStats.mMemory = mHierarchyStats.mPvsEntries * 
+                sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
 
         cout << "\nreseting cost for vsp, new total cost: " << mHierarchyStats.mTotalCost << endl;
@@ -940 +945 @@
                         // (if view space was already subdivided)
                         mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects);
-                        mHierarchyStats.mMemory = sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
+                        mHierarchyStats.mMemory = mHierarchyStats.mPvsEntries *
+                                sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
 
                         // evaluate stats before first subdivision
@@ -974 +980 @@
         mVspTree->Initialise(sampleRays, forcedViewSpace);
         
+        mHierarchyStats.mNodes = -mVspTree->mVspStats.nodes + 1;
+        mHierarchyStats.mRenderCostDecrease = 0;
+
         SubdivisionCandidate *vsc = PrepareViewSpaceSubdivision(sampleRays, objects);
         
-        mHierarchyStats.mNodes = 2;
-        
-        mHierarchyStats.mRenderCostDecrease = 0;
-
         // evaluate new stats before first subdivsiion
         EvalSubdivisionStats();