9 |
|
*/ |
10 |
|
|
11 |
|
#include "ray.h" |
12 |
+ |
#include "platform.h" |
13 |
|
#include "source.h" |
14 |
|
#include "view.h" |
15 |
|
#include "random.h" |
27 |
|
1.,180.,180.,0.,0.,0.,0., |
28 |
|
{0.,0.,0.},{0.,0.,0.},0.,0.}; |
29 |
|
|
30 |
< |
unsigned long nsamps = 10000; /* desired number of initial samples */ |
30 |
< |
unsigned long nssamps = 9000; /* number of super-samples */ |
30 |
> |
long nsamps = 10000; /* desired number of initial samples */ |
31 |
|
int ndsamps = 32; /* number of direct samples */ |
32 |
|
int nprocs = 1; /* number of rendering processes */ |
33 |
|
|
59 |
|
over_options(); |
60 |
|
printf("-n %-9d\t\t\t# number of processes\n", nprocs); |
61 |
|
printf("-rd %-9ld\t\t\t# ray directions\n", nsamps); |
62 |
– |
/* printf("-rs %-9ld\t\t\t# ray super-samples\n", nssamps); */ |
62 |
|
printf("-dn %-9d\t\t\t# direct number of samples\n", ndsamps); |
63 |
|
printf("-vp %f %f %f\t# view point\n", |
64 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
76 |
|
int ec; |
77 |
|
{ |
78 |
|
if (ray_pnprocs > 0) /* close children if any */ |
79 |
< |
ray_pclose(0); |
79 |
> |
ray_pclose(0); |
80 |
> |
else if (ray_pnprocs < 0) |
81 |
> |
_exit(ec); /* avoid flush in child */ |
82 |
|
exit(ec); |
83 |
|
} |
84 |
|
|
130 |
|
if (argv[i][1] == 'r') { /* sampling options */ |
131 |
|
if (argv[i][2] == 'd') |
132 |
|
nsamps = atol(argv[++i]); |
132 |
– |
else if (argv[i][2] == 's') |
133 |
– |
nssamps = atol(argv[++i]); |
133 |
|
else { |
134 |
|
sprintf(errmsg, "bad option at '%s'", argv[i]); |
135 |
|
error(USER, errmsg); |
208 |
|
{ |
209 |
|
int warnedneg; |
210 |
|
char linebuf[8192]; |
211 |
+ |
int last_pos_val = 0; |
212 |
|
int nelem = 1000; |
213 |
|
float *sarr = (float *)malloc(sizeof(float)*nelem); |
214 |
|
FILE *fp; |
236 |
|
cp = fskip(cp); |
237 |
|
if (cp == NULL) |
238 |
|
break; |
239 |
< |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) { |
239 |
> |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) { |
240 |
|
sprintf(errmsg, |
241 |
|
"Phi values not monotinically increasing in sensor file '%s'", |
242 |
|
sfile); |
262 |
|
cp = fskip(cp); |
263 |
|
if (cp == NULL) |
264 |
|
break; |
265 |
< |
if (i && sarr[i] < .0) { |
265 |
> |
if (sarr[i] < .0) { |
266 |
|
if (!warnedneg++) { |
267 |
|
sprintf(errmsg, |
268 |
|
"Negative value(s) in sensor file '%s' (ignored)\n", sfile); |
269 |
|
error(WARNING, errmsg); |
270 |
|
} |
271 |
|
sarr[i] = .0; |
272 |
< |
} |
272 |
> |
} else if (sarr[i] > FTINY && i > ntp[0]*(ntp[1]+1)) |
273 |
> |
last_pos_val = i; |
274 |
|
++i; |
275 |
|
} |
276 |
< |
if (i == ntp[0]*(ntp[1]+1)) |
276 |
> |
if (i == ntp[0]*(ntp[1]+1)) /* empty line? */ |
277 |
|
break; |
278 |
|
if (ntp[0] > 1 && sarr[ntp[0]*(ntp[1]+1)] <= |
279 |
|
sarr[(ntp[0]-1)*(ntp[1]+1)]) { |
289 |
|
error(USER, errmsg); |
290 |
|
} |
291 |
|
} |
292 |
< |
nelem = i; |
292 |
> |
/* truncate zero region */ |
293 |
> |
ntp[0] = (last_pos_val + ntp[1])/(ntp[1]+1) - 1; |
294 |
> |
nelem = (ntp[0]+1)*(ntp[1]+1); |
295 |
|
fclose(fp); |
296 |
|
errmsg[0] = '\0'; /* sanity checks */ |
297 |
< |
if (ntp[0] <= 0) |
298 |
< |
sprintf(errmsg, "no data in sensor file '%s'", sfile); |
297 |
> |
if (!last_pos_val) |
298 |
> |
sprintf(errmsg, "no positive sensor values in file '%s'", sfile); |
299 |
|
else if (fabs(sarr[ntp[1]+1]) > FTINY) |
300 |
|
sprintf(errmsg, "minimum theta must be 0 in sensor file '%s'", |
301 |
|
sfile); |
302 |
|
else if (fabs(sarr[1]) > FTINY) |
303 |
|
sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'", |
304 |
|
sfile); |
305 |
< |
else if (sarr[ntp[1]] <= FTINY) |
305 |
> |
else if (sarr[ntp[1]] < 270.-FTINY) |
306 |
|
sprintf(errmsg, |
307 |
< |
"maximum phi must be positive in sensor file '%s'", |
307 |
> |
"maximum phi must be 270 or greater in sensor file '%s'", |
308 |
|
sfile); |
309 |
< |
else if (sarr[ntp[0]*(ntp[1]+1)] <= FTINY) |
309 |
> |
else if (sarr[ntp[1]] >= 360.-FTINY) |
310 |
|
sprintf(errmsg, |
311 |
< |
"maximum theta must be positive in sensor file '%s'", |
311 |
> |
"maximum phi must be less than 360 in sensor file '%s'", |
312 |
|
sfile); |
313 |
|
if (errmsg[0]) |
314 |
|
error(USER, errmsg); |
321 |
|
char *sfile |
322 |
|
) |
323 |
|
{ |
324 |
< |
int samptot = nsamps; |
324 |
> |
long samptot = nsamps; |
325 |
|
float *rowp, *rowp1; |
326 |
|
double rowsum[MAXNT], rowomega[MAXNT]; |
327 |
|
double thdiv[MAXNT+1], phdiv[MAXNP+1]; |
369 |
|
psize = PI*tsize/maxtheta; |
370 |
|
if (sntp[0]*sntp[1] < samptot) /* don't overdo resolution */ |
371 |
|
samptot = sntp[0]*sntp[1]; |
372 |
< |
ntheta = (int)(sqrt((double)samptot*tsize/psize) + 0.5); |
372 |
> |
ntheta = (int)(sqrt((double)samptot*tsize/psize)*sntp[0]/sntp[1]) + 1; |
373 |
|
if (ntheta > MAXNT) |
374 |
|
ntheta = MAXNT; |
375 |
|
nphi = samptot/ntheta; |