--- ray/src/gen/mkillum3.c 1992/03/12 11:44:01 2.3 +++ ray/src/gen/mkillum3.c 2004/09/28 17:54:18 2.10 @@ -1,9 +1,6 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: mkillum3.c,v 2.10 2004/09/28 17:54:18 greg Exp $"; #endif - /* * Routines to print mkillum objects */ @@ -17,10 +14,21 @@ char DATSUF[] = ".dat"; /* data file suffix */ char DSTSUF[] = ".dist"; /* distribution suffix */ char FNCFNM[] = "illum.cal"; /* function file name */ +void compinv(float *rinv, float *rp, int m); +void colorout(int p, float *da, int n, int m, double mult, FILE *fp); +void fputnum(double d, FILE *fp); +void brightout(float *da, int n, int m, double mult, FILE *fp); +void fputeol(FILE *fp); +void compavg(float col[3], float *da, int n); +char * dfname(struct illum_args *il, int c); +FILE * dfopen(struct illum_args *il, int c); -printobj(mod, obj) /* print out an object */ -char *mod; -register OBJREC *obj; + +void +printobj( /* print out an object */ + char *mod, + register OBJREC *obj +) { register int i; @@ -48,11 +56,11 @@ register OBJREC *obj; char * -dfname(il, c) /* return data file name */ -struct illum_args *il; -int c; +dfname( /* return data file name */ + struct illum_args *il, + int c +) { - extern char *getpath(), *strcpy(); char fname[MAXSTR]; register char *s; @@ -69,9 +77,10 @@ int c; FILE * -dfopen(il, c) /* open data file */ -register struct illum_args *il; -int c; +dfopen( /* open data file */ + register struct illum_args *il, + int c +) { char *fn; FILE *fp; @@ -89,15 +98,24 @@ int c; } -flatout(il, da, n, m, u, v, w) /* write hemispherical distribution */ -struct illum_args *il; -float *da; -int n, m; -FVECT u, v, w; +extern void +flatout( /* write hemispherical distribution */ + struct illum_args *il, + float *da, + int n, + int m, + FVECT u, + FVECT v, + FVECT w +) { + float *Ninv; FILE *dfp; int i; + if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL) + error(SYSTEM, "out of memory in flatout"); + compinv(Ninv, da, m); if (il->flags & IL_COLDST) { printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame, il->matname, DSTSUF); @@ -105,9 +123,11 @@ FVECT u, v, w; for (i = 0; i < 3; i++) { dfp = dfopen(il, DATORD[i]); fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", - 1.-.5/n, .5/n, n, + 1.+.5/n, .5/n, n+1, 0., 2.*PI, m+1); + colorout(i, Ninv, 1, m, 1./il->nsamps/il->col[i], dfp); colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp); + fputeol(dfp); fclose(dfp); printf(" %s", dfname(il, DATORD[i])); } @@ -116,9 +136,12 @@ FVECT u, v, w; il->matname, DSTSUF); printf("\n5 noneg"); dfp = dfopen(il, 0); - fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-.5/n, .5/n, n, + fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", + 1.+.5/n, .5/n, n+1, 0., 2.*PI, m+1); + brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp); brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp); + fputeol(dfp); fclose(dfp); printf(" %s", dfname(il, 0)); } @@ -128,17 +151,27 @@ FVECT u, v, w; printf("\t%f\t%f\t%f\n", v[0], v[1], v[2]); printf("\t%f\t%f\t%f\n", w[0], w[1], w[2]); il->dfnum++; + free((void *)Ninv); } -roundout(il, da, n, m) /* write spherical distribution */ -struct illum_args *il; -float *da; -int n, m; +extern void +roundout( /* write spherical distribution */ + struct illum_args *il, + float *da, + int n, + int m +) { + float *Ninv, *Sinv; FILE *dfp; int i; + if ((Ninv = (float *)malloc(3*m*sizeof(float))) == NULL || + (Sinv = (float *)malloc(3*m*sizeof(float))) == NULL) + error(SYSTEM, "out of memory in roundout"); + compinv(Ninv, da, m); + compinv(Sinv, da+3*m*(n-1), m); if (il->flags & IL_COLDST) { printf("\n%s %s %s%s", VOIDID, ofun[PAT_CDATA].funame, il->matname, DSTSUF); @@ -146,9 +179,12 @@ int n, m; for (i = 0; i < 3; i++) { dfp = dfopen(il, DATORD[i]); fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", - 1.-1./n, -1.+1./n, n, + 1.+1./n, -1.-1./n, n+2, 0., 2.*PI, m+1); + colorout(i, Ninv, 1, m, 1./il->nsamps/il->col[i], dfp); colorout(i, da, n, m, 1./il->nsamps/il->col[i], dfp); + colorout(i, Sinv, 1, m, 1./il->nsamps/il->col[i], dfp); + fputeol(dfp); fclose(dfp); printf(" %s", dfname(il, DATORD[i])); } @@ -157,21 +193,29 @@ int n, m; il->matname, DSTSUF); printf("\n5 noneg"); dfp = dfopen(il, 0); - fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", 1.-1./n, -1.+1./n, n, + fprintf(dfp, "2\n%f %f %d\n%f %f %d\n", + 1.+1./n, -1.-1./n, n+2, 0., 2.*PI, m+1); + brightout(Ninv, 1, m, 1./il->nsamps/brt(il->col), dfp); brightout(da, n, m, 1./il->nsamps/brt(il->col), dfp); + brightout(Sinv, 1, m, 1./il->nsamps/brt(il->col), dfp); + fputeol(dfp); fclose(dfp); printf(" %s", dfname(il, 0)); } printf("\n\t%s il_alt il_azi", FNCFNM); printf("\n0\n0\n"); il->dfnum++; + free((void *)Ninv); + free((void *)Sinv); } -illumout(il, ob) /* print illum object */ -register struct illum_args *il; -OBJREC *ob; +extern void +illumout( /* print illum object */ + register struct illum_args *il, + OBJREC *ob +) { double cout[3]; @@ -198,53 +242,96 @@ OBJREC *ob; } -average(il, da, n) /* compute average value for distribution */ -register struct illum_args *il; -register float *da; -int n; +void +compavg( /* compute average for set of data values */ + float col[3], + register float *da, + int n +) { register int i; - il->col[0] = il->col[1] = il->col[2] = 0.; + col[0] = col[1] = col[2] = 0.; i = n; while (i-- > 0) { - il->col[0] += *da++; - il->col[1] += *da++; - il->col[2] += *da++; + col[0] += *da++; + col[1] += *da++; + col[2] += *da++; } for (i = 0; i < 3; i++) - il->col[i] /= (double)n*il->nsamps; + col[i] /= (double)n; +} + +void +compinv( /* compute other side of row average */ + register float *rinv, + register float *rp, + int m +) +{ + float avg[3]; + + compavg(avg, rp, m); /* row average */ + while (m-- > 0) { + *rinv++ = 2.*avg[0] - *rp++; + *rinv++ = 2.*avg[1] - *rp++; + *rinv++ = 2.*avg[2] - *rp++; + } +} + + +extern int +average( /* evaluate average value for distribution */ + register struct illum_args *il, + float *da, + int n +) +{ + compavg(il->col, da, n); /* average */ + if (il->nsamps > 1) { + il->col[0] /= (double)il->nsamps; + il->col[1] /= (double)il->nsamps; + il->col[2] /= (double)il->nsamps; + } + /* brighter than minimum? */ return(brt(il->col) > il->minbrt+FTINY); } static int colmcnt = 0; /* count of columns written */ -fputnum(d, fp) /* put out a number to fp */ -double d; -FILE *fp; +void +fputnum( /* put out a number to fp */ + double d, + FILE *fp +) { - if (colmcnt++ % 6 == 0) + if (colmcnt++ % 5 == 0) putc('\n', fp); fprintf(fp, " %11e", d); } -fputeol(fp) /* write end of line to fp */ -register FILE *fp; +void +fputeol( /* write end of line to fp */ + register FILE *fp +) { putc('\n', fp); colmcnt = 0; } -colorout(p, da, n, m, mult, fp) /* put out color distribution data */ -int p; -register float *da; -int n, m; -double mult; -FILE *fp; +void +colorout( /* put out color distribution data */ + int p, + register float *da, + int n, + int m, + double mult, + FILE *fp +) { register int i, j; @@ -255,15 +342,17 @@ FILE *fp; } fputnum(mult*da[p-3*m], fp); /* wrap phi */ } - fputeol(fp); } -brightout(da, n, m, mult, fp) /* put out brightness distribution data */ -register float *da; -int n, m; -double mult; -FILE *fp; +void +brightout( /* put out brightness distribution data */ + register float *da, + int n, + int m, + double mult, + FILE *fp +) { register int i, j; @@ -274,5 +363,4 @@ FILE *fp; } fputnum(mult*brt(da-3*m), fp); /* wrap phi */ } - fputeol(fp); }