Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[Manta] r2101 - trunk/Engine/ImageTraversers


Chronological Thread 
  • From: "Solomon Boulos" <boulos@cs.utah.edu>
  • To: manta@sci.utah.edu
  • Subject: [Manta] r2101 - trunk/Engine/ImageTraversers
  • Date: Wed, 20 Feb 2008 14:45:57 -0700 (MST)

Author: boulos
Date: Wed Feb 20 14:45:56 2008
New Revision: 2101

Modified:
   trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc
Log:
Engine/ImageTraversers/DeadlineImageTraverser.cc

 I guess I never added the early exit for converged rendering I meant to... 
Also removing evil tabs.


Modified: trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc      (original)
+++ trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc      Wed Feb 20 
14:45:56 2008
@@ -120,7 +120,7 @@
       else
         throw IllegalArgument("DeadlineImageTraverser -priority, bad 
priority", i, args);
     } else if(arg == "-FIFOCutoff") {
-      if(!getArg(i, args, FIFO_cutoff))        
+      if(!getArg(i, args, FIFO_cutoff))
         throw IllegalArgument("DeadlineImageTraverser -FIFOCutoff", i, args);
     } else if(arg == "-refinmentRatio"){
       if(!getResolutionArg(i, args, xrefinementRatio, yrefinementRatio))
@@ -292,9 +292,9 @@
         //having this hardcoded exit though.
         std::cout << "<DartMeasurement name=\"total_time\" 
type=\"numeric/double\">"<<total_time<<"</DartMeasurement>\n";
         context.rtrt_int->finish();
-      }
-      else
+      } else {
         cerr << "Took " << total_time << " seconds to refine to "<< 
total_samples <<" spp" << endl;
+      }
     }
   }
 }
@@ -320,6 +320,7 @@
 void DeadlineImageTraverser::renderImage(const RenderContext& context, 
Image* image)
 {
   // Determine number of coarse level
+  if (converged) return;
   bool stereo;
   int xres, yres;
   image->getResolution(stereo, xres, yres);
@@ -682,7 +683,7 @@
     if(luminance > max)
       max = luminance;
   }
-  return (max-min)/(max+min) * tile->xmag  * tile->ymag ;  
+  return (max-min)/(max+min) * tile->xmag  * tile->ymag ;
 }
 
 float DeadlineImageTraverser::computeFIFOPriority(Tile* tile, const 
Fragment& frag) const
@@ -719,7 +720,7 @@
         tile->yend   > render_region.yend ) {
       tile->priority = 0;
       return;
-    } 
+    }
   }
 
   switch(priority) {




  • [Manta] r2101 - trunk/Engine/ImageTraversers, Solomon Boulos, 02/20/2008

Archive powered by MHonArc 2.6.16.

Top of page