Changeset 399 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

11/10/05 01:09:53 (19 years ago)

Author:

mattausch

Message:

fixed pvs bug in bsp view cells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -274 +274 @@
                 }
 
-                contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
+                if (ray->sourceObject.mObject)
+                        contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
 
                 if (contribution > 0)
@@ -281 +282 @@
                         ++ contributingSamples;
                 }
-
-                // warning: not ordered
+                // warning: intersections not ordered
                 ray->bspIntersections.push_back(Ray::BspIntersection((*it)->mMinT, this));
         }
@@ -1392 +1392 @@
                                 // assure that we only count a object 
                                 // once for the front and once for the back side of the plane
-                                AddToPvs(*ray->intersections[0].mObject, frontData.mPvs, backData.mPvs, 
-                                                 cf, frontId, backId, frontAndBackId);
+                                IncPvs(*ray->intersections[0].mObject, frontData.mPvs, backData.mPvs, 
+                                           cf, frontId, backId, frontAndBackId);
                         }
 
                         // the source object in the origin of the ray
-                        AddToPvs(*ray->sourceObject.mObject, frontData.mPvs, backData.mPvs, 
-                                         cf, frontId, backId, frontAndBackId);
+                        if (ray->sourceObject.mObject)
+                        {
+                                IncPvs(*ray->sourceObject.mObject, frontData.mPvs, backData.mPvs, 
+                                           cf, frontId, backId, frontAndBackId);
+                        }
 
                         // use #rays to approximate volume
@@ -1429 +1432 @@
 }
 
-void BspTree::AddToPvs(Intersectable &obj,
-                                           int &frontPvs,
-                                           int &backPvs,
-                                           const int cf, 
-                                           const int frontId, 
-                                           const int backId, 
-                                           const int frontAndBackId) const
+void BspTree::IncPvs(Intersectable &obj,
+                                         int &frontPvs,
+                                         int &backPvs,
+                                         const int cf, 
+                                         const int frontId, 
+                                         const int backId, 
+                                         const int frontAndBackId) const
 {
         if (cf == Ray::COINCIDENT) //TODO: really belongs to no pvs?
@@ -2311 +2314 @@
                         }
                 }
-                if (!ray->sourceObject.mObject->Mailed())
-                {
-                        ray->sourceObject.mObject->Mail();
-                        ++ pvsSize;
+                if (ray->sourceObject.mObject)
+                {
+                        if (!ray->sourceObject.mObject->Mailed())
+                        {
+                                ray->sourceObject.mObject->Mail();
+                                ++ pvsSize;
+                        }
                 }
         }