Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

11/28/06 19:46:36 (18 years ago)

Author:

bittner

Message:

global lines support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp (modified) (11 diffs)

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

@@ -336 +336 @@
           leaf->dirBBox.Initialize();
           leaf->dirBBox.SetMin(2, 0.0f);
-          leaf->dirBBox.SetMax(2, 1.0f);
+          leaf->dirBBox.SetMax(2, 0.0f);
           mRoots[i] = leaf;
         }
@@ -391 +391 @@
   // make the z axis (unused) a unit size
   // important for volume computation
-
   
   //  if ( forcedBoundingBox ) 
@@ -2230 +2229 @@
         dirVector = dirBox.GetPoint(dVector);
         
-        direction = Vector3(sin(dirVector.x), sin(dirVector.y), cos(dirVector.x));
-        
-        
-        // shift the origin a little bit
-        direction.Normalize();
+        direction = VssRay::GetInvDirParam(dirVector.x, dirVector.y);
         
         //      float dist = Min(avgLength*0.5f, Magnitude(GetBBox(leaf).Size()));
@@ -2243 +2238 @@
 #if 1
         if (box.ComputeMinMaxT(origin, direction, &minT, &maxT) && minT < maxT)
-          dist = maxT;
+          dist = (maxT + 1e-2*boxSize);
 #else
         dist = 0.5f*boxSize;
@@ -2373 +2368 @@
                 w1*leaf->rays[r1].GetDir() +
                 w2*leaf->rays[r2].GetDir();
+
+          // shift the origin a little bit
+          direction.Normalize();
+          
         } else {
           Vector3 dirVector;
@@ -2405 +2404 @@
           dirVector = dirBox.GetPoint(dVector);
 
-          direction = Vector3(sin(dirVector.x), sin(dirVector.y), cos(dirVector.x));
-        }
-
-        // shift the origin a little bit
-        direction.Normalize();
+          direction = VssRay::GetInvDirParam(dirVector.x,dirVector.y);
+        }
+        
         
         //      float dist = Min(avgLength*0.5f, Magnitude(GetBBox(leaf).Size()));
@@ -2628 +2625 @@
           if (node->IsLeaf()) {
                 RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-                // prunned += PruneRaysRandom(leaf, ratio);
+                //              prunned += PruneRaysRandom(leaf, ratio);
                 prunned += PruneRaysContribution(leaf, ratio);
           } else {
@@ -2759 +2756 @@
 // if small very high importance of the last sample
 // if 1.0f then weighs = 1 1/2 1/3 1/4
+//float passSampleWeightDecay = 1.0f;
 float passSampleWeightDecay = 1.0f;
-//float passSampleWeightDecay = 0.0001f;
 
 float
@@ -2768 +2765 @@
   float weight;
   if (1) 
-        weight = 1.0f/sqr(passDiff + passSampleWeightDecay);
+                weight = 1.0f/(passDiff + passSampleWeightDecay);
   else 
-        switch (passDiff) {
+                switch (passDiff) {
           case 0:
-          //      weight = 1.0f;
-          //      break;
-        default:
-          weight = 1.0f;
-          break;
+                        //        weight = 1.0f;
+                        //        break;
+                default:
+                        weight = 1.0f;
+                        break;
           //    case 1:
 //        weight = 0.5f;
@@ -2823 +2820 @@
         float sumRelContributions = 0.0f;
         float sumWeights = 0.0f;
+        float maxContribution = 0.0f;
+        float maxRelContribution = 0.0f;
+        float sumLength = 0;
+        
         for (; it != it_end; ++it) {
           VssRay *ray = (*it).mRay;
+          float sumLength = ray->Length();
+
           float weight = GetSampleWeight(ray->mPass);
           
-          sumContributions += weight*ray->mPvsContribution;
-          //$$ 20.7. changed to sqr to pronouce higher contribution so that they do not get smoothed!!
+          float c1 = weight*ray->mPvsContribution;
+          float c2 = weight*ray->mRelativePvsContribution;
+          sumContributions += c1;
+          if (c1 > maxContribution)
+                maxContribution = c1;
+          
+          //$$ 20.7. changed to sqr to pronouce higher contribution so that
+          // they do not get smoothed!!
           //sumRelContributions += weight*ray->mRelativePvsContribution;
-
-          sumRelContributions += sqr(weight*ray->mRelativePvsContribution);
-          
+          
+          sumRelContributions += c2;
+          if (c2 > maxRelContribution)
+                maxRelContribution = c2;
+
           //sumWeights += weight;
           sumWeights += 1.0f;
         }
+
+        float distImportance = 0.0f;
+
+        if (leaf->rays.size()) {
+          // compute average length of the ray 
+          float avgLength = sumLength/leaf->rays.size();
+          // compute estimated area of the visible surface corresponding to these rays
+          float ss = GetBBox(leaf).SurfaceArea()/2.0f;
+          float sd = GetDirBBox(leaf).SurfaceArea();
+          float s = ss + avgLength*(2*sqrt(ss*sd) + avgLength*sd);
+          
+          distImportance = s/leaf->rays.size();
+        }
+        
         // $$ 
         // sumWeights = leaf->mTotalRays;
-          
-        if (sumWeights != 0.0f) 
+
+        if (sumWeights != 0.0f) {
           leaf->mImportance =
-                (weightAbsContributions*sumContributions +
-                 (1.0f - weightAbsContributions)*sumRelContributions)/sumWeights;
-        else
+                        sqr(((weightAbsContributions*sumContributions +
+                                                (1.0f - weightAbsContributions)*sumRelContributions)/sumWeights));
+          
+          //      leaf->mImportance =
+          //            (weightAbsContributions*maxContribution +
+          //             (1.0f - weightAbsContributions)*maxRelContribution)/sumWeights;
+          
+        } else
           leaf->mImportance = 0.0f;
         
@@ -2856 +2886 @@
 RssTreeLeaf::GetImportance()  const
 {
-  //return sqr(mImportance);
+  //  return sqr(mImportance);
   return mImportance;
 }