--- ray/src/gen/gensky.c	1989/07/21 21:17:42	1.2
+++ ray/src/gen/gensky.c	1991/12/19 15:09:28	2.2
@@ -17,7 +17,11 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <math.h>
 
+#include  "color.h"
 
+#ifndef atof
+extern double  atof();
+#endif
 extern char  *strcpy(), *strcat(), *malloc();
 extern double  stadj(), sdec(), sazi(), salt();
 
@@ -53,7 +57,7 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	extern double  atof();
+	extern double  fabs();
 	int  i;
 
 	progname = argv[0];
@@ -102,6 +106,11 @@ char  *argv[];
 		else
 			userror("bad option");
 
+	if (fabs(s_meridian-s_longitude) > 30*PI/180)
+		fprintf(stderr,
+	"%s: warning: %.1f hours btwn. standard meridian and longitude\n",
+			progname, (s_longitude-s_meridian)*12/PI);
+
 	printhead(argc, argv);
 
 	computesky();
@@ -128,10 +137,10 @@ computesky()			/* compute sky parameters */
 	if (zenithbr <= 0.0)
 		if (cloudy) {
 			zenithbr = 8.6*sundir[2] + .123;
-			zenithbr *= 1000.0/683.0;
+			zenithbr *= 1000.0/SKYEFFICACY;
 		} else {
 			zenithbr = (1.376*turbidity-1.81)*tan(altitude)+0.38;
-			zenithbr *= 1000.0/683.0;
+			zenithbr *= 1000.0/SKYEFFICACY;
 		}
 	if (zenithbr < 0.0)
 		zenithbr = 0.0;
@@ -146,9 +155,10 @@ computesky()			/* compute sky parameters */
 		printf("# Ground ambient level: %f\n", groundbr);
 		if (sundir[2] > 0.0) {
 			if (sundir[2] > .16)
-				solarbr = 2.47e6 - 3.15e5/sundir[2];
+				solarbr = (1.5e9/SUNEFFICACY) *
+					(1.147 - .147/sundir[2]);
 			else
-				solarbr = 5e5;
+				solarbr = 1.5e9/SUNEFFICACY*(1.147-.147/.16);
 			groundbr += solarbr*6e-5*sundir[2]/PI;
 		} else
 			dosun = 0;
@@ -159,12 +169,10 @@ computesky()			/* compute sky parameters */
 
 printsky()			/* print out sky */
 {
-	register int  i;
-
 	if (dosun) {
 		printf("\nvoid light solar\n");
 		printf("0\n0\n");
-		printf("3 %f %f %f\n", solarbr, solarbr, solarbr);
+		printf("3 %.2e %.2e %.2e\n", solarbr, solarbr, solarbr);
 		printf("\nsolar source sun\n");
 		printf("0\n0\n");
 		printf("4 %f %f %f 0.5\n", sundir[0], sundir[1], sundir[2]);
@@ -174,10 +182,10 @@ printsky()			/* print out sky */
 	printf("2 skybright skybright.cal\n");
 	printf("0\n");
 	if (cloudy)
-		printf("3 1 %f %f\n", zenithbr, groundbr);
+		printf("3 1 %.2e %.2e\n", zenithbr, groundbr);
 	else
-		printf("7 -1 %f %f %f %f %f %f\n", zenithbr, groundbr, F2,
-				sundir[0], sundir[1], sundir[2]);
+		printf("7 -1 %.2e %.2e %.2e %f %f %f\n", zenithbr, groundbr,
+				F2, sundir[0], sundir[1], sundir[2]);
 }