| 30 |
|
*/ |
| 31 |
|
|
| 32 |
|
|
| 33 |
< |
extern int |
| 33 |
> |
int |
| 34 |
|
t_data( /* interpolate texture data */ |
| 35 |
< |
register OBJREC *m, |
| 35 |
> |
OBJREC *m, |
| 36 |
|
RAY *r |
| 37 |
|
) |
| 38 |
|
{ |
| 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"); |
| 67 |
|
disp[i] = funvalue(m->oargs.sarg[i], 3, dval); |
| 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++) |
| 78 |
< |
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"); |
