16 |
|
|
17 |
|
|
18 |
|
typedef struct { |
19 |
– |
double sca; /* scalefactor */ |
19 |
|
double xfm[4][4]; /* transform matrix */ |
20 |
+ |
double sca; /* scalefactor */ |
21 |
|
} XF; |
22 |
|
|
23 |
|
static OBJREC *fobj; /* current function object */ |
25 |
|
static XF fxf; /* current transformation */ |
26 |
|
|
27 |
|
|
28 |
< |
setmap(m, r, sca, xfm) /* set channels for function call */ |
28 |
> |
setmap(m, r, xfm, sca) /* set channels for function call */ |
29 |
|
OBJREC *m; |
30 |
|
register RAY *r; |
31 |
– |
double sca; |
31 |
|
double xfm[4][4]; |
32 |
+ |
double sca; |
33 |
|
{ |
34 |
|
extern double l_noise3(), l_noise3a(), l_noise3b(), l_noise3c(); |
35 |
|
extern double l_hermite(), l_fnoise3(), l_arg(); |
53 |
|
} |
54 |
|
fobj = m; |
55 |
|
fray = r; |
56 |
< |
fxf.sca = r->ros * sca; |
57 |
< |
multmat4(fxf.xfm, r->rox, xfm); |
56 |
> |
fxf.sca = r->robs * sca; |
57 |
> |
multmat4(fxf.xfm, r->robx, xfm); |
58 |
|
eclock++; /* notify expression evaluator */ |
59 |
|
} |
60 |
|
|
84 |
|
mxf->sca = -mxf->sca; |
85 |
|
m->os = (char *)mxf; |
86 |
|
} |
87 |
< |
setmap(m, r, mxf->sca, mxf->xfm); |
87 |
> |
setmap(m, r, mxf->xfm, mxf->sca); |
88 |
|
return; |
89 |
|
memerr: |
90 |
|
error(SYSTEM, "out of memory in setfunc"); |