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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.48 by gregl, Mon Oct 20 16:46:37 1997 UTC vs.
Revision 2.49 by gwlarson, Tue Mar 3 19:14:28 1998 UTC

# Line 53 | Line 53 | int  psample = 4;                      /* pixel sample size */
53   double  maxdiff = .05;                  /* max. difference for interpolation */
54   double  dstrpix = 0.67;                 /* square pixel distribution */
55  
56 + double  mblur = 0.;                     /* motion blur parameter */
57 +
58   double  dstrsrc = 0.0;                  /* square source distribution */
59   double  shadthresh = .05;               /* shadow threshold */
60   double  shadcert = .5;                  /* shadow certainty */
# Line 104 | Line 106 | extern unsigned long  nrays;           /* number of rays traced
106  
107   int  hres, vres;                        /* resolution for this frame */
108  
109 + static VIEW     lastview;               /* the previous view input */
110 +
111   extern char  *mktemp();
112  
113   double  pixvalue();
# Line 331 | Line 335 | FILE  *fp;
335   {
336          char  linebuf[256];
337  
338 +        copystruct(&lastview, &ourview);
339          while (fgets(linebuf, sizeof(linebuf), fp) != NULL)
340                  if (isview(linebuf) && sscanview(&ourview, linebuf) > 0)
341                          return(0);
# Line 603 | Line 608 | pixvalue(col, x, y)            /* compute pixel value */
608   COLOR  col;                     /* returned color */
609   int  x, y;                      /* pixel position */
610   {
611 <        static RAY  thisray;
612 <
613 <        if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
614 <                        (x+pixjitter())/hres, (y+pixjitter())/vres)) < -FTINY) {
611 >        RAY  thisray;
612 >        FVECT   lorg, ldir;
613 >        double  hpos, vpos, lmax, d;
614 >                                                /* compute view ray */
615 >        hpos = (x+pixjitter())/hres;
616 >        vpos = (y+pixjitter())/vres;
617 >        if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
618 >                                        &ourview, hpos, vpos)) < -FTINY) {
619                  setcolor(col, 0.0, 0.0, 0.0);
620                  return(0.0);
621          }
622  
614 –        rayorigin(&thisray, NULL, PRIMARY, 1.0);
615 –
623          samplendx = pixnumber(x,y,hres,vres);   /* set pixel index */
624 +
625 +                                                /* optional motion blur */
626 +        if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir,
627 +                                        &lastview, hpos, vpos)) >= -FTINY) {
628 +                register int    i;
629 +                register double  d = mblur*(.5-urand(281+samplendx));
630 +
631 +                thisray.rmax = (1.-d)*thisray.rmax + d*lmax;
632 +                for (i = 3; i--; ) {
633 +                        thisray.rorg[i] = (1.-d)*thisray.rorg[i] + d*lorg[i];
634 +                        thisray.rdir[i] = (1.-d)*thisray.rdir[i] + d*ldir[i];
635 +                }
636 +                if (normalize(thisray.rdir) == 0.0)
637 +                        return(0.0);
638 +        }
639 +
640 +        rayorigin(&thisray, NULL, PRIMARY, 1.0);
641  
642          rayvalue(&thisray);                     /* trace ray */
643  

Diff Legend

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