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

Timestamp:

01/15/07 08:37:28 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -2027 +2027 @@
                 stat.avgPvs += pvsCost;
 
-                const float pvsEntries = mViewCellsTree->GetPvsEntries(viewcell);
+                const float pvsEntries = (float)mViewCellsTree->GetPvsEntries(viewcell);
                 stat.avgPvsEntries += pvsEntries;
                 
-
                 if (mPerViewCellStat[i].pvsSize > 0.0f)
                   mPerViewCellStat[i].relPvsIncrease = (pvsCost - mPerViewCellStat[i].pvsSize)/mPerViewCellStat[i].pvsSize;
@@ -2280 +2279 @@
           }
         
+}
+
+
+float ViewCellsManager::ComputeSampleContribution(VssRay &ray,
+                                                                                                  const bool addRays,
+                                                                                                  ViewCell *currentViewCell)
+{
+        ray.mPvsContribution = 0;
+        ray.mRelativePvsContribution = 0.0f;
+
+        if (!ray.mTerminationObject)
+                return 0.0f;
+
+        static Ray hray;
+        hray.Init(ray);
+
+        float tmin = 0, tmax = 1.0;
+
+        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+        {
+                // cerr<<"ray outside view space box\n";
+                return 0;
+        }
+
+        Vector3 origin = hray.Extrap(tmin);
+        Vector3 termination = hray.Extrap(tmax);
+
+        // traverse the view space subdivision
+        if (!LineSegmentIntersects(origin, 
+                                                           termination, 
+                                                           currentViewCell))
+        {
+                return 0;
+        }
+        
+        // optain pvs entry (can be different from hit object)
+        Intersectable *terminationObj = GetIntersectable(ray, true);
+
+        ComputeViewCellContribution(currentViewCell, 
+                                                                ray, 
+                                                                terminationObj, 
+                                                                ray.mTermination, 
+                                                                addRays);
+        
+#if USE_RAY_LENGTH_AS_CONTRIBUTION
+        float c = 0.0f;
+        if (terminationObj) 
+          c = ray.Length();
+        ray.mRelativePvsContribution = ray.mPvsContribution = c;
+        return c;
+#else
+        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+#endif
 }
 
@@ -3330 +3383 @@
 
 
+bool BspViewCellsManager::LineSegmentIntersects(const Vector3 &origin, 
+                                                                                                const Vector3 &termination, 
+                                                                                                ViewCell *viewCell)
+{
+        return false;
+}
+
+
 void ViewCellsManager::ExportMergedViewCells(const ObjectContainer &objects)
 {
@@ -4316 +4377 @@
 
 
+bool KdViewCellsManager::LineSegmentIntersects(const Vector3 &origin, 
+                                                                                           const Vector3 &termination, 
+                                                                                           ViewCell *viewCell)
+{
+        return false;
+}
+
+
 void KdViewCellsManager::CreateMesh(ViewCell *vc)
 {
@@ -5089 +5158 @@
 {
         return mVspBspTree->CastLineSegment(origin, termination, viewcells);
+}
+
+
+bool VspBspViewCellsManager::LineSegmentIntersects(const Vector3 &origin, 
+                                                                                                   const Vector3 &termination, 
+                                                                                                   ViewCell *viewCell)
+{
+        return false;
 }
 
@@ -6105 +6182 @@
                                                                                         ViewCellContainer &viewcells)
 {
-        return mHierarchyManager->GetVspTree()->CastLineSegment(origin, termination, viewcells);
+        return mHierarchyManager->
+                GetVspTree()->CastLineSegment(origin, termination, viewcells);
+}
+
+
+bool VspOspViewCellsManager::LineSegmentIntersects(const Vector3 &origin, 
+                                                                                                   const Vector3 &termination, 
+                                                                                                   ViewCell *viewCell)
+{
+        return mHierarchyManager->
+                GetVspTree()->LineSegmentIntersects(origin, termination, viewCell);
 }