129 |
|
{ |
130 |
|
const int sqres = 1<<samp_order; |
131 |
|
const double sqfact = 1./(double)sqres; |
132 |
< |
float *ryval = NULL; |
133 |
< |
char *rtrip = NULL; |
132 |
> |
float *val_last = NULL; |
133 |
> |
float *val_next = NULL; |
134 |
> |
SDValue *sdv_next = NULL; |
135 |
|
FILE *ofp, *uvfp[2]; |
136 |
|
int assignD = 0; |
137 |
|
char cmd[128]; |
193 |
|
if (funame != NULL) /* need to assign Dx, Dy, Dz? */ |
194 |
|
assignD = (fundefined(funame) < 6); |
195 |
|
#if (NSSAMP > 0) |
196 |
< |
rtrip = (char *)malloc(sqres); /* track sample triggerings */ |
197 |
< |
ryval = (float *)calloc(sqres, sizeof(float)); |
196 |
> |
val_last = (float *)calloc(sqres, sizeof(float)); |
197 |
> |
if (funame == NULL) |
198 |
> |
sdv_next = (SDValue *)malloc(sizeof(SDValue)*sqres); |
199 |
> |
else |
200 |
> |
val_next = (float *)malloc(sizeof(float)*sqres); |
201 |
|
#endif |
202 |
|
/* run through directions */ |
203 |
|
for (ix = 0; ix < sqres/2; ix++) { |
209 |
|
- iovec[1]*iovec[1]); |
210 |
|
if (funame == NULL) |
211 |
|
rbf = advect_rbf(iovec, lobe_lim); |
212 |
< |
for (ox = 0; ox < sqres; ox++) { |
213 |
< |
SDValue sdv_next; |
214 |
< |
SDsquare2disk(iovec+3, (ox+.5)*sqfact, .5*sqfact); |
212 |
> |
/* presample first row */ |
213 |
> |
for (oy = 0; oy < sqres; oy++) { |
214 |
> |
SDsquare2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); |
215 |
|
iovec[5] = output_orient * |
216 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
217 |
|
if (funame == NULL) { |
218 |
< |
eval_rbfcol(&sdv_next, rbf, iovec+3); |
218 |
> |
eval_rbfcol(&sdv_next[oy], rbf, iovec+3); |
219 |
|
} else { |
216 |
– |
sdv_next.spec = c_dfcolor; |
220 |
|
if (assignD) { |
221 |
|
varset("Dx", '=', -iovec[3]); |
222 |
|
varset("Dy", '=', -iovec[4]); |
223 |
|
varset("Dz", '=', -iovec[5]); |
224 |
|
++eclock; |
225 |
|
} |
226 |
< |
sdv_next.cieY = funvalue(funame, 6, iovec); |
226 |
> |
val_next[oy] = funvalue(funame, 6, iovec); |
227 |
|
} |
228 |
+ |
} |
229 |
+ |
for (ox = 0; ox < sqres; ox++) { |
230 |
|
/* |
231 |
|
* Super-sample when we detect a difference from before |
232 |
< |
* or after in this row, or the previous row in this column. |
228 |
< |
* Also super-sample if the previous neighbors performed |
229 |
< |
* super-sampling, regardless of any differences. |
232 |
> |
* or after in this row, above or below. |
233 |
|
*/ |
231 |
– |
memset(rtrip, 0, sqres); |
234 |
|
for (oy = 0; oy < sqres; oy++) { |
235 |
< |
int trip; |
236 |
< |
bsdf = sdv_next.cieY; /* keeping one step ahead... */ |
235 |
< |
if (oy < sqres-1) { |
236 |
< |
SDsquare2disk(iovec+3, (ox+.5)*sqfact, (oy+1.5)*sqfact); |
235 |
> |
if (ox < sqres-1) { /* keeping one row ahead... */ |
236 |
> |
SDsquare2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); |
237 |
|
iovec[5] = output_orient * |
238 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
239 |
|
} |
240 |
|
if (funame == NULL) { |
241 |
< |
SDValue sdv = sdv_next; |
242 |
< |
if (oy < sqres-1) |
243 |
< |
eval_rbfcol(&sdv_next, rbf, iovec+3); |
241 |
> |
SDValue sdv = sdv_next[oy]; |
242 |
> |
bsdf = sdv.cieY; |
243 |
> |
if (ox < sqres-1) |
244 |
> |
eval_rbfcol(&sdv_next[oy], rbf, iovec+3); |
245 |
|
#if (NSSAMP > 0) |
246 |
< |
trip = (abs_diff(bsdf, sdv_next.cieY) > ssamp_thresh || |
247 |
< |
(ox && abs_diff(bsdf, ryval[oy]) > ssamp_thresh) || |
248 |
< |
(oy && abs_diff(bsdf, ryval[oy-1]) > ssamp_thresh)); |
249 |
< |
if (trip | rtrip[oy] || (oy && rtrip[oy-1])) { |
246 |
> |
if (abs_diff(bsdf, sdv_next[oy].cieY) > ssamp_thresh || |
247 |
> |
(ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || |
248 |
> |
(oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || |
249 |
> |
(oy < sqres-1 && |
250 |
> |
abs_diff(bsdf, sdv_next[oy+1].cieY) > ssamp_thresh)) { |
251 |
|
int ssi; |
252 |
|
double ssa[2], sum = 0, usum = 0, vsum = 0; |
253 |
|
/* super-sample voxel */ |
281 |
|
uv[1] *= 9.*sdv.spec.cy; |
282 |
|
} |
283 |
|
} else { |
284 |
< |
if (oy < sqres-1) { |
284 |
> |
bsdf = val_next[oy]; |
285 |
> |
if (ox < sqres-1) { |
286 |
|
if (assignD) { |
287 |
|
varset("Dx", '=', -iovec[3]); |
288 |
|
varset("Dy", '=', -iovec[4]); |
289 |
|
varset("Dz", '=', -iovec[5]); |
290 |
|
++eclock; |
291 |
|
} |
292 |
< |
sdv_next.cieY = funvalue(funame, 6, iovec); |
292 |
> |
val_next[oy] = funvalue(funame, 6, iovec); |
293 |
|
} |
294 |
|
#if (NSSAMP > 0) |
295 |
< |
trip = (abs_diff(bsdf, sdv_next.cieY) > ssamp_thresh || |
296 |
< |
(ox && abs_diff(bsdf, ryval[oy]) > ssamp_thresh) || |
297 |
< |
(oy && abs_diff(bsdf, ryval[oy-1]) > ssamp_thresh)); |
298 |
< |
if (trip | rtrip[oy] || (oy && rtrip[oy-1])) { |
295 |
> |
if (abs_diff(bsdf, val_next[oy]) > ssamp_thresh || |
296 |
> |
(ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || |
297 |
> |
(oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || |
298 |
> |
(oy < sqres-1 && |
299 |
> |
abs_diff(bsdf, val_next[oy+1]) > ssamp_thresh)) { |
300 |
|
int ssi; |
301 |
|
double ssa[4], ssvec[6], sum = 0; |
302 |
|
/* super-sample voxel */ |
343 |
|
fprintf(uvfp[1], "\t%.3e\n", uv[1]); |
344 |
|
} |
345 |
|
} |
346 |
< |
if (ryval != NULL) { |
347 |
< |
rtrip[oy] = trip; |
344 |
< |
ryval[oy] = bsdf; |
345 |
< |
} |
346 |
> |
if (val_last != NULL) |
347 |
> |
val_last[oy] = bsdf; |
348 |
|
} |
349 |
|
} |
350 |
|
if (rbf != NULL) |
352 |
|
prog_show((ix+1.)*(2.*sqfact)); |
353 |
|
} |
354 |
|
prog_done(); |
355 |
< |
if (ryval != NULL) { |
356 |
< |
free(rtrip); |
357 |
< |
free(ryval); |
355 |
> |
if (val_last != NULL) { |
356 |
> |
free(val_last); |
357 |
> |
if (val_next != NULL) free(val_next); |
358 |
> |
if (sdv_next != NULL) free(sdv_next); |
359 |
|
} |
360 |
|
if (pctcull >= 0) { /* finish output */ |
361 |
|
if (pclose(ofp)) { |
400 |
|
{ |
401 |
|
const int sqres = 1<<samp_order; |
402 |
|
const double sqfact = 1./(double)sqres; |
403 |
< |
float *ryval = NULL; |
404 |
< |
char *rtrip = NULL; |
403 |
> |
float *val_last = NULL; |
404 |
> |
float *val_next = NULL; |
405 |
> |
SDValue *sdv_next = NULL; |
406 |
|
FILE *ofp, *uvfp[2]; |
407 |
|
int assignD = 0; |
408 |
|
char cmd[128]; |
469 |
|
if (funame != NULL) /* need to assign Dx, Dy, Dz? */ |
470 |
|
assignD = (fundefined(funame) < 6); |
471 |
|
#if (NSSAMP > 0) |
472 |
< |
rtrip = (char *)malloc(sqres); /* track sample triggerings */ |
473 |
< |
ryval = (float *)calloc(sqres, sizeof(float)); |
472 |
> |
val_last = (float *)calloc(sqres, sizeof(float)); |
473 |
> |
if (funame == NULL) |
474 |
> |
sdv_next = (SDValue *)malloc(sizeof(SDValue)*sqres); |
475 |
> |
else |
476 |
> |
val_next = (float *)malloc(sizeof(float)*sqres); |
477 |
|
#endif |
478 |
|
/* run through directions */ |
479 |
|
for (ix = 0; ix < sqres; ix++) |
484 |
|
sqrt(1. - iovec[0]*iovec[0] - iovec[1]*iovec[1]); |
485 |
|
if (funame == NULL) |
486 |
|
rbf = advect_rbf(iovec, lobe_lim); |
487 |
< |
for (ox = 0; ox < sqres; ox++) { |
488 |
< |
SDValue sdv_next; |
489 |
< |
SDsquare2disk(iovec+3, (ox+.5)*sqfact, .5*sqfact); |
487 |
> |
/* presample first row */ |
488 |
> |
for (oy = 0; oy < sqres; oy++) { |
489 |
> |
SDsquare2disk(iovec+3, .5*sqfact, (oy+.5)*sqfact); |
490 |
|
iovec[5] = output_orient * |
491 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
492 |
|
if (funame == NULL) { |
493 |
< |
eval_rbfcol(&sdv_next, rbf, iovec+3); |
493 |
> |
eval_rbfcol(&sdv_next[oy], rbf, iovec+3); |
494 |
|
} else { |
488 |
– |
sdv_next.spec = c_dfcolor; |
495 |
|
if (assignD) { |
496 |
|
varset("Dx", '=', -iovec[3]); |
497 |
|
varset("Dy", '=', -iovec[4]); |
498 |
|
varset("Dz", '=', -iovec[5]); |
499 |
|
++eclock; |
500 |
|
} |
501 |
< |
sdv_next.cieY = funvalue(funame, 6, iovec); |
501 |
> |
val_next[oy] = funvalue(funame, 6, iovec); |
502 |
|
} |
503 |
+ |
} |
504 |
+ |
for (ox = 0; ox < sqres; ox++) { |
505 |
|
/* |
506 |
|
* Super-sample when we detect a difference from before |
507 |
< |
* or after in this row, or the previous row in this column. |
500 |
< |
* Also super-sample if the previous neighbors performed |
501 |
< |
* super-sampling, regardless of any differences. |
507 |
> |
* or after in this row, above or below. |
508 |
|
*/ |
503 |
– |
memset(rtrip, 0, sqres); |
509 |
|
for (oy = 0; oy < sqres; oy++) { |
510 |
< |
int trip; |
511 |
< |
bsdf = sdv_next.cieY; /* keeping one step ahead... */ |
507 |
< |
if (oy < sqres-1) { |
508 |
< |
SDsquare2disk(iovec+3, (ox+.5)*sqfact, (oy+1.5)*sqfact); |
510 |
> |
if (ox < sqres-1) { /* keeping one row ahead... */ |
511 |
> |
SDsquare2disk(iovec+3, (ox+1.5)*sqfact, (oy+.5)*sqfact); |
512 |
|
iovec[5] = output_orient * |
513 |
|
sqrt(1. - iovec[3]*iovec[3] - iovec[4]*iovec[4]); |
514 |
|
} |
515 |
|
if (funame == NULL) { |
516 |
< |
SDValue sdv = sdv_next; |
517 |
< |
if (oy < sqres-1) |
518 |
< |
eval_rbfcol(&sdv_next, rbf, iovec+3); |
516 |
> |
SDValue sdv = sdv_next[oy]; |
517 |
> |
bsdf = sdv.cieY; |
518 |
> |
if (ox < sqres-1) |
519 |
> |
eval_rbfcol(&sdv_next[oy], rbf, iovec+3); |
520 |
|
#if (NSSAMP > 0) |
521 |
< |
trip = (abs_diff(bsdf, sdv_next.cieY) > ssamp_thresh || |
522 |
< |
(ox && abs_diff(bsdf, ryval[oy]) > ssamp_thresh) || |
523 |
< |
(oy && abs_diff(bsdf, ryval[oy-1]) > ssamp_thresh)); |
524 |
< |
if (trip | rtrip[oy] || (oy && rtrip[oy-1])) { |
521 |
> |
if (abs_diff(bsdf, sdv_next[oy].cieY) > ssamp_thresh || |
522 |
> |
(ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || |
523 |
> |
(oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || |
524 |
> |
(oy < sqres-1 && |
525 |
> |
abs_diff(bsdf, sdv_next[oy+1].cieY) > ssamp_thresh)) { |
526 |
|
int ssi; |
527 |
|
double ssa[2], sum = 0, usum = 0, vsum = 0; |
528 |
|
/* super-sample voxel */ |
556 |
|
uv[1] *= 9.*sdv.spec.cy; |
557 |
|
} |
558 |
|
} else { |
559 |
< |
if (oy < sqres-1) { |
559 |
> |
bsdf = val_next[oy]; |
560 |
> |
if (ox < sqres-1) { |
561 |
|
if (assignD) { |
562 |
|
varset("Dx", '=', -iovec[3]); |
563 |
|
varset("Dy", '=', -iovec[4]); |
564 |
|
varset("Dz", '=', -iovec[5]); |
565 |
|
++eclock; |
566 |
|
} |
567 |
< |
sdv_next.cieY = funvalue(funame, 6, iovec); |
567 |
> |
val_next[oy] = funvalue(funame, 6, iovec); |
568 |
|
} |
569 |
|
#if (NSSAMP > 0) |
570 |
< |
trip = (abs_diff(bsdf, sdv_next.cieY) > ssamp_thresh || |
571 |
< |
(ox && abs_diff(bsdf, ryval[oy]) > ssamp_thresh) || |
572 |
< |
(oy && abs_diff(bsdf, ryval[oy-1]) > ssamp_thresh)); |
573 |
< |
if (trip | rtrip[oy] || (oy && rtrip[oy-1])) { |
570 |
> |
if (abs_diff(bsdf, val_next[oy]) > ssamp_thresh || |
571 |
> |
(ox && abs_diff(bsdf, val_last[oy]) > ssamp_thresh) || |
572 |
> |
(oy && abs_diff(bsdf, val_last[oy-1]) > ssamp_thresh) || |
573 |
> |
(oy < sqres-1 && |
574 |
> |
abs_diff(bsdf, val_next[oy+1]) > ssamp_thresh)) { |
575 |
|
int ssi; |
576 |
|
double ssa[4], ssvec[6], sum = 0; |
577 |
|
/* super-sample voxel */ |
614 |
|
fprintf(uvfp[1], "\t%.3e\n", uv[1]); |
615 |
|
} |
616 |
|
} |
617 |
< |
if (ryval != NULL) { |
618 |
< |
rtrip[oy] = trip; |
612 |
< |
ryval[oy] = bsdf; |
613 |
< |
} |
617 |
> |
if (val_last != NULL) |
618 |
> |
val_last[oy] = bsdf; |
619 |
|
} |
620 |
|
if (rbf != NULL) |
621 |
|
free(rbf); |
623 |
|
} |
624 |
|
} |
625 |
|
prog_done(); |
626 |
< |
if (ryval != NULL) { |
627 |
< |
free(rtrip); |
628 |
< |
free(ryval); |
626 |
> |
if (val_last != NULL) { |
627 |
> |
free(val_last); |
628 |
> |
if (val_next != NULL) free(val_next); |
629 |
> |
if (sdv_next != NULL) free(sdv_next); |
630 |
|
} |
631 |
|
if (pctcull >= 0) { /* finish output */ |
632 |
|
if (pclose(ofp)) { |