Changeset 1149 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

Timestamp:

07/25/06 08:42:07 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp (modified) (6 diffs)

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

@@ -413 +413 @@
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         
-        //Environment::GetSingleton()->GetFloatValue("VspTree.maxTotalMemory", mMaxTotalMemory);
+        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
         Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
 
@@ -1390 +1390 @@
                                                                            float &position)
 {
-        RayInfoContainer *rays = tData.mRays;
+        RayInfoContainer usedRays;
+
+        if (mMaxTests < (int)tData.mRays->size())
+        {
+                GetRayInfoSets(*tData.mRays, mMaxTests, usedRays);
+        }
+        else
+        {
+                usedRays = *tData.mRays;
+        }
+
         int pvsSize = tData.mPvs;
 
@@ -1401 +1411 @@
         const float maxBand = minBox + mMaxBand * sizeBox;
 
-        SortSplitCandidates(*rays, axis, minBand, maxBand);
+        SortSplitCandidates(usedRays, axis, minBand, maxBand);
 
         // prepare the sweep
         // (note: returns pvs size, so there would be no need 
         // to give pvs size as argument)
-        pvsSize = PrepareHeuristics(*rays);
+        pvsSize = PrepareHeuristics(usedRays);
 
         // go through the lists, count the number of objects left and right
@@ -1448 +1458 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
                                 currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
                         else
@@ -3295 +3305 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
                                 currentPos = ((*ci).mPos + (*(ci + 1)).mPos) * 0.5f;
                         else
@@ -3301 +3311 @@
 
                         // note matt: can happen that volr is less than zero: bug or numerical error?
-                        //if (volr < 0)         Debug << "warning!! " << totalVol << " " << volRightDecr << " " << volRightDecr - totalVol << endl;
+                        //if (volr < 0) Debug << "warning!";
 
                         /*Debug << "pos: " << (*ci).mPos