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.6 by greg, Mon Apr 22 10:11:21 1991 UTC vs.
Revision 1.7 by greg, Mon Apr 29 08:31:23 1991 UTC

# Line 273 | Line 273 | struct glare_dir       *gd;
273   {
274   #define q(w)    (20.4*w+1.52*pow(w,.2)-.075)
275          register struct glare_src       *gs;
276 +        FVECT   mydir;
277          double  p;
278          double  sum;
279          double  wtot, brsum;
280          int     n;
281  
282 +        spinvector(mydir, midview.vdir, midview.vup, gd->ang);
283          sum = wtot = brsum = 0.0; n = 0;
284          for (gs = all_srcs; gs != NULL; gs = gs->next) {
285 <                p = posindex(gs->dir, midview.vdir, midview.vup);
285 >                p = posindex(gs->dir, mydir, midview.vup);
286                  if (p <= FTINY)
287                          continue;
288                  sum += gs->lum * q(gs->dom) / p;
# Line 311 | Line 313 | double
313   guth_vcp(gd)            /* compute Guth visual comfort probability */
314   struct glare_dir        *gd;
315   {
316 <        return(100.*norm_integral(6.374-1.3227*log(guth_dgr(gd))));
316 >        double  dgr;
317 >
318 >        dgr = guth_dgr(gd);
319 >        if (dgr <= FTINY)
320 >                return(100.0);
321 >        return(100.*norm_integral(6.374-1.3227*log(dgr)));
322   }

Diff Legend

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