Changeset 1636 for GTP/trunk

Timestamp:

10/18/06 09:56:53 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (2 diffs)
• HierarchyManager.cpp (modified) (1 diff)

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

@@ -517 +517 @@
 
 #if 1
-        // take render cost of node into account 
-        // otherwise danger of being stuck in a local minimum!!
-        const float factor = mRenderCostDecreaseWeight;
         float priority;
         
@@ -539 +536 @@
         else
         {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                // take render cost of node into account 
+                // otherwise danger of being stuck in a local minimum!!
+                priority = mRenderCostDecreaseWeight * renderCostDecr + 
+                                   (1.0f - mRenderCostDecreaseWeight) * oldRenderCost;
         }
 

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

@@ -935 +935 @@
                 // subdivide view space with respect to the objects
 
-                ResetViewSpaceSubdivision(sampleRays, objects);
+                if (!ViewSpaceSubdivisionConstructed())
+                {
+                        mTQueue.Push(vspVc);
+                        
+                        // view space subdivision constructed
+                        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+                }
+                else
+                {
+                        ResetViewSpaceSubdivision(sampleRays, objects);
+                }
 
                 // process view space candidates
                 RunConstruction(false);
 
-                // view space subdivision constructed
-                mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-        
                 cout << "iteration " << i << " of " << limit << " finished" << endl;