Changeset 1011 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

06/12/06 16:36:26 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• VspBspTree.cpp (modified) (3 diffs)
• VspKdTree.cpp (modified) (3 diffs)
• VspOspTree.cpp (modified) (14 diffs)
• VspOspTree.h (modified) (2 diffs)

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

@@ -68 +68 @@
         bool randomize = false;
         Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.randomize", randomize);
-        if (randomize)
-                Randomize(); // initialise random generator for heuristics
+        if (randomize) Randomize(); // initialise random generator for heuristics
 
         //-- termination criteria for autopartition
@@ -87 +86 @@
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
-
-        // HACK//mTermMinPolygons = 25;
 
         //-- factors for bsp tree split plane heuristics
@@ -2736 +2733 @@
                                 const int side = plane.Side(bRay.ExtrapOrigin());
 
+                                ++ splits;
+
                                 if (side <= 0)
                                 {

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

@@ -147 +147 @@
 }
 
+
 void VspKdInterior::Print(ostream &s) const
 {
@@ -165 +166 @@
 }
 
+
 int VspKdInterior::ComputeRayIntersection(const RayInfo &rayData, float &t)
 {
@@ -170 +172 @@
 }
 
+
 VspKdNode *VspKdInterior::GetBack() const
 {
         return mBack;
 }
+
 
 VspKdNode *VspKdInterior::GetFront() const

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

@@ -124 +124 @@
 {}
 
+
 VspInterior::~VspInterior() 
 { 
@@ -130 +131 @@
 }
 
+
 bool VspInterior::IsLeaf() const
 { 
@@ -135 +137 @@
 }
 
+
 VspNode *VspInterior::GetBack() 
 {
@@ -140 +143 @@
 }
 
+
 VspNode *VspInterior::GetFront() 
 {
@@ -145 +149 @@
 }
 
+
 AxisAlignedPlane VspInterior::GetPlane() const
 {
         return mPlane;
 }
+
 
 void VspInterior::ReplaceChildLink(VspNode *oldChild, VspNode *newChild) 
@@ -157 +163 @@
                 mFront = newChild;
 }
+
 
 void VspInterior::SetupChildLinks(VspNode *b, VspNode *f) 
@@ -527 +534 @@
 {
         return
-                (mOutOfMemory 
-                || (mVspStats.Leaves() >= mMaxViewCells) 
-                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
-                 );
+                (mOutOfMemory || 
+                (mVspStats.Leaves() >= mMaxViewCells) || 
+                (mGlobalCostMisses >= mTermGlobalCostMissTolerance));
 }
 
@@ -680 +686 @@
         backData.mRays = new RayInfoContainer();
         
-
         //-- subdivide rays
-#if TODO        
         SplitRays(splitPlane,
                           *tData.mRays,
                           *frontData.mRays,
                           *backData.mRays);
-#endif
-
-        // compute pvs
+
+        //-- compute pvs
         frontData.mPvs = ComputePvsSize(*frontData.mRays);
         backData.mPvs = ComputePvsSize(*backData.mRays);
 
         // split front and back node geometry and compute area
-        
-        // if geometry was not already computed
-        // TODO
-
-#if TODO
         tData.mBoundingBox.Split(splitPlane.mAxis, splitPlane.mPosition, 
                                                          frontData.mBoundingBox, backData.mBoundingBox);
 
-#endif
 
         frontData.mProbability = frontData.mBoundingBox.GetVolume();
@@ -1039 +1036 @@
         int bestAxis = -1;
 
-#if 0
-        // maximum cost ratio for axis to be valid:
-        // if exceeded, spatial mid split is used instead
-        const maxCostRatioForHeur = 0.99f;
-#endif
 
         // if we use some kind of specialised fixed axis
@@ -1146 +1138 @@
         }
 
-#if TODO
-        pFront = geomFront.GetVolume();
+        AxisAlignedBox3 frontBox;
+        AxisAlignedBox3 backBox;
+
+        data.mBoundingBox.Split(candidatePlane.mAxis, candidatePlane.mPosition, frontBox, backBox);
+
+        pFront = frontBox.GetVolume();
         pBack = pOverall - pFront;
-#endif
                 
 
@@ -1399 +1394 @@
         Intersectable::NewMail();
         ViewCell::NewMail();
+
         Vector3 entp = ray.Extrap(mint);
         Vector3 extp = ray.Extrap(maxt);
@@ -1651 +1647 @@
 
 
-int VspOspTree::SplitRays(const Plane3 &plane,
-                                                  RayInfoContainer &rays,
-                                                  RayInfoContainer &frontRays,
-                                                  RayInfoContainer &backRays) const
-{
-        int splits = 0;
-
-        RayInfoContainer::const_iterator it, it_end = rays.end();
-
-        for (it = rays.begin(); it != it_end; ++ it)
-        {
-                RayInfo bRay = *it;
-                
-                VssRay *ray = bRay.mRay;
-                float t;
-
-                // get classification and receive new t
-                const int cf = bRay.ComputeRayIntersection(plane, t);
-
-                switch (cf)
-                {
-                case -1:
-                        backRays.push_back(bRay);
-                        break;
-                case 1:
-                        frontRays.push_back(bRay);
-                        break;
-                case 0:
-                        {
-                                //-- split ray
-                                //-- test if start point behind or in front of plane
-                                const int side = plane.Side(bRay.ExtrapOrigin());
-
-                                if (side <= 0)
-                                {
-                                        backRays.push_back(RayInfo(ray, bRay.GetMinT(), t));
-                                        frontRays.push_back(RayInfo(ray, t, bRay.GetMaxT()));
-                                }
-                                else
-                                {
-                                        frontRays.push_back(RayInfo(ray, bRay.GetMinT(), t));
-                                        backRays.push_back(RayInfo(ray, t, bRay.GetMaxT()));
-                                }
-                        }
-                        break;
-                default:
-                        Debug << "Should not come here" << endl;
-                        break;
-                }
-        }
-
-        return splits;
-}
-
-
 int VspOspTree::FindNeighbors(VspNode *n, vector<VspLeaf *> &neighbors,
                                                           const bool onlyUnmailed) const
@@ -1849 +1790 @@
         int hits = 0;
 #if TODO
-        stack<BspRayTraversalData> tStack;
+        stack<VspRayTraversalData> tStack;
 
         float mint = 0.0f, maxt = 1.0f;
@@ -2195 +2136 @@
 }
 
-}
+
+int VspOspTree::SplitRays(const AxisAlignedPlane &plane,
+                                                  RayInfoContainer &rays,
+                                                  RayInfoContainer &frontRays,
+                                                  RayInfoContainer &backRays) const
+{
+        int splits = 0;
+
+        RayInfoContainer::const_iterator rit, rit_end = rays.end();
+
+        for (rit = rays.begin(); rit != rit_end; ++ rit)
+        {
+                RayInfo bRay = *rit;
+                
+                VssRay *ray = bRay.mRay;
+                float t;
+
+                // get classification and receive new t
+                //-- test if start point behind or in front of plane
+                const int side = plane.ComputeRayIntersection(bRay, t);
+
+                if (side == 0)
+                {
+                        ++ splits;
+
+                        if (ray->HasPosDir(plane.mAxis))
+                        {
+                                backRays.push_back(RayInfo(ray, bRay.GetMinT(), t));
+                                frontRays.push_back(RayInfo(ray, t, bRay.GetMaxT()));
+                        }
+                        else
+                        {
+                                frontRays.push_back(RayInfo(ray, bRay.GetMinT(), t));
+                                backRays.push_back(RayInfo(ray, t, bRay.GetMaxT()));
+                        }
+                }
+                else if (side == 1)
+                {
+                        frontRays.push_back(bRay);
+                }
+                else
+                {
+                        backRays.push_back(bRay);
+                }
+
+        }
+
+        return splits;
+}
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

@@ -35 +35 @@
 {
 public:
+
+        int ComputeRayIntersection(const RayInfo &rayData, float &t) const
+        {
+                return rayData.ComputeRayIntersection(mAxis, mPosition, t);
+        }
+
         int mAxis;
         float mPosition;
@@ -742 +748 @@
                 @returns the number of splits
         */
-        int SplitRays(const Plane3 &plane,
+        int SplitRays(const AxisAlignedPlane &plane,
                                   RayInfoContainer &rays, 
                               RayInfoContainer &frontRays,