| 102 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
| 103 |
|
error(USER, errmsg); |
| 104 |
|
} |
| 105 |
– |
if (nmods >= MAXMODLIST) { |
| 106 |
– |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
| 107 |
– |
error(INTERNAL, errmsg); |
| 108 |
– |
} |
| 105 |
|
if (!strcmp(modn, VOIDID)) { |
| 106 |
|
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
| 107 |
|
error(USER, errmsg); |
| 108 |
|
} |
| 109 |
+ |
if (nmods >= modasiz) { /* need bigger modifier array */ |
| 110 |
+ |
modasiz += modasiz/3 + 64; |
| 111 |
+ |
if (modname == NULL) |
| 112 |
+ |
modname = (char **)malloc(modasiz*sizeof(char *)); |
| 113 |
+ |
else |
| 114 |
+ |
modname = (char **)realloc(modname, modasiz*sizeof(char *)); |
| 115 |
+ |
if (modname == NULL) |
| 116 |
+ |
error(SYSTEM, "Out of memory in addmodifier()"); |
| 117 |
+ |
} |
| 118 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
| 119 |
|
lep->key = modn; /* XXX assumes static string */ |
| 120 |
|
if (binv == NULL) |
| 159 |
|
void |
| 160 |
|
addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt) |
| 161 |
|
{ |
| 162 |
< |
char *mname[MAXMODLIST]; |
| 163 |
< |
int i; |
| 164 |
< |
/* find the file & store strings */ |
| 165 |
< |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
| 166 |
< |
if (i < 0) { |
| 167 |
< |
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 162 |
> |
char *path = getpath(fname, getrlibpath(), R_OK); |
| 163 |
> |
char mod[MAXSTR]; |
| 164 |
> |
FILE *fp; |
| 165 |
> |
|
| 166 |
> |
if (path == NULL || (fp = fopen(path, "r")) == NULL) { |
| 167 |
> |
sprintf(errmsg, "cannot load modifier file '%s'", |
| 168 |
> |
path != NULL ? path : fname); |
| 169 |
|
error(SYSTEM, errmsg); |
| 170 |
|
} |
| 171 |
< |
if (i >= MAXMODLIST-1) { |
| 172 |
< |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
| 173 |
< |
MAXMODLIST-1, fname); |
| 174 |
< |
error(INTERNAL, errmsg); |
| 171 |
> |
while (fgetword(mod, sizeof(mod), fp) != NULL) |
| 172 |
> |
addmodifier(mod, outf, prms, binv, bincnt); |
| 173 |
> |
fclose(fp); |
| 174 |
> |
} |
| 175 |
> |
|
| 176 |
> |
|
| 177 |
> |
/* Check if we have any more rays left (and report progress) */ |
| 178 |
> |
int |
| 179 |
> |
morays(void) |
| 180 |
> |
{ |
| 181 |
> |
static RNUMBER total_rays; |
| 182 |
> |
static time_t tstart, last_report; |
| 183 |
> |
time_t tnow; |
| 184 |
> |
|
| 185 |
> |
if (!raysleft) |
| 186 |
> |
return(1); /* unknown total, so nothing to do or say */ |
| 187 |
> |
|
| 188 |
> |
if (report_intvl > 0 && (tnow = time(0)) >= last_report+report_intvl) { |
| 189 |
> |
if (!total_rays) { |
| 190 |
> |
total_rays = raysleft; |
| 191 |
> |
tstart = tnow; |
| 192 |
> |
} else { |
| 193 |
> |
sprintf(errmsg, "%.2f%% done after %.3f hours\n", |
| 194 |
> |
100.-100.*raysleft/total_rays, |
| 195 |
> |
(1./3600.)*(tnow - tstart)); |
| 196 |
> |
eputs(errmsg); |
| 197 |
> |
} |
| 198 |
> |
last_report = tnow; |
| 199 |
|
} |
| 200 |
< |
for (i = 0; mname[i]; i++) /* add each one */ |
| 171 |
< |
addmodifier(mname[i], outf, prms, binv, bincnt); |
| 200 |
> |
return(--raysleft); |
| 201 |
|
} |
| 202 |
|
|
| 203 |
|
|
| 204 |
+ |
/* Quit program */ |
| 205 |
|
void |
| 206 |
< |
quit( /* quit program */ |
| 206 |
> |
quit( |
| 207 |
|
int code |
| 208 |
|
) |
| 209 |
|
{ |
| 210 |
|
if (nchild > 0) /* close children if any */ |
| 211 |
|
end_children(code != 0); |
| 212 |
+ |
else if (nchild < 0) |
| 213 |
+ |
_exit(code); /* avoid flush() in child */ |
| 214 |
|
exit(code); |
| 215 |
|
} |
| 216 |
|
|
| 313 |
|
thisray.rmax = 0.0; |
| 314 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 315 |
|
/* pretend we hit surface */ |
| 316 |
< |
thisray.rt = thisray.rot = 1e-5; |
| 316 |
> |
thisray.rxt = thisray.rot = 1e-5; |
| 317 |
|
thisray.rod = 1.0; |
| 318 |
|
VCOPY(thisray.ron, dir); |
| 319 |
|
VSUM(thisray.rop, org, dir, 1e-4); |
| 394 |
|
} |
| 395 |
|
done_contrib(); /* accumulate/output */ |
| 396 |
|
++lastdone; |
| 397 |
< |
if (raysleft && !--raysleft) |
| 397 |
> |
if (!morays()) |
| 398 |
|
break; /* preemptive EOI */ |
| 399 |
|
} |
| 400 |
|
if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) { |
