Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] r424 - trunk/Engine/ImageTraversers


Chronological Thread 
  • From: bigler@sci.utah.edu
  • To: manta@sci.utah.edu
  • Subject: [MANTA] r424 - trunk/Engine/ImageTraversers
  • Date: Wed, 6 Jul 2005 00:01:53 -0600 (MDT)

Author: bigler
Date: Wed Jul  6 00:01:51 2005
New Revision: 424

Modified:
   trunk/Engine/ImageTraversers/FramelessImageTraverser.cc
   trunk/Engine/ImageTraversers/FramelessImageTraverser.h
Log:
Fix tabs.

Modified: trunk/Engine/ImageTraversers/FramelessImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/FramelessImageTraverser.cc     (original)
+++ trunk/Engine/ImageTraversers/FramelessImageTraverser.cc     Wed Jul  6 
00:01:51 2005
@@ -85,18 +85,18 @@
   nx = 1;
   int tres = xres;
   while(tres>1)
-  {
-    nx++;
-    tres /= 2;
-  }
+    {
+      nx++;
+      tres /= 2;
+    }
   
   ny = 1;
   tres = yres;
   while(tres>1)
-  {
-    ny++;
-    tres /= 2;
-  }
+    {
+      ny++;
+      tres /= 2;
+    }
   nx/=2;
   ny/=2;
   
@@ -120,32 +120,32 @@
   shuffledTiles = new UniformTiles[xtiles*ytiles];
   for(i=0; i<xtiles*ytiles; i++) {
     if(xtiles<ytiles)
-    {
-      j = i%xtiles;
-      k = i/xtiles;
-      shuffledTiles[i].xstart = j*xtilesize;
-      shuffledTiles[i].xend = (j+1)*xtilesize;
-      shuffledTiles[i].ystart = k*ytilesize;
-      shuffledTiles[i].yend = (k+1)*ytilesize;
-    }
+      {
+        j = i%xtiles;
+        k = i/xtiles;
+        shuffledTiles[i].xstart = j*xtilesize;
+        shuffledTiles[i].xend = (j+1)*xtilesize;
+        shuffledTiles[i].ystart = k*ytilesize;
+        shuffledTiles[i].yend = (k+1)*ytilesize;
+      }
     else
-    {
-      j = i%ytiles;
-      k = i/ytiles;
-      shuffledTiles[i].xstart = k*xtilesize;
-      shuffledTiles[i].xend = (k+1)*xtilesize;
-      shuffledTiles[i].ystart = j*ytilesize;
-      shuffledTiles[i].yend = (j+1)*ytilesize;
-    }
+      {
+        j = i%ytiles;
+        k = i/ytiles;
+        shuffledTiles[i].xstart = k*xtilesize;
+        shuffledTiles[i].xend = (k+1)*xtilesize;
+        shuffledTiles[i].ystart = j*ytilesize;
+        shuffledTiles[i].yend = (j+1)*ytilesize;
+      }
    
     if(shuffledTiles[i].xend>xres)
       shuffledTiles[i].xend = xres;
     if(shuffledTiles[i].yend>yres)
       shuffledTiles[i].yend = yres; 
     if(shuffledTiles[i].xstart == shuffledTiles[i].xend)
-    { printf("error\n"); }   
+      { printf("error\n"); }   
     if( shuffledTiles[i].ystart == shuffledTiles[i].yend)
-    { printf("error\n"); }  
+      { printf("error\n"); }  
   }
   
   shuffleMyTiles(); // shuffle them up
@@ -185,15 +185,15 @@
       // normalized
       double px, py;
       if(xres>yres) // let the smaller dimension be mapped to [-1,1]
-      {
-        px = (double)(-1.0 + 2.0*(double)(fe.x+0.5)/(double)yres); 
-        py = (double)(-1.0 + 2.0*(double)(fe.y+0.5)/(double)yres);
-      }
+        {
+          px = (double)(-1.0 + 2.0*(double)(fe.x+0.5)/(double)yres); 
+          py = (double)(-1.0 + 2.0*(double)(fe.y+0.5)/(double)yres);
+        }
       else
-      {
-        px = (double)(-1.0 + 2.0*(double)(fe.x+0.5)/(double)xres); 
-        py = (double)(-1.0 + 2.0*(double)(fe.y+0.5)/(double)xres);
-      }  
+        {
+          px = (double)(-1.0 + 2.0*(double)(fe.x+0.5)/(double)xres); 
+          py = (double)(-1.0 + 2.0*(double)(fe.y+0.5)/(double)xres);
+        }  
       //printf("%f, %f\n", (float)px, (float)py);
       rays.setPixel(i, 0, px, py, &fe.color);
     }

Modified: trunk/Engine/ImageTraversers/FramelessImageTraverser.h
==============================================================================
--- trunk/Engine/ImageTraversers/FramelessImageTraverser.h      (original)
+++ trunk/Engine/ImageTraversers/FramelessImageTraverser.h      Wed Jul  6 
00:01:51 2005
@@ -13,7 +13,7 @@
   using namespace std;
   struct UniformTiles
   {
-         int xstart, ystart, xend, yend;
+    int xstart, ystart, xend, yend;
   };
   class FramelessImageTraverser : public ImageTraverser {
   public:
@@ -23,16 +23,16 @@
     virtual void setupDisplayChannel(SetupContext&);
     virtual void setupFrame(const RenderContext& context);
     virtual void renderImage(const RenderContext& context, Image* image);
-       void shuffleMyTiles();
+    void shuffleMyTiles();
     void renderFragment(const RenderContext& context, Fragment& fragment, 
int xres, int yres);
     static ImageTraverser* create(const vector<string>& args);
   private:
     FramelessImageTraverser(const FramelessImageTraverser&);
     FramelessImageTraverser& operator=(const FramelessImageTraverser&);
-       int xtilesize, ytilesize;
-       UniformTiles *shuffledTiles;
+    int xtilesize, ytilesize;
+    UniformTiles *shuffledTiles;
     int xtiles,ytiles;
-       MT_RNG *myRandomNumber;
+    MT_RNG *myRandomNumber;
   };
 }
 




  • [MANTA] r424 - trunk/Engine/ImageTraversers, bigler, 07/06/2005

Archive powered by MHonArc 2.6.16.

Top of page