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

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.64 by greg, Fri Oct 18 17:04:13 2013 UTC vs.
Revision 2.66 by greg, Fri Mar 30 23:14:07 2018 UTC

# Line 26 | Line 26 | extern double  maxdiff;                        /* max. sample difference */
26  
27   #define  CTRL(c)        ((c)-'@')
28  
29 < #ifdef  SMLFLT
30 < #define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
31 < #else
32 < #define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
33 < #endif
29 > #define  sscanvec(s,v)  (sscanf(s,FVFORMAT,v,v+1,v+2)==3)
30  
31   extern char  rifname[128];              /* rad input file name */
32  
# Line 380 | Line 376 | getorigin(                             /* origin viewpoint */
376          VIEW    nv = ourview;
377          double  d;
378                                          /* get new view origin */
379 <        if (!sscanvec(s, nv.vp)) {
380 <                int     x, y;
379 >        if (sscanf(s, "%lf %lf", &d, &d) == 1) {
380 >                                        /* just moving some distance */
381 >                VSUM(nv.vp, nv.vp, nv.vdir, d);
382 >        } else if (!sscanvec(s, nv.vp)) {
383 >                int     x, y;           /* need to pick origin */
384                  RAY     thisray;
385                  if (dev->getcur == NULL)
386                          return;

Diff Legend

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