25 |
|
/* super-sampling threshold */ |
26 |
|
const double ssamp_thresh = 0.35; |
27 |
|
/* number of super-samples */ |
28 |
< |
const int nssamp = 100; |
28 |
> |
#ifndef NSSAMP |
29 |
> |
#define NSSAMP 100 |
30 |
> |
#endif |
31 |
|
/* limit on number of RBF lobes */ |
32 |
|
static int lobe_lim = 15000; |
33 |
|
/* progress bar length */ |
58 |
|
} |
59 |
|
|
60 |
|
/* Finish progress bar */ |
61 |
< |
#define prog_done() if (do_prog) fputc('\n',stderr); else |
61 |
> |
static void |
62 |
> |
prog_done(void) |
63 |
> |
{ |
64 |
> |
int n = do_prog; |
65 |
|
|
66 |
+ |
if (n <= 1) return; |
67 |
+ |
fputc('\r', stderr); |
68 |
+ |
while (n--) |
69 |
+ |
fputc(' ', stderr); |
70 |
+ |
fputc('\r', stderr); |
71 |
+ |
} |
72 |
+ |
|
73 |
|
/* Output XML prologue to stdout */ |
74 |
|
static void |
75 |
|
xml_prologue(int ac, char *av[]) |
199 |
|
iovec[5] = output_orient * |
200 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
201 |
|
if (funame == NULL) |
202 |
< |
bsdf = eval_rbfrep(rbf, iovec+3) * |
191 |
< |
output_orient/iovec[5]; |
202 |
> |
bsdf = eval_rbfrep(rbf, iovec+3); |
203 |
|
else { |
193 |
– |
double ssa[3], ssvec[6], sum; |
194 |
– |
int ssi; |
204 |
|
if (assignD) { |
205 |
|
varset("Dx", '=', -iovec[3]); |
206 |
|
varset("Dy", '=', -iovec[4]); |
208 |
|
++eclock; |
209 |
|
} |
210 |
|
bsdf = funvalue(funame, 6, iovec); |
211 |
+ |
#if (NSSAMP > 0) |
212 |
|
if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) { |
213 |
< |
sum = 0; /* super-sample voxel */ |
214 |
< |
for (ssi = nssamp; ssi--; ) { |
215 |
< |
SDmultiSamp(ssa, 3, (ssi+frandom())/nssamp); |
213 |
> |
int ssi; |
214 |
> |
double ssa[3], ssvec[6], sum = 0; |
215 |
> |
/* super-sample voxel */ |
216 |
> |
for (ssi = NSSAMP; ssi--; ) { |
217 |
> |
SDmultiSamp(ssa, 3, (ssi+frandom()) * |
218 |
> |
(1./NSSAMP)); |
219 |
|
ssvec[0] = 2.*(ix+ssa[0])/sqres - 1.; |
220 |
|
ssvec[1] = .0; |
221 |
|
ssvec[2] = input_orient * |
226 |
|
sqrt(1. - ssvec[3]*ssvec[3] - |
227 |
|
ssvec[4]*ssvec[4]); |
228 |
|
if (assignD) { |
229 |
< |
varset("Dx", '=', -iovec[3]); |
230 |
< |
varset("Dy", '=', -iovec[4]); |
231 |
< |
varset("Dz", '=', -iovec[5]); |
229 |
> |
varset("Dx", '=', -ssvec[3]); |
230 |
> |
varset("Dy", '=', -ssvec[4]); |
231 |
> |
varset("Dz", '=', -ssvec[5]); |
232 |
|
++eclock; |
233 |
|
} |
234 |
|
sum += funvalue(funame, 6, ssvec); |
235 |
|
} |
236 |
< |
bsdf = sum/nssamp; |
236 |
> |
bsdf = sum/NSSAMP; |
237 |
|
} |
238 |
+ |
#endif |
239 |
|
} |
240 |
|
if (pctcull >= 0) |
241 |
|
fwrite(&bsdf, sizeof(bsdf), 1, ofp); |
312 |
|
iovec[5] = output_orient * |
313 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
314 |
|
if (funame == NULL) |
315 |
< |
bsdf = eval_rbfrep(rbf, iovec+3) * |
302 |
< |
output_orient/iovec[5]; |
315 |
> |
bsdf = eval_rbfrep(rbf, iovec+3); |
316 |
|
else { |
304 |
– |
double ssa[4], ssvec[6], sum; |
305 |
– |
int ssi; |
317 |
|
if (assignD) { |
318 |
|
varset("Dx", '=', -iovec[3]); |
319 |
|
varset("Dy", '=', -iovec[4]); |
321 |
|
++eclock; |
322 |
|
} |
323 |
|
bsdf = funvalue(funame, 6, iovec); |
324 |
+ |
#if (NSSAMP > 0) |
325 |
|
if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) { |
326 |
< |
sum = 0; /* super-sample voxel */ |
327 |
< |
for (ssi = nssamp; ssi--; ) { |
328 |
< |
SDmultiSamp(ssa, 4, (ssi+frandom())/nssamp); |
326 |
> |
int ssi; |
327 |
> |
double ssa[4], ssvec[6], sum = 0; |
328 |
> |
/* super-sample voxel */ |
329 |
> |
for (ssi = NSSAMP; ssi--; ) { |
330 |
> |
SDmultiSamp(ssa, 4, (ssi+frandom()) * |
331 |
> |
(1./NSSAMP)); |
332 |
|
SDsquare2disk(ssvec, 1.-(ix+ssa[0])/sqres, |
333 |
|
1.-(iy+ssa[1])/sqres); |
334 |
< |
ssvec[2] = output_orient * |
334 |
> |
ssvec[2] = input_orient * |
335 |
|
sqrt(1. - ssvec[0]*ssvec[0] - |
336 |
|
ssvec[1]*ssvec[1]); |
337 |
|
SDsquare2disk(ssvec+3, (ox+ssa[2])/sqres, |
340 |
|
sqrt(1. - ssvec[3]*ssvec[3] - |
341 |
|
ssvec[4]*ssvec[4]); |
342 |
|
if (assignD) { |
343 |
< |
varset("Dx", '=', -iovec[3]); |
344 |
< |
varset("Dy", '=', -iovec[4]); |
345 |
< |
varset("Dz", '=', -iovec[5]); |
343 |
> |
varset("Dx", '=', -ssvec[3]); |
344 |
> |
varset("Dy", '=', -ssvec[4]); |
345 |
> |
varset("Dz", '=', -ssvec[5]); |
346 |
|
++eclock; |
347 |
|
} |
348 |
|
sum += funvalue(funame, 6, ssvec); |
349 |
|
} |
350 |
< |
bsdf = sum/nssamp; |
350 |
> |
bsdf = sum/NSSAMP; |
351 |
|
} |
352 |
+ |
#endif |
353 |
|
} |
354 |
|
if (pctcull >= 0) |
355 |
|
fwrite(&bsdf, sizeof(bsdf), 1, ofp); |