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

changed to hsv_circular, now the default

Browse Source
This commit is contained in:
EReckase 2015-04-11 17:50:27 -06:00
parent d8fbddac62
commit 4242535339
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flam3.c
View File

@ -1281,7 +1281,7 @@ void clear_cp(flam3_genome *cp, int default_flag) {
cp->rotate = 0.0; cp->rotate = 0.0;
cp->pixels_per_unit = 50; cp->pixels_per_unit = 50;
cp->interpolation = flam3_interpolation_linear; cp->interpolation = flam3_interpolation_linear;
cp->palette_interpolation = flam3_palette_interpolation_hsv; cp->palette_interpolation = flam3_palette_interpolation_hsv_circular;
cp->genome_index = 0; cp->genome_index = 0;
memset(cp->parent_fname,0,flam3_parent_fn_len); memset(cp->parent_fname,0,flam3_parent_fn_len);

2
flam3.h
View File

@ -75,7 +75,7 @@ extern char *flam3_variation_names[];
#define flam3_palette_interpolation_hsv 0 #define flam3_palette_interpolation_hsv 0
#define flam3_palette_interpolation_sweep 1 #define flam3_palette_interpolation_sweep 1
#define flam3_palette_interpolation_rgb 2 #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 #define flam3_max_action_length 10000

2
interpolation.c
View File

@ -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]); // 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, /* should also support blending between rgb and hsv,
and change the color of the cut, so we can keep and change the color of the cut, so we can keep
a dominant color but control what it is. */ a dominant color but control what it is. */

4
parser.c
View File

@ -345,8 +345,8 @@ int parse_flame_element(xmlNode *flame_node, flam3_genome *loc_current_cp) {
cp->palette_interpolation = flam3_palette_interpolation_hsv; cp->palette_interpolation = flam3_palette_interpolation_hsv;
} else if (!strcmp("sweep", att_str)) { } else if (!strcmp("sweep", att_str)) {
cp->palette_interpolation = flam3_palette_interpolation_sweep; cp->palette_interpolation = flam3_palette_interpolation_sweep;
} else if (!strcmp("hsv2", att_str)) { } else if (!strcmp("hsv_circular", att_str)) {
cp->palette_interpolation = flam3_palette_interpolation_hsv2; cp->palette_interpolation = flam3_palette_interpolation_hsv_circular;
} else if (!strcmp("rgb", att_str)) { } else if (!strcmp("rgb", att_str)) {
cp->palette_interpolation = flam3_palette_interpolation_rgb; cp->palette_interpolation = flam3_palette_interpolation_rgb;
} else { } else {