--- ray/src/gen/gensky.c	1992/03/10 11:12:06	2.3
+++ ray/src/gen/gensky.c	1992/10/23 14:19:35	2.8
@@ -36,10 +36,11 @@ extern double  s_longitude;
 extern double  s_meridian;
 					/* required values */
 int  month, day;				/* date */
-double  hour;					/* standard time */
+double  hour;					/* time */
+int  tsolar;					/* 0=standard, 1=solar */
 double  altitude, azimuth;			/* or solar angles */
 					/* default values */
-int  cloudy = 0;
+int  cloudy = 0;				/* 1=standard, 2=uniform */
 int  dosun = 1;
 double  zenithbr = -1.0;
 double  turbidity = 2.75;
@@ -48,7 +49,7 @@ double  gprefl = 0.2;
 double  sundir[3];
 double  groundbr;
 double  F2;
-double  solarbr;
+double  solarbr = -1.0;
 
 char  *progname;
 char  errmsg[128];
@@ -58,7 +59,6 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	extern double  fabs();
 	int  i;
 
 	progname = argv[0];
@@ -74,8 +74,15 @@ char  *argv[];
 		month = 0;
 	} else {
 		month = atoi(argv[1]);
+		if (month < 1 || month > 12)
+			userror("bad month");
 		day = atoi(argv[2]);
+		if (day < 1 || day > 31)
+			userror("bad day");
 		hour = atof(argv[3]);
+		if (hour < 0 || hour >= 24)
+			userror("bad hour");
+		tsolar = argv[3][0] == '+';
 	}
 	for (i = 4; i < argc; i++)
 		if (argv[i][0] == '-' || argv[i][0] == '+')
@@ -84,8 +91,11 @@ char  *argv[];
 				cloudy = 0;
 				dosun = argv[i][0] == '+';
 				break;
+			case 'r':
+				solarbr = atof(argv[++i]);
+				break;
 			case 'c':
-				cloudy = 1;
+				cloudy = argv[i][0] == '+' ? 2 : 1;
 				dosun = 0;
 				break;
 			case 't':
@@ -134,7 +144,10 @@ computesky()			/* compute sky parameters */
 
 		jd = jdate(month, day);		/* Julian date */
 		sd = sdec(jd);			/* solar declination */
-		st = hour + stadj(jd);		/* solar time */
+		if (tsolar)			/* solar time */
+			st = hour;
+		else
+			st = hour + stadj(jd);
 		altitude = salt(sd, st);
 		azimuth = sazi(sd, st);
 	}
@@ -146,7 +159,7 @@ computesky()			/* compute sky parameters */
 	if (zenithbr <= 0.0)
 		if (cloudy) {
 			zenithbr = 8.6*sundir[2] + .123;
-			zenithbr *= 1000.0/SKYEFFICACY;
+			zenithbr *= 1000.0/WHTEFFICACY;
 		} else {
 			zenithbr = (1.376*turbidity-1.81)*tan(altitude)+0.38;
 			zenithbr *= 1000.0/SKYEFFICACY;
@@ -155,19 +168,20 @@ computesky()			/* compute sky parameters */
 		zenithbr = 0.0;
 					/* Compute horizontal radiance */
 	if (cloudy) {
-		groundbr = zenithbr*0.777778;
+		if (cloudy == 2)
+			groundbr = zenithbr;
+		else
+			groundbr = zenithbr*0.777778;
 		printf("# Ground ambient level: %f\n", groundbr);
 	} else {
 		F2 = 0.274*(0.91 + 10.0*exp(-3.0*(PI/2.0-altitude)) +
 				0.45*sundir[2]*sundir[2]);
-		groundbr = zenithbr*normsc(PI/2.0-altitude)/F2/PI;
+		groundbr = zenithbr*normsc(altitude)/F2/PI;
 		printf("# Ground ambient level: %f\n", groundbr);
-		if (sundir[2] > 0.0) {
-			if (sundir[2] > .16)
-				solarbr = (1.5e9/SUNEFFICACY) *
-					(1.147 - .147/sundir[2]);
-			else
-				solarbr = 1.5e9/SUNEFFICACY*(1.147-.147/.16);
+		if (sundir[2] > 0.0 && solarbr != 0.0) {
+			if (solarbr < 0.0)
+				solarbr = 1.5e9/SUNEFFICACY *
+				(1.147 - .147/(sundir[2]>.16?sundir[2]:.16));
 			groundbr += solarbr*6e-5*sundir[2]/PI;
 		} else
 			dosun = 0;
@@ -191,7 +205,7 @@ printsky()			/* print out sky */
 	printf("2 skybright skybright.cal\n");
 	printf("0\n");
 	if (cloudy)
-		printf("3 1 %.2e %.2e\n", zenithbr, groundbr);
+		printf("3 %d %.2e %.2e\n", cloudy, zenithbr, groundbr);
 	else
 		printf("7 -1 %.2e %.2e %.2e %f %f %f\n", zenithbr, groundbr,
 				F2, sundir[0], sundir[1], sundir[2]);
@@ -200,8 +214,10 @@ printsky()			/* print out sky */
 
 printdefaults()			/* print default values */
 {
-	if (cloudy)
+	if (cloudy == 1)
 		printf("-c\t\t\t\t# Cloudy sky\n");
+	else if (cloudy == 2)
+		printf("+c\t\t\t\t# Uniform cloudy sky\n");
 	else if (dosun)
 		printf("+s\t\t\t\t# Sunny sky with sun\n");
 	else