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.24 by greg, Mon Feb 28 09:24:43 1994 UTC vs.
Revision 2.26 by greg, Tue Dec 20 20:18:37 1994 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1993 Regents of the University of California */
1 > /* Copyright (c) 1994 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 140 | Line 140 | char  *s;
140          else {
141                  nv.horiz = ourview.horiz; nv.vert = ourview.vert;
142          }
143 +        sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
144 +                        ourview.vfore, ourview.vaft);
145 +        (*dev->comout)(buf);
146 +        (*dev->comin)(buf, NULL);
147 +        if (buf[0] == CTRL('C')) return;
148 +        if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
149 +                change++;
150 +        else {
151 +                nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
152 +        }
153          sprintf(buf, "view shift and lift (%.6g %.6g): ",
154                          ourview.hoff, ourview.voff);
155          (*dev->comout)(buf);
# Line 350 | Line 360 | char  *s;
360          register PNODE  *p = &ptrunk;
361          int  adapt = 0;
362          double  e = 1.0;
363 < start:
363 >
364          for (cp = s; isspace(*cp); cp++)
365                  ;
366          if (*cp == '@') {
367                  adapt++;
368 <                goto start;
368 >                while (isspace(*++cp))
369 >                        ;
370          }
371          if (*cp == '\0') {              /* normalize to point */
372                  if (dev->getcur == NULL)
# Line 609 | Line 620 | char  *s;
620          int  x, y;
621          RAY  thisray;
622  
623 +        thisray.rmax = 0.0;
624 +
625          if (!sscanvec(s, thisray.rorg) ||
626                          !sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) {
627  
# Line 618 | Line 631 | char  *s;
631                  if ((*dev->getcur)(&x, &y) == ABORT)
632                          return;
633  
634 <                if (viewray(thisray.rorg, thisray.rdir, &ourview,
635 <                                (x+.5)/hresolu, (y+.5)/vresolu) < 0) {
634 >                if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
635 >                        &ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
636                          error(COMMAND, "not on image");
637                          return;
638                  }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines