diff --git a/flam3.c b/flam3.c index 370d14a..6f35ffe 100644 --- a/flam3.c +++ b/flam3.c @@ -1281,7 +1281,7 @@ void clear_cp(flam3_genome *cp, int default_flag) { cp->rotate = 0.0; cp->pixels_per_unit = 50; cp->interpolation = flam3_interpolation_linear; - cp->palette_interpolation = flam3_palette_interpolation_hsv; + cp->palette_interpolation = flam3_palette_interpolation_hsv_circular; cp->genome_index = 0; memset(cp->parent_fname,0,flam3_parent_fn_len); diff --git a/flam3.h b/flam3.h index d6008ad..ebfcc04 100644 --- a/flam3.h +++ b/flam3.h @@ -75,7 +75,7 @@ extern char *flam3_variation_names[]; #define flam3_palette_interpolation_hsv 0 #define flam3_palette_interpolation_sweep 1 #define flam3_palette_interpolation_rgb 2 -#define flam3_palette_interpolation_hsv2 3 +#define flam3_palette_interpolation_hsv_circular 3 #define flam3_max_action_length 10000 diff --git a/interpolation.c b/interpolation.c index 80da2be..5651a50 100644 --- a/interpolation.c +++ b/interpolation.c @@ -400,7 +400,7 @@ void flam3_interpolate_n(flam3_genome *result, int ncp, // fprintf(stderr, "hsv=%g %g %g\n", t[0], t[1], t[2]); // } - if (2 == ncp && k == 0 &&cpi[0].palette_interpolation == flam3_palette_interpolation_hsv2) { + if (2 == ncp && k == 0 &&cpi[0].palette_interpolation == flam3_palette_interpolation_hsv_circular) { /* should also support blending between rgb and hsv, and change the color of the cut, so we can keep a dominant color but control what it is. */ diff --git a/parser.c b/parser.c index ff5b51a..035363d 100644 --- a/parser.c +++ b/parser.c @@ -345,8 +345,8 @@ int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp) { cp->palette_interpolation = flam3_palette_interpolation_hsv; } else if (!strcmp("sweep", att_str)) { cp->palette_interpolation = flam3_palette_interpolation_sweep; - } else if (!strcmp("hsv2", att_str)) { - cp->palette_interpolation = flam3_palette_interpolation_hsv2; + } else if (!strcmp("hsv_circular", att_str)) { + cp->palette_interpolation = flam3_palette_interpolation_hsv_circular; } else if (!strcmp("rgb", att_str)) { cp->palette_interpolation = flam3_palette_interpolation_rgb; } else {