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

Timestamp:

11/09/06 13:36:30 (18 years ago)

Author:

mattausch

Message:

resolved coflicts
improved memory constant

File:

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

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

@@ -151 +151 @@
         Environment::GetSingleton()->GetIntValue(
                 "Hierarchy.Construction.maxRepairs", mMaxRepairs);
-
-        if (1 && mConsiderMemory2)
-        {
-                mMemoryConst = (float)(sizeof(VspLeaf *) + sizeof (VspViewCell *));
-        }
-        else
-        {
-                Environment::GetSingleton()->GetFloatValue(
-                        "Hierarchy.Termination.memoryConst", mMemoryConst);
-        }
-
         // compare to bytes
         mTermMaxMemory *= (1024.0f * 1024.0f);
@@ -177 +166 @@
         Debug << "consider memory: " << mConsiderMemory << endl;
         Debug << "consider memory2: " << mConsiderMemory << endl;
-        Debug << "mem const: " << mMemoryConst << endl;
         Debug << "min steps of same kind: " << mMinStepsOfSameType << endl;
         Debug << "max steps of same kind: " << mMaxStepsOfSameType << endl;
@@ -1933 +1921 @@
                         
                         isLeaf = newNode->IsLeaf();
-                        subStats.mRenderCostDecrease = oldNode->mRenderCostDecr;
-                        entriesIncr = oldNode->mPvsEntriesIncr;
+                        //subStats.mRenderCostDecrease = oldNode->mRenderCostDecr;
+                        //entriesIncr = oldNode->mPvsEntriesIncr;
                 }
                 else
@@ -1944 +1932 @@
                         
                         isLeaf = newNode->IsLeaf();
-                        subStats.mRenderCostDecrease = oldNode->mRenderCostDecr;
-                        entriesIncr = oldNode->mPvsEntriesIncr;
+                        //subStats.mRenderCostDecrease = oldNode->mRenderCostDecr;
+                        //entriesIncr = oldNode->mPvsEntriesIncr;
                 }               
                                 
@@ -2078 +2066 @@
                 
                 const float objectSpaceHierarchyMem = float(
-                                                                                          subStats.mObjectSpaceSplits * sizeof(BvhLeaf *) + 
-                                                                                          (subStats.mObjectSpaceSplits - 1) * sizeof(BvhInterior *) + 
-                                                                                          sizeof(BvHierarchy)
+                                                                                          subStats.mObjectSpaceSplits * sizeof(ObjectContainer)
+                                                                                          //+ (subStats.mObjectSpaceSplits - 1) * sizeof(BvhInterior)
+                                                                                          //+sizeof(BvHierarchy)
                                                                                           ) / float(1024 * 1024);
 
                         
                 const float viewSpaceHierarchyMem = float(
-                                                                                        subStats.mViewSpaceSplits * sizeof(VspLeaf *) + 
-                                                                                        (subStats.mViewSpaceSplits - 1) * sizeof(VspInterior *) + 
-                                                                                        sizeof(VspTree)
+                                                                                        subStats.mViewSpaceSplits * sizeof(ObjectPvs)
+                                                                                        //+ (subStats.mViewSpaceSplits - 1) * sizeof(VspInterior)
+                                                                                        + sizeof(ObjectPvs)
+                                                                                        //+ sizeof(VspTree)
                                                                                         )  / float(1024 * 1024);
 
@@ -2093 +2082 @@
                 
                 subStats.Print(splitsStats);
-
                 splits += splitsStepSize;
 
                 if (subStats.mNumSplits == mHierarchyStats.Leaves())
                         break;
-        }
+
+                cout << subStats.mNumSplits << " ";
+        }
+        cout << endl;
 }