ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/RpictSimulManager.cpp
(Generate patch)

Comparing ray/src/rt/RpictSimulManager.cpp (file contents):
Revision 2.13 by greg, Fri Jan 10 19:09:12 2025 UTC vs.
Revision 2.16 by greg, Tue Jul 1 19:40:35 2025 UTC

# Line 426 | Line 426 | RpictSimulManager::RenderRect(const int x0, const int
426                  doneSamples |= sampMap; // samples now done or at least queued
427                  sp2 -= layer++ & 1;     // next denser sampling
428          }
429 <        if (FlushQueue() < 0)           // make sure we got everyone
429 >        if (FlushQueue() < 0)           // compute stragglers
430                  return false;
431 –        x = y = 0;
432 –        if (doneMap.Find(&x, &y, false)) {
433 –                sprintf(errmsg, "missed %.4f%% of pixels in rectangle\n",
434 –                                100. - 100.*doneMap.SumTotal() /
435 –                                        doneMap.Width() / doneMap.Height());
436 –                error(WARNING, errmsg);
437 –        }
431          if ((prCB != NULL) & (barPix == NULL))
432                  (*prCB)(100.);
433          return true;
# Line 596 | Line 589 | RpictSimulManager::RenderBelow(int ytop, const int vst
589                  error(WARNING, "spectral range incompatible with color output");
590          COLORV **       parr = NULL;            // set up tiny source drawing
591          float **        zarr = NULL;
592 <        if (!ptvw.type && directvis && dblur <= FTINY) {
592 >        if (!ptvw.type && directvis && (dblur <= FTINY) & (mblur <= FTINY)) {
593                  parr = new COLORV * [THeight()];
594                  zarr = new float * [THeight()];
595                  for (int n = THeight(); n-- > 0; ) {
# Line 612 | Line 605 | RpictSimulManager::RenderBelow(int ytop, const int vst
605                          (*prCB)(100.*(GetHeight()-ytop)/GetHeight());
606                  if (!RenderRect(0, THeight()-ytop))     // render this bar
607                          return false;
608 <                int     nlines = lastOut - ytop + THeight();
608 >                int     nlines = lastOut - ytop + vstep;
609                  if (nlines > ytop)
610                          nlines = ytop;
611                  else if (parr)                  // drawing sources?
# Line 713 | Line 706 | RpictSimulManager::NewOutput(FILE *pdfp[2], const char
706          if (frameNo > 0)
707                  fprintf(pdfp[0], "FRAME=%d\n", frameNo);
708          double  pasp = viewaspect(&vw) * GetWidth() / GetHeight();
709 <        if ((0.99 > pasp) | (pasp > 1.01))
709 >        if ((0.999 > pasp) | (pasp > 1.001))
710                  fputaspect(pasp, pdfp[0]);
711          fputnow(pdfp[0]);
712          switch (RDTcolorT(dt)) {                // set primaries and picture format

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)