--- ray/src/rt/rpmain.c	2013/08/07 05:10:09	2.15
+++ ray/src/rt/rpmain.c	2023/02/06 22:40:21	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rpmain.c,v 2.15 2013/08/07 05:10:09 greg Exp $";
+static const char	RCSid[] = "$Id: rpmain.c,v 2.26 2023/02/06 22:40:21 greg Exp $";
 #endif
 /*
  *  rpmain.c - main for rpict batch rendering program
@@ -18,6 +18,7 @@ static const char	RCSid[] = "$Id: rpmain.c,v 2.15 2013
 #include  "random.h"
 #include  "paths.h"
 #include  "view.h"
+#include  "pmapray.h"
 
 					/* persistent processes define */
 #ifdef  F_SETLKW
@@ -54,6 +55,21 @@ extern double  dblur;			/* depth-of-field blur paramet
 static void onsig(int signo);
 static void sigdie(int  signo, char  *msg);
 static void printdefaults(void);
+					/* rpict additional features */
+#ifdef PERSIST
+#define RPICT_FEATURES	"Persist\nParallelPersist\n" \
+		"Recovery\nIrradianceCalc\nViewTypes=v,l,a,h,s,c\n" \
+		"HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n" \
+		"PixelJitter\nPixelSampling\nPixelMotion\nPixelDepthOfField\n" \
+		"SmallSourceDrawing\nViewSequence\nProgressReporting\n" \
+		"AdaptiveShadowTesting\nOutputs=v,l\n"
+#else
+#define RPICT_FEATURES	"Recovery\nIrradianceCalc\nViewTypes=v,l,a,h,s,c\n" \
+		"HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n" \
+		"PixelJitter\nPixelSampling\nPixelMotion\nPixelDepthOfField\n" \
+		"SmallSourceDrawing\nViewSequence\nProgressReporting\n" \
+		"AdaptiveShadowTesting\nOutputs=v,l\n"
+#endif
 
 
 int
@@ -62,7 +78,7 @@ main(int  argc, char  *argv[])
 #define	 check(ol,al)		if (argv[i][ol] || \
 				badarg(argc-i-1,argv+i+1,al)) \
 				goto badopt
-#define	 bool(olen,var)		switch (argv[i][olen]) { \
+#define	 check_bool(olen,var)		switch (argv[i][olen]) { \
 				case '\0': var = !var; break; \
 				case 'y': case 'Y': case 't': case 'T': \
 				case '+': case '1': var = 1; break; \
@@ -83,6 +99,10 @@ main(int  argc, char  *argv[])
 	tstart = time((time_t *)NULL);
 					/* global program name */
 	progname = argv[0] = fixargv0(argv[0]);
+					/* feature check only? */
+	strcat(RFeatureList, RPICT_FEATURES);
+	if (argc > 1 && !strcmp(argv[1], "-features"))
+		return feature_status(argc-2, argv+2);
 					/* option city */
 	for (i = 1; i < argc; i++) {
 						/* expand arguments */
@@ -208,7 +228,7 @@ main(int  argc, char  *argv[])
 #endif
 		case 'w':				/* warnings */
 			rval = erract[WARNING].pf != NULL;
-			bool(2,rval);
+			check_bool(2,rval);
 			if (rval) erract[WARNING].pf = wputs;
 			else erract[WARNING].pf = NULL;
 			break;
@@ -285,11 +305,9 @@ main(int  argc, char  *argv[])
 #endif
 	if (outfile != NULL)
 		openheader();
-#ifdef	_WIN32
 	SET_FILE_BINARY(stdout);
 	if (octname == NULL)
 		SET_FILE_BINARY(stdin);
-#endif
 	readoct(octname, loadflags, &thescene, NULL);
 	nsceneobjs = nobjects;
 
@@ -297,14 +315,17 @@ main(int  argc, char  *argv[])
 		printargs(i, argv, stdout);
 		printf("SOFTWARE= %s\n", VersionID);
 	}
+	          
+	ray_init_pmap();     /* PMAP: set up & load photon maps */
 
 	marksources();			/* find and mark sources */
 
 	setambient();			/* initialize ambient calculation */
+	
+	fflush(stdout);			/* in case we're duplicating header */
 
 #ifdef  PERSIST
 	if (persist) {
-		fflush(stdout);
 		if (outfile == NULL) {		/* reconnect stdout */
 			dup2(duped1, fileno(stdout));
 			close(duped1);
@@ -356,6 +377,10 @@ runagain:
 		goto runagain;
 	}
 #endif
+
+
+	ray_done_pmap();           /* PMAP: free photon maps */
+	
 	quit(0);
 
 badopt:
@@ -364,13 +389,13 @@ badopt:
 	return 1; /* pro forma return */
 
 #undef	check
-#undef	bool
+#undef	check_bool
 }
 
 
 void
 wputs(				/* warning output function */
-	char	*s
+	const char	*s
 )
 {
 	int  lasterrno = errno;
@@ -381,7 +406,7 @@ wputs(				/* warning output function */
 
 void
 eputs(				/* put string to stderr */
-	register char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;