--- ray/src/util/glaresrc.c 1991/04/10 15:59:10 1.11 +++ ray/src/util/glaresrc.c 2003/02/22 02:07:30 2.4 @@ -1,14 +1,12 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: glaresrc.c,v 2.4 2003/02/22 02:07:30 greg Exp $"; #endif - /* * Gather samples and compute glare sources. */ #include "glare.h" +#include "linregr.h" #define vcont(vd,vu) ((vu)-(vd)<=SEPS) #define hcont(s1,s2) ((s1)->r-(s2)->l>=-SEPS&&(s2)->r-(s1)->l>=-SEPS) @@ -50,9 +48,11 @@ analyze() /* analyze our scene */ for (v = vsize; v >= -vsize; v--) { close_sources(v); #ifndef DEBUG - if (verbose) + if (verbose) { fprintf(stderr, "%s: analyzing... %3ld%%\r", progname, 100L*(vsize-v)/(2*vsize)); + fflush(stderr); + } #endif getviewspan(v, spanbr); left = hsize + 1; @@ -72,26 +72,28 @@ analyze() /* analyze our scene */ addsrcspan(newspan(left,h,v,spanbr)); left = hsize + 1; } - addindirect(h, spanbr[h+hsize]); + addindirect(h, v, spanbr[h+hsize]); } } if (left < h) addsrcspan(newspan(left,h,v,spanbr)); } - free((char *)spanbr); + free((void *)spanbr); close_allsrcs(); } -addindirect(h, br) /* add brightness to indirect illuminances */ -int h; +addindirect(h, v, br) /* add brightness to indirect illuminances */ +int h, v; double br; { double tanb, d; + int hl; register int i; - if (h <= -hlim) { /* left region */ - d = (double)(-h-hlim)/sampdens; + hl = hlim(v); + if (h <= -hl) { /* left region */ + d = (double)(-h-hl)/sampdens; if (d >= 1.0-FTINY) return; tanb = d/sqrt(1.0-d*d); @@ -104,8 +106,8 @@ double br; } return; } - if (h >= hlim) { /* right region */ - d = (double)(-h+hlim)/sampdens; + if (h >= hl) { /* right region */ + d = (double)(-h+hl)/sampdens; if (d <= -1.0+FTINY) return; tanb = d/sqrt(1.0-d*d); @@ -120,7 +122,7 @@ double br; } /* central region */ for (i = 0; i < nglardirs; i++) { - d = cos(h_theta(h) - indirect[i].theta); + d = cos(h_theta(h,v) - indirect[i].theta); if (d > 0.0) { indirect[i].sum += d * br; indirect[i].n += d; @@ -140,13 +142,14 @@ comp_thresh() /* compute glare threshold */ progname); brsum = 0.0; nsamps = 0; - for (v = vsize; v >= -vsize; v -= TSAMPSTEP) + for (v = vsize; v >= -vsize; v -= TSAMPSTEP) { for (h = -hsize; h <= hsize; h += TSAMPSTEP) { if ((br = getviewpix(h, v)) < 0.0) continue; brsum += br; nsamps++; } + } if (nsamps == 0) { fprintf(stderr, "%s: no viewable scene!\n", progname); exit(1); @@ -235,7 +238,7 @@ struct source *sp, *ap; sp->brt = (sp->brt*sp->dom + ap->brt*ap->dom) / (sp->dom + ap->dom); } - free((char *)ap); + free((void *)ap); } @@ -272,40 +275,122 @@ close_allsrcs() /* done with everything */ } +struct srcspan * +splitspan(sso, h, v, m) /* divide source span at point */ +register struct srcspan *sso; +double h, v, m; +{ + register struct srcspan *ssn; + double d; + int hs; + + d = h - m*(sso->v - v); + hs = d < 0. ? d-.5 : d+.5; + if (sso->l >= hs) + return(NULL); + if (sso->r <= hs) + return(sso); + /* need to split it */ + ssn = (struct srcspan *)malloc(sizeof(struct srcspan)); + if (ssn == NULL) + memerr("source spans in splitspan"); + ssn->brsum = (double)(hs - sso->l)/(sso->r - sso->l) * sso->brsum; + sso->brsum -= ssn->brsum; + ssn->v = sso->v; + ssn->l = sso->l; + ssn->r = sso->l = hs; + return(ssn); +} + + +struct source * +splitsource(so) /* divide source in two if it's big and long */ +struct source *so; +{ + LRSUM lr; + LRLIN fit; + register struct srcspan *ss, *ssn; + struct srcspan *ssl, *ssnl, head; + int h; + double mh, mv; + struct source *sn; + + lrclear(&lr); + for (ss = so->first; ss != NULL; ss = ss->next) + for (h = ss->l; h < ss->r; h++) + lrpoint(h, ss->v, &lr); + if ((double)lr.n/(sampdens*sampdens) < SABIG) + return(NULL); /* too small */ + if (lrfit(&fit, &lr) < 0) + return(NULL); /* can't fit a line */ + if (fit.correlation < LCORR && fit.correlation > -LCORR) + return(NULL); + if (verbose) + fprintf(stderr, "%s: splitting large source\n", progname); + mh = lrxavg(&lr); + mv = lryavg(&lr); + sn = (struct source *)malloc(sizeof(struct source)); + if (sn == NULL) + memerr("source records in splitsource"); + sn->dom = 0.0; + sn->first = NULL; + ssnl = NULL; + head.next = so->first; + ssl = &head; + for (ss = so->first; ss != NULL; ssl = ss, ss = ss->next) + if ((ssn = splitspan(ss, mh, mv, fit.slope)) != NULL) { + if (ssn == ss) { /* remove from old */ + ssl->next = ss->next; + ss = ssl; + } + if (ssnl == NULL) /* add to new */ + sn->first = ssn; + else + ssnl->next = ssn; + ssn->next = NULL; + ssnl = ssn; + } + so->first = head.next; + return(sn); +} + + donesource(sp) /* finished with this source */ register struct source *sp; { - FVECT dthis, dright; + struct source *newsrc; register struct srcspan *ss; int h, n; - double d; + double hsum, vsum, d; + while ((newsrc = splitsource(sp)) != NULL) /* split it? */ + donesource(newsrc); sp->dom = 0.0; - sp->dir[0] = sp->dir[1] = sp->dir[2] = 0.0; + hsum = vsum = 0.0; sp->brt = 0.0; n = 0; for (ss = sp->first; ss != NULL; ss = ss->next) { sp->brt += ss->brsum; n += ss->r - ss->l; - if (compdir(dright, ss->r, ss->v) < 0) - compdir(dright, ss->r-2, ss->v); - for (h = ss->r-1; h >= ss->l; h--) - if (compdir(dthis, h, ss->v) == 0) { - d = dist2(dthis, dright); - fvsum(sp->dir, sp->dir, dthis, d); - sp->dom += d; - VCOPY(dright, dthis); - } - free((char *)ss); + for (h = ss->l; h < ss->r; h++) { + d = pixsize(h, ss->v); + hsum += d*h; + vsum += d*ss->v; + sp->dom += d; + } } - sp->first = NULL; + freespans(sp); + if (sp->dom <= FTINY) { /* must be right at edge of image */ + free((void *)sp); + return; + } sp->brt /= (double)n; - normalize(sp->dir); + compdir(sp->dir, (int)(hsum/sp->dom), (int)(vsum/sp->dom)); sp->next = donelist; donelist = sp; if (verbose) fprintf(stderr, - "%s: found source at (%.3f,%.3f,%.3f), dw %.5f, br %.1f (%d samps)\n", + "%s: source at [%.3f,%.3f,%.3f], dw %.5f, br %.1f (%d samps)\n", progname, sp->dir[0], sp->dir[1], sp->dir[2], sp->dom, sp->brt, n); } @@ -369,7 +454,18 @@ register struct source *s; indirect[i].sum += d * s->brt; indirect[i].n += d; } - for ( ; s->first != NULL; s->first = s->first->next) - free((char *)s->first); - free((char *)s); + freespans(s); + free((void *)s); +} + + +freespans(sp) /* free spans associated with source */ +struct source *sp; +{ + register struct srcspan *ss; + + while ((ss = sp->first) != NULL) { + sp->first = ss->next; + free((void *)ss); + } }