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

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.5 by greg, Thu Aug 5 13:05:01 1993 UTC vs.
Revision 2.6 by greg, Tue Dec 20 20:18:41 1994 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1987 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 103 | Line 103 | double  *mp;
103                  (*dev->comout)("Pick view center\n");
104                  if ((*dev->getcur)(&x, &y) == ABORT)
105                          return(-1);
106 <                if (viewray(thisray.rorg, thisray.rdir, &ourview,
107 <                                (x+.5)/hresolu, (y+.5)/vresolu) < 0) {
106 >                if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
107 >                        &ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
108                          error(COMMAND, "not on image");
109                          return(-1);
110                  }
# Line 162 | Line 162 | int  xmin, ymin, xmax, ymax;
162          h = xmin + (xmax-xmin)*frandom();
163          v = ymin + (ymax-ymin)*frandom();
164          
165 <        if (viewray(thisray.rorg, thisray.rdir, &ourview,
166 <                        h/hresolu, v/vresolu) < 0) {
165 >        if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
166 >                        h/hresolu, v/vresolu)) < -FTINY) {
167                  setcolor(thisray.rcol, 0.0, 0.0, 0.0);
168          } else {
169                  rayorigin(&thisray, NULL, PRIMARY, 1.0);

Diff Legend

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