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 |
89 |
< |
for (i = 0; i < 3; i++) |
90 |
< |
r->pert[i] += ( disp[0]*mxf->fore.xfm[0][i] + |
91 |
< |
disp[1]*mxf->fore.xfm[1][i] + |
92 |
< |
disp[2]*mxf->fore.xfm[2][i] ) |
93 |
< |
/ 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"); |