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] */ |
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]]) { |
240 |
> |
if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) { |
241 |
|
sprintf(errmsg, |
242 |
|
"Phi values not monotinically increasing in sensor file '%s'", |
243 |
|
sfile); |
263 |
|
cp = fskip(cp); |
264 |
|
if (cp == NULL) |
265 |
|
break; |
266 |
< |
if (i && sarr[i] < .0) { |
266 |
> |
if (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 |
< |
} |
273 |
> |
} else if (sarr[i] > FTINY && i > ntp[0]*(ntp[1]+1)) |
274 |
> |
last_pos_val = i; |
275 |
|
++i; |
276 |
|
} |
277 |
< |
if (i == ntp[0]*(ntp[1]+1)) |
277 |
> |
if (i == ntp[0]*(ntp[1]+1)) /* empty line? */ |
278 |
|
break; |
279 |
|
if (ntp[0] > 1 && sarr[ntp[0]*(ntp[1]+1)] <= |
280 |
|
sarr[(ntp[0]-1)*(ntp[1]+1)]) { |
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 (ntp[0] <= 0) |
299 |
< |
sprintf(errmsg, "no data in sensor file '%s'", sfile); |
298 |
> |
if (!last_pos_val) |
299 |
> |
sprintf(errmsg, "no positive sensor values in file '%s'", sfile); |
300 |
|
else if (fabs(sarr[ntp[1]+1]) > FTINY) |
301 |
|
sprintf(errmsg, "minimum theta must be 0 in sensor file '%s'", |
302 |
|
sfile); |
303 |
|
else if (fabs(sarr[1]) > FTINY) |
304 |
|
sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'", |
305 |
|
sfile); |
306 |
< |
else if (sarr[ntp[1]] <= FTINY) |
306 |
> |
else if (sarr[ntp[1]] < 270.-FTINY) |
307 |
|
sprintf(errmsg, |
308 |
< |
"maximum phi must be positive in sensor file '%s'", |
308 |
> |
"maximum phi must be 270 or greater in sensor file '%s'", |
309 |
|
sfile); |
310 |
< |
else if (sarr[ntp[0]*(ntp[1]+1)] <= FTINY) |
310 |
> |
else if (sarr[ntp[1]] >= 360.-FTINY) |
311 |
|
sprintf(errmsg, |
312 |
< |
"maximum theta must be positive in sensor file '%s'", |
312 |
> |
"maximum phi must be less than 360 in sensor file '%s'", |
313 |
|
sfile); |
314 |
|
if (errmsg[0]) |
315 |
|
error(USER, errmsg); |
370 |
|
psize = PI*tsize/maxtheta; |
371 |
|
if (sntp[0]*sntp[1] < samptot) /* don't overdo resolution */ |
372 |
|
samptot = sntp[0]*sntp[1]; |
373 |
< |
ntheta = (int)(sqrt((double)samptot*tsize/psize) + 0.5); |
373 |
> |
ntheta = (int)(sqrt((double)samptot*tsize/psize)*sntp[0]/sntp[1]) + 1; |
374 |
|
if (ntheta > MAXNT) |
375 |
|
ntheta = MAXNT; |
376 |
|
nphi = samptot/ntheta; |
402 |
|
tvals[i] = 1. - ( (1.-frac)*cos(thdiv[t]) + |
403 |
|
frac*cos(thdiv[t+1]) ); |
404 |
|
/* offset b/c sensor values are centered */ |
405 |
< |
if (!t || (t < sntp[0]-1) & (frac >= 0.5)) |
405 |
> |
if ((t < sntp[0]-1) & (!t | (frac >= 0.5))) { |
406 |
|
frac -= 0.5; |
407 |
< |
else { |
407 |
> |
} else { |
408 |
|
frac += 0.5; |
409 |
|
--t; |
410 |
|
} |
428 |
|
} |
429 |
|
pvals[i*(nphi+1) + nphi] = phdiv[sntp[1]]; |
430 |
|
} |
431 |
+ |
/* duplicate final row */ |
432 |
+ |
memcpy(pvals+ntheta*(nphi+1), pvals+(ntheta-1)*(nphi+1), |
433 |
+ |
sizeof(*pvals)*(nphi+1)); |
434 |
|
tvals[0] = .0f; |
435 |
|
tvals[ntheta] = (float)tsize; |
436 |
|
} |
477 |
|
int t, p; |
478 |
|
|
479 |
|
dv[2] = DOT(dvec, ourview.vdir); |
480 |
< |
theta = (float)((1./DEGREE) * acos(dv[2])); |
480 |
> |
theta = acos(dv[2]); |
481 |
|
if (theta >= maxtheta) |
482 |
|
return(.0f); |
483 |
|
dv[0] = DOT(dvec, ourview.hvec); |
484 |
|
dv[1] = DOT(dvec, ourview.vvec); |
485 |
< |
phi = (float)((1./DEGREE) * atan2(-dv[0], dv[1])); |
486 |
< |
while (phi < .0f) phi += 360.f; |
485 |
> |
phi = atan2(-dv[0], dv[1]); |
486 |
> |
while (phi < .0f) phi += (float)(2.*PI); |
487 |
|
t = (int)(theta/maxtheta * sntp[0]); |
488 |
< |
p = (int)(phi*(1./360.) * sntp[1]); |
488 |
> |
p = (int)(phi*(1./(2.*PI)) * sntp[1]); |
489 |
|
/* hack for non-uniform sensor grid */ |
490 |
+ |
theta *= (float)(1./DEGREE); |
491 |
+ |
phi *= (float)(1./DEGREE); |
492 |
|
while (t+1 < sntp[0] && theta >= s_theta(t+1)) |
493 |
|
++t; |
494 |
|
while (t-1 >= 0 && theta <= s_theta(t-1)) |
551 |
|
continue; |
552 |
|
} |
553 |
|
rr.rmax = .0; |
554 |
< |
rayorigin(&rr, PRIMARY, NULL, NULL); |
554 |
> |
rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL); |
555 |
|
scalecolor(rr.rcoef, sf); |
556 |
|
if (ray_pqueue(&rr) == 1) |
557 |
|
addcolor(vsum, rr.rcol); |
567 |
|
continue; |
568 |
|
} |
569 |
|
rr.rmax = .0; |
570 |
< |
rayorigin(&rr, PRIMARY, NULL, NULL); |
570 |
> |
rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL); |
571 |
|
scalecolor(rr.rcoef, sf); |
572 |
|
if (ray_pqueue(&rr) == 1) |
573 |
|
addcolor(vsum, rr.rcol); |