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.16 by greg, Tue Jun 26 09:00:19 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;
135        register int  i;
141  
142          if (xmax - xmin <= 0 || ymax - ymin <= 0) {     /* empty */
143                  p->x = xmin;
# Line 141 | Line 146 | int  xmin, ymin, xmax, ymax;
146                  return;
147          }
148                                                  /* jitter ray direction */
149 <        p->x = h = xmin + (xmax-xmin)*frandom();
150 <        h /= hresolu;
146 <        p->y = v = ymin + (ymax-ymin)*frandom();
147 <        v /= vresolu;
149 >        h = xmin + (xmax-xmin)*frandom();
150 >        v = ymin + (ymax-ymin)*frandom();
151          
152 <        viewray(thisray.rorg, thisray.rdir, &ourview, h, v);
150 <
152 >        viewray(thisray.rorg, thisray.rdir, &ourview, h/hresolu, v/vresolu);
153          rayorigin(&thisray, NULL, PRIMARY, 1.0);
152        
154          rayvalue(&thisray);
155  
156 +        p->x = h;
157 +        p->y = v;
158          copycolor(p->v, thisray.rcol);
156
159          scalecolor(p->v, exposure);
160  
161          (*dev->paintr)(greyscale?greyof(p->v):p->v, xmin, ymin, xmax, ymax);
162 +
163 +        if (dev->flush != NULL && nrays - lastflush >= WFLUSH) {
164 +                lastflush = nrays;
165 +                (*dev->flush)();
166 +        }
167   }
168  
169  
# Line 167 | Line 174 | newimage()                             /* start a new image */
174                                                  /* compute resolution */
175          hresolu = dev->xsiz;
176          vresolu = dev->ysiz;
177 <        normaspect(&ourview, &dev->pixaspect, &hresolu, &vresolu);
177 >        normaspect(viewaspect(&ourview), &dev->pixaspect, &hresolu, &vresolu);
178          pframe.l = pframe.d = 0;
179          pframe.r = hresolu; pframe.u = vresolu;
180          pdepth = 0;
# Line 346 | Line 353 | register VIEW  *vp;
353          if ((err = setview(vp)) != NULL) {
354                  sprintf(errmsg, "view not set - %s", err);
355                  error(COMMAND, errmsg);
356 <        } else if (bcmp(vp, &ourview, sizeof(VIEW))) {
357 <                copyview(&oldview, &ourview);
358 <                copyview(&ourview, vp);
359 <                newimage();             /* newimage() calls with vp=&ourview! */
356 >        } else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
357 >                copystruct(&oldview, &ourview);
358 >                copystruct(&ourview, vp);
359 >                newimage();
360          }
361   }
362  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines