--- ray/src/rt/rcmain.c	2012/06/27 15:32:58	2.8
+++ ray/src/rt/rcmain.c	2015/02/24 19:39:27	2.14
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rcmain.c,v 2.8 2012/06/27 15:32:58 greg Exp $";
+static const char	RCSid[] = "$Id: rcmain.c,v 2.14 2015/02/24 19:39:27 greg Exp $";
 #endif
 /*
  *  rcmain.c - main for rtcontrib ray contribution tracer
@@ -8,10 +8,13 @@ static const char	RCSid[] = "$Id: rcmain.c,v 2.8 2012/
 #include "copyright.h"
 
 #include <signal.h>
+#include <time.h>
 #include "rcontrib.h"
 #include "random.h"
 #include "source.h"
 #include "ambient.h"
+#include "pmapray.h"
+#include "pmapcontrib.h"
 
 int	gargc;				/* global argc */
 char	**gargv;			/* global argv */
@@ -45,14 +48,12 @@ int		nmods = 0;		/* number of modifiers */
 
 void	(*addobjnotify[8])() = {ambnotify, NULL};
 
-char	RCCONTEXT[] = "RCONTRIB";	/* our special evaluation context */
+char	RCCONTEXT[] = "RC";		/* our special evaluation context */
 
 
 static void
 printdefaults(void)			/* print default values to stdout */
 {
-	char  *cp;
-
 	printf("-c %-5d\t\t\t# accumulated rays per record\n", accumulate);
 	printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
 			contrib ? "contributions" : "coefficients");
@@ -170,6 +171,7 @@ main(int argc, char *argv[])
 				case '-': case '0': var = 0; break; \
 				default: goto badopt; }
 	char	*curout = NULL;
+	char	*prms = NULL;
 	char	*binval = NULL;
 	int	bincnt = 0;
 	int	rval;
@@ -269,6 +271,10 @@ main(int argc, char *argv[])
 		case 'h':			/* header output */
 			bool(2,header);
 			break;
+		case 'p':			/* parameter setting(s) */
+			check(2,"s");
+			set_eparams(prms = argv[++i]);
+			break;
 		case 'b':			/* bin expression/count */
 			if (argv[i][2] == 'n') {
 				check(3,"s");
@@ -280,16 +286,18 @@ main(int argc, char *argv[])
 			break;
 		case 'm':			/* modifier name */
 			check(2,"s");
-			addmodifier(argv[++i], curout, binval, bincnt);
+			addmodifier(argv[++i], curout, prms, binval, bincnt);
 			break;
 		case 'M':			/* modifier file */
 			check(2,"s");
-			addmodfile(argv[++i], curout, binval, bincnt);
+			addmodfile(argv[++i], curout, prms, binval, bincnt);
 			break;
 		default:
 			goto badopt;
 		}
 	}
+	if (nmods <= 0)
+		error(USER, "missing required modifier argument");
 					/* override some option settings */
 	override_options();
 					/* initialize object types */
@@ -334,19 +342,28 @@ main(int argc, char *argv[])
 	readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
 	nsceneobjs = nobjects;
 
+	/* PMAP: set up & load photon maps */
+	ray_init_pmap();     
+	
 	marksources();			/* find and mark sources */
+	
+	/* PMAP: init photon map for light source contributions */
+	initPmapContrib(&modconttab, nmods);
 
 	setambient();			/* initialize ambient calculation */
-
+	
 	rcontrib();			/* trace ray contributions (loop) */
 
 	ambsync();			/* flush ambient file */
 
+	/* PMAP: free photon maps */
+	ray_done_pmap();     
+	
 	quit(0);	/* exit clean */
 
 badopt:
 	fprintf(stderr,
-"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
+"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
 			progname);
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);