Changeset 1147 for GTP/trunk

Timestamp:

07/24/06 18:21:32 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• RayInfo.h (modified) (1 diff)
• VspBspTree.cpp (modified) (9 diffs)
• VspOspTree.cpp (modified) (6 diffs)

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

@@ -1994 +1994 @@
         RegisterOption("VspBspTree.Construction.maxBand",
                                         optFloat,
-                                        "vsp_bsp_construction_min_band=",
+                                        "vsp_bsp_construction_max_band=",
                                         "0.99");
 

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

@@ -92 +92 @@
         */
         int ComputeRayIntersection(const Plane3 &splitPlane, float &t) const;
+
+        /*friend void GetRaySets(const RayInfoContainer &sourceRays,
+                                                   const int maxSize,
+                                                   RayInfoContainer &usedRays,
+                                                   RayInfoContainer *savedRays) const;*/
 };
 
-
 }
-
 #endif 
 

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

@@ -1358 +1358 @@
                                           float &position)
 {
+        RayInfoContainer usedRays, savedRays;
+
+/*      if (mMaxTests < rays.size())
+        {
+                GetRaySets(rays, mMaxTests, usedRays, savedRays);
+        }
+        else
+        {*/
+                usedRays = rays;
+        //}
+
         const float minBox = box.Min(axis);
         const float maxBox = box.Max(axis);
@@ -1366 +1377 @@
         const float maxBand = minBox + mMaxBand * sizeBox;
 
-        SortSplitCandidates(rays, axis, minBand, maxBand);
+        SortSplitCandidates(usedRays, axis, minBand, maxBand);
 
         // go through the lists, count the number of objects left and right
@@ -1391 +1402 @@
         Intersectable::NewMail();
 
-        RayInfoContainer::const_iterator ri, ri_end = rays.end();
+        RayInfoContainer::const_iterator ri, ri_end = usedRays.end();
 
         // set all object as belonging to the front pvs
@@ -1486 +1497 @@
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
 
+                        float currentPos;
+                        
+                        // HACK: current positition is BETWEEN visibility events
+                        if ((ci + 1) != ci_end)
+                                currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
+                        else
+                                currentPos = (*ci).value;                       
+
                         //Debug  << "pos=" << (*ci).value << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << endl;
                         //Debug << "cost= " << sum << endl;
@@ -1494 +1513 @@
 
                                 minSum = sum;
-                                position = (*ci).value;
+                                position = currentPos;
                                 
                                 pvsBack = pvsl;
@@ -1501 +1520 @@
                 }
         }
-        
         
         // -- compute cost
@@ -1560 +1578 @@
         //TODO: for kd split geometry already is box => only take minmax vertices
         if (1)
-        {
-                // get bounding box from geometry
+        {       // get bounding box from geometry
                 tData.mGeometry->GetBoundingBox(box);
         }
@@ -1572 +1589 @@
                         box.Include((*ri).ExtrapTermination());
         }
+
 
         int sAxis = 0;
@@ -1620 +1638 @@
                         }
                         else 
-                        {
-                                //-- split plane position is spatial median
+                        {       //-- split plane position is spatial median
 
                                 nPosition[axis] = (box.Min()[axis] + box.Max()[axis]) * 0.5f;

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

@@ -1448 +1448 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if (ci != ci_end)
+                        if ((ci + 1) != ci_end)
                                 currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
                         else
@@ -1454 +1454 @@
 
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
-                        Debug  << "pos=" << (*ci).value << "\t newpos=" << currentPos << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << "\t cost= " << sum << endl;
+                        //Debug  << "pos=" << (*ci).value << "\t newpos=" << currentPos << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << "\t cost= " << sum << endl;
 
                         if (sum < minSum)
@@ -1461 +1461 @@
 
                                 minSum = sum;
-                                position = (*ci).value;
+                                position = currentPos;
                                 
                                 pvsBack = pvsl;
@@ -1470 +1470 @@
         
         
-        // -- compute cost
+        //-- compute cost
 
         const int lowerPvsLimit = mViewCellsManager->GetMinPvsSize();
@@ -3292 +3292 @@
                         sum = voll * pvsl + volr * pvsr;
 
+                        float currentPos;
+                        
+                        // HACK: current positition is BETWEEN visibility events
+                        if ((ci + 1) != ci_end)
+                                currentPos = ((*ci).mPos + (*(ci + 1)).mPos) * 0.5f;
+                        else
+                                currentPos = (*ci).mPos;                        
+
                         // note matt: can happen that volr is less than zero: bug or numerical error?
                         //if (volr < 0)         Debug << "warning!! " << totalVol << " " << volRightDecr << " " << volRightDecr - totalVol << endl;
@@ -3313 +3321 @@
                                 volFront = volr;
 
-                                position = (*ci).mPos;
+                                position = currentPos;
                         }
                 }