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

Comparing ray/src/util/glarendx.c (file contents):
Revision 1.1 by greg, Tue Apr 16 16:40:22 1991 UTC vs.
Revision 1.3 by greg, Wed Apr 17 11:55:03 1991 UTC

# Line 7 | Line 7 | static char SCCSid[] = "$SunId$ LBL";
7   /*
8   * Compute Glare Index given by program name:
9   *
10 < *      gnuth_dgr -     Gnuth discomfort glare rating
11 < *      gnuth_vcp -     Gnuth visual comfort probability
10 > *      guth_dgr -      Guth discomfort glare rating
11 > *      guth_vcp -      Guth visual comfort probability
12   *
13   *              12 April 1991   Greg Ward       EPFL
14   */
# Line 21 | Line 21 | extern double  erfc();
21   double  posindex();
22   int     headline();
23  
24 < double  direct(), gnuth_dgr(), gnuth_vcp();
24 > double  direct(), guth_dgr(), guth_vcp();
25  
26   struct named_func {
27          char    *name;
28          double  (*func)();
29   } all_funcs[] = {
30          {"direct", direct},
31 <        {"gnuth_dgr", gnuth_dgr},
32 <        {"gnuth_vcp", gnuth_vcp},
31 >        {"guth_dgr", guth_dgr},
32 >        {"guth_vcp", guth_vcp},
33          {NULL}
34   };
35  
# Line 155 | Line 155 | read_input()                   /* read glare sources from stdin */
155                                          &gs->dir[0], &gs->dir[1], &gs->dir[2],
156                                          &gs->dom, &gs->lum) != 5)
157                                  goto readerr;
158 +                        normalize(gs->dir);
159                          gs->next = all_srcs;
160                          all_srcs = gs;
161                          break;
# Line 247 | Line 248 | FVECT  sd, vd, vu;
248  
249  
250   double
251 < gnuth_dgr(gd)           /* compute Gnuth discomfort glare rating */
251 > guth_dgr(gd)            /* compute Guth discomfort glare rating */
252   struct glare_dir        *gd;
253   {
254   #define q(w)    (20.4*w+1.52*pow(w,.2)-.075)
255          register struct glare_src       *gs;
256          double  p;
257          double  sum;
258 +        double  wtot, brsum;
259          int     n;
260  
261 <        sum = 0.0; n = 0;
261 >        sum = wtot = brsum = 0.0; n = 0;
262          for (gs = all_srcs; gs != NULL; gs = gs->next) {
263                  p = posindex(gs->dir, midview.vdir, midview.vup);
264                  if (p <= FTINY)
265                          continue;
266                  sum += gs->lum * q(gs->dom) / p;
267 +                brsum += gs->lum * gs->dom;
268 +                wtot += gs->dom;
269                  n++;
270          }
271          if (n == 0)
272                  return(0.0);
273          else
274                  return( pow(
275 <                        .5*sum/pow(direct(gd)+gd->indirect,.44),
275 >                        .5*sum/pow((brsum+(5.-wtot)*gd->indirect/PI)/5.,.44),
276                          pow((double)n, -.0914) ) );
277   #undef q
278   }
# Line 284 | Line 288 | extern double  erf(), erfc();
288  
289  
290   double
291 < gnuth_vcp(gd)           /* compute Gnuth visual comfort probability */
291 > guth_vcp(gd)            /* compute Guth visual comfort probability */
292   struct glare_dir        *gd;
293   {
294 <        return(100.*norm_integral(-6.374+1.3227*log(gnuth_dgr(gd))));
294 >        return(100.*norm_integral(6.374-1.3227*log(guth_dgr(gd))));
295   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)