--- ray/src/rt/RpictSimulManager.cpp 2024/08/22 00:44:02 2.7 +++ ray/src/rt/RpictSimulManager.cpp 2024/08/25 17:24:48 2.10 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.7 2024/08/22 00:44:02 greg Exp $"; +static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.10 2024/08/25 17:24:48 greg Exp $"; #endif /* * RpictSimulManager.cpp @@ -9,6 +9,8 @@ static const char RCSid[] = "$Id: RpictSimulManager.cp * Created by Greg Ward on 07/11/2024. */ +#define DEBUG 1 // XXX temporary! + #include #include "platform.h" #include "RpictSimulManager.h" @@ -196,14 +198,15 @@ RpictSimulManager::SetTile(const int ti[2]) bool RpictSimulManager::ComputePixel(int x, int y) { - static const SCOLOR scBlack = {0}; + DCHECK(doneMap.OffBitMap(x,y), + CONSISTENCY, "illegal pixel index in ComputPixel()"); int i; FVECT rodir[2]; double hpos = (x+pixjitter())/TWidth(); double vpos = (y+pixjitter())/THeight(); double dlim = viewray(rodir[0], rodir[1], &tvw, hpos, vpos); if (dlim < -FTINY) { // off view? - pacc.SetPixel(x, y, scBlack); + pacc.SetPixel(x, y, scblack); doneMap.Set(x, y); return true; } @@ -233,31 +236,37 @@ RpictSimulManager::ComputePixel(int x, int y) // Check if neighbor differences are below pixel sampling threshold bool -RpictSimulManager::BelowSampThresh(int x, int y, const int noff[4][2]) const +RpictSimulManager::BelowSampThresh(const int x, const int y, const int noff[4][2]) const { SCOLOR pval[4]; float dist[4]; int i, j; for (i = 4; i--; ) { // get pixels from tile store - int px = x + noff[i][0]; - int py = y + noff[i][1]; + const int px = x + noff[i][0]; + const int py = y + noff[i][1]; if (!doneMap.Check(px, py) || !pacc.GetPixel(px, py, pval[i], &dist[i])) return false; } - const bool spectr = (pacc.NC() > 3); - for (i = 4; --i; ) // do pairwise comparisons - for (j = i; j--; ) { - if (pacc.DepthType() && - (dist[i] - dist[j] > maxdiff*dist[j]) | + // do pairwise comparisons + for (i = (pacc.DepthType() != RDTnone)*4; --i > 0; ) + for (j = i; j--; ) + if ((dist[i] - dist[j] > maxdiff*dist[j]) | (dist[j] - dist[i] > maxdiff*dist[i])) return false; - if (spectr ? sbigsdiff(pval[i], pval[j], maxdiff) : - bigdiff(pval[i], pval[j], maxdiff)) + if (pacc.NC() > 3) { + for (i = 4; --i; ) + for (j = i; j--; ) + if (sbigsdiff(pval[i], pval[j], maxdiff)) return false; - } - return true; // linear interpolation OK + } else { + for (i = 4; --i; ) + for (j = i; j--; ) + if (bigdiff(pval[i], pval[j], maxdiff)) + return false; + } + return true; } // Fill an interior square patch with interpolated values @@ -268,9 +277,11 @@ RpictSimulManager::FillSquare(const int x, const int y float dist[4]; int i, j; // assumes 4 corners are valid! - for (i = 4; i--; ) + for (i = 4; i--; ) { + DCHECK(!doneMap.Check(x+noff[i][0], y+noff[i][1]), + CONSISTENCY, "inclusion of bad pixel in FillSquare()"); pacc.GetPixel(x+noff[i][0], y+noff[i][1], pval[i], &dist[i]); - + } i = abs(noff[1][0]-noff[0][0]); j = abs(noff[1][1]-noff[0][1]); // i==j for diamond fill const int slen = (i > j) ? i : j; @@ -328,13 +339,9 @@ RpictSimulManager::FillSquare(const int x, const int y // helper function to set up quincunx sampling static void -SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int spc, const bool odd) +SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int spc, bool odd, int x0, int y) { - for (int y = 0; y < bmp2->Height(); y += spc>>1) - for (int x = (odd^(y&1))*(spc>>1); x < bmp2->Width(); x += spc) - bmp2->Set(x, y); - // order neighbors CCW - if (odd) { + if (odd) { // order neighbors CCW noff[0][0] = spc>>1; noff[0][1] = 0; noff[1][0] = 0; noff[1][1] = spc>>1; noff[2][0] = -(spc>>1); noff[2][1] = 0; @@ -345,11 +352,27 @@ SetQuincunx(ABitMap2 *bmp2, int noff[4][2], const int noff[2][0] = -(spc>>1); noff[2][1] = -(spc>>1); noff[3][0] = spc>>1; noff[3][1] = -(spc>>1); } + int nsteps; // non-negative range + if (x0 < -(spc>>1)) { + nsteps = (spc-1 - x0 - (spc>>1))/spc; + x0 += nsteps*spc; + } + if (y < 0) { // get past y==0 + nsteps = ((spc>>1)-1 - y)/(spc>>1); + y += nsteps*(spc>>1); + odd ^= nsteps&1; + } + while (y < bmp2->Height()) { + for (int x = x0 + odd*(spc>>1); x < bmp2->Width(); x += spc) + bmp2->Set(x, y); + y += spc>>1; + odd = !odd; + } } // Render (or finish rendering) current tile bool -RpictSimulManager::RenderRect() +RpictSimulManager::RenderRect(const int x0, const int y0) { if (!tvw.type || !Ready()) { error(INTERNAL, "need octree and view for RenderRect()"); @@ -359,14 +382,12 @@ RpictSimulManager::RenderRect() int sp2 = ceil(log2((TWidth()>THeight() ? TWidth() : THeight()) - 1.)); int layer = 0; int x, y; -// fprintf(stderr, "Rendering %dx%d tile with psample=%d, maxdiff=%.3f ...\n", -// TWidth(), THeight(), psample, maxdiff); while (sp2 > 0) { ABitMap2 sampMap(TWidth(), THeight()); int noff[4][2]; if ((prCB != NULL) & (barPix == NULL)) (*prCB)(100.*doneMap.SumTotal()/doneMap.Width()/doneMap.Height()); - SetQuincunx(&sampMap, noff, 1< 0) { -// fprintf(stderr, "At y=%d, source drawing %s...\n", ytop, parr ? "ON" : "OFF"); if (prCB) (*prCB)(100.*(GetHeight()-ytop)/GetHeight()); - if (!RenderRect()) // render this bar + if (!RenderRect(0, THeight()-ytop)) // render this bar return false; int nlines = lastOut - ytop + THeight(); if (nlines > ytop) @@ -652,7 +666,7 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char { pdfp[0] = pdfp[1] = NULL; if (!RDTcolorT(dt)) - error(INTERNAL, "botched color output type in NewOutput()"); + error(INTERNAL, "missing color output type in NewOutput()"); if (NCSAMP == 3) { if (RDTcolorT(dt) == RDTscolr) dt = RDTnewCT(dt, prims==xyzprims ? RDTxyze : RDTrgbe); @@ -674,7 +688,7 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char sprintf(errmsg, "cannot open picture file '%s'", pfname); error(SYSTEM, errmsg); } - return RDTnone; // expected in parallel sequence + return RDTnone; // may be expected in sequence run } if (fd == 1) pdfp[0] = stdout; @@ -729,9 +743,9 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char fputendian(pdfp[0]); fputformat("float", pdfp[0]); break; - default:; + default:; // pro forma - caught this above } - fputc('\n', pdfp[0]); // flush picture header + resolution + fputc('\n', pdfp[0]); // flush picture header if (fflush(pdfp[0]) == EOF) { sprintf(errmsg, "cannot write header to picture '%s'", pfname); error(SYSTEM, errmsg); @@ -791,8 +805,8 @@ RpictSimulManager::RenderFrame(const char *pfname, Ren if (RDTdepthT(dt) == RDTdshort) fprtresolu(GetWidth(), GetHeight(), pdfp[1]); - const int bheight = (psample > 1) ? int(2*psample+.99) : 4; - const int vstep = bheight >> (psample > 1); + const int bheight = (psample > 1) ? int(8*psample+.99) : 16; + const int vstep = bheight >> (psample > 1); NewBar(bheight); // render frame if we can if (!RenderBelow(GetHeight(), vstep, pdfp[0], dt, pdfp[1])) { @@ -1154,7 +1168,7 @@ RpictSimulManager::ResumeFrame(const char *pfname, con fclose(pdfp[0]); fclose(pdfp[1]); return RDTnone; } - int bheight = (psample > 1) ? int(2*psample+.99) : 4; + int bheight = (psample > 1) ? int(8*psample+.99) : 16; if (bheight > GetHeight()-doneScans) bheight = GetHeight()-doneScans; int vstep = bheight >> (psample > 1);