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

Timestamp:

01/05/07 16:29:54 (18 years ago)

Author:

bittner

Message:

tmp commit

File:

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

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

@@ -2299 +2299 @@
 {
   Vector3 origin = sbox.GetPoint(Vector3(params[0], params[1], params[2]));
-
   Vector3 dirVector = sDirBBox.GetPoint(Vector3(params[3], params[4], 0.0f));
-
   Vector3 direction = VssRay::GetInvDirParam(dirVector.x, dirVector.y);
   
@@ -2308 +2306 @@
   float minT, maxT;
   
-  float boxSize = Magnitude(sbox.Size());
   // compute interection of the ray with the box
 #if 1
   if (sbox.ComputeMinMaxT(origin, direction, &minT, &maxT) && minT < maxT)
-        dist = (maxT + 0.0f*boxSize);
+        dist = (maxT + Limits::Small);
 #else
+  float boxSize = Magnitude(sbox.Size());
   dist = 0.5f*boxSize;
 #endif
   
   origin += direction*dist;
-
+  
   //Debug<<"dir vector.x="<<dirVector.x<<"direction'.x="<<atan2(direction.x, direction.y)<<endl;
   rays.push_back(SimpleRay(origin,
@@ -2765 +2763 @@
           sumContributions += c1;
           if (c1 > maxContribution)
-                        maxContribution = c1;
+                maxContribution = c1;
           
           //$$ 20.7. changed to sqr to pronouce higher contribution so that
@@ -2806 +2804 @@
                 pow(((weightAbsContributions*sumContributions +
                           (1.0f - weightAbsContributions)*sumRelContributions)/sumWeights), 1.0f);
-#else 1
+#else 
           leaf->mImportance =
                 (weightAbsContributions*maxContribution +