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 1.10 by greg, Tue Jan 9 09:07:33 1990 UTC vs.
Revision 1.15 by greg, Thu Mar 8 10:28:29 1990 UTC

# Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18  
19   #include  "random.h"
20  
21 + #ifndef WFLUSH
22 + #define WFLUSH          30              /* flush after this many rays */
23 + #endif
24  
25 +
26   getrect(s, r)                           /* get a box */
27   char  *s;
28   register RECT  *r;
# Line 130 | Line 134 | paint(p, xmin, ymin, xmax, ymax)       /* compute and paint
134   register PNODE  *p;
135   int  xmin, ymin, xmax, ymax;
136   {
137 +        extern long  nrays;
138 +        static long  lastflush = 0;
139          static RAY  thisray;
140          double  h, v;
141          register int  i;
# Line 141 | Line 147 | int  xmin, ymin, xmax, ymax;
147                  return;
148          }
149                                                  /* jitter ray direction */
150 <        p->x = h = xmin + (xmax-xmin)*frandom();
151 <        h /= hresolu;
146 <        p->y = v = ymin + (ymax-ymin)*frandom();
147 <        v /= vresolu;
150 >        h = xmin + (xmax-xmin)*frandom();
151 >        v = ymin + (ymax-ymin)*frandom();
152          
153 <        viewray(thisray.rorg, thisray.rdir, &ourview, h, v);
150 <
153 >        viewray(thisray.rorg, thisray.rdir, &ourview, h/hresolu, v/vresolu);
154          rayorigin(&thisray, NULL, PRIMARY, 1.0);
152        
155          rayvalue(&thisray);
156  
157 +        p->x = h;
158 +        p->y = v;
159          copycolor(p->v, thisray.rcol);
156
160          scalecolor(p->v, exposure);
161  
162          (*dev->paintr)(greyscale?greyof(p->v):p->v, xmin, ymin, xmax, ymax);
163 +
164 +        if (dev->flush != NULL && nrays - lastflush >= WFLUSH) {
165 +                lastflush = nrays;
166 +                (*dev->flush)();
167 +        }
168   }
169  
170  
# Line 167 | Line 175 | newimage()                             /* start a new image */
175                                                  /* compute resolution */
176          hresolu = dev->xsiz;
177          vresolu = dev->ysiz;
178 <        normaspect(&ourview, &dev->pixaspect, &hresolu, &vresolu);
178 >        normaspect(viewaspect(&ourview), &dev->pixaspect, &hresolu, &vresolu);
179          pframe.l = pframe.d = 0;
180          pframe.r = hresolu; pframe.u = vresolu;
181          pdepth = 0;
# Line 346 | Line 354 | register VIEW  *vp;
354          if ((err = setview(vp)) != NULL) {
355                  sprintf(errmsg, "view not set - %s", err);
356                  error(COMMAND, errmsg);
357 <        } else if (bcmp(vp, &ourview, sizeof(VIEW))) {
358 <                copyview(&oldview, &ourview);
359 <                copyview(&ourview, vp);
360 <                newimage();             /* newimage() calls with vp=&ourview! */
357 >        } else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
358 >                copystruct(&oldview, &ourview);
359 >                copystruct(&ourview, vp);
360 >                newimage();
361          }
362   }
363  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines