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

Comparing ray/src/util/glareval.c (file contents):
Revision 2.14 by greg, Wed Oct 10 21:41:02 2012 UTC vs.
Revision 2.18 by greg, Thu May 14 20:58:03 2020 UTC

# Line 177 | Line 177 | pict_val(                      /* find picture value for view direction *
177          pp[0] = pictview.vp[0] + vd[0];
178          pp[1] = pictview.vp[1] + vd[1];
179          pp[2] = pictview.vp[2] + vd[2];
180 <        viewloc(ip, &pictview, pp);
181 <        if (ip[2] <= FTINY || ip[0] < 0. || ip[0] >= 1. ||
182 <                        ip[1] < 0. || ip[1] >= 1.)
180 >        if (viewloc(ip, &pictview, pp) != VL_GOOD)
181                  return(-1.0);
182          colr_color(res, getpictscan((int)(ip[1]*pysiz))[(int)(ip[0]*pxsiz)]);
183          return(luminance(res)/exposure);
# Line 201 | Line 199 | getviewpix(            /* compute single view pixel */
199          npixinvw++;
200          if ((res = pict_val(dir)) >= 0.0)
201                  return(res);
202 <        if (rt_pd.r == -1) {
202 >        if (!(rt_pd.flags & PF_RUNNING)) {
203                  npixmiss++;
204                  return(-1.0);
205          }
# Line 242 | Line 240 | getviewspan(           /* compute a span of view pixels */
240                  npixinvw++;
241                  if ((vb[vh+hsize] = pict_val(dir)) >= 0.0)
242                          continue;
243 <                if (rt_pd.r == -1) {            /* missing information */
243 >                if (!(rt_pd.flags & PF_RUNNING)) {      /* missing information */
244                          npixmiss++;
245                          continue;
246                  }
# Line 301 | Line 299 | getexpos(                      /* get exposure from header line */
299          void    *p
300   )
301   {
302 <        char    fmt[32];
302 >        char    fmt[MAXFMTLEN];
303  
304          if (isexpos(s))
305                  exposure *= exposval(s);
# Line 378 | Line 376 | done_rtrace(void)                      /* wait for rtrace to finish */
376                                  progname, status);
377                  exit(1);
378          }
381 –        rt_pd.r = -1;
379   }
380  
381  

Diff Legend

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