--- ray/src/rt/rtrace.c 1990/08/18 10:34:47 1.11 +++ ray/src/rt/rtrace.c 1991/05/01 11:16:58 1.13 @@ -20,7 +20,7 @@ static char SCCSid[] = "$SunId$ LBL"; * All values default to ascii representation of real * numbers. Binary representations can be selected * with '-ff' for float or '-fd' for double. By default, - * radiance is computed. The '-i' option indicates that + * radiance is computed. The '-i' or '-I' options indicate that * irradiance values are desired. */ @@ -30,6 +30,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "otypes.h" +int imm_irrad = 0; /* compute immediate irradiance? */ + int inform = 'a'; /* input format */ int outform = 'a'; /* output format */ char *outvals = "v"; /* output specification */ @@ -53,6 +55,8 @@ int ambounce = 0; /* ambient bounces */ char *amblist[128]; /* ambient include/exclude list */ int ambincl = -1; /* include == 1, exclude == 0 */ +extern OBJREC Lamb; /* a Lambertian surface */ + static RAY thisray; /* for our convenience */ static int oputo(), oputd(), oputv(), oputl(), @@ -103,10 +107,10 @@ char *fname; continue; } /* compute and print */ - if (outvals[0] == 'i') + if (imm_irrad) irrad(orig, direc); else - radiance(orig, direc); + traceray(orig, direc); /* flush if time */ if (--nextflush == 0) { fflush(stdout); @@ -172,7 +176,7 @@ register char *vs; } -radiance(org, dir) /* compute radiance value */ +traceray(org, dir) /* compute and print ray value(s) */ FVECT org, dir; { register int (**tp)(); @@ -194,14 +198,9 @@ FVECT org, dir; } -irrad(org, dir) /* compute irradiance value */ +irrad(org, dir) /* compute immediate irradiance value */ FVECT org, dir; { - static double Lambfa[5] = {PI, PI, PI, 0.0, 0.0}; - static OBJREC Lamb = { - OVOID, MAT_PLASTIC, "Lambertian", - {0, 5, NULL, Lambfa}, NULL, -1, - }; register int i; for (i = 0; i < 3; i++) {