--- ray/src/gen/gensky.c	1992/03/10 11:12:06	2.3
+++ ray/src/gen/gensky.c	1993/11/05 17:25:34	2.13
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -19,9 +19,6 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "color.h"
 
-#ifndef atof
-extern double  atof();
-#endif
 extern char  *strcpy(), *strcat(), *malloc();
 extern double  stadj(), sdec(), sazi(), salt();
 
@@ -29,6 +26,13 @@ extern double  stadj(), sdec(), sazi(), salt();
 
 #define  DOT(v1,v2)	(v1[0]*v2[0]+v1[1]*v2[1]+v1[2]*v2[2])
 
+#define  S_CLEAR	1
+#define  S_OVER		2
+#define  S_UNIF		3
+#define  S_INTER	4
+
+#define  overcast	(skytype==S_OVER|skytype==S_UNIF)
+
 double  normsc();
 					/* sun calculation constants */
 extern double  s_latitude;
@@ -36,19 +40,22 @@ 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  skytype = S_CLEAR;				/* sky type */
 int  dosun = 1;
-double  zenithbr = -1.0;
+double  zenithbr = 0.0;
+int	u_zenith = 0;				/* -1=irradiance, 1=radiance */
 double  turbidity = 2.75;
 double  gprefl = 0.2;
 					/* computed values */
 double  sundir[3];
 double  groundbr;
 double  F2;
-double  solarbr;
+double  solarbr = 0.0;
+int	u_solar = 0;				/* -1=irradiance, 1=radiance */
 
 char  *progname;
 char  errmsg[128];
@@ -58,7 +65,6 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	extern double  fabs();
 	int  i;
 
 	progname = argv[0];
@@ -74,24 +80,46 @@ 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] == '+')
 			switch (argv[i][1]) {
 			case 's':
-				cloudy = 0;
+				skytype = S_CLEAR;
 				dosun = argv[i][0] == '+';
 				break;
+			case 'r':
+			case 'R':
+				u_solar = argv[i][1]=='R' ? -1 : 1;
+				solarbr = atof(argv[++i]);
+				break;
 			case 'c':
-				cloudy = 1;
+				skytype = S_OVER;
 				dosun = 0;
 				break;
+			case 'u':
+				skytype = S_UNIF;
+				dosun = 0;
+				break;
+			case 'i':
+				skytype = S_INTER;
+				dosun = argv[i][0] == '+';
+				break;
 			case 't':
 				turbidity = atof(argv[++i]);
 				break;
 			case 'b':
+			case 'B':
+				u_zenith = argv[i][1]=='B' ? -1 : 1;
 				zenithbr = atof(argv[++i]);
 				break;
 			case 'g':
@@ -127,6 +155,7 @@ char  *argv[];
 
 computesky()			/* compute sky parameters */
 {
+	double	normfactor;
 					/* compute solar direction */
 	if (month) {			/* from date and time */
 		int  jd;
@@ -134,44 +163,76 @@ 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);
+		printf("# Solar altitude and azimuth: %.1f %.1f\n",
+				180./PI*altitude, 180./PI*azimuth);
 	}
+	if (!overcast && altitude > 87.*PI/180.) {
+		fprintf(stderr,
+"%s: warning - sun too close to zenith, reducing altitude to 87 degrees\n",
+				progname);
+		printf(
+"# warning - sun too close to zenith, reducing altitude to 87 degrees\n");
+		altitude = 87.*PI/180.;
+	}
 	sundir[0] = -sin(azimuth)*cos(altitude);
 	sundir[1] = -cos(azimuth)*cos(altitude);
 	sundir[2] = sin(altitude);
 
+					/* Compute normalization factor */
+	switch (skytype) {
+	case S_UNIF:
+		normfactor = 1.0;
+		break;
+	case S_OVER:
+		normfactor = 0.777778;
+		break;
+	case S_CLEAR:
+		F2 = 0.274*(0.91 + 10.0*exp(-3.0*(PI/2.0-altitude)) +
+				0.45*sundir[2]*sundir[2]);
+		normfactor = normsc()/F2/PI;
+		break;
+	case S_INTER:
+		F2 = (2.739 + .9891*sin(.3119+2.6*altitude)) *
+			exp(-(PI/2.0-altitude)*(.4441+1.48*altitude));
+		normfactor = normsc()/F2/PI;
+		break;
+	}
 					/* Compute zenith brightness */
-	if (zenithbr <= 0.0)
-		if (cloudy) {
+	if (u_zenith == -1)
+		zenithbr /= normfactor*PI;
+	else if (u_zenith == 0) {
+		if (overcast)
 			zenithbr = 8.6*sundir[2] + .123;
-			zenithbr *= 1000.0/SKYEFFICACY;
-		} else {
+		else
 			zenithbr = (1.376*turbidity-1.81)*tan(altitude)+0.38;
+		if (skytype == S_INTER)
+			zenithbr = (zenithbr + 8.6*sundir[2] + .123)/2.0;
+		if (zenithbr < 0.0)
+			zenithbr = 0.0;
+		else
 			zenithbr *= 1000.0/SKYEFFICACY;
-		}
-	if (zenithbr < 0.0)
-		zenithbr = 0.0;
-					/* Compute horizontal radiance */
-	if (cloudy) {
-		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;
-		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);
-			groundbr += solarbr*6e-5*sundir[2]/PI;
-		} else
-			dosun = 0;
 	}
+					/* Compute horizontal radiance */
+	groundbr = zenithbr*normfactor;
+	printf("# Ground ambient level: %.1f\n", groundbr);
+	if (sundir[2] > 0.0 && (!u_solar || solarbr > 0.0)) {
+		if (u_solar == -1)
+			solarbr /= 6e-5*sundir[2];
+		else if (u_solar == 0) {
+			solarbr = 1.5e9/SUNEFFICACY *
+			(1.147 - .147/(sundir[2]>.16?sundir[2]:.16));
+			if (skytype == S_INTER)
+				solarbr *= 0.15;	/* fudge factor! */
+		}
+		groundbr += 6e-5/PI*solarbr*sundir[2];
+	} else
+		dosun = 0;
 	groundbr *= gprefl;
 }
 
@@ -188,24 +249,39 @@ printsky()			/* print out sky */
 	}
 	
 	printf("\nvoid brightfunc skyfunc\n");
-	printf("2 skybright skybright.cal\n");
+	printf("2 skybr skybright.cal\n");
 	printf("0\n");
-	if (cloudy)
-		printf("3 1 %.2e %.2e\n", zenithbr, groundbr);
+	if (overcast)
+		printf("3 %d %.2e %.2e\n", skytype, zenithbr, groundbr);
 	else
-		printf("7 -1 %.2e %.2e %.2e %f %f %f\n", zenithbr, groundbr,
-				F2, sundir[0], sundir[1], sundir[2]);
+		printf("7 %d %.2e %.2e %.2e %f %f %f\n",
+				skytype, zenithbr, groundbr, F2,
+				sundir[0], sundir[1], sundir[2]);
 }
 
 
 printdefaults()			/* print default values */
 {
-	if (cloudy)
+	switch (skytype) {
+	case S_OVER:
 		printf("-c\t\t\t\t# Cloudy sky\n");
-	else if (dosun)
-		printf("+s\t\t\t\t# Sunny sky with sun\n");
-	else
-		printf("-s\t\t\t\t# Sunny sky without sun\n");
+		break;
+	case S_UNIF:
+		printf("-u\t\t\t\t# Uniform cloudy sky\n");
+		break;
+	case S_INTER:
+		if (dosun)
+			printf("+i\t\t\t\t# Intermediate sky with sun\n");
+		else
+			printf("-i\t\t\t\t# Intermediate sky without sun\n");
+		break;
+	case S_CLEAR:
+		if (dosun)
+			printf("+s\t\t\t\t# Sunny sky with sun\n");
+		else
+			printf("-s\t\t\t\t# Sunny sky without sun\n");
+		break;
+	}
 	printf("-g %f\t\t\t# Ground plane reflectance\n", gprefl);
 	if (zenithbr > 0.0)
 		printf("-b %f\t\t\t# Zenith radiance (watts/ster/m2\n", zenithbr);
@@ -230,17 +306,22 @@ char  *msg;
 
 
 double
-normsc(theta)			/* compute normalization factor (E0*F2/L0) */
-double  theta;
+normsc()			/* compute normalization factor (E0*F2/L0) */
 {
-	static double  nf[5] = {2.766521, 0.547665,
-				-0.369832, 0.009237, 0.059229};
+	static double  nfc[2][5] = {
+				/* clear sky approx. */
+		{2.766521, 0.547665, -0.369832, 0.009237, 0.059229},
+				/* intermediate sky approx. */
+		{3.5556, -2.7152, -1.3081, 1.0660, 0.60227},
+	};
+	register double  *nf;
 	double  x, nsc;
 	register int  i;
 					/* polynomial approximation */
-	x = (theta - PI/4.0)/(PI/4.0);
-	nsc = nf[4];
-	for (i = 3; i >= 0; i--)
+	nf = nfc[skytype==S_INTER];
+	x = (altitude - PI/4.0)/(PI/4.0);
+	nsc = nf[i=4];
+	while (i--)
 		nsc = nsc*x + nf[i];
 
 	return(nsc);