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

Timestamp:

10/22/06 17:35:23 (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

@@ -790 +790 @@
 
 
+int HierarchyManager::GetObjectSpaceSubdivisionNodes() const
+{
+        int maxLeaves = 0;
+
+        if (mObjectSpaceSubdivisionType == KD_BASED_OBJ_SUBDIV)
+        {
+                maxLeaves = mOspTree->mOspStats.nodes;
+        }
+        else if (mObjectSpaceSubdivisionType == BV_BASED_OBJ_SUBDIV)
+        {
+                maxLeaves = mBvHierarchy->mBvhStats.nodes;
+        }
+
+        return maxLeaves;
+}
+
 bool HierarchyManager::StartObjectSpaceSubdivision() const
 {
@@ -954 +970 @@
                         cout << "\nreseting bv hierarchy" << endl;
                         Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
+                                
+                        // rather use this: remove previous nodes and add the two new ones
+                        //mHierarchyStats.mNodes -= mBvHierarchy->mBvhStats.nodes + 1;
+                        mHierarchyStats.mNodes = mVspTree->mVspStats.nodes;
                         
+                        // create root
                         mBvHierarchy->Initialise(objects);
         
-                        // rather use this: remove previous nodes and add the two new ones
-                        mHierarchyStats.mNodes -= mBvHierarchy->mBvhStats.nodes + 1;
+                        firstCandidate = mBvHierarchy->Reset(sampleRays, objects);
+
+                        mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost;
                         
-                        firstCandidate = mBvHierarchy->Reset(sampleRays, objects);
-
-                        mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost;
                         //mHierarchyStats.mPvsEntries -= mBvHierarchy->mPvsEntries + 1;
                         mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects);
+
                         mHierarchyStats.mMemory = mHierarchyStats.mPvsEntries *
                                 sizeof(PvsData) + sizeof(Intersectable *) / (1024.0f * 1024.0f);
@@ -1003 +1023 @@
         
         //-- reset stats
-    mHierarchyStats.mNodes = -mVspTree->mVspStats.nodes + 1;
+    mHierarchyStats.mNodes = GetObjectSpaceSubdivisionNodes();//-mVspTree->mVspStats.nodes + 1;
         
         SubdivisionCandidate *vsc = PrepareViewSpaceSubdivision(sampleRays, objects);