Text archives Help

---

Author: bigler
Date: Mon Jul 16 15:44:15 2007
New Revision: 1478

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

Engine/ImageTraversers/DeadlineImageTraverser.cc

  Use CPUTime::currentSeconds instead of Time::currentSeconds which
  doesn't scale.


Modified: trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc      (original)
+++ trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc      Mon Jul 16 
15:44:15 2007
@@ -39,7 +39,6 @@
 #include <Core/Exceptions/InternalError.h>
 #include <Core/Math/MinMax.h>
 #include <Core/Math/Expon.h>
-#include <Core/Thread/Time.h>
 #include <Core/Thread/Mutex.h>
 #include <Core/Util/Args.h>
 #include <Core/Util/NotFinished.h>
@@ -52,11 +51,12 @@
 #include <Engine/PixelSamplers/SingleSampler.h>
 #include <Engine/PixelSamplers/JitterSampler.h>
 #include <Interface/RayPacket.h> // for maxsize
+#include <Core/Util/CPUTime.h>
 #include <MantaSSE.h>
 #include <set>
 #include <sstream>
+
 using namespace Manta;
-using SCIRun::Time;
 
 ImageTraverser* DeadlineImageTraverser::create(const vector<string>& args)
 {
@@ -184,7 +184,7 @@
 {
   //if (context.proc == 0)
   //  cerr << __func__ << endl;
-  StartFrameTime = Time::currentSeconds();
+  StartFrameTime = CPUTime::currentSeconds();
   finished_coarse = false;
   // Determine the resolution.
   bool stereo;
@@ -275,10 +275,10 @@
     jitterSamplers[i]->setupFrame(context);
   }
   // Determine how long we should render this frame.
-  frameEnd = Time::currentSeconds() + frameTime;
+  frameEnd = CPUTime::currentSeconds() + frameTime;
   if (context.proc == 0) {
     if (finished_coarse && qsize == 0) {
-      double EndTime = Time::currentSeconds();
+      double EndTime = CPUTime::currentSeconds();
       double total_time = EndTime - StartFrameTime;
       //cerr << "Took " << total_time << " seconds to refine to 64 spp" << 
endl;
     }
@@ -405,7 +405,7 @@
 
 void DeadlineImageTraverser::renderImage(const RenderContext& context, 
Image* image)
 {
-  double bt = Time::currentSeconds();
+  double bt = CPUTime::currentSeconds();
   // Determine number of coarse level
   bool stereo;
   int xres, yres;
@@ -479,7 +479,7 @@
   if (!finished_coarse)
     finished_coarse = true;
 
-  while(Time::currentSeconds() < frameEnd){
+  while(CPUTime::currentSeconds() < frameEnd){
     Tile* childtiles;
     Tile* tile = popFromQueue(childtiles);
     if(!tile)
@@ -562,7 +562,7 @@
           jitter_sampler->renderFragment(context, frag);
 
           if (ShowTimeSupersample) {
-            ColorComponent color = Time::currentSeconds()/60.;
+            ColorComponent color = CPUTime::currentSeconds()/60.;
             for (int i = frag.begin(); i < frag.end(); i++) {
               for ( int c = 0; c < Color::NumComponents; c++ )
                 frag.color[c][i] = color;

---

• [MANTA] r1478 - trunk/Engine/ImageTraversers, bigler, 07/16/2007

---

Archive powered by MHonArc 2.6.16.