--- ray/src/rt/rxpiece.cpp	2024/09/17 02:24:18	2.4
+++ ray/src/rt/rxpiece.cpp	2025/01/09 17:25:37	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rxpiece.cpp,v 2.4 2024/09/17 02:24:18 greg Exp $";
+static const char	RCSid[] = "$Id: rxpiece.cpp,v 2.10 2025/01/09 17:25:37 greg Exp $";
 #endif
 /*
  *  rxpiece.cpp - main for rxpiece tile rendering program
@@ -14,6 +14,8 @@ static const char	RCSid[] = "$Id: rxpiece.cpp,v 2.4 20
 
 #include  "platform.h"
 #include  "RpictSimulManager.h"
+#include  "ambient.h"
+#include  "pmapray.h"
 #include  "random.h"
 
 extern char  *progname;			/* argv[0] */
@@ -35,7 +37,7 @@ double  mblur = 0.;			/* motion blur parameter (unused
 
 double  dblur = 0.;			/* depth-of-field blur parameter */
 
-int  nproc = 1;				/* number of processes to run */
+int  nproc = 1;				/* number of processes to run (-1 in child) */
 
 RpictSimulManager	myRPmanager;	// global simulation manager
 
@@ -54,13 +56,27 @@ static RenderDataType rpiece(char *pout, RenderDataTyp
 		"AdaptiveShadowTesting\nOutputs=v,l\n" \
 		"OutputCS=RGB,XYZ,prims,spec\n"
 
-
+// Exit program
 void
 quit(int code)				/* quit program */
 {
-	exit(code);
+	exit(code);			// don't bother to free data structs
 }
 
+/* Set default options */
+static void
+default_options(void)
+{
+	shadthresh = .05;
+	shadcert = .5;
+	srcsizerat = .25;
+	directrelay = 1;
+	ambacc = 0.2;
+	ambres = 64;
+	ambdiv = 512;
+	ambssamp = 128;
+	maxdepth = 7;
+}
 
 int
 main(int  argc, char  *argv[])
@@ -88,6 +104,8 @@ main(int  argc, char  *argv[])
 	strcat(RFeatureList, RXPIECE_FEATURES);
 	if (argc > 1 && !strcmp(argv[1], "-features"))
 		return feature_status(argc-2, argv+2);
+					/* set defaults */
+	default_options();
 					/* option city */
 	for (i = 1; i < argc; i++) {
 						/* expand arguments */
@@ -315,8 +333,12 @@ main(int  argc, char  *argv[])
 					// render tiles
 	dtype = rpiece(outfile, dtype, zfile);
 
-	quit(dtype==RDTnone);		// clean up and exit
+	ambsync();			// flush ambient cache
 
+	ray_done_pmap();		/* PMAP: free photon maps */
+
+	quit(dtype==RDTnone);		// status is 1 on failure
+
 badopt:
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
@@ -332,6 +354,8 @@ wputs(				/* warning output function */
 	const char	*s
 )
 {
+	if (!erract[WARNING].pf)
+		return;		// warnings were disabled!
 	int  lasterrno = errno;
 	eputs(s);
 	errno = lasterrno;
@@ -499,6 +523,7 @@ children_finished()
 
 	if (cpid == 0) {		// children render tiles
 		sleep(nproc - cnt);	// avoid race conditions
+		nproc = -1;		// flag as child
 		return false;
 	}
 	cow_doneshare();		// parent frees memory and waits
@@ -604,7 +629,7 @@ rpiece(char *pout, RenderDataType dt, char *zout)
 	} else {
 		dt = myRPmanager.ReopenOutput(pdfp, pout, zout);
 		if (dt == RDTnone)
-			quit(1);
+			return RDTnone;
 		if (!fscnresolu(&hresolu, &vresolu, pdfp[0]))
 			error(USER, "missing picture resolution");
 		pixaspect = .0;			// need to leave this as is
@@ -634,16 +659,17 @@ rpiece(char *pout, RenderDataType dt, char *zout)
 		myRPmanager.AddHeader(buf);
 		dt = myRPmanager.NewOutput(pdfp, pout, dt, zout);
 		if (dt == RDTnone)
-			quit(1);
+			return RDTnone;
 		fprtresolu(hresolu, vresolu, pdfp[0]);
-	}
-	if (RDTdepthT(dt) == RDTdshort) {
-		if (newOutput)
+		fflush(pdfp[0]);
+		if (RDTdepthT(dt) == RDTdshort) {
 			fprtresolu(hresolu, vresolu, pdfp[1]);
-		else if (!fscnresolu(&hvdim[0], &hvdim[1], pdfp[1]) ||
-				(hvdim[0] != hresolu) | (hvdim[1] != vresolu))
-			error(USER, "mismatched depth file resolution");
-	}
+			fflush(pdfp[1]);
+		}
+	} else if (RDTdepthT(dt) == RDTdshort &&
+			(!fscnresolu(&hvdim[0], &hvdim[1], pdfp[1]) ||
+				(hvdim[0] != hresolu) | (hvdim[1] != vresolu)))
+		error(USER, "mismatched depth file resolution");
 						// prepare (flat) pixel buffer
 	const long	pdata_beg = ftell(pdfp[0]);
 	const size_t	pixSiz = (RDTcolorT(dt)==RDTrgbe)|(RDTcolorT(dt)==RDTxyze) ? sizeof(COLR)