| 6 |
|
* Initialization and calculation routines |
| 7 |
|
*/ |
| 8 |
|
|
| 9 |
+ |
#include "copyright.h" |
| 10 |
+ |
|
| 11 |
|
#include "rcontrib.h" |
| 12 |
|
#include "otypes.h" |
| 13 |
|
#include "source.h" |
| 90 |
|
|
| 91 |
|
/* Add modifier to our list to track */ |
| 92 |
|
MODCONT * |
| 93 |
< |
addmodifier(char *modn, char *outf, char *binv, int bincnt) |
| 93 |
> |
addmodifier(char *modn, char *outf, char *prms, char *binv, int bincnt) |
| 94 |
|
{ |
| 95 |
|
LUENT *lep = lu_find(&modconttab,modn); |
| 96 |
|
MODCONT *mp; |
| 101 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
| 102 |
|
error(USER, errmsg); |
| 103 |
|
} |
| 104 |
< |
if (nmods >= MAXMODLIST) |
| 105 |
< |
error(INTERNAL, "too many modifiers"); |
| 104 |
> |
if (nmods >= MAXMODLIST) { |
| 105 |
> |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
| 106 |
> |
error(INTERNAL, errmsg); |
| 107 |
> |
} |
| 108 |
> |
if (!strcmp(modn, VOIDID)) { |
| 109 |
> |
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
| 110 |
> |
error(USER, errmsg); |
| 111 |
> |
} |
| 112 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
| 113 |
|
lep->key = modn; /* XXX assumes static string */ |
| 114 |
|
if (binv == NULL) |
| 133 |
|
error(SYSTEM, "out of memory in addmodifier"); |
| 134 |
|
mp->outspec = outf; /* XXX assumes static string */ |
| 135 |
|
mp->modname = modn; /* XXX assumes static string */ |
| 136 |
+ |
mp->params = prms; |
| 137 |
|
mp->binv = ebinv; |
| 138 |
|
mp->nbins = bincnt; |
| 139 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt); |
| 147 |
|
|
| 148 |
|
/* Add modifiers from a file list */ |
| 149 |
|
void |
| 150 |
< |
addmodfile(char *fname, char *outf, char *binv, int bincnt) |
| 150 |
> |
addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt) |
| 151 |
|
{ |
| 152 |
|
char *mname[MAXMODLIST]; |
| 153 |
|
int i; |
| 154 |
|
/* find the file & store strings */ |
| 155 |
< |
if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) { |
| 155 |
> |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
| 156 |
> |
if (i < 0) { |
| 157 |
|
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 158 |
|
error(SYSTEM, errmsg); |
| 159 |
|
} |
| 160 |
+ |
if (i >= MAXMODLIST-1) { |
| 161 |
+ |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
| 162 |
+ |
MAXMODLIST-1, fname); |
| 163 |
+ |
error(INTERNAL, errmsg); |
| 164 |
+ |
} |
| 165 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
| 166 |
< |
addmodifier(mname[i], outf, binv, bincnt); |
| 166 |
> |
addmodifier(mname[i], outf, prms, binv, bincnt); |
| 167 |
|
} |
| 168 |
|
|
| 169 |
|
|
| 237 |
|
|
| 238 |
|
if (r->ro == NULL || r->ro->omod == OVOID) |
| 239 |
|
return; |
| 240 |
+ |
/* shadow ray not on source? */ |
| 241 |
+ |
if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) |
| 242 |
+ |
return; |
| 243 |
|
|
| 244 |
|
mp = (MODCONT *)lu_find(&modconttab,objptr(r->ro->omod)->oname)->data; |
| 245 |
|
|
| 246 |
|
if (mp == NULL) /* not in our list? */ |
| 247 |
|
return; |
| 230 |
– |
/* shadow ray not on source? */ |
| 231 |
– |
if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) |
| 232 |
– |
return; |
| 248 |
|
|
| 249 |
< |
worldfunc(RCCONTEXT, r); /* else get bin number */ |
| 250 |
< |
if ((bval = evalue(mp->binv)) <= -.5) |
| 251 |
< |
return; /* silently ignore */ |
| 249 |
> |
worldfunc(RCCONTEXT, r); /* else set context */ |
| 250 |
> |
set_eparams((char *)mp->params); |
| 251 |
> |
if ((bval = evalue(mp->binv)) <= -.5) /* and get bin number */ |
| 252 |
> |
return; /* silently ignore negatives */ |
| 253 |
|
if ((bn = (int)(bval + .5)) >= mp->nbins) { |
| 254 |
< |
error(WARNING, "bad bin number (ignored)"); |
| 254 |
> |
sprintf(errmsg, "bad bin number (%d ignored)", bn); |
| 255 |
> |
error(WARNING, errmsg); |
| 256 |
|
return; |
| 257 |
|
} |
| 258 |
|
raycontrib(contr, r, PRIMARY); /* compute coefficient */ |
