--- ray/src/rt/RpictSimulManager.cpp	2024/08/23 02:08:28	2.8
+++ ray/src/rt/RpictSimulManager.cpp	2024/08/27 18:50:01	2.11
@@ -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.11 2024/08/27 18:50:01 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"
@@ -196,6 +198,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 +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
@@ -267,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;
@@ -378,7 +390,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,12 +401,14 @@ 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;
@@ -409,9 +423,9 @@ RpictSimulManager::RenderRect(const int x0, const int 
 		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);
+		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))
@@ -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,11 +579,14 @@ 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) {
@@ -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);
@@ -697,7 +691,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;
@@ -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);
@@ -814,7 +808,7 @@ 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
@@ -1177,7 +1171,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);