Changeset 1732 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.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/BvHierarchy.cpp (modified) (8 diffs)

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

@@ -47 +47 @@
 mParent(NULL), 
 mMailbox(0),
-mRenderCostDecr(0), 
-mMemoryIncr(0),
-mPvsEntriesIncr(0),
+//mRenderCostDecr(0), 
+//mMemoryIncr(0),
+//mPvsEntriesIncr(0),
 mTimeStamp(0)
 {
@@ -59 +59 @@
 mBoundingBox(bbox), 
 mMailbox(0),
-mMemoryIncr(0),
-mRenderCostDecr(0), 
-mPvsEntriesIncr(0),
+//mMemoryIncr(0),
+//mRenderCostDecr(0), 
+//mPvsEntriesIncr(0),
 mTimeStamp(0)
 {
@@ -71 +71 @@
 mParent(parent), 
 mMailbox(0),
-mMemoryIncr(0),
-mRenderCostDecr(0), 
-mPvsEntriesIncr(0),
+//mMemoryIncr(0),
+//mRenderCostDecr(0), 
+//mPvsEntriesIncr(0),
 mTimeStamp(0)
 {
@@ -292 +292 @@
         Environment::GetSingleton()->GetIntValue("BvHierarchy.maxTests", mMaxTests);
 
-        //mUseBboxAreaForSah = false;
-        mUseBboxAreaForSah = true;
+        //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(VspViewCell));
+        //mMemoryConst = (float)sizeof(BvhLeaf);
+mMemoryConst = (float)sizeof(ObjectContainer);
+        cout << "bvh memcost: " << mMemoryConst << endl;
+        cout << "triangle: " << sizeof(TriangleIntersectable) << endl;
+        cout << "triangle: " << sizeof(Intersectable) << endl;
+        cout << "triangle: " << sizeof(ObjectContainer) << endl;
+        cout << "triangle: " << sizeof(float) << endl;
+        cout << "triangle: " << sizeof(int) << endl;
+
+    mUseBboxAreaForSah = true;
 
         /////////////
@@ -317 +326 @@
         Debug << "use global sort: " << mUseGlobalSorting << endl;
         Debug << "minimal rays for visibility: " << mMinRaysForVisibility << endl;
+        Debug << "bvh mem const: " << mMemoryConst << endl;
 
         Debug << endl;
@@ -503 +513 @@
                 {
                         BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(currentNode);
-                        CollectRays(leaf->mObjects, leaf->mVssRays);
+                //      CollectRays(leaf->mObjects, leaf->mVssRays);
                 }
                 
@@ -584 +594 @@
                 // otherwise danger of being stuck in a local minimum!
                 const float factor = mRenderCostDecreaseWeight;
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-
-                if (mHierarchyManager->mConsiderMemory2)
-                {
-                        priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);
+
+                if (1)
+                {
+                        priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                        if (mHierarchyManager->mConsiderMemory2)
+                        {
+                                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
+                        }
+                }
+                else
+                {
+                        if (!mHierarchyManager->mConsiderMemory2)
+                        {
+                                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                        }
+                        else
+                        {
+                                const float ratio = 
+                                        renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
+
+                                priority = factor * ratio + (1.0f - factor) * oldRenderCost;
+                        }
                 }
         }
@@ -2351 +2378 @@
                 //oldNode->mPvsEntriesIncr += sc->GetPvsEntriesIncr();
                 
-                oldNode->mRenderCostDecr = sc->GetRenderCostDecrease();
-                oldNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
+                //oldNode->mRenderCostDecr = sc->GetRenderCostDecrease();
+                //oldNode->mPvsEntriesIncr = sc->GetPvsEntriesIncr();
                 
                 ///////////////////////////