From 179075df17fd5c30d4a8a5984c1637ab67433248 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 14 May 2015 16:20:58 +0200 Subject: Fix final transformation Regression introduced by commit b66dc836db66e9769f5c7142104c80fda6dd386b --- flam3.c | 4 ++-- variations.c | 4 ++-- variations.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flam3.c b/flam3.c index 3e82da7..7ab0b97 100644 --- a/flam3.c +++ b/flam3.c @@ -169,7 +169,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->xform[fn], fn, iter->p, &q, rc)>0) { + if (apply_xform(&genome->xform[fn], iter->p, &q, rc)>0) { ++iter->consec; if (iter->consec < 5) { iter->p = q; @@ -187,7 +187,7 @@ 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)xform[genome->final_xform_index].opacity) { - apply_xform(&genome->xform[fn], genome->final_xform_index, iter->p, + apply_xform(&genome->xform[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] }; diff --git a/variations.c b/variations.c index 17017cd..ed10d41 100644 --- a/variations.c +++ b/variations.c @@ -2030,8 +2030,8 @@ int prepare_precalc_flags(flam3_genome *cp) { return(0); } -int apply_xform(const flam3_xform * const xf, const unsigned int fn, - const double4 p, double4 *q_ret, randctx * const rc) { +int apply_xform(const flam3_xform * const xf, const double4 p, double4 *q_ret, + randctx * const rc) { flam3_iter_helper f = { .rc = rc, .xform = xf }; const double s1 = xf->color_speed; diff --git a/variations.h b/variations.h index b1c3d42..eab6e01 100644 --- a/variations.h +++ b/variations.h @@ -22,6 +22,6 @@ void xform_precalc (flam3_xform * const xform); int prepare_precalc_flags(flam3_genome *); -int apply_xform(const flam3_xform * const xf, const unsigned int fn, - const double4 p, double4 *q_ret, randctx * const rc); +int apply_xform(const flam3_xform * const xf, const double4 p, double4 *q_ret, + randctx * const rc); -- cgit v1.2.3