--- ray/src/rt/RpictSimulManager.cpp 2025/01/10 19:09:12 2.13 +++ ray/src/rt/RpictSimulManager.cpp 2025/07/02 16:54:44 2.17 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.13 2025/01/10 19:09:12 greg Exp $"; +static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.17 2025/07/02 16:54:44 greg Exp $"; #endif /* * RpictSimulManager.cpp @@ -426,15 +426,8 @@ RpictSimulManager::RenderRect(const int x0, const int doneSamples |= sampMap; // samples now done or at least queued sp2 -= layer++ & 1; // next denser sampling } - if (FlushQueue() < 0) // make sure we got everyone + if (FlushQueue() < 0) // compute stragglers return false; - x = y = 0; - if (doneMap.Find(&x, &y, false)) { - sprintf(errmsg, "missed %.4f%% of pixels in rectangle\n", - 100. - 100.*doneMap.SumTotal() / - doneMap.Width() / doneMap.Height()); - error(WARNING, errmsg); - } if ((prCB != NULL) & (barPix == NULL)) (*prCB)(100.); return true; @@ -596,7 +589,7 @@ RpictSimulManager::RenderBelow(int ytop, const int vst error(WARNING, "spectral range incompatible with color output"); COLORV ** parr = NULL; // set up tiny source drawing float ** zarr = NULL; - if (!ptvw.type && directvis && dblur <= FTINY) { + if (!ptvw.type && directvis && (dblur <= FTINY) & (mblur <= FTINY)) { parr = new COLORV * [THeight()]; zarr = new float * [THeight()]; for (int n = THeight(); n-- > 0; ) { @@ -612,7 +605,7 @@ RpictSimulManager::RenderBelow(int ytop, const int vst (*prCB)(100.*(GetHeight()-ytop)/GetHeight()); if (!RenderRect(0, THeight()-ytop)) // render this bar return false; - int nlines = lastOut - ytop + THeight(); + int nlines = lastOut - ytop + vstep; if (nlines > ytop) nlines = ytop; else if (parr) // drawing sources? @@ -713,7 +706,7 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char if (frameNo > 0) fprintf(pdfp[0], "FRAME=%d\n", frameNo); double pasp = viewaspect(&vw) * GetWidth() / GetHeight(); - if ((0.99 > pasp) | (pasp > 1.01)) + if ((0.995 > pasp) | (pasp > 1.005)) fputaspect(pasp, pdfp[0]); fputnow(pdfp[0]); switch (RDTcolorT(dt)) { // set primaries and picture format