Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1506 - trunk/Engine/ImageTraversers
- Date: Wed, 18 Jul 2007 22:41:41 -0600 (MDT)
Author: bigler
Date: Wed Jul 18 22:41:40 2007
New Revision: 1506
Modified:
trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc
trunk/Engine/ImageTraversers/DeadlineImageTraverser.h
Log:
Engine/ImageTraversers/DeadlineImageTraverser.cc
Engine/ImageTraversers/DeadlineImageTraverser.h
Added converged flag and made it so it only printed out the time to
converge only once.
Modified: trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc
==============================================================================
--- trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc (original)
+++ trunk/Engine/ImageTraversers/DeadlineImageTraverser.cc Wed Jul 18
22:41:40 2007
@@ -68,6 +68,7 @@
{
finished_coarse = false;
reset_every_frame = false;
+ converged = false;
float frameRate = 15;
ypacketsize = 1;
while(ypacketsize * ypacketsize * 2 < Fragment::MaxSize)
@@ -186,6 +187,7 @@
// cerr << __func__ << endl;
StartFrameTime = CPUTime::currentSeconds();
finished_coarse = false;
+ converged = false;
// Determine the resolution.
bool stereo;
int xres, yres;
@@ -265,6 +267,8 @@
context.loadBalancer->setupFrame(context);
qsize = 0;
next_tile = top_tiles;
+ converged = false;
+ StartFrameTime = CPUTime::currentSeconds();
}
context.pixelSampler->setupFrame(context);
@@ -277,10 +281,11 @@
// Determine how long we should render this frame.
frameEnd = CPUTime::currentSeconds() + frameTime;
if (context.proc == 0) {
- if (finished_coarse && qsize == 0) {
+ if (finished_coarse && qsize == 0 && !converged) {
+ converged = true;
double EndTime = CPUTime::currentSeconds();
double total_time = EndTime - StartFrameTime;
- //cerr << "Took " << total_time << " seconds to refine to 64 spp" <<
endl;
+ cerr << "Took " << total_time << " seconds to refine to
"<<Fragment::MaxSize<<" spp" << endl;
}
//cerr << "qsize = " << qsize << ", next_tile = " << next_tile << endl;
//cerr << "totalTiles = " << total_tiles << endl;
Modified: trunk/Engine/ImageTraversers/DeadlineImageTraverser.h
==============================================================================
--- trunk/Engine/ImageTraversers/DeadlineImageTraverser.h (original)
+++ trunk/Engine/ImageTraversers/DeadlineImageTraverser.h Wed Jul 18
22:41:40 2007
@@ -99,6 +99,7 @@
bool reset_every_frame;
bool finished_coarse;
bool ShowTimeSupersample;
+ bool converged;
double StartFrameTime;
enum PriorityScheme {
FIFO, LuminanceVariance, Contrast
- [MANTA] r1506 - trunk/Engine/ImageTraversers, bigler, 07/19/2007
Archive powered by MHonArc 2.6.16.