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

Timestamp:

11/23/05 18:29:41 (19 years ago)

Author:

mattausch

Message:

fixed vspkdtree rays bug

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -38 +38 @@
 int BspTree::sConstructionMethod = FROM_INPUT_VIEW_CELLS;
 
+int BspTree::sFrontId = 0; 
+int BspTree::sBackId = 0;
+int BspTree::sFrontAndBackId = 0;
 
 /****************************************************************/
@@ -1420 +1423 @@
 }
 
+inline void BspTree::GenerateUniqueIdsForPvs()
+{
+        Intersectable::NewMail(); sBackId = ViewCell::sMailId;
+        Intersectable::NewMail(); sFrontId = ViewCell::sMailId;
+        Intersectable::NewMail(); sFrontAndBackId = ViewCell::sMailId;
+}
+
 float BspTree::SplitPlaneCost(const Plane3 &candidatePlane, 
                                                           const BoundedRayContainer &rays,
@@ -1445 +1455 @@
         if (mSplitPlaneStrategy & PVS)
         {
-                // create three unique ids for pvs heuristics
-                Intersectable::NewMail(); backId = ViewCell::sMailId;
-                Intersectable::NewMail(); frontId = ViewCell::sMailId;
-                Intersectable::NewMail(); frontAndBackId = ViewCell::sMailId;
+                // create unique ids for pvs heuristics
+                GenerateUniqueIdsForPvs();
 
                 if (mPvsUseArea) // use front and back cell areas to approximate volume
@@ -1490 +1498 @@
                 if (mSplitPlaneStrategy & PVS)
                 {
-                        if (!ray->intersections.empty())
-                        {
-                                // in case the ray intersects an objcrs
-                                // assure that we only count a object 
-                                // once for the front and once for the back side of the plane
-                                IncPvs(*ray->intersections[0].mObject, frontPvs, backPvs, 
-                                           cf, frontId, backId, frontAndBackId);
-                        }
-
-                        // the source object in the origin of the ray
-                        if (ray->sourceObject.mObject)
-                        {
-                                IncPvs(*ray->sourceObject.mObject, frontPvs, backPvs, 
-                                           cf, frontId, backId, frontAndBackId);
-                        }
-
+                        // in case the ray intersects an object
+                        // assure that we only count the object 
+                        // once for the front and once for the back side of the plane
+                        
+                        // add the termination object
+                        AddObjToPvs(ray->intersections[0].mObject, cf, frontPvs, backPvs);
+                        
+                        // add the source object
+                        AddObjToPvs(ray->sourceObject.mObject, cf, frontPvs, backPvs);
+                        
                         if (!mPvsUseArea) // use front and back cell areas to approximate volume
                         {       
@@ -1584 +1586 @@
 }
 
-void BspTree::IncPvs(Intersectable &obj,
-                                         int &frontPvs,
-                                         int &backPvs,
-                                         const int cf, 
-                                         const int frontId, 
-                                         const int backId, 
-                                         const int frontAndBackId) const
-{
+void BspTree::AddObjToPvs(Intersectable *obj,
+                                                  const int cf,
+                                                  int &frontPvs,
+                                                  int &backPvs) const
+{
+        if (!obj)
+                return;
         // TODO: does this really belong to no pvs?
         //if (cf == Ray::COINCIDENT) return;
 
-        if (cf == Ray::FRONT)
-        {
-                if ((obj.mMailbox != frontId) && 
-                        (obj.mMailbox != frontAndBackId))
+        // object belongs to both PVS
+        const bool bothSides = (cf == Ray::FRONT_BACK) || 
+                                                   (cf == Ray::BACK_FRONT) ||
+                                                   (cf == Ray::COINCIDENT);
+
+        if ((cf == Ray::FRONT) || bothSides)
+        {
+                if ((obj->mMailbox != sFrontId) && 
+                        (obj->mMailbox != sFrontAndBackId))
                 {
                         ++ frontPvs;
 
-                        if (obj.mMailbox != backId)
-                                obj.mMailbox = frontId;
+                        if (obj->mMailbox == sBackId)
+                                obj->mMailbox = sFrontAndBackId;        
                         else
-                                obj.mMailbox = frontAndBackId;                                  
-                }
-        }
-        else if (cf == Ray::BACK)
-        {
-                if ((obj.mMailbox != backId) &&
-                        (obj.mMailbox != frontAndBackId))
+                                obj->mMailbox = sFrontId;                                                               
+                }
+        }
+        
+        if ((cf == Ray::BACK) || bothSides)
+        {
+                if ((obj->mMailbox != sBackId) &&
+                        (obj->mMailbox != sFrontAndBackId))
                 {
                         ++ backPvs;
 
-                        if (obj.mMailbox != frontId)
-                                obj.mMailbox = backId;
+                        if (obj->mMailbox == sFrontId)
+                                obj->mMailbox = sFrontAndBackId; 
                         else
-                                obj.mMailbox = frontAndBackId; 
-                }
-        }
-        // object belongs to both PVS
-        else if ((cf == Ray::FRONT_BACK) || (cf == Ray::BACK_FRONT) ||(cf == Ray::COINCIDENT))
-        {
-                if (obj.mMailbox !=  frontAndBackId)
-                {
-                        if (obj.mMailbox != frontId)
-                                ++ frontPvs;
-                        if (obj.mMailbox != backId)
-                                ++ backPvs;
-                
-                        obj.mMailbox = frontAndBackId;
+                                obj->mMailbox = sBackId;                                
                 }
         }