Changeset 2571 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

12/18/07 17:40:35 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)

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

@@ -2671 +2671 @@
 void ViewCellsManager::UpdateStatsForViewCell(ViewCell *vc, Intersectable *obj)
 {
-                KdIntersectable *kdObj = static_cast<KdIntersectable *>(obj);
-
-        const AxisAlignedBox3 box = kdObj->GetBox();
-                const float dist = SqrDistance(vc->GetBox().Center(), box.Center());
-
-                float f;
-
-                const float radius = mViewSpaceBox.Radius();
-                const float fullRadius = mViewSpaceBox.Radius();
-
-                const float minVal = 0.1f;
-                const float maxVal = 1.0f;
-
-                if (dist <= radius) 
-                        f = maxVal;
-                else if (dist >= fullRadius)
-                        f = minVal;
-                else // linear blending
-                {
-                        f = minVal * (dist - radius) + maxVal * (fullRadius - radius - dist);
-                }
-
-                const int numTriangles = kdObj->ComputeNumTriangles();
-
-                vc->GetPvs().mStats.mDistanceWeightedTriangles += f * numTriangles; 
-                vc->GetPvs().mStats.mDistanceWeightedPvs += f;
-                vc->GetPvs().mStats.mWeightedTriangles += numTriangles;
+        KdIntersectable *kdObj = static_cast<KdIntersectable *>(obj);
+
+        const AxisAlignedBox3 box = kdObj->GetBox();
+        const float dist = Distance(vc->GetBox().Center(), box.Center());
+
+        float f;
+
+        const float radius = box.Radius();
+        const float fullRadius = max(0.2f * mViewSpaceBox.Radius(), radius);
+
+        const float minVal = 0.01f;
+        const float maxVal = 1.0f;
+
+        if (dist <= radius) 
+                f = maxVal;
+        else if (dist >= fullRadius)
+                f = minVal;
+        else // linear blending
+        {
+                f = minVal * (dist - radius) / (fullRadius - radius) + 
+                        maxVal * (fullRadius - radius - dist) / (fullRadius - radius);
+        }
+
+        //cout << "x " << radius << " " << dist << " " << fullRadius << " " << f << " " << f * f << endl;
+
+        const int numTriangles = kdObj->ComputeNumTriangles();
+
+        vc->GetPvs().mStats.mDistanceWeightedTriangles += f * numTriangles; 
+        vc->GetPvs().mStats.mDistanceWeightedPvs += f ;
+        vc->GetPvs().mStats.mWeightedTriangles += numTriangles;
 }
 
@@ -2725 +2728 @@
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
 #if 1
-                UpdateStatsForViewCell(viewCell, obj);
+                if (hasAbsContribution)
+                {
+                        UpdateStatsForViewCell(viewCell, obj);
+                        mVizBuffer.AddRay(&ray);
+                }
 #endif