--- ray/src/rt/rpmain.c	2022/10/19 23:10:34	2.22
+++ ray/src/rt/rpmain.c	2024/04/05 16:41:17	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rpmain.c,v 2.22 2022/10/19 23:10:34 greg Exp $";
+static const char	RCSid[] = "$Id: rpmain.c,v 2.32 2024/04/05 16:41:17 greg Exp $";
 #endif
 /*
  *  rpmain.c - main for rpict batch rendering program
@@ -52,23 +52,30 @@ extern double  mblur;			/* motion blur parameter */
 
 extern double  dblur;			/* depth-of-field blur parameter */
 
+RGBPRIMP  out_prims = stdprims;		/* output color primitives */
+static RGBPRIMS  our_prims;		/* private output color primitives */
+
 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" \
+		"ParticipatingMedia=Mist\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\n"
+		"AdaptiveShadowTesting\nOutputs=v,l\n" \
+		"OutputCS=RGB,XYZ,Y,S,M,prims\n"
 #else
 #define RPICT_FEATURES	"Recovery\nIrradianceCalc\nViewTypes=v,l,a,h,s,c\n" \
+		"ParticipatingMedia=Mist\n" \
 		"HessianAmbientCache\nAmbientAveraging\nAmbientValueSharing\n" \
 		"PixelJitter\nPixelSampling\nPixelMotion\nPixelDepthOfField\n" \
 		"SmallSourceDrawing\nViewSequence\nProgressReporting\n" \
-		"AdaptiveShadowTesting\n"
+		"AdaptiveShadowTesting\nOutputs=v,l\n" \
+		"OutputCS=RGB,XYZ,Y,S,M,prims\n"
 #endif
 
 
@@ -101,7 +108,7 @@ main(int  argc, char  *argv[])
 	progname = argv[0] = fixargv0(argv[0]);
 					/* feature check only? */
 	strcat(RFeatureList, RPICT_FEATURES);
-	if (!strcmp(argv[1], "-features"))
+	if (argc > 1 && !strcmp(argv[1], "-features"))
 		return feature_status(argc-2, argv+2);
 					/* option city */
 	for (i = 1; i < argc; i++) {
@@ -178,6 +185,31 @@ main(int  argc, char  *argv[])
 				check(3,"f");
 				dblur = atof(argv[++i]);
 				break;
+			case 'R':				/* standard RGB output */
+				if (strcmp(argv[i]+2, "RGB"))
+					goto badopt;
+				out_prims = stdprims;
+				break;
+			case 'X':				/* XYZ output */
+				if (strcmp(argv[i]+2, "XYZ"))
+					goto badopt;
+				out_prims = xyzprims;
+				break;
+			case 'c': {				/* chromaticities */
+				int	j;
+				check(3,"ffffffff");
+				rval = 0;
+				for (j = 0; j < 8; j++) {
+					our_prims[0][j] = atof(argv[++i]);
+					rval |= fabs(our_prims[0][j]-stdprims[0][j]) > .001;
+				}
+				if (rval) {
+					if (!colorprimsOK(our_prims))
+						error(USER, "illegal primary chromaticities");
+					out_prims = our_prims;
+				} else
+					out_prims = stdprims;
+				} break;
 			default:
 				goto badopt;
 			}
@@ -240,6 +272,10 @@ main(int  argc, char  *argv[])
 			goto badopt;
 		}
 	}
+					/* set/check spectral sampling */
+	if (setspectrsamp(CNDX, WLPART) <= 0)
+		error(USER, "unsupported spectral sampling");
+
 	err = setview(&ourview);	/* set viewing parameters */
 	if (err != NULL)
 		error(USER, err);
@@ -395,7 +431,7 @@ badopt:
 
 void
 wputs(				/* warning output function */
-	char	*s
+	const char	*s
 )
 {
 	int  lasterrno = errno;
@@ -406,7 +442,7 @@ wputs(				/* warning output function */
 
 void
 eputs(				/* put string to stderr */
-	char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;
@@ -483,6 +519,16 @@ printdefaults(void)			/* print default values to stdou
 	printf("-vl %f\t\t\t# view lift\n", ourview.voff);
 	printf("-x  %-9d\t\t\t# x resolution\n", hresolu);
 	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
+	if (out_prims == stdprims)
+		printf("-pRGB\t\t\t\t# standard RGB color output\n");
+	else if (out_prims == xyzprims)
+		printf("-pXYZ\t\t\t\t# CIE XYZ color output\n");
+	else if (out_prims != NULL)
+		printf("-pc %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\t# output color primaries and white point\n",
+				out_prims[RED][0], out_prims[RED][1],
+				out_prims[GRN][0], out_prims[GRN][1],
+				out_prims[BLU][0], out_prims[BLU][1],
+				out_prims[WHT][0], out_prims[WHT][1]);
 	printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect);
 	printf("-pj %f\t\t\t# pixel jitter\n", dstrpix);
 	printf("-pm %f\t\t\t# pixel motion\n", mblur);