ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/util/glaresrc.c
(Generate patch)

Comparing src/util/glaresrc.c (file contents):
Revision 2.2 by greg, Tue Mar 10 10:00:33 1992 UTC vs.
Revision 2.7 by greg, Tue Nov 29 20:45:21 2022 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Gather samples and compute glare sources.
6   */
# Line 17 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14   struct source   *curlist = NULL;        /* current source list */
15   struct source   *donelist = NULL;       /* finished sources */
16  
17 + void    pict_stats(void);
18  
19 < struct srcspan *
20 < newspan(l, r, v, sb)            /* allocate a new source span */
21 < int     l, r, v;
22 < float   *sb;
19 > static struct srcspan * newspan(int     l, int  r, int  v, float        *sb);
20 > static void addindirect(int     h, int  v, double       br);
21 > static void addsrcspan(struct srcspan   *nss);
22 > static void mergesource(struct source   *sp, struct source      *ap);
23 > static void close_sources(int   v);
24 > static void close_allsrcs(void);
25 > static struct srcspan * splitspan(struct srcspan        *sso, double    h, double       v, double       m);
26 > static struct source * splitsource(struct source        *so);
27 > static void donesource(struct source    *sp);
28 > static struct source * findbuddy(struct source  *s, struct source       *l);
29 > static void absorb(struct source        *s);
30 > static void freespans(struct source     *sp);
31 >
32 >
33 > static struct srcspan *
34 > newspan(                /* allocate a new source span */
35 >        int     l,
36 >        int     r,
37 >        int     v,
38 >        float   *sb
39 > )
40   {
41 <        register struct srcspan *ss;
42 <        register int    i;
41 >        struct srcspan  *ss;
42 >        int     i;
43  
44          ss = (struct srcspan *)malloc(sizeof(struct srcspan));
45          if (ss == NULL)
# Line 39 | Line 54 | float  *sb;
54   }
55  
56  
57 < analyze()                       /* analyze our scene */
57 > void
58 > analyze(void)                   /* analyze our scene */
59   {
60          int     h, v;
61          int     left;
# Line 81 | Line 97 | analyze()                      /* analyze our scene */
97                  if (left < h)
98                          addsrcspan(newspan(left,h,v,spanbr));
99          }
100 <        free((char *)spanbr);
100 >        free((void *)spanbr);
101          close_allsrcs();
102   }
103  
104  
105 < addindirect(h, v, br)           /* add brightness to indirect illuminances */
106 < int     h, v;
107 < double  br;
105 > static void
106 > addindirect(            /* add brightness to indirect illuminances */
107 >        int     h,
108 >        int     v,
109 >        double  br
110 > )
111   {
112          double  tanb, d;
113          int     hl;
114 <        register int    i;
114 >        int     i;
115  
116          hl = hlim(v);
117          if (h <= -hl) {                 /* left region */
# Line 134 | Line 153 | double br;
153   }
154  
155  
156 < comp_thresh()                   /* compute glare threshold */
156 > void
157 > comp_thresh(void)                       /* compute glare threshold */
158   {
159          int     h, v;
160          int     nsamps;
# Line 173 | Line 193 | comp_thresh()                  /* compute glare threshold */
193   }
194  
195  
196 < addsrcspan(nss)                 /* add new source span to our list */
197 < struct srcspan  *nss;
196 > static void
197 > addsrcspan(                     /* add new source span to our list */
198 >        struct srcspan  *nss
199 > )
200   {
201          struct source   *last, *cs, *this;
202 <        register struct srcspan *ss;
202 >        struct srcspan  *ss;
203  
204          cs = NULL;
205          for (this = curlist; this != NULL; this = this->next) {
# Line 211 | Line 233 | struct srcspan *nss;
233   }
234  
235  
236 < mergesource(sp, ap)             /* merge source ap into source sp */
237 < struct source   *sp, *ap;
236 > static void
237 > mergesource(            /* merge source ap into source sp */
238 >        struct source   *sp,
239 >        struct source   *ap
240 > )
241   {
242          struct srcspan  head;
243 <        register struct srcspan *alp, *prev, *tp;
243 >        struct srcspan  *alp, *prev, *tp;
244  
245          head.next = sp->first;
246          prev = &head;
# Line 241 | Line 266 | struct source  *sp, *ap;
266                  sp->brt = (sp->brt*sp->dom + ap->brt*ap->dom)
267                                  / (sp->dom + ap->dom);
268          }
269 <        free((char *)ap);
269 >        free((void *)ap);
270   }
271  
272  
273 < close_sources(v)                /* close sources above v */
274 < int     v;
273 > static void
274 > close_sources(          /* close sources above v */
275 >        int     v
276 > )
277   {
278          struct source   head;
279 <        register struct source  *last, *this;
279 >        struct source   *last, *this;
280  
281          head.next = curlist;
282          last = &head;
# Line 264 | Line 291 | int    v;
291   }
292  
293  
294 < close_allsrcs()                 /* done with everything */
294 > static void
295 > close_allsrcs(void)                     /* done with everything */
296   {
297 <        register struct source  *this, *next;
297 >        struct source   *this, *next;
298  
299          this = curlist;
300          while (this != NULL) {
# Line 278 | Line 306 | close_allsrcs()                        /* done with everything */
306   }
307  
308  
309 < struct srcspan *
310 < splitspan(sso, h, v, m)         /* divide source span at point */
311 < register struct srcspan *sso;
312 < double  h, v, m;
309 > static struct srcspan *
310 > splitspan(              /* divide source span at point */
311 >        struct srcspan  *sso,
312 >        double  h,
313 >        double  v,
314 >        double  m
315 > )
316   {
317 <        register struct srcspan *ssn;
317 >        struct srcspan  *ssn;
318          double  d;
319          int     hs;
320  
# Line 306 | Line 337 | double h, v, m;
337   }
338  
339  
340 < struct source *
341 < splitsource(so)                 /* divide source in two if it's big and long */
342 < struct source   *so;
340 > static struct source *
341 > splitsource(                    /* divide source in two if it's big and long */
342 >        struct source   *so
343 > )
344   {
345          LRSUM   lr;
346          LRLIN   fit;
347 <        register struct srcspan *ss, *ssn;
347 >        struct srcspan  *ss, *ssn;
348          struct srcspan  *ssl, *ssnl, head;
349          int     h;
350          double  mh, mv;
# Line 358 | Line 390 | struct source  *so;
390   }
391  
392  
393 < donesource(sp)                  /* finished with this source */
394 < register struct source  *sp;
393 > static void
394 > donesource(                     /* finished with this source */
395 >        struct source   *sp
396 > )
397   {
398          struct source   *newsrc;
399 <        register struct srcspan *ss;
399 >        struct srcspan  *ss;
400          int     h, n;
401          double  hsum, vsum, d;
402  
# Line 382 | Line 416 | register struct source *sp;
416                          sp->dom += d;
417                  }
418          }
419 +        freespans(sp);
420 +        if (sp->dom <= FTINY) {         /* must be right at edge of image */
421 +                free((void *)sp);
422 +                return;
423 +        }
424          sp->brt /= (double)n;
425          compdir(sp->dir, (int)(hsum/sp->dom), (int)(vsum/sp->dom));
387 –        freespans(sp);
426          sp->next = donelist;
427          donelist = sp;
428          if (verbose)
# Line 395 | Line 433 | register struct source *sp;
433   }
434  
435  
436 < struct source *
437 < findbuddy(s, l)                 /* find close enough source to s in l*/
438 < register struct source  *s, *l;
436 > static struct source *
437 > findbuddy(                      /* find close enough source to s in l*/
438 >        struct source   *s,
439 >        struct source   *l
440 > )
441   {
442          struct source   *bestbuddy = NULL;
443          double  d, r, mindist = MAXBUDDY;
# Line 414 | Line 454 | register struct source *s, *l;
454   }
455  
456  
457 < absorb_specks()                 /* eliminate too-small sources */
457 > void
458 > absorb_specks(void)                     /* eliminate too-small sources */
459   {
460          struct source   head, *buddy;
461 <        register struct source  *last, *this;
461 >        struct source   *last, *this;
462  
463          if (verbose)
464                  fprintf(stderr, "%s: absorbing small sources...\n", progname);
# Line 438 | Line 479 | absorb_specks()                        /* eliminate too-small sources */
479   }
480  
481  
482 < absorb(s)                       /* absorb a source into indirect */
483 < register struct source  *s;
482 > static void
483 > absorb(                 /* absorb a source into indirect */
484 >        struct source   *s
485 > )
486   {
487          FVECT   dir;
488          double  d;
489 <        register int    i;
489 >        int     i;
490  
491          for (i = 0; i < nglardirs; i++) {
492                  spinvector(dir, ourview.vdir, ourview.vup, indirect[i].theta);
# Line 454 | Line 497 | register struct source *s;
497                  indirect[i].n += d;
498          }
499          freespans(s);
500 <        free((char *)s);
500 >        free((void *)s);
501   }
502  
503  
504 < freespans(sp)                   /* free spans associated with source */
505 < struct source   *sp;
504 > static void
505 > freespans(                      /* free spans associated with source */
506 >        struct source   *sp
507 > )
508   {
509 <        register struct srcspan *ss;
509 >        struct srcspan  *ss;
510  
511 <        for (ss = sp->first; ss != NULL; ss = ss->next)
512 <                free((char *)ss);
513 <        sp->first = NULL;
511 >        while ((ss = sp->first) != NULL) {
512 >                sp->first = ss->next;
513 >                free((void *)ss);
514 >        }
515   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines