--- ray/src/rt/RpictSimulManager.cpp	2024/08/23 02:08:28	2.8
+++ ray/src/rt/RpictSimulManager.cpp	2025/01/25 04:57:27	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.8 2024/08/23 02:08:28 greg Exp $";
+static const char RCSid[] = "$Id: RpictSimulManager.cpp,v 2.15 2025/01/25 04:57:27 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 <ctype.h>
 #include "platform.h"
 #include "RpictSimulManager.h"
@@ -103,8 +105,12 @@ RpictSimulManager::NewFrame(const VIEW &v, int xydim[2
 
 	if (!xydim) return false;
 	if (!ap) ap = &pasp;
-	pvw = vw;			// save previous view for motion blur
-	vw = v;
+	if (&v == &vw) {
+		pvw.type = 0;
+	} else {
+		pvw = vw;		// save previous view for motion blur
+		vw = v;
+	}
 	const char *	verr = setview(&vw);
 	if (verr) {
 		error(WARNING, verr);
@@ -196,6 +202,8 @@ RpictSimulManager::SetTile(const int ti[2])
 bool
 RpictSimulManager::ComputePixel(int x, int y)
 {
+	DCHECK(doneMap.OffBitMap(x,y),
+			CONSISTENCY, "illegal pixel index in ComputPixel()");
 	int	i;
 	FVECT	rodir[2];
 	double	hpos = (x+pixjitter())/TWidth();
@@ -232,31 +240,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
@@ -267,9 +281,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;
@@ -378,7 +394,7 @@ RpictSimulManager::RenderRect(const int x0, const int 
 		SetQuincunx(&sampMap, noff, 1<<sp2, layer&1, x0, y0);
 		sampMap -= doneSamples;	// avoid resampling pixels
 		// Are we into adaptive sampling realm?
-		if (noff[0][0]*noff[0][0] + noff[0][1]*noff[0][1] < 4*psample*psample) {
+		if (noff[0][0]*noff[0][0] + noff[0][1]*noff[0][1] < psample*psample) {
 			if (FlushQueue() < 0)	// need results to check thresholds
 				return false;
 			ABitMap2	fillMap = sampMap;
@@ -389,31 +405,29 @@ RpictSimulManager::RenderRect(const int x0, const int 
 			const ABitMap2	origSampMap = sampMap;
 			for (x = 4; x--; ) {
 				ABitMap2	stamp = origSampMap;
-				stamp.Shift(noff[x][0], noff[x][1]);
+				stamp.Shift(noff[x][0] + noff[(x+1)&3][0],
+						noff[x][1] + noff[(x+1)&3][1]);
 				sampMap |= stamp;
 			}		// ...but don't resample what's done
 			sampMap -= doneSamples;
 					// interpolate smooth regions
 			fillMap -= sampMap;
+			fillMap -= doneSamples;
 			for (x = y = 0; fillMap.Find(&x, &y); x++)
 				FillSquare(x, y, noff);
 			doneSamples |= doneMap;
 		}			// compute required ray samples
 		for (x = y = 0; sampMap.Find(&x, &y); x++)
-			if (!ComputePixel(x, y))
+			if (!ComputePixel(x, y)) {
+				sprintf(errmsg, "ComputePixel(%d,%d) failed", x, y);
+				error(WARNING, errmsg);
 				return false;
+			}
 		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 %ld tile pixels, e.g. (%d,%d)",
-				(long)doneMap.Width()*doneMap.Height() -
-					doneMap.SumTotal(), x, y);
-		error(WARNING, errmsg);
-	}
 	if ((prCB != NULL) & (barPix == NULL))
 		(*prCB)(100.);
 	return true;
@@ -438,12 +452,7 @@ RpictSimulManager::RenderTile(COLORV *rp, int ystride,
 	else if (prims)
 		pacc.SetColorSpace(RDTrgb, prims);
 
-	int	x0=0, y0=0;
-	if (tile) {
-		x0 = -tile[0]*TWidth();
-		y0 = -tile[1]*THeight();
-	}
-	return SetTile(tile) && RenderRect(x0, y0);
+	return SetTile(tile) && RenderRect();
 }
 
 // Same but store as common-exponent COLR or SCOLR
@@ -460,12 +469,7 @@ RpictSimulManager::RenderTile(COLRV *bp, int ystride, 
 	else if (prims)
 		pacc.SetColorSpace(RDTrgbe, prims);
 
-	int	x0=0, y0=0;
-	if (tile) {
-		x0 = -tile[0]*TWidth();
-		y0 = -tile[1]*THeight();
-	}
-	return SetTile(tile) && RenderRect(x0, y0);
+	return SetTile(tile) && RenderRect();
 }
 
 // Same but also use 16-bit encoded depth buffer
@@ -482,12 +486,7 @@ RpictSimulManager::RenderTile(COLRV *bp, int ystride, 
 	else if (prims)
 		pacc.SetColorSpace(RDTrgbe, prims);
 
-	int	x0=0, y0=0;
-	if (tile) {
-		x0 = -tile[0]*TWidth();
-		y0 = -tile[1]*THeight();
-	}
-	return SetTile(tile) && RenderRect(x0, y0);
+	return SetTile(tile) && RenderRect();
 }
 
 // Back to float color with 16-bit depth
@@ -504,12 +503,7 @@ RpictSimulManager::RenderTile(COLORV *rp, int ystride,
 	else if (prims)
 		pacc.SetColorSpace(RDTrgb, prims);
 
-	int	x0=0, y0=0;
-	if (tile) {
-		x0 = -tile[0]*TWidth();
-		y0 = -tile[1]*THeight();
-	}
-	return SetTile(tile) && RenderRect(x0, y0);
+	return SetTile(tile) && RenderRect();
 }
 
 // Allocate a new render bar
@@ -561,11 +555,8 @@ RpictSimulManager::LowerBar(int v, int ytop)
 			sizeof(COLORV)*NC*TWidth()*(THeight()-v));
 	memmove(barDepth, barDepth + TWidth()*v,
 			sizeof(float)*TWidth()*(THeight()-v));
-	if (ytop < THeight()) {			// mark what we won't do as finished
+	if (ytop < THeight())			// mark what we won't do as finished
 		doneMap.ClearRect(0, 0, TWidth(), THeight()-ytop, true);
-		memset(barPix, 0, sizeof(COLORV)*NC*TWidth()*(THeight()-ytop));
-		memset(barDepth, 0, sizeof(float)*TWidth()*(THeight()-ytop));
-	}
 	return true;
 }
 
@@ -588,14 +579,17 @@ RpictSimulManager::RenderBelow(int ytop, const int vst
 			cropview(&ptvw, 0., double(ytop-THeight())/GetHeight(),
 						1., double(ytop)/GetHeight()))
 		ptvw.type = 0;
-						// set up spectral sampling
-	if (setspectrsamp(CNDX, WLPART) <= 0) {
+						// update spectral sampling
+	int	rv = setspectrsamp(CNDX, WLPART);
+	if (rv < 0) {
 		error(USER, "unsupported spectral sampling");
 		return false;
 	}
+	if (!rv & (RDTcolorT(dt) != RDTscolor) & (RDTcolorT(dt) != RDTscolr))
+		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; ) {
@@ -611,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?
@@ -675,7 +669,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);
@@ -690,23 +684,23 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char
 			error(INTERNAL, "writing picture to a command not supported");
 			return RDTnone;
 		}
-		fd = open(pfname, O_WRONLY|O_CREAT|O_EXCL, 0666);
+		fd = open(pfname, O_RDWR|O_CREAT|O_EXCL, 0666);
 	}
 	if (fd < 0) {
 		if ((frameNo <= 0) | (errno != EEXIST)) {
 			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;
-	else if (!(pdfp[0] = fdopen(fd, "w")))
+	else if (!(pdfp[0] = fdopen(fd, "w+")))
 		error(SYSTEM, "failure calling fdopen()");
 	SET_FILE_BINARY(pdfp[0]);		// write picture header
 	if ((pdfp[0] != stdout) | (frameNo <= 1)) {
 		newheader("RADIANCE", pdfp[0]);
-		fputs(GetHeader(), pdfp[0]);
+		fputs(GetHeadStr(), pdfp[0]);
 	}
 	fputs(VIEWSTR, pdfp[0]); fprintview(&vw, pdfp[0]); fputc('\n', pdfp[0]);
 	if (frameNo > 0)
@@ -752,9 +746,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);
@@ -766,7 +760,7 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char
 		if (dfname[0] == '!')
 			pdfp[1] = popen(dfname+1, "w");
 		else
-			pdfp[1] = fopen(dfname, "w");
+			pdfp[1] = fopen(dfname, "w+");
 		if (!pdfp[1]) {
 			sprintf(errmsg, "cannot open depth output '%s'", dfname);
 			error(SYSTEM, errmsg);
@@ -778,7 +772,7 @@ RpictSimulManager::NewOutput(FILE *pdfp[2], const char
 	}
 	if (RDTdepthT(dt) == RDTdshort) {	// write header for 16-bit depth?
 		newheader("RADIANCE", pdfp[1]);
-		fputs(GetHeader(), pdfp[1]);
+		fputs(GetHeadStr(), pdfp[1]);
 		fputs(VIEWSTR, pdfp[1]); fprintview(&vw, pdfp[1]); fputc('\n', pdfp[1]);
 		fputs(DEPTHSTR, pdfp[1]); fputs(dunit, pdfp[1]); fputc('\n', pdfp[1]);
 		fputformat(DEPTH16FMT, pdfp[1]);
@@ -814,14 +808,13 @@ RpictSimulManager::RenderFrame(const char *pfname, Ren
 	if (RDTdepthT(dt) == RDTdshort)
 		fprtresolu(GetWidth(), GetHeight(), pdfp[1]);
 
-	const int	bheight = (psample > 1) ? int(4*psample+.99) : 8;
+	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])) {
 		fclose(pdfp[0]);
 		if (pdfp[1]) (dfname[0] == '!') ? pclose(pdfp[1]) : fclose(pdfp[1]);
-		Cleanup();
 		return RDTnone;
 	}
 	NewBar();				// clean up and return
@@ -1008,6 +1001,10 @@ RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
 		pdfp[0] = NULL;
 		return RDTnone;
 	}
+	if (hinfo.gotview) {			// header view overrides
+		pvw = vw;
+		vw = hinfo.vw;
+	}
 	if (!dfname)				// no depth file?
 		return dt;
 
@@ -1027,7 +1024,7 @@ RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
 	}
 	SET_FILE_BINARY(pdfp[1]);
 	int	n, len = strlen(HDRSTR);
-	char	buf[32];		// sniff for 16-bit header
+	char	buf[32];			// sniff for 16-bit header
 	if (getbinary(buf, 1, len+1, pdfp[1]) < len+1) {
 		sprintf(errmsg, "empty depth file '%s'", dfname);
 		error(SYSTEM, errmsg);
@@ -1037,12 +1034,12 @@ RpictSimulManager::ReopenOutput(FILE *pdfp[2], const c
 	}
 	for (n = 0; n < len; n++)
 		if (buf[n] != HDRSTR[n])
-			break;		// not a Radiance header
+			break;			// not a Radiance header
 	rewind(pdfp[1]);
 	if ((n < len) | !isprint(buf[len]))
 		return RDTnewDT(dt, RDTdfloat);
 
-	HeaderInfo	dinfo;		// thinking it's 16-bit encoded
+	HeaderInfo	dinfo;			// thinking it's 16-bit encoded
 	if (getheader(pdfp[1], head_check, &dinfo) < 0)
 		sprintf(errmsg, "bad header in encoded depth file '%s'",
 				dfname);
@@ -1081,17 +1078,17 @@ RpictSimulManager::ResumeFrame(const char *pfname, con
 	case RDTxyze:
 		break;
 	case RDTscolr:
-		bytesPer = hinfo.ncomp + 1;	// XXX assumes no compression
+		bytesPer = NCSAMP + 1;	// XXX assumes no compression
 		break;
 	case RDTrgb:
 	case RDTxyz:
 		bytesPer = sizeof(float)*3;
 		break;
 	case RDTscolor:
-		bytesPer = sizeof(float)*hinfo.ncomp;
+		bytesPer = sizeof(float)*NCSAMP;
 		break;
 	default:
-		sprintf(errmsg, "unknown format (%s) for '%s'", hinfo.fmt, pfname);
+		sprintf(errmsg, "unknown format for '%s'", pfname);
 		error(USER, errmsg);
 		fclose(pdfp[0]);
 		if (pdfp[1]) fclose(pdfp[1]);
@@ -1105,11 +1102,10 @@ RpictSimulManager::ResumeFrame(const char *pfname, con
 		if (pdfp[1]) fclose(pdfp[1]);
 		return RDTnone;
 	}
-	vw.type = 0;				// set up new (unreferenced) frame
-	frameNo = 0;
+	frameNo = 0;				// set up unreferenced frame
 	int	hvdim[2] = {res.xr, res.yr};
 	double	noAdj = 0;
-	if (!NewFrame(hinfo.vw, hvdim, &noAdj) ||
+	if (!NewFrame(vw, hvdim, &noAdj) ||
 			(hvdim[0] != res.xr) | (hvdim[1] != res.yr)) {
 		error(CONSISTENCY, "unexpected resolution change in ResumeFrame()");
 		fclose(pdfp[0]);
@@ -1177,7 +1173,7 @@ RpictSimulManager::ResumeFrame(const char *pfname, con
 		fclose(pdfp[0]); fclose(pdfp[1]);
 		return RDTnone;
 	}
-	int	bheight = (psample > 1) ? int(4*psample+.99) : 8;
+	int	bheight = (psample > 1) ? int(8*psample+.99) : 16;
 	if (bheight > GetHeight()-doneScans)
 		bheight = GetHeight()-doneScans;
 	int	vstep =  bheight >> (psample > 1);
@@ -1187,7 +1183,6 @@ RpictSimulManager::ResumeFrame(const char *pfname, con
 	if (!RenderBelow(GetHeight()-doneScans, vstep, pdfp[0], dt, pdfp[1])) {
 		fclose(pdfp[0]);
 		if (pdfp[1]) fclose(pdfp[1]);
-		Cleanup();
 		return RDTnone;
 	}
 	NewBar();				// close up and return success