41 |
|
char pbar[256]; |
42 |
|
int nchars; |
43 |
|
|
44 |
< |
if (do_prog <= 0) return; |
44 |
> |
if (do_prog <= 1) return; |
45 |
|
if (do_prog > sizeof(pbar)-2) |
46 |
|
do_prog = sizeof(pbar)-2; |
47 |
|
if (frac < 0) frac = 0; |
55 |
|
} |
56 |
|
|
57 |
|
/* Finish progress bar */ |
58 |
< |
#define prog_done() if (do_prog) fputc('\n',stderr); else |
58 |
> |
static void |
59 |
> |
prog_done(void) |
60 |
> |
{ |
61 |
> |
int n = do_prog; |
62 |
|
|
63 |
+ |
if (n <= 1) return; |
64 |
+ |
fputc('\r', stderr); |
65 |
+ |
while (n--) |
66 |
+ |
fputc(' ', stderr); |
67 |
+ |
fputc('\r', stderr); |
68 |
+ |
} |
69 |
+ |
|
70 |
|
/* Return angle basis corresponding to the given name */ |
71 |
|
static ANGLE_BASIS * |
72 |
|
get_basis(const char *bn) |
376 |
|
|
377 |
|
sum += eval_rbfrep(rbf, vout); |
378 |
|
} |
379 |
< |
fo_getvec(vout, j+.5, abp); /* use centered secant */ |
370 |
< |
bsdfarr[j*abp->nangles + i] = sum / (npsamps*vout[2]); |
379 |
> |
bsdfarr[j*abp->nangles + i] = sum / (double)npsamps; |
380 |
|
} |
381 |
|
if (rbf != NULL) |
382 |
|
free(rbf); |