diff options
author | Lars-Dominik Braun <lars@6xq.net> | 2015-05-02 17:02:51 +0200 |
---|---|---|
committer | Lars-Dominik Braun <lars@6xq.net> | 2015-05-02 21:36:45 +0200 |
commit | b66dc836db66e9769f5c7142104c80fda6dd386b (patch) | |
tree | 7836f2425aebd1d945d71cca45283e301c15f4a7 /flam3.c | |
parent | 78509371189f5ae323cc98bf5fba9e450c76e575 (diff) | |
download | pucket-b66dc836db66e9769f5c7142104c80fda6dd386b.tar.gz pucket-b66dc836db66e9769f5c7142104c80fda6dd386b.tar.bz2 pucket-b66dc836db66e9769f5c7142104c80fda6dd386b.zip |
Clean up apply_xform
Diffstat (limited to 'flam3.c')
-rw-r--r-- | flam3.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -175,7 +175,7 @@ bool iterator_step (iterator * const iter, double4 * const ret, randctx * const else fn = iter->xform_distrib[ rand_u64(rc) & CHOOSE_XFORM_GRAIN_M1 ]; - if (apply_xform(genome, fn, iter->p, &q, rc)>0) { + if (apply_xform(&genome->xform[fn], fn, iter->p, &q, rc)>0) { ++iter->consec; if (iter->consec < 5) { iter->p = q; @@ -193,7 +193,8 @@ bool iterator_step (iterator * const iter, double4 * const ret, randctx * const if (genome->final_xform_enable == 1) { if (genome->xform[genome->final_xform_index].opacity==1 || rand_d01(rc)<genome->xform[genome->final_xform_index].opacity) { - apply_xform(genome, genome->final_xform_index, iter->p, &q, rc); + apply_xform(&genome->xform[fn], genome->final_xform_index, iter->p, + &q, rc); /* Keep the opacity from the original xform */ q = (double4) { q[0], q[1], q[2], iter->p[3] }; } |