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

Comparing ray/src/rt/t_func.c (file contents):
Revision 2.8 by greg, Mon Oct 25 22:57:45 2010 UTC vs.
Revision 2.10 by greg, Tue Jul 8 18:25:00 2014 UTC

# Line 28 | Line 28 | static const char      RCSid[] = "$Id$";
28   */
29  
30  
31 < extern int
31 > int
32   t_func(                 /* compute texture for ray */
33 <        register OBJREC  *m,
34 <        register RAY  *r
33 >        OBJREC  *m,
34 >        RAY  *r
35   )
36   {
37          FVECT  disp;
38          double  d;
39 <        register MFUNC  *mf;
40 <        register int  i;
39 >        MFUNC  *mf;
40 >        int  i;
41  
42          if (m->oargs.nsargs < 4)
43                  objerror(m, USER, "bad # arguments");
# Line 51 | Line 51 | t_func(                        /* compute texture for ray */
51                          return(0);
52                  }
53          }
54 <        if (mf->f != &unitxf)
55 <                multv3(disp, disp, mf->f->xfm);
54 >        if (mf->fxp != &unitxf)
55 >                multv3(disp, disp, mf->fxp->xfm);
56          if (r->rox != NULL) {
57                  multv3(disp, disp, r->rox->f.xfm);
58 <                d = 1.0 / (mf->f->sca * r->rox->f.sca);
58 >                d = 1.0 / (mf->fxp->sca * r->rox->f.sca);
59          } else
60 <                d = 1.0 / mf->f->sca;
60 >                d = 1.0 / mf->fxp->sca;
61          VSUM(r->pert, r->pert, disp, d);
62          return(0);
63   }

Diff Legend

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