From f3fbff1366bcd1ac2211db4fa23d1995a58ba2c6 Mon Sep 17 00:00:00 2001 From: Erik Reckase Date: Thu, 12 Apr 2018 06:08:35 -0600 Subject: [PATCH] color_speed was not handled properly for motion elements (#19) * updated for aclocal 1.15 * libtool update after configure * aclocal needed refresh * localhost * color speed is a motion element variable * if mult motion elements present, was not using correct vals --- config.h | 3 +-- config.h.in | 3 +-- flam3.c | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config.h b/config.h index 16d558e..f470bfc 100644 --- a/config.h +++ b/config.h @@ -52,8 +52,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Name of package */ diff --git a/config.h.in b/config.h.in index 12d8361..26fab62 100644 --- a/config.h.in +++ b/config.h.in @@ -51,8 +51,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff --git a/flam3.c b/flam3.c index edb25e1..6487bb1 100644 --- a/flam3.c +++ b/flam3.c @@ -570,8 +570,8 @@ void apply_motion_parameters(flam3_xform *xf, flam3_xform *addto, double blend) /* Loop over the motion elements and add their contribution to the original vals */ for (i=0; inum_motion; i++) { - freq = mot->motion_freq; - func = mot->motion_func; + freq = mot[i]->motion_freq; + func = mot[i]->motion_func; APPMOT(density); /* Must ensure > 0 after all is applied */ APPMOT(color); /* Must ensure [0,1] after all is applied */ @@ -1937,7 +1937,7 @@ void flam3_print_xform(FILE *f, flam3_xform *x, int final_flag, int numstd, doub if (flam27_flag) fprintf(f, "symmetry=\"%g\" ", 1.0-2.0*x->color_speed); - else if (!motion_flag) + else if (!motion_flag || x->color_speed != 0.0) fprintf(f, "color_speed=\"%g\" ", x->color_speed); if (!final_flag && !motion_flag && !flam27_flag)