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

Timestamp:

03/11/07 16:14:59 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -105 +105 @@
         Environment::GetSingleton()->GetFloatValue(
                 "Hierarchy.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
+
+        Environment::GetSingleton()->GetFloatValue("Hierarchy.minRenderCost", mMinRenderCost);
+
         Environment::GetSingleton()->GetIntValue(
                 "Hierarchy.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
@@ -179 +182 @@
         Debug << "max avg rays per object: " << mMaxAvgRaysPerObject << endl;
         Debug << "mín avg rays per object: " << mMinAvgRaysPerObject << endl;
+        Debug << "mín render cost: " << mMinRenderCost << endl;
 
         // for comparing it with byte - value
@@ -833 +837 @@
                                                                                  const float avgRaysPerObjects) const
 {
+        // don't correct pvss
+        if (mMaxAvgRaysPerObject <= mMinAvgRaysPerObject)
+        {
+                return childPvs;
+        }
+        
         // assume pvs sampled sufficiently => take child pvs
         if (avgRaysPerObjects > mMaxAvgRaysPerObject)
@@ -838 +848 @@
                 return childPvs;
         }
-        // assume pvs not sampled sufficiently => take total pvs
-        else if (avgRaysPerObjects <= mMinAvgRaysPerObject)
-        {
-                cout << "b ";// << avgRaysPerObjects << " ";
+
+        // assume pvs not sampled sufficiently => pvs equal to parent pvs
+        // we should not subdivide further from this point
+        if (avgRaysPerObjects <= mMinAvgRaysPerObject)
+        {
+                cout << "t ";// << avgRaysPerObjects << " ";
                 return totalPvs;
         }
+
+        ///////////
+        //-- blend pvss
 
         const float alpha = (mMaxAvgRaysPerObject - avgRaysPerObjects) / 
@@ -857 +872 @@
         const float newPvs = alpha * childPvs + (1.0f - alpha) * totalPvs;
 #endif
-cout << "c ";// << avgRaysPerObjects << " ";
+cout << "b ";// << avgRaysPerObjects << " ";
         //cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl;
         
@@ -927 +942 @@
         
         mPriority = sc->GetPriority();
+
+        cout << sc->Type() << " ";
 
         //////////
@@ -1160 +1177 @@
                 {
                         //sc->CollectDirtyCandidates(dirtyCandidates, true);
-                        //if (steps % 10 == 0)
-                                cout << sc->Type() << " ";
+                        //if (steps % 10 == 0) cout << sc->Type() << " ";
                         
                         ++ steps;