40 |
|
register OBJREC *m; |
41 |
|
register RAY *r; |
42 |
|
{ |
43 |
– |
#define mxf ((XFORM *)m->os) |
43 |
|
extern double varvalue(); |
44 |
|
extern int errno; |
45 |
|
FVECT disp; |
46 |
+ |
register XFORM *mxf; |
47 |
|
register int i; |
48 |
|
register char **sa; |
49 |
|
|
51 |
|
objerror(m, USER, "bad # arguments"); |
52 |
|
sa = m->oargs.sarg; |
53 |
|
|
54 |
< |
if (mxf == NULL) { |
54 |
> |
if ((mxf = (XFORM *)m->os) == NULL) { |
55 |
|
mxf = (XFORM *)malloc(sizeof(XFORM)); |
56 |
|
if (mxf == NULL) |
57 |
|
goto memerr; |
68 |
|
m->oargs.nsargs-4, sa+4); |
69 |
|
if (mxf->back.sca < 0.0) |
70 |
|
mxf->back.sca = -mxf->back.sca; |
71 |
+ |
m->os = (char *)mxf; |
72 |
|
} |
73 |
|
|
74 |
< |
setmap(m, r, mxf->back.sca, mxf->back.xfm); |
74 |
> |
setmap(m, r, mxf->back.xfm, mxf->back.sca); |
75 |
|
|
76 |
|
if (!vardefined(sa[0])) |
77 |
|
loadfunc(sa[3]); |
82 |
|
objerror(m, WARNING, "compute error"); |
83 |
|
return; |
84 |
|
} |
85 |
< |
if (mxf->fore.xfm == NULL) |
86 |
< |
for (i = 0; i < 3; i++) |
87 |
< |
r->pert[i] += disp[i]; |
88 |
< |
else |
88 |
< |
for (i = 0; i < 3; i++) |
89 |
< |
r->pert[i] += ( disp[0]*mxf->fore.xfm[0][i] + |
90 |
< |
disp[1]*mxf->fore.xfm[1][i] + |
91 |
< |
disp[2]*mxf->fore.xfm[2][i] ) |
92 |
< |
/ mxf->fore.sca; |
85 |
> |
multv3(disp, disp, mxf->fore.xfm); |
86 |
> |
multv3(disp, disp, r->rofx); |
87 |
> |
for (i = 0; i < 3; i++) |
88 |
> |
r->pert[i] += disp[i] / (mxf->fore.sca * r->rofs); |
89 |
|
return; |
90 |
|
memerr: |
91 |
|
error(SYSTEM, "out of memory in t_func"); |
96 |
– |
#undef mxf |
92 |
|
} |