Changeset 1635 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

10/18/06 02:32:32 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (4 diffs)

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

@@ -520 +520 @@
         // otherwise danger of being stuck in a local minimum!!
         const float factor = mRenderCostDecreaseWeight;
-        const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+        float priority;
+        
+        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+                HierarchyManager::NO_VIEWSPACE_SUBDIV)
+        {
+                ////////////////
+                //-- surface area heuristics
+
+        //      if (objects.empty())
+        //              return 0.0f;
+
+                const AxisAlignedBox3 box = EvalBoundingBox(leaf->mObjects);
+                const float area = box.SurfaceArea();
+                const float viewSpaceArea = mViewCellsManager->GetViewSpaceBox().SurfaceArea();
+
+                priority = (float)leaf->mObjects.size() * area / viewSpaceArea;
+        }
+        else
+        {
+                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+        }
+
 #else
         const float priority = (float)-splitCandidate.mParentData.mDepth;
@@ -1360 +1381 @@
 float BvHierarchy::EvalRenderCost(const ObjectContainer &objects) const
 {       
-        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
-                HierarchyManager::NO_VIEWSPACE_SUBDIV)
+        if (0 && 
+                (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+                HierarchyManager::NO_VIEWSPACE_SUBDIV))
         {
                 ////////////////
@@ -1450 +1472 @@
 {
         // no view cells yet
-        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+        if (0 && mHierarchyManager->GetViewSpaceSubdivisionType() == 
                 HierarchyManager::NO_VIEWSPACE_SUBDIV)
                 return;
@@ -1543 +1565 @@
 {
         // no view cells yet
-        if (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+        if (0 && mHierarchyManager->GetViewSpaceSubdivisionType() == 
                 HierarchyManager::NO_VIEWSPACE_SUBDIV)
                 return 1;