33 |
|
register RAY *r; |
34 |
|
XF *bx; |
35 |
|
{ |
36 |
< |
extern double l_noise3(), l_noise3a(), l_noise3b(), l_noise3c(); |
37 |
< |
extern double l_hermite(), l_fnoise3(), l_arg(); |
36 |
> |
extern double l_arg(); |
37 |
|
extern long eclock; |
38 |
|
static char *initfile = "rayinit.cal"; |
39 |
+ |
static long lastrno = -1; |
40 |
+ |
/* check to see if already set */ |
41 |
+ |
if (m == fobj && r->rno == lastrno) |
42 |
+ |
return(0); |
43 |
|
/* initialize if first call */ |
44 |
|
if (initfile != NULL) { |
45 |
|
loadfunc(initfile); |
52 |
|
scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0); |
53 |
|
scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0); |
54 |
|
funset("arg", 1, '=', l_arg); |
55 |
< |
funset("noise3", 3, ':', l_noise3); |
53 |
< |
funset("noise3a", 3, ':', l_noise3a); |
54 |
< |
funset("noise3b", 3, ':', l_noise3b); |
55 |
< |
funset("noise3c", 3, ':', l_noise3c); |
56 |
< |
funset("hermite", 5, ':', l_hermite); |
57 |
< |
funset("fnoise3", 3, ':', l_fnoise3); |
55 |
> |
setnoisefuncs(); |
56 |
|
initfile = NULL; |
57 |
|
} |
58 |
|
fobj = m; |
65 |
|
copystruct(&funcxf, &r->rox->b); |
66 |
|
else |
67 |
|
copystruct(&funcxf, bx); |
68 |
+ |
lastrno = r->rno; |
69 |
|
eclock++; /* notify expression evaluator */ |
70 |
+ |
return(1); |
71 |
|
} |
72 |
|
|
73 |
|
|
97 |
|
} |
98 |
|
m->os = (char *)mxf; |
99 |
|
} |
100 |
< |
setmap(m, r, mxf); |
101 |
< |
return; |
100 |
> |
return(setmap(m, r, mxf)); |
101 |
|
memerr: |
102 |
|
error(SYSTEM, "out of memory in setfunc"); |
103 |
|
} |
175 |
|
return(sum * funcxf.sca); |
176 |
|
|
177 |
|
} |
178 |
< |
if (n == 10) /* dot product */ |
179 |
< |
return(fray->rod); |
178 |
> |
if (n == 10) /* dot product (range [-1,1]) */ |
179 |
> |
return( fray->rod <= -1.0 ? -1.0 : |
180 |
> |
fray->rod >= 1.0 ? 1.0 : |
181 |
> |
fray->rod ); |
182 |
|
|
183 |
|
if (n == 11) /* scale */ |
184 |
|
return(funcxf.sca); |