--- ray/src/rt/rtmain.c	2007/09/13 20:02:11	2.15
+++ ray/src/rt/rtmain.c	2023/08/15 00:46:56	2.45
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.15 2007/09/13 20:02:11 greg Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.45 2023/08/15 00:46:56 greg Exp $";
 #endif
 /*
  *  rtmain.c - main for rtrace per-ray calculation program
@@ -17,7 +17,12 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.15 2007
 #include  "ambient.h"
 #include  "random.h"
 #include  "paths.h"
+#include  "pmapray.h"
 
+extern char	*progname;		/* global argv[0] */
+
+extern char	*shm_boundary;		/* boundary of shared memory */
+
 					/* persistent processes define */
 #ifdef  F_SETLKW
 #define  PERSIST	1		/* normal persist */
@@ -25,53 +30,87 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.15 2007
 #define  PCHILD		3		/* child of normal persist */
 #endif
 
-char  *progname;			/* argv[0] */
-char  *octname;				/* octree name */
 char  *sigerr[NSIG];			/* signal error messages */
-char  *shm_boundary = NULL;		/* boundary of shared memory */
 char  *errfile = NULL;			/* error output file */
 
-extern char  *formstr();		/* string from format */
-extern int  inform;			/* input format */
-extern int  outform;			/* output format */
-extern char  *outvals;			/* output values */
+int  nproc = 1;				/* number of processes */
 
-extern int  hresolu;			/* horizontal resolution */
-extern int  vresolu;			/* vertical resolution */
+extern int  setrtoutput(void);		/* set output values */
 
-extern int  imm_irrad;			/* compute immediate irradiance? */
-extern int  lim_dist;			/* limit distance? */
+int  inform = 'a';			/* input format */
+int  outform = 'a';			/* output format */
+char  *outvals = "v";			/* output specification */
 
-extern char  *tralist[];		/* list of modifers to trace (or no) */
-extern int  traincl;			/* include == 1, exclude == 0 */
+int  hresolu = 0;			/* horizontal (scan) size */
+int  vresolu = 0;			/* vertical resolution */
 
+extern int  castonly;			/* only doing ray-casting? */
+
+int  imm_irrad = 0;			/* compute immediate irradiance? */
+int  lim_dist = 0;			/* limit distance? */
+
+#ifndef	MAXMODLIST
+#define	MAXMODLIST	1024		/* maximum modifiers we'll track */
+#endif
+
+extern void  (*addobjnotify[])();	/* object notification calls */
+extern void  tranotify(OBJECT obj);
+
+char  *tralist[MAXMODLIST];		/* list of modifers to trace (or no) */
+int  traincl = -1;			/* include == 1, exclude == 0 */
+
 static int  loadflags = ~IO_FILES;	/* what to load from octree */
 
 static void onsig(int  signo);
 static void sigdie(int  signo, char  *msg);
 static void printdefaults(void);
 
+#ifdef PERSIST
+#define RTRACE_FEATURES	"Persist\nParallelPersist\nMultiprocessing\n" \
+			"IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
+			"HessianAmbientCache\nAmbientAveraging\n" \
+			"AmbientValueSharing\nAdaptiveShadowTesting\n" \
+			"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
+			"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
+#else
+#define RTRACE_FEATURES	"IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
+			"HessianAmbientCache\nAmbientAveraging\n" \
+			"AmbientValueSharing\nAdaptiveShadowTesting\n" \
+			"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
+			"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
+#endif
 
+
 int
 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; \
 				case 'n': case 'N': case 'f': case 'F': \
 				case '-': case '0': var = 0; break; \
 				default: goto badopt; }
+	extern char  *octname;
 	int  persist = 0;
-	char  **tralp;
-	int  duped1;
+	char  *octnm = NULL;
+	char  **tralp = NULL;
+	int  duped1 = -1;
 	int  rval;
 	int  i;
 					/* global program name */
 	progname = argv[0] = fixargv0(argv[0]);
+					/* feature check only? */
+	strcat(RFeatureList, RTRACE_FEATURES);
+	if (argc > 1 && !strcmp(argv[1], "-features"))
+		return feature_status(argc-2, argv+2);
+					/* add trace notify function */
+	for (i = 0; addobjnotify[i] != NULL; i++)
+		;
+	addobjnotify[i] = tranotify;
 					/* option city */
 	for (i = 1; i < argc; i++) {
 						/* expand arguments */
@@ -98,6 +137,12 @@ main(int  argc, char  *argv[])
 			continue;
 		}
 		switch (argv[i][1]) {
+		case 'n':				/* number of cores */
+			check(2,"i");
+			nproc = atoi(argv[++i]);
+			if (nproc <= 0)
+				error(USER, "bad number of processes");
+			break;
 		case 'x':				/* x resolution */
 			check(2,"i");
 			hresolu = atoi(argv[++i]);
@@ -108,7 +153,7 @@ main(int  argc, char  *argv[])
 			break;
 		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;
@@ -119,10 +164,10 @@ main(int  argc, char  *argv[])
 		case 'l':				/* limit distance */
 			if (argv[i][2] != 'd')
 				goto badopt;
-			bool(3,lim_dist);
+			check_bool(3,lim_dist);
 			break;
 		case 'I':				/* immed. irradiance */
-			bool(2,imm_irrad);
+			check_bool(2,imm_irrad);
 			break;
 		case 'f':				/* format i/o */
 			switch (argv[i][2]) {
@@ -154,7 +199,7 @@ main(int  argc, char  *argv[])
 			break;
 		case 'h':				/* header output */
 			rval = loadflags & IO_INFO;
-			bool(2,rval);
+			check_bool(2,rval);
 			loadflags = rval ? loadflags | IO_INFO :
 					loadflags & ~IO_INFO;
 			break;
@@ -168,7 +213,7 @@ main(int  argc, char  *argv[])
 					tralp = tralist;
 				}
 				if (argv[i][2] == 'I') {	/* file */
-					rval = wordfile(tralp,
+					rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
 					getpath(argv[++i],getrlibpath(),R_OK));
 					if (rval < 0) {
 						sprintf(errmsg,
@@ -190,7 +235,7 @@ main(int  argc, char  *argv[])
 					tralp = tralist;
 				}
 				if (argv[i][2] == 'E') {	/* file */
-					rval = wordfile(tralp,
+					rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
 					getpath(argv[++i],getrlibpath(),R_OK));
 					if (rval < 0) {
 						sprintf(errmsg,
@@ -224,6 +269,8 @@ main(int  argc, char  *argv[])
 			goto badopt;
 		}
 	}
+	if (nproc > 1 && persist)
+		error(USER, "multiprocessing incompatible with persist file");
 					/* initialize object types */
 	initotypes();
 					/* initialize urand */
@@ -265,12 +312,12 @@ main(int  argc, char  *argv[])
 #endif
 					/* get octree */
 	if (i == argc)
-		octname = NULL;
+		octnm = NULL;
 	else if (i == argc-1)
-		octname = argv[i];
+		octnm = argv[i];
 	else
 		goto badopt;
-	if (octname == NULL)
+	if (octnm == NULL)
 		error(USER, "missing octree argument");
 					/* set up output */
 #ifdef  PERSIST
@@ -281,6 +328,8 @@ main(int  argc, char  *argv[])
 #endif
 	if (outform != 'a')
 		SET_FILE_BINARY(stdout);
+	rval = setrtoutput();
+	octname = savqstr(octnm);
 	readoct(octname, loadflags, &thescene, NULL);
 	nsceneobjs = nobjects;
 
@@ -288,17 +337,28 @@ main(int  argc, char  *argv[])
 		printargs(i, argv, stdout);
 		printf("SOFTWARE= %s\n", VersionID);
 		fputnow(stdout);
+		if (rval > 0)		/* saved from setrtoutput() call */
+			printf("NCOMP=%d\n", rval);
+		if ((outform == 'f') | (outform == 'd'))
+			fputendian(stdout);
 		fputformat(formstr(outform), stdout);
 		putchar('\n');
 	}
 
-	marksources();			/* find and mark sources */
+	if (!castonly) {	/* any actual ray traversal to do? */
 
-	setambient();			/* initialize ambient calculation */
+		ray_init_pmap();	/* PMAP: set up & load photon maps */
+		
+		marksources();		/* find and mark sources */
 
+		setambient();		/* initialize ambient calculation */
+	} else
+		distantsources();	/* else mark only distant sources */
+
+	fflush(stdout);			/* in case we're duplicating header */
+
 #ifdef  PERSIST
 	if (persist) {
-		fflush(stdout);
 						/* reconnect stdout */
 		dup2(duped1, fileno(stdout));
 		close(duped1);
@@ -321,7 +381,7 @@ runagain:
 		dupheader();			/* send header to stdout */
 #endif
 					/* trace rays */
-	rtrace(NULL);
+	rtrace(NULL, nproc);
 					/* flush ambient file */
 	ambsync();
 #ifdef  PERSIST
@@ -336,12 +396,14 @@ runagain:
 		}
 	}
 	if (persist == PCHILD) {	/* wait for a signal then go again */
-		close(duped1);			/* release output handle */
 		pfhold();
 		raynum = nrays = 0;		/* reinitialize */
 		goto runagain;
 	}
 #endif
+
+	ray_done_pmap();           /* PMAP: free photon maps */
+	
 	quit(0);
 
 badopt:
@@ -350,13 +412,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;
@@ -367,7 +429,7 @@ wputs(				/* warning output function */
 
 void
 eputs(				/* put string to stderr */
-	register char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;
@@ -422,12 +484,14 @@ sigdie(			/* set fatal signal */
 static void
 printdefaults(void)			/* print default values to stdout */
 {
-	register char  *cp;
+	char  *cp;
 
 	if (imm_irrad)
 		printf("-I+\t\t\t\t# immediate irradiance on\n");
-	printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
-	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
+	printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
+	printf("-x %-9d\t\t\t# %s\n", hresolu,
+			vresolu && hresolu ? "x resolution" : "flush interval");
+	printf("-y %-9d\t\t\t# y resolution\n", vresolu);
 	printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
 			"-ld-\t\t\t\t# limit distance off\n");
 	printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
@@ -440,6 +504,10 @@ printdefaults(void)			/* print default values to stdou
 		case 't': case 'T': printf(" trace"); break;
 		case 'o': printf(" origin"); break;
 		case 'd': printf(" direction"); break;
+		case 'r': printf(" reflect_contrib"); break;
+		case 'R': printf(" reflect_length"); break;
+		case 'x': printf(" unreflect_contrib"); break;
+		case 'X': printf(" unreflect_length"); break;
 		case 'v': printf(" value"); break;
 		case 'V': printf(" contribution"); break;
 		case 'l': printf(" length"); break;
@@ -452,7 +520,7 @@ printdefaults(void)			/* print default values to stdou
 		case 'W': printf(" coefficient"); break;
 		case 'm': printf(" modifier"); break;
 		case 'M': printf(" material"); break;
-		case '-': printf(" stroke"); break;
+		case '~': printf(" tilde"); break;
 		}
 	putchar('\n');
 	printf(erract[WARNING].pf != NULL ?