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

Comparing ray/src/rt/t_data.c (file contents):
Revision 2.6 by greg, Tue Feb 25 02:47:23 2003 UTC vs.
Revision 2.11 by greg, Tue Jul 8 18:25:00 2014 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include  "ray.h"
11 –
11   #include  "data.h"
13 –
12   #include  "func.h"
13 + #include  "rtotypes.h"
14  
15   /*
16   *      A stored texture is specified as follows:
# Line 31 | Line 30 | static const char      RCSid[] = "$Id$";
30   */
31  
32  
33 < t_data(m, r)                    /* interpolate texture data */
34 < register OBJREC  *m;
35 < RAY  *r;
33 > int
34 > t_data(                 /* interpolate texture data */
35 >        OBJREC  *m,
36 >        RAY  *r
37 > )
38   {
39          int  nv;
40          FVECT  disp;
41          double  dval[3], pt[MAXDIM];
42          double  d;
43          DATARRAY  *dp;
44 <        register MFUNC  *mf;
45 <        register int  i;
44 >        MFUNC  *mf;
45 >        int  i;
46  
47          if (m->oargs.nsargs < 8)
48                  objerror(m, USER, "bad # arguments");
# Line 52 | Line 53 | RAY  *r;
53          errno = 0;
54          for (i = 0; i < nv; i++)
55                  pt[i] = evalue(mf->ep[i]);
56 <        if (errno)
56 >        if (errno == EDOM || errno == ERANGE)
57                  goto computerr;
58          dval[0] = datavalue(dp, pt);
59          for (i = 1; i < 3; i++) {
# Line 64 | Line 65 | RAY  *r;
65          errno = 0;
66          for (i = 0; i < 3; i++)
67                  disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
68 <        if (errno)
68 >        if (errno == EDOM || errno == ERANGE)
69                  goto computerr;
70 <        if (mf->f != &unitxf)
71 <                multv3(disp, disp, mf->f->xfm);
70 >        if (mf->fxp != &unitxf)
71 >                multv3(disp, disp, mf->fxp->xfm);
72          if (r->rox != NULL) {
73                  multv3(disp, disp, r->rox->f.xfm);
74 <                d = 1.0 / (mf->f->sca * r->rox->f.sca);
74 >                d = 1.0 / (mf->fxp->sca * r->rox->f.sca);
75          } else
76 <                d = 1.0 / mf->f->sca;
77 <        for (i = 0; i < 3; i++)
77 <                r->pert[i] += disp[i] * d;
76 >                d = 1.0 / mf->fxp->sca;
77 >        VSUM(r->pert, r->pert, disp, d);
78          return(0);
79   computerr:
80          objerror(m, WARNING, "compute error");

Diff Legend

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