Changeset 1635 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (4 diffs)
• HierarchyManager.cpp (modified) (9 diffs)
• HierarchyManager.h (modified) (1 diff)

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;

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

@@ -464 +464 @@
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
 
+        // create just one view cell
+        SubdivisionCandidate *vspSc = 
+                PrepareViewSpaceSubdivision(sampleRays, objects);
+
         // start view space subdivison immediately?
         if (StartViewSpaceSubdivision())
@@ -469 +473 @@
                 // prepare vsp tree for traversal
                 mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-                SubdivisionCandidate *vspSc = 
-                        PrepareViewSpaceSubdivision(sampleRays, objects);
                 mTQueue.Push(vspSc);
         }
@@ -487 +489 @@
                                         sampleRays, 
                                         objects, 
-                                        forcedViewSpace//, 
-                                        /*vspSc*/);
+                                        forcedViewSpace,// 
+                                        vspSc);
         
         cout << "\nfinished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -699 +701 @@
                                                                            const VssRayContainer &sampleRays,
                                                                            const ObjectContainer &objects,
-                                                                           AxisAlignedBox3 *forcedViewSpace)
+                                                                           AxisAlignedBox3 *forcedViewSpace,
+                                                                           SubdivisionCandidate *firstVsp)
 {
         while (!FinishedConstruction())
@@ -736 +739 @@
                                  << mMinDepthForViewSpaceSubdivion << ") " << endl;
 
-                        SubdivisionCandidate *vspSc = PrepareViewSpaceSubdivision(sampleRays, objects);
-                        mTQueue.Push(vspSc);
+                        //SubdivisionCandidate *vspSc = PrepareViewSpaceSubdivision(sampleRays, objects);
+                        mTQueue.Push(firstVsp);
 
                         cout << "reseting queue ... ";
@@ -889 +892 @@
         mSavedViewSpaceSubdivisionType = mViewSpaceSubdivisionType;
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
+        
+        // first view cell
+        SubdivisionCandidate *vspVc = PrepareViewSpaceSubdivision(sampleRays, objects);
 
         mSavedObjectSpaceSubdivisionType = mObjectSpaceSubdivisionType;
@@ -908 +914 @@
 
                 // subdivide object space first
-
                 ResetObjectSpaceSubdivision(sampleRays, objects);
 
@@ -920 +925 @@
 
                 mSubdivisionStats.close();
+
                 if ((i ++) >= limit)
                         break;
@@ -980 +986 @@
 bool HierarchyManager::ViewSpaceSubdivisionConstructed() const
 {
-        return mVspTree && mVspTree->GetRoot();
+        return mViewSpaceSubdivisionType != NO_VIEWSPACE_SUBDIV;
+        //return mVspTree && mVspTree->GetRoot();
 }
 

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

@@ -255 +255 @@
                                                  const VssRayContainer &sampleRays,
                                                  const ObjectContainer &objects,
-                                                 AxisAlignedBox3 *forcedViewSpace);
+                                                 AxisAlignedBox3 *forcedViewSpace,
+                                                 SubdivisionCandidate *firstVsp);
         
         /** This is for interleaved construction using some objects