mirror-github-bspeice/flam3
1
0
Fork 0
mirror of https://github.com/scottdraves/flam3.git synced 2025-01-21 05:20:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

color_speed was not handled properly for motion elements (#19)

Browse Source 
* 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
This commit is contained in:
Erik Reckase 2018-04-12 06:08:35 -06:00 committed by Scott Draves
parent 2a090163a3
commit f3fbff1366
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h
View File

@ -52,8 +52,7 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #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/" #define LT_OBJDIR ".libs/"
/* Name of package */ /* Name of package */

3
config.h.in
View File

@ -51,8 +51,7 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #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 #undef LT_OBJDIR
/* Name of package */ /* Name of package */

6
flam3.c
View File

@ -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 */ /* Loop over the motion elements and add their contribution to the original vals */
for (i=0; i<xf->num_motion; i++) { for (i=0; i<xf->num_motion; i++) {
freq = mot->motion_freq; freq = mot[i]->motion_freq;
func = mot->motion_func; func = mot[i]->motion_func;
APPMOT(density); /* Must ensure > 0 after all is applied */ APPMOT(density); /* Must ensure > 0 after all is applied */
APPMOT(color); /* Must ensure [0,1] 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) if (flam27_flag)
fprintf(f, "symmetry=\"%g\" ", 1.0-2.0*x->color_speed); 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); fprintf(f, "color_speed=\"%g\" ", x->color_speed);
if (!final_flag && !motion_flag && !flam27_flag) if (!final_flag && !motion_flag && !flam27_flag)