21 |
|
int ndims = 0; /* number of sampling dimensions */ |
22 |
|
int samplendx = 0; /* index for this sample */ |
23 |
|
|
24 |
< |
void (*trace)(); |
24 |
> |
void (*trace)() = NULL; /* trace call (NULL before rcinit) */ |
25 |
|
|
26 |
|
int do_irrad = 0; /* compute irradiance? */ |
27 |
|
|
74 |
|
|
75 |
|
/************************** INITIALIZATION ROUTINES ***********************/ |
76 |
|
|
77 |
< |
char * |
77 |
> |
const char * |
78 |
|
formstr( /* return format identifier */ |
79 |
|
int f |
80 |
|
) |
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/2 + 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 |
> |
if (path == NULL) |
168 |
> |
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
169 |
> |
else |
170 |
> |
sprintf(errmsg, "cannot load modifier file '%s'", path); |
171 |
|
error(SYSTEM, errmsg); |
172 |
|
} |
173 |
< |
if (i >= MAXMODLIST-1) { |
174 |
< |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
175 |
< |
MAXMODLIST-1, fname); |
176 |
< |
error(INTERNAL, errmsg); |
173 |
> |
while (fgetword(mod, sizeof(mod), fp) != NULL) |
174 |
> |
addmodifier(savqstr(mod), outf, prms, binv, bincnt); |
175 |
> |
fclose(fp); |
176 |
> |
} |
177 |
> |
|
178 |
> |
|
179 |
> |
/* Check if we have any more rays left (and report progress) */ |
180 |
> |
int |
181 |
> |
morays(void) |
182 |
> |
{ |
183 |
> |
static RNUMBER total_rays; |
184 |
> |
static time_t tstart, last_report; |
185 |
> |
time_t tnow; |
186 |
> |
|
187 |
> |
if (!raysleft) |
188 |
> |
return(1); /* unknown total, so nothing to do or say */ |
189 |
> |
|
190 |
> |
if (report_intvl > 0 && (tnow = time(0)) >= last_report+report_intvl) { |
191 |
> |
if (!total_rays) { |
192 |
> |
total_rays = raysleft; |
193 |
> |
tstart = tnow; |
194 |
> |
} else { |
195 |
> |
sprintf(errmsg, "%.2f%% done after %.3f hours\n", |
196 |
> |
100.-100.*raysleft/total_rays, |
197 |
> |
(1./3600.)*(tnow - tstart)); |
198 |
> |
eputs(errmsg); |
199 |
> |
} |
200 |
> |
last_report = tnow; |
201 |
|
} |
202 |
< |
for (i = 0; mname[i]; i++) /* add each one */ |
171 |
< |
addmodifier(mname[i], outf, prms, binv, bincnt); |
202 |
> |
return(--raysleft); |
203 |
|
} |
204 |
|
|
205 |
|
|
206 |
+ |
/* Quit program */ |
207 |
|
void |
208 |
< |
quit( /* quit program */ |
208 |
> |
quit( |
209 |
|
int code |
210 |
|
) |
211 |
|
{ |
212 |
|
if (nchild > 0) /* close children if any */ |
213 |
|
end_children(code != 0); |
214 |
+ |
else if (nchild < 0) |
215 |
+ |
_exit(code); /* avoid flush() in child */ |
216 |
|
exit(code); |
217 |
|
} |
218 |
|
|
315 |
|
thisray.rmax = 0.0; |
316 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
317 |
|
/* pretend we hit surface */ |
318 |
< |
thisray.rt = thisray.rot = 1e-5; |
318 |
> |
thisray.rxt = thisray.rot = 1e-5; |
319 |
|
thisray.rod = 1.0; |
320 |
|
VCOPY(thisray.ron, dir); |
321 |
|
VSUM(thisray.rop, org, dir, 1e-4); |
396 |
|
} |
397 |
|
done_contrib(); /* accumulate/output */ |
398 |
|
++lastdone; |
399 |
< |
if (raysleft && !--raysleft) |
399 |
> |
if (!morays()) |
400 |
|
break; /* preemptive EOI */ |
401 |
|
} |
402 |
|
if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) { |