15 |
|
|
16 |
|
#define DEGREE (PI/180.) |
17 |
|
|
18 |
< |
#define MAXNT 180 /* maximum number of theta divisions */ |
18 |
> |
#define MAXNT 181 /* maximum number of theta divisions */ |
19 |
|
#define MAXNP 360 /* maximum number of phi divisions */ |
20 |
|
|
21 |
|
extern char *progname; /* global argv[0] */ |
34 |
|
float *sensor = NULL; /* current sensor data */ |
35 |
|
int sntp[2]; /* number of sensor theta and phi angles */ |
36 |
|
float maxtheta; /* maximum theta value for this sensor */ |
37 |
< |
float tvals[MAXNT+1]; /* theta values (1-D table of 1-cos(t)) */ |
38 |
< |
float *pvals = NULL; /* phi values (2-D table in radians) */ |
37 |
> |
float tvals[MAXNT+1]; /* theta prob. values (1-D table of 1-cos(t)) */ |
38 |
> |
float *pvals = NULL; /* phi prob. values (2-D table in radians) */ |
39 |
|
int ntheta = 0; /* polar angle divisions */ |
40 |
|
int nphi = 0; /* azimuthal angle divisions */ |
41 |
|
double gscale = 1.; /* global scaling value */ |
71 |
|
print_rdefaults(); |
72 |
|
} |
73 |
|
|
74 |
+ |
|
75 |
+ |
void |
76 |
+ |
quit(ec) /* make sure exit is called */ |
77 |
+ |
int ec; |
78 |
+ |
{ |
79 |
+ |
if (ray_pnprocs > 0) /* close children if any */ |
80 |
+ |
ray_pclose(0); |
81 |
+ |
exit(ec); |
82 |
+ |
} |
83 |
+ |
|
84 |
+ |
|
85 |
|
int |
86 |
|
main( |
87 |
|
int argc, |
120 |
|
putchar('\n'); |
121 |
|
} |
122 |
|
/* start process(es) */ |
123 |
< |
ray_pinit(argv[argc-1], nprocs); |
123 |
> |
if (strcmp(argv[argc-1], ".")) |
124 |
> |
ray_pinit(argv[argc-1], nprocs); |
125 |
|
} |
126 |
|
comp_sensor(argv[i]); /* process a sensor file */ |
127 |
|
continue; |
195 |
|
} |
196 |
|
i += rval; |
197 |
|
} |
198 |
< |
if (!ray_pnprocs) |
198 |
> |
if (sensor == NULL) |
199 |
|
error(USER, i<argc ? "missing sensor file" : "missing octree"); |
200 |
|
quit(0); |
201 |
|
} |
207 |
|
char *sfile |
208 |
|
) |
209 |
|
{ |
210 |
+ |
int warnedneg; |
211 |
|
char linebuf[8192]; |
212 |
+ |
int last_pos_val = 0; |
213 |
|
int nelem = 1000; |
214 |
|
float *sarr = (float *)malloc(sizeof(float)*nelem); |
215 |
|
FILE *fp; |
237 |
|
cp = fskip(cp); |
238 |
|
if (cp == NULL) |
239 |
|
break; |
240 |
+ |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) { |
241 |
+ |
sprintf(errmsg, |
242 |
+ |
"Phi values not monotinically increasing in sensor file '%s'", |
243 |
+ |
sfile); |
244 |
+ |
error(USER, errmsg); |
245 |
+ |
} |
246 |
|
++ntp[1]; |
247 |
|
} |
248 |
+ |
warnedneg = 0; |
249 |
|
ntp[0] = 0; /* get thetas + data */ |
250 |
|
while (fgets(linebuf, sizeof(linebuf), fp) != NULL) { |
251 |
|
++ntp[0]; |
263 |
|
cp = fskip(cp); |
264 |
|
if (cp == NULL) |
265 |
|
break; |
266 |
+ |
if (i && sarr[i] < .0) { |
267 |
+ |
if (!warnedneg++) { |
268 |
+ |
sprintf(errmsg, |
269 |
+ |
"Negative value(s) in sensor file '%s' (ignored)\n", sfile); |
270 |
+ |
error(WARNING, errmsg); |
271 |
+ |
} |
272 |
+ |
sarr[i] = .0; |
273 |
+ |
} else if (i > ntp[0]*(ntp[1]+1) && sarr[i] > FTINY) |
274 |
+ |
last_pos_val = i; |
275 |
|
++i; |
276 |
|
} |
277 |
|
if (i == ntp[0]*(ntp[1]+1)) |
278 |
|
break; |
279 |
+ |
if (ntp[0] > 1 && sarr[ntp[0]*(ntp[1]+1)] <= |
280 |
+ |
sarr[(ntp[0]-1)*(ntp[1]+1)]) { |
281 |
+ |
sprintf(errmsg, |
282 |
+ |
"Theta values not monotinically increasing in sensor file '%s'", |
283 |
+ |
sfile); |
284 |
+ |
error(USER, errmsg); |
285 |
+ |
} |
286 |
|
if (i != (ntp[0]+1)*(ntp[1]+1)) { |
287 |
|
sprintf(errmsg, |
288 |
|
"bad column count near line %d in sensor file '%s'", |
290 |
|
error(USER, errmsg); |
291 |
|
} |
292 |
|
} |
293 |
< |
nelem = i; |
293 |
> |
/* truncate zero region */ |
294 |
> |
ntp[0] = (last_pos_val + ntp[1])/(ntp[1]+1) - 1; |
295 |
> |
nelem = (ntp[0]+1)*(ntp[1]+1); |
296 |
|
fclose(fp); |
297 |
|
errmsg[0] = '\0'; /* sanity checks */ |
298 |
+ |
if (!last_pos_val) |
299 |
+ |
sprintf(errmsg, "no positive sensor values in file '%s'", sfile); |
300 |
|
if (ntp[0] <= 0) |
301 |
|
sprintf(errmsg, "no data in sensor file '%s'", sfile); |
302 |
|
else if (fabs(sarr[ntp[1]+1]) > FTINY) |
311 |
|
sfile); |
312 |
|
else if (sarr[ntp[0]*(ntp[1]+1)] <= FTINY) |
313 |
|
sprintf(errmsg, |
314 |
< |
"maximum theta must be positive in sensor file '%s'", |
315 |
< |
sfile); |
314 |
> |
"maximum theta (%f) must be positive in sensor file '%s'", |
315 |
> |
sarr[ntp[0]*(ntp[1]+1)], sfile); |
316 |
|
if (errmsg[0]) |
317 |
|
error(USER, errmsg); |
318 |
|
return((float *)realloc((void *)sarr, sizeof(float)*nelem)); |
356 |
|
error(INTERNAL, errmsg); |
357 |
|
} |
358 |
|
/* compute boundary angles */ |
359 |
< |
maxtheta = 1.5f*s_theta(sntp[0]-1) - 0.5f*s_theta(sntp[0]-2); |
359 |
> |
maxtheta = DEGREE*(1.5f*s_theta(sntp[0]-1) - 0.5f*s_theta(sntp[0]-2)); |
360 |
> |
if (maxtheta > PI) |
361 |
> |
maxtheta = PI; |
362 |
|
thdiv[0] = .0; |
363 |
|
for (t = 1; t < sntp[0]; t++) |
364 |
|
thdiv[t] = DEGREE/2.*(s_theta(t-1) + s_theta(t)); |
365 |
< |
thdiv[sntp[0]] = maxtheta*DEGREE; |
366 |
< |
phdiv[0] = .0; |
365 |
> |
thdiv[sntp[0]] = maxtheta; |
366 |
> |
phdiv[0] = DEGREE*(1.5f*s_phi(0) - 0.5f*s_phi(1)); |
367 |
|
for (p = 1; p < sntp[1]; p++) |
368 |
|
phdiv[p] = DEGREE/2.*(s_phi(p-1) + s_phi(p)); |
369 |
< |
phdiv[sntp[1]] = 2.*PI; |
369 |
> |
phdiv[sntp[1]] = DEGREE*(1.5f*s_phi(sntp[1]-1) - 0.5f*s_phi(sntp[1]-2)); |
370 |
|
/* size our table */ |
371 |
< |
tsize = 1. - cos(maxtheta*DEGREE); |
372 |
< |
psize = PI*tsize/(maxtheta*DEGREE); |
371 |
> |
tsize = 1. - cos(maxtheta); |
372 |
> |
psize = PI*tsize/maxtheta; |
373 |
|
if (sntp[0]*sntp[1] < samptot) /* don't overdo resolution */ |
374 |
|
samptot = sntp[0]*sntp[1]; |
375 |
|
ntheta = (int)(sqrt((double)samptot*tsize/psize) + 0.5); |
376 |
|
if (ntheta > MAXNT) |
377 |
|
ntheta = MAXNT; |
378 |
|
nphi = samptot/ntheta; |
379 |
< |
pvals = (float *)malloc(sizeof(float)*ntheta*(nphi+1)); |
379 |
> |
pvals = (float *)malloc(sizeof(float)*(ntheta+1)*(nphi+1)); |
380 |
|
if (pvals == NULL) |
381 |
|
error(SYSTEM, "out of memory in init_ptable()"); |
382 |
|
gscale = .0; /* compute our inverse table */ |
383 |
|
for (i = 0; i < sntp[0]; i++) { |
384 |
|
rowp = &s_val(i,0); |
385 |
< |
rowsum[i] = 0.; |
385 |
> |
rowsum[i] = 1e-20; |
386 |
|
for (j = 0; j < sntp[1]; j++) |
387 |
|
rowsum[i] += *rowp++; |
388 |
|
rowomega[i] = cos(thdiv[i]) - cos(thdiv[i+1]); |
389 |
|
rowomega[i] *= 2.*PI / (double)sntp[1]; |
390 |
|
gscale += rowsum[i] * rowomega[i]; |
391 |
|
} |
392 |
+ |
if (gscale <= FTINY) { |
393 |
+ |
sprintf(errmsg, "Sensor values sum to zero in file '%s'", sfile); |
394 |
+ |
error(USER, errmsg); |
395 |
+ |
} |
396 |
|
for (i = 0; i < ntheta; i++) { |
397 |
|
prob = (double)i / (double)ntheta; |
398 |
|
for (t = 0; t < sntp[0]; t++) |
404 |
|
tvals[i] = 1. - ( (1.-frac)*cos(thdiv[t]) + |
405 |
|
frac*cos(thdiv[t+1]) ); |
406 |
|
/* offset b/c sensor values are centered */ |
407 |
< |
if (t <= 0 || frac > 0.5) |
407 |
> |
if ((t < sntp[0]-1) & (!t | (frac >= 0.5))) { |
408 |
|
frac -= 0.5; |
409 |
< |
else if (t >= sntp[0]-1 || frac < 0.5) { |
409 |
> |
} else { |
410 |
|
frac += 0.5; |
411 |
|
--t; |
412 |
|
} |
413 |
< |
pvals[i*(nphi+1)] = .0f; |
413 |
> |
pvals[i*(nphi+1)] = phdiv[0]; |
414 |
|
for (j = 1; j < nphi; j++) { |
415 |
|
prob = (double)j / (double)nphi; |
416 |
|
rowp = &s_val(t,0); |
417 |
|
rowp1 = &s_val(t+1,0); |
418 |
< |
for (p = 0; p < sntp[1]; p++) { |
418 |
> |
for (p = 0; p < sntp[1]; p++) |
419 |
|
if ((prob -= (1.-frac)*rowp[p]/rowsum[t] + |
420 |
|
frac*rowp1[p]/rowsum[t+1]) <= .0) |
421 |
|
break; |
422 |
< |
if (p >= sntp[1]) |
423 |
< |
error(INTERNAL, |
424 |
< |
"code error 2 in init_ptable()"); |
378 |
< |
frac1 = 1. + prob/((1.-frac)*rowp[p]/rowsum[t] |
379 |
< |
+ frac*rowp1[p]/rowsum[t+1]); |
380 |
< |
pvals[i*(nphi+1) + j] = (1.-frac1)*phdiv[p] + |
381 |
< |
frac1*phdiv[p+1]; |
422 |
> |
if (p >= sntp[1]) { /* should never happen? */ |
423 |
> |
p = sntp[1] - 1; |
424 |
> |
prob = .5; |
425 |
|
} |
426 |
+ |
frac1 = 1. + prob/((1.-frac)*rowp[p]/rowsum[t] |
427 |
+ |
+ frac*rowp1[p]/rowsum[t+1]); |
428 |
+ |
pvals[i*(nphi+1) + j] = (1.-frac1)*phdiv[p] + |
429 |
+ |
frac1*phdiv[p+1]; |
430 |
|
} |
431 |
< |
pvals[i*(nphi+1) + nphi] = (float)(2.*PI); |
431 |
> |
pvals[i*(nphi+1) + nphi] = phdiv[sntp[1]]; |
432 |
|
} |
433 |
+ |
/* duplicate final row */ |
434 |
+ |
memcpy(pvals+ntheta*(nphi+1), pvals+(ntheta-1)*(nphi+1), |
435 |
+ |
sizeof(*pvals)*(nphi+1)); |
436 |
|
tvals[0] = .0f; |
437 |
|
tvals[ntheta] = (float)tsize; |
438 |
|
} |
479 |
|
int t, p; |
480 |
|
|
481 |
|
dv[2] = DOT(dvec, ourview.vdir); |
482 |
< |
theta = (float)((1./DEGREE) * acos(dv[2])); |
482 |
> |
theta = acos(dv[2]); |
483 |
|
if (theta >= maxtheta) |
484 |
|
return(.0f); |
485 |
|
dv[0] = DOT(dvec, ourview.hvec); |
486 |
|
dv[1] = DOT(dvec, ourview.vvec); |
487 |
< |
phi = (float)((1./DEGREE) * atan2(-dv[0], dv[1])); |
488 |
< |
while (phi < .0f) phi += 360.f; |
487 |
> |
phi = atan2(-dv[0], dv[1]); |
488 |
> |
while (phi < .0f) phi += (float)(2.*PI); |
489 |
|
t = (int)(theta/maxtheta * sntp[0]); |
490 |
< |
p = (int)(phi*(1./360.) * sntp[1]); |
490 |
> |
p = (int)(phi*(1./(2.*PI)) * sntp[1]); |
491 |
|
/* hack for non-uniform sensor grid */ |
492 |
+ |
theta *= (float)(1./DEGREE); |
493 |
+ |
phi *= (float)(1./DEGREE); |
494 |
|
while (t+1 < sntp[0] && theta >= s_theta(t+1)) |
495 |
|
++t; |
496 |
|
while (t-1 >= 0 && theta <= s_theta(t-1)) |
502 |
|
return(s_val(t,p)); |
503 |
|
} |
504 |
|
|
505 |
+ |
/* Print origin and direction */ |
506 |
+ |
static void |
507 |
+ |
print_ray( |
508 |
+ |
FVECT rorg, |
509 |
+ |
FVECT rdir |
510 |
+ |
) |
511 |
+ |
{ |
512 |
+ |
printf("%.6g %.6g %.6g %.8f %.8f %.8f\n", |
513 |
+ |
rorg[0], rorg[1], rorg[2], |
514 |
+ |
rdir[0], rdir[1], rdir[2]); |
515 |
+ |
} |
516 |
+ |
|
517 |
|
/* Compute sensor output */ |
518 |
|
static void |
519 |
|
comp_sensor( |
548 |
|
get_direc(rr.rdir, (i+frandom())/nt, (j+frandom())/np); |
549 |
|
if (ourview.vfore > FTINY) |
550 |
|
VSUM(rr.rorg, rr.rorg, rr.rdir, ourview.vfore); |
551 |
+ |
if (!ray_pnprocs) { |
552 |
+ |
print_ray(rr.rorg, rr.rdir); |
553 |
+ |
continue; |
554 |
+ |
} |
555 |
|
rr.rmax = .0; |
556 |
< |
rayorigin(&rr, PRIMARY, NULL, NULL); |
556 |
> |
rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL); |
557 |
|
scalecolor(rr.rcoef, sf); |
558 |
|
if (ray_pqueue(&rr) == 1) |
559 |
|
addcolor(vsum, rr.rcol); |
564 |
|
get_direc(rr.rdir, frandom(), frandom()); |
565 |
|
if (ourview.vfore > FTINY) |
566 |
|
VSUM(rr.rorg, rr.rorg, rr.rdir, ourview.vfore); |
567 |
+ |
if (!ray_pnprocs) { |
568 |
+ |
print_ray(rr.rorg, rr.rdir); |
569 |
+ |
continue; |
570 |
+ |
} |
571 |
|
rr.rmax = .0; |
572 |
< |
rayorigin(&rr, PRIMARY, NULL, NULL); |
572 |
> |
rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL); |
573 |
|
scalecolor(rr.rcoef, sf); |
574 |
|
if (ray_pqueue(&rr) == 1) |
575 |
|
addcolor(vsum, rr.rcol); |
576 |
|
} |
577 |
+ |
if (!ray_pnprocs) /* just printing rays */ |
578 |
+ |
return; |
579 |
|
/* scale partial result */ |
580 |
|
scalecolor(vsum, sf); |
581 |
|
/* add direct component */ |