Changeset 495 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

01/04/06 10:02:28 (19 years ago)

Author:

mattausch

Message:

fixed bug in tree collapse

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (15 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -35 +35 @@
 float BspMergeCandidate::sOverallCost = 0;
 
-
-/// Adds object to the pvs of the front and back node
-inline void AddObject2Pvs(Intersectable *object,
-                                                  const int side,
-                                                  int &pvsBack,
-                                                  int &pvsFront)
-{
-        if (!object)
-                return;
-
-        if (side <= 0)
-        {
-                if (!object->Mailed() && !object->Mailed(2))
-                {
-                        ++ pvsBack;
-
-                        if (object->Mailed(1))
-                                object->Mail(2);
-                        else
-                                object->Mail();
-                }
-        }
-
-        if (side >= 0)
-        {
-                if (!object->Mailed(1) && !object->Mailed(2))
-                {
-                        ++ pvsFront;
-
-                        if (object->Mailed())
-                                object->Mail(2);
-                        else
-                                object->Mail(1);
-                }
-        }
-}
-
-
 /****************************************************************/
 /*                  class VspBspTree implementation             */
@@ -83 +45 @@
 mViewCellsManager(NULL),
 mStoreRays(false),
-mOnlyDrivingAxis(false),
 mOutOfBoundsCell(NULL)
 {
@@ -794 +755 @@
 float VspBspTree::SelectAxisAlignedPlane(Plane3 &plane,
                                                                                  const VspBspTraversalData &tData,
-                                                                                 int &bestAxis)
+                                                                                 int &axis,
+                                                                                 float &position,
+                                                                                 int &raysBack,
+                                                                                 int &raysFront,
+                                                                                 int &pvsBack,
+                                                                                 int &pvsFront)
 {
         AxisAlignedBox3 box;
@@ -810 +776 @@
         float nPosition[3];
         float nCostRatio[3];
-        bestAxis = -1;
+        int bestAxis = -1;
 
         const int sAxis = box.Size().DrivingAxis();
 
-        for (int axis = 0; axis < 3; ++ axis)
+        for (axis = 0; axis < 3; ++ axis)
         {
                 if (!mOnlyDrivingAxis || axis == sAxis)
@@ -851 +817 @@
         }
 
-        //-- assign best axis
+        //-- assign values
+        axis = bestAxis;
+        position = nPosition[bestAxis];
+
+        raysBack = 0;//nRaysBack[bestAxis];
+        raysFront = 0;//nRaysFront[bestAxis];
+
+        pvsBack = 0;//nPvsBack[bestAxis];
+        pvsFront = 0;//nPvsFront[bestAxis];
+
         Vector3 normal(0,0,0); normal[bestAxis] = 1;
         plane = Plane3(normal, nPosition[bestAxis]);
@@ -1070 +1045 @@
 }
 
+
 bool VspBspTree::SelectPlaneHeuristics(Plane3 &bestPlane,
                                                                            BspLeaf *leaf,
@@ -1086 +1062 @@
         for (int i = 0; i < limit; ++ i)
         {
-                // assure that no index is taken twice
+                //-- assure that no index is taken twice
                 const int candidateIdx = (int)RandomValue(0, (Real)(-- maxIdx));
-                //Debug << "current Idx: " << maxIdx << " cand idx " << candidateIdx << endl;
-
                 Polygon3 *poly = (*data.mPolygons)[candidateIdx];
 
@@ -1109 +1083 @@
         //-- axis aligned splits
         int axis;
-        candidateCost = SelectAxisAlignedPlane(plane, data, axis);
+        float position;
+        int raysBack;
+        int raysFront;
+        int pvsFront;
+        int pvsBack;
+
+        candidateCost = SelectAxisAlignedPlane(plane, 
+                                                                                   data, 
+                                                                                   axis,
+                                                                                   position,
+                                                                                   raysBack,
+                                                                                   raysFront,
+                                                                                   pvsFront,
+                                                                                   pvsBack);
 
         if (candidateCost < lowestCost)
@@ -1116 +1103 @@
                 {
                         useAxisAlignedPlane = true;
+                        //if (data.mPolygons->size() > 0)
+                        //      Debug << "haha" << endl;
                         //! error also computed if cost ratio is missed
                         ++ mStat.splits[axis];
@@ -1142 +1131 @@
         Intersectable::NewMail(); sFrontAndBackId = ViewCell::sMailId;
 }
+
 
 float VspBspTree::SplitPlaneCost(const Plane3 &candidatePlane,
@@ -1159 +1149 @@
         float pBack = 0;
 
-        const bool pvsUseLen = false;
-
         if (mSplitPlaneStrategy & PVS)
         {
-// matt: change back!!
-Intersectable::NewMail(3);
                 // create unique ids for pvs heuristics
-                //GenerateUniqueIdsForPvs();
+                GenerateUniqueIdsForPvs();
 
                 if (mPvsUseArea) // use front and back cell areas to approximate volume
@@ -1227 +1213 @@
                         // 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->mTerminationObject, cf, frontPvs, backPvs);
-                        AddObject2Pvs(ray->mTerminationObject, cf, frontPvs, backPvs);
-                        // add the source object
-                        //AddObjToPvs(ray->mOriginObject, cf, frontPvs, backPvs);
+                        AddObjToPvs(ray->mTerminationObject, cf, frontPvs, backPvs);
+                        AddObjToPvs(ray->mOriginObject, cf, frontPvs, backPvs);
 
                         // use number of rays to approximate volume
                         if (!mPvsUseArea)
                         {
-                                ++ pOverall;
+                                pOverall = (float)data.mRays->size();
 
                                 if (cf >= 0)
@@ -1253 +1235 @@
 
         if (mSplitPlaneStrategy & BALANCED_RAYS)
-                cost += mBalancedRaysFactor * fabs(sumBalancedRays) /  raysSize;
+                cost += mBalancedRaysFactor * fabs(sumBalancedRays) / raysSize;
 
         // pvs criterium
@@ -2125 +2107 @@
 BspNode *VspBspTree::CollapseTree(BspNode *node)
 {
-    if (node->IsLeaf())
+        if (node->IsLeaf())
                 return node;
 
@@ -2156 +2138 @@
         }
 
+        return node;
+}
+
+
+void VspBspTree::CollapseTree()
+{
+        CollapseTree(mRoot);
         // revalidate leaves
         RepairVcLeafLists();
-
-        return node;
 }