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

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.44 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.46 by greg, Tue Dec 3 19:36:58 2024 UTC

# Line 112 | Line 112 | getinterest(           /* get area of interest */
112                          error(COMMAND, "not on image");
113                          return(-1);
114                  }
115 <                if (!direc || ourview.type == VT_PAR) {
115 >                if (!direc | (ourview.type == VT_PAR)) {
116                          int     weakhit = 0;
117                          FVECT   weakpt;
118                          rayorigin(&thisray, PRIMARY, NULL, NULL);
# Line 229 | Line 229 | paint(                 /* compute and paint a rectangle */
229                  p = (PNODE *)thisray.rno;
230          }
231  
232 <        scolor_color(p->v, thisray.rcol);
232 >        scolor_rgb(p->v, thisray.rcol);
233          scalecolor(p->v, exposure);
234  
235          recolor(p);                             /* paint it */
# Line 271 | Line 271 | waitrays(void)                                 /* finish up pending rays */
271                  return(0);
272          while ((rval = ray_presult(&raydone, 0)) > 0) {
273                  PNODE  *p = (PNODE *)raydone.rno;
274 <                scolor_color(p->v, raydone.rcol);
274 >                scolor_rgb(p->v, raydone.rcol);
275                  scalecolor(p->v, exposure);
276                  recolor(p);
277                  nwaited++;
# Line 361 | Line 361 | paintrect(                             /* paint picture rectangle */
361   {
362          int  mx, my;
363  
364 <        if (p->xmax - p->xmin <= 0 || p->ymax - p->ymin <= 0)
364 >        if ((p->xmax <= p->xmin) | (p->ymax <= p->ymin))
365                  return;
366  
367          if (p->kid == NULL) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)