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

Timestamp:

12/08/06 17:10:14 (18 years ago)

Author:

bittner

Message:

merge, global lines, rss sampling updates

File:

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

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

@@ -352 +352 @@
         leaf->dirBBox.Initialize();
         leaf->dirBBox.SetMin(2, 0.0f);
-        leaf->dirBBox.SetMax(2, 1.0f);
+        leaf->dirBBox.SetMax(2, 0.0f);
         mRoots[0] = leaf;
         stat.nodes = 1;
@@ -1237 +1237 @@
   node->axis = axis;
   node->position = info.position;
-  //  node->bbox = box;
-  //  node->dirBBox = GetDirBBox(leaf);
-  
+
+  node->bbox = GetBBox(leaf);
+  node->dirBBox = GetDirBBox(leaf);
   
   RssTreeLeaf *back = new RssTreeLeaf(node, info.raysBack);
@@ -1245 +1245 @@
 
   
-  // update halton generator
-  back->halton.index = leaf->halton.index;
-  front->halton.index = leaf->halton.index;
   
   // replace a link from node's parent
@@ -1810 +1807 @@
   int leaves = 0;
 
+  for (int i=0; i < mRoots.size(); i++)
+        UpdateImportance(mRoots[i]);
+  
   while (!tstack.empty()) {
     RssTreeNode *node = tstack.top();
-    tstack.pop();
-                
+        tstack.pop();
+        
     if (node->IsLeaf()) {
           leaves++;
           RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-          UpdatePvsSize(leaf);
+          // updated above already
+          //      UpdatePvsSize(leaf);
           
           sumPvsSize += leaf->GetPvsSize();
@@ -1841 +1842 @@
           sumImportance += imp;
           
-
         } else {
           RssTreeInterior *in = (RssTreeInterior *)node;
-          // both nodes for directional splits
           tstack.push(in->front);
           tstack.push(in->back);
@@ -1858 +1857 @@
   stat.avgWeightedRayContribution = sumWeightedRayContribution/(float)sumRays;
   stat.rayRefs = (int)sumRays;
-}
-
-
+  
+}
+
+void
+RssTree::UpdateImportance(
+                                                  RssTreeNode *node)
+{
+  if (node->IsLeaf()) {
+        UpdatePvsSize((RssTreeLeaf *)node);
+  } else {
+        RssTreeInterior *in = (RssTreeInterior *)node;
+        UpdateImportance(in->front);
+        UpdateImportance(in->back);
+        node->mImportance = in->front->mImportance + in->back->mImportance;
+  }
+}
+
+// generate a single ray described by parameters in a unit cube
+void
+RssTree::GenerateRay(float *params, SimpleRayContainer &rays)
+{
+  RssTreeNode *node;
+  
+  // works only with single root now!
+  node = mRoots[0];
+  
+  while (!node->IsLeaf()) {
+        RssTreeInterior *in = (RssTreeInterior *)node;
+        // decide whether to go left or right
+        int axis = in->axis;
+        float pos = in->GetRelativePosition(); 
+        
+        float r = in->back->GetImportance()/(in->back->GetImportance() + in->front->GetImportance());
+        
+        //      cout<<"axis="<<axis<<" pos="<<pos<<endl;
+        //      cout<<GetBBox(in)<<endl;
+        //      cout<<GetDirBBox(in)<<endl;
+        //      cout<<"********"<<endl;
+        
+        if (params[axis] < r) {
+          node = in->back;
+          params[axis] = params[axis] / pos;
+        } else {
+          node = in->front;
+          params[axis] = (params[axis] - pos) / ( 1.0f - pos);
+        }
+  }
+
+  //  cout<<params[0]<<" "<<params[1]<<" "<<params[2]<<" "<<params[3]<<" "<<params[4]<<endl;
+  
+  GenerateLeafRay(params, rays, node->bbox, node->dirBBox);
+}
 
 int
@@ -1867 +1915 @@
                                           SimpleRayContainer &rays)
 {
+
+  
+
+
   stack<RssTreeNode *> tstack;
   PushRoots(tstack);
@@ -2195 +2247 @@
   for (int i=0; i < numberOfRays; i++) {
         //      Debug<<i<<flush;
-
-        Vector3 origin, direction;
-        Vector3 dirVector;
-        
-        Vector3 pVector;
-        Vector3 dVector;
-        
-        bool useHalton = false;
-        
-        
-        if (useHalton) {
-          // generate a random 5D vector
-          pVector = Vector3(leaf->halton.GetNumber(1),
-                                                leaf->halton.GetNumber(2),
-                                                leaf->halton.GetNumber(3));
-          
-          dVector = Vector3(leaf->halton.GetNumber(4),
-                                                leaf->halton.GetNumber(5),
-                                                0.0f);
-          
-          leaf->halton.GenerateNext();
-        } else {
-          pVector = Vector3(RandomValue(0.0f, 1.0f),
-                                                RandomValue(0.0f, 1.0f),
-                                                RandomValue(0.0f, 1.0f));
-          
-          dVector = Vector3(RandomValue(0.0f, 1.0f),
-                                                RandomValue(0.0f, 1.0f),
-                                                0.0f);
-        }
-        
-        origin = box.GetPoint(pVector);
-        dirVector = dirBox.GetPoint(dVector);
-        
-        direction = VssRay::GetInvDirParam(dirVector.x, dirVector.y);
-        
-        //      float dist = Min(avgLength*0.5f, Magnitude(GetBBox(leaf).Size()));
-        float dist = 0.0f;
-        float minT, maxT;
-
-        // compute interection of the ray with the box
-#if 1
-        if (box.ComputeMinMaxT(origin, direction, &minT, &maxT) && minT < maxT)
-          dist = (maxT + 1e-2*boxSize);
-#else
-        dist = 0.5f*boxSize;
-#endif
-
-        origin += direction*dist;
-        
-#if 0
-        static int counter = 0;
-        //      Debug<<counter++<<flush;
-
-        if (counter > 10374968) {
-          Debug<<"size="<<rays.size()<<endl;
-          Debug<<"capacity="<<rays.capacity()<<endl;
-          Debug<<"o="<<origin<<endl;
-          Debug<<"d="<<direction<<endl;
-        }
-#endif  
-        //Debug<<"dir vector.x="<<dirVector.x<<"direction'.x="<<atan2(direction.x, direction.y)<<endl;
-        rays.push_back(SimpleRay(origin, direction));
-        //      Debug<<endl;
-        
+        float r[5];
+        
+        r[0] = RandomValue(0.0f, 1.0f);
+        r[1] = RandomValue(0.0f, 1.0f);
+        r[2] = RandomValue(0.0f, 1.0f);
+        r[3] = RandomValue(0.0f, 1.0f);
+        r[4] = RandomValue(0.0f, 1.0f);
+        
+        GenerateLeafRay(r, rays, box, dirBox);
   }
 
@@ -2269 +2265 @@
         rays[i].mPdf = p;
   }
+}
+
+void
+RssTree::GenerateLeafRay(
+                                                 float *params,
+                                                 SimpleRayContainer &rays,
+                                                 const AxisAlignedBox3 &box,
+                                                 const AxisAlignedBox3 &dirBBox
+                                                 )
+{
+  Vector3 origin = bbox.GetPoint(Vector3(params[0], params[1], params[2]));
+  Vector3 dirVector = dirBBox.GetPoint(Vector3(params[3], params[4], 0.0f));
+  Vector3 direction = VssRay::GetInvDirParam(dirVector.x, dirVector.y);
+  
+  //    float dist = Min(avgLength*0.5f, Magnitude(GetBBox(leaf).Size()));
+  float dist = 0.0f;
+  float minT, maxT;
+  
+  float boxSize = Magnitude(bbox.Size());
+  // compute interection of the ray with the box
+#if 1
+  if (bbox.ComputeMinMaxT(origin, direction, &minT, &maxT) && minT < maxT)
+        dist = (maxT + 1e-2*boxSize);
+#else
+  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, direction));
 }
 
@@ -2378 +2406 @@
           Vector3 dVector;
 
-          bool useHalton = true;
-          
-          if (useHalton) {
-                // generate a random 5D vector
-                pVector = Vector3(leaf->halton.GetNumber(1),
-                                                  leaf->halton.GetNumber(2),
-                                                  leaf->halton.GetNumber(3));
-                
-                dVector = Vector3(leaf->halton.GetNumber(4),
-                                                  leaf->halton.GetNumber(5),
-                                                  0.0f);
-                
-                leaf->halton.GenerateNext();
-          } else {
-                pVector = Vector3(RandomValue(0.0f, 1.0f),
-                                                  RandomValue(0.0f, 1.0f),
-                                                  RandomValue(0.0f, 1.0f));
-                
-                dVector = Vector3(RandomValue(0.0f, 1.0f),
-                                                  RandomValue(0.0f, 1.0f),
-                                                  0.0f);
-          }
+          pVector = Vector3(RandomValue(0.0f, 1.0f),
+                                                RandomValue(0.0f, 1.0f),
+                                                RandomValue(0.0f, 1.0f));
+          
+          dVector = Vector3(RandomValue(0.0f, 1.0f),
+                                                RandomValue(0.0f, 1.0f),
+                                                0.0f);
+          
           
           origin = box.GetPoint(pVector);
@@ -2625 +2639 @@
           if (node->IsLeaf()) {
                 RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-                //              prunned += PruneRaysRandom(leaf, ratio);
+                // prunned += PruneRaysRandom(leaf, ratio);
                 prunned += PruneRaysContribution(leaf, ratio);
           } else {
@@ -2653 +2667 @@
 {
 
-
+  float param[5];
+
+  for (int i=0; i < numberOfRays; i++) {
+        halton.GetNext(param);
+        GenerateRay(param, rays);
+  }
+
+  return rays.size();
+  
   vector<RssTreeLeaf *> leaves;
 
@@ -2864 +2886 @@
         
         // $$ 
-        sumWeights = (float)leaf->mTotalRays;
+        // sumWeights = leaf->mTotalRays;
 
         //$$ test 30.11. 2006 
@@ -2890 +2912 @@
 
 float
-RssTreeLeaf::GetImportance()  const
+RssTreeNode::GetImportance()  const
 {
   //  return sqr(mImportance);
@@ -3129 +3151 @@
 
 
-}
+
+
+
+}