Changeset 1677

Timestamp:

10/25/06 10:10:54 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.h (modified) (1 diff)
• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• VspTree.h (modified) (1 diff)

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

@@ -444 +444 @@
                         if (hm->ConsiderMemory())
                         {
-                                const float rc = mRenderCostDecrease / hm->GetHierarchyStats().mTotalCost;
+                                //const float rc = mRenderCostDecrease / hm->GetHierarchyStats().mTotalCost;
+                                const float rc = mPriority / (hm->mInitialRenderCost - hm->GetHierarchyStats().mTotalCost + 1.0f);
+                                //cout << "\np: " << mPriority << " i: " << hm->mInitialRenderCost << " t: " << hm->GetHierarchyStats().mTotalCost << endl;
                                 //const float mc = mMemoryIncr /  / hm->GetHierarchyStats().mMemory;
                                 const float mc = (float)mPvsEntriesIncr / (float)hm->GetHierarchyStats().mPvsEntries;   
-                                //cout << "x";
-                                return hm->GetMemoryConst() * rc + (1.0f - hm->GetMemoryConst()) * mc;
+                                cout << "osp rc: " << rc << " mc: " << mc << endl;
+                                return hm->GetMemoryConst() * rc - (1.0f - hm->GetMemoryConst()) * mc;
                         }
                         else

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

@@ -361 +361 @@
 
         // hack: assume that object space can be seen from view space
-        mHierarchyStats.mTotalCost = (float)objects.size();
+        mHierarchyStats.mTotalCost = mInitialRenderCost = (float)objects.size();
         // only one entry for start
         mHierarchyStats.mPvsEntries = 1;

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

@@ -235 +235 @@
         inline float GetMemoryConst() const { return mMemoryConst; }
 
+float mInitialRenderCost;
 
 protected:

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

@@ -489 +489 @@
                 {
                         HierarchyManager *hm = sVspTree->mHierarchyManager;
+                        
                         if (hm->ConsiderMemory())
                         {
-                                const float rc = mRenderCostDecrease / hm->GetHierarchyStats().mTotalCost;
-                                const float mc = (float)mPvsEntriesIncr / (float)hm->GetHierarchyStats().mPvsEntries;
-                                //cout << "y";                  
-                                return hm->GetMemoryConst() * rc + (1.0f - hm->GetMemoryConst()) * mc;
+                                //const float rc = mRenderCostDecrease / hm->GetHierarchyStats().mTotalCost;
+                                const float rc = mPriority / (hm->mInitialRenderCost - hm->GetHierarchyStats().mTotalCost + 1.0f);
+                                //const float mc = mMemoryIncr /  / hm->GetHierarchyStats().mMemory;
+                                const float mc = (float)mPvsEntriesIncr / (float)hm->GetHierarchyStats().mPvsEntries;   
+                        cout << "vsp rc: " << rc << " mc: " << mc << endl;
+                                return hm->GetMemoryConst() * rc - (1.0f - hm->GetMemoryConst()) * mc;
                         }
                         else