Text archives Help

---

Author: abhinav
Date: Wed Feb  8 17:01:53 2006
New Revision: 906

Modified:
   trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc
Log:
this is the working version of the afr merge.




Modified: trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc
==============================================================================
--- trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc   
(original)
+++ trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc   Wed 
Feb  8 17:01:53 2006
@@ -415,7 +415,6 @@
       
f.addElement((int)(newSampleSet[myID][j].sample[TEMPORAL_SAMPLE].viewCoord[0] 
+ offset[i][0]),
                    
(int)(newSampleSet[myID][j].sample[TEMPORAL_SAMPLE].viewCoord[1] + 
offset[i][1]),
                     0);
-      rays.setColor(raypos, color[myID][raypos]);
     }
   }
   
/////////////////////////////////////////////////////////////////////////////
@@ -428,6 +427,7 @@
   for(j=start; j<=sscount; j++) {
     for(i=0; i<5; i++) {
       int rayindex = (j-start)*5+i;
+      color[myID][rayindex] = rays.getColor(rayindex);
       RGBColor tempcol = color[myID][rayindex].convertRGB();
       Point p = rays.getHitPosition(rayindex);
       float nsx, nsy;
@@ -572,7 +572,6 @@
         // Specify the position and color pointer for the packet element.
         rays.setPixel(i, 0, px, py);
         frag.addElement((int)(newSample[myID][fi].viewCoord[0]), 
(int)(newSample[myID][fi].viewCoord[1]), 0);
-        rays.setColor(i, color[myID][i]);
         coherenceCount++;
         if(!spatialCoherence || 
coherenceCount>=6)//kdtree[myID].getTileSize(tindex)/10)
         {
@@ -591,7 +590,7 @@
       {
   
         int fi = (f+i);
-      
+        color[myID][i] = rays.getColor(i);
         RGBColor tempcol = color[myID][i].convertRGB();
         newSample[myID][fi].c[0] = tempcol.r();
         newSample[myID][fi].c[1] = tempcol.g();
@@ -605,6 +604,8 @@
         // newSample[i].print();
         
/////////////////////////////////////////////////////////////////////////////
         // Skip reconstruction and set the image pixel.
+        //cout << newSample[myID][fi].viewCoord[0] << ", " << 
newSample[myID][fi].viewCoord[1] << " has color " 
+        //      << tempcol.r() << ", " << tempcol.g() << ", " << tempcol.b() 
<< endl;
         frag.setColor(i, color[myID][i]);
       }
       image->set(frag);

---

• [MANTA] r906 - trunk/fox/afr_demo/Engine/ImageTraversers, abhinav, 02/08/2006

---

Archive powered by MHonArc 2.6.16.