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

Timestamp:

10/25/06 20:29:41 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -319 +319 @@
                                                                  AxisAlignedBox3 *forcedViewSpace)
 {
+        mTimeStamp = 1;
+
         switch (mConstructionType)
         {
@@ -422 +424 @@
         // then optimizate view space partition for the current osp
         // and vice versa until iteration depth is reached.
-
+bool lastSplitWasOsp = true;
         while (!(viewSpaceQueue.Empty() && objectSpaceQueue.Empty()))
         {
@@ -432 +434 @@
 
                 // should view or object space be subdivided further?
-                if (ospPriority >= vspPriority)
-                {
+                //if (ospPriority >= vspPriority)
+                if (!lastSplitWasOsp)
+                {
+                        lastSplitWasOsp = true;
                         cout << "osp" << endl;
                         // dirtied view space candidates
@@ -456 +460 @@
                 else
                 {
+                        lastSplitWasOsp = false;
                         cout << "vsp" << endl;
                         
@@ -912 +917 @@
                 const float threshold = oldCandidate ? oldCandidate->GetPriority() : 1e20;
                 SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
-                //cout << "here2 " << sc->GetPriority() << " " << threshold << endl;
+                //cout << "here2 " << sc->GetRenderCostDecrease() << " " << threshold << endl;
+                float rc = (float)sc->GetRenderCostDecrease() / (mInitialRenderCost - mHierarchyStats.mTotalCost + 1.0f);
+                float mc = (float)sc->GetPvsEntriesIncr() / (float)mHierarchyStats.mPvsEntries; 
+
+                //cout << "dRc: " << sc->GetRenderCostDecrease() << " dMem: " << sc->GetPvsEntriesIncr() << " ratio1 " << rc << " ratio2 " << mc << " const: " << 1.0f - GetMemoryConst() << endl;
 
                 // minimum slope reached
@@ -1505 +1514 @@
 
 
-void HierarchyManager::FinishObjectSpaceSubdivision(const ObjectContainer &objects, const bool removeRayRefs) const
+void HierarchyManager::FinishObjectSpaceSubdivision(const ObjectContainer &objects, 
+                                                                                                        const bool removeRayRefs) const
 {
         switch (mObjectSpaceSubdivisionType)