mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename "fuzziness" parameter to "tolerance" in Replace Color effect (to keep consistency with the new floodfill tolerance parameter).

Browse Source
This commit is contained in:
David Capello 2010-08-13 10:53:42 -03:00
parent 8dac6bdcae
commit 52db5a6bb3
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/widgets/replace_color.xml
View File

@ -11,8 +11,8 @@
</box>
<box vertical="true" homogeneous="true" expansive="true" name="color_buttons_box" />
</box>
<label text="Fuzziness:" />
<slider min="0" max="255" name="fuzziness" />
<label text="Tolerance:" />
<slider min="0" max="255" name="tolerance" />
</box>
<box vertical="true">
<button text="&amp;OK" name="button_ok" magnetic="true" />

18
src/commands/fx/cmd_replace_color.cpp
View File

@ -42,7 +42,7 @@
#include "widgets/target.h"
static JWidget button_color1, button_color2;
static JWidget slider_fuzziness, check_preview;
static JWidget slider_tolerance, check_preview;
static JWidget preview;
static bool color_change_hook(JWidget widget, void *data);
@ -90,7 +90,7 @@ void ReplaceColorCommand::onExecute(Context* context)
get_widgets(window,
"color_buttons_box", &color_buttons_box,
"preview", &check_preview,
"fuzziness", &slider_fuzziness,
"tolerance", &slider_tolerance,
"target", &box_target,
"button_ok", &button_ok, NULL);
@ -114,8 +114,8 @@ void ReplaceColorCommand::onExecute(Context* context)
target_button = target_button_new(sprite->getImgType(), false);
target_button_set_target(target_button, effect.target);
jslider_set_value(slider_fuzziness,
get_config_int("ReplaceColor", "Fuzziness", 0));
jslider_set_value(slider_tolerance,
get_config_int("ReplaceColor", "Tolerance", 0));
if (get_config_bool("ReplaceColor", "Preview", true))
check_preview->setSelected(true);
@ -127,7 +127,7 @@ void ReplaceColorCommand::onExecute(Context* context)
HOOK(button_color1, SIGNAL_COLORBUTTON_CHANGE, color_change_hook, 1);
HOOK(button_color2, SIGNAL_COLORBUTTON_CHANGE, color_change_hook, 2);
HOOK(target_button, SIGNAL_TARGET_BUTTON_CHANGE, target_change_hook, 0);
HOOK(slider_fuzziness, JI_SIGNAL_SLIDER_CHANGE, slider_change_hook, 0);
HOOK(slider_tolerance, JI_SIGNAL_SLIDER_CHANGE, slider_change_hook, 0);
HOOK(check_preview, JI_SIGNAL_CHECK_CHANGE, preview_change_hook, 0);
/* default position */
@ -174,7 +174,7 @@ static bool target_change_hook(JWidget widget, void *data)
static bool slider_change_hook(JWidget widget, void *data)
{
set_config_int("ReplaceColor", "Fuzziness", jslider_get_value(widget));
set_config_int("ReplaceColor", "Tolerance", jslider_get_value(widget));
make_preview();
return false;
}
@ -190,15 +190,15 @@ static void make_preview()
{
Sprite* sprite = preview_get_effect(preview)->sprite;
color_t from, to;
int fuzziness;
int tolerance;
from = get_config_color("ReplaceColor", "Color1", color_mask());
to = get_config_color("ReplaceColor", "Color2", color_mask());
fuzziness = get_config_int("ReplaceColor", "Fuzziness", 0);
tolerance = get_config_int("ReplaceColor", "Tolerance", 0);
set_replace_colors(get_color_for_layer(sprite->getCurrentLayer(), from),
get_color_for_layer(sprite->getCurrentLayer(), to),
MID(0, fuzziness, 255));
MID(0, tolerance, 255));
if (check_preview->isSelected())
preview_restart(preview);

20
src/effect/replcol.cpp
View File

@ -24,14 +24,14 @@
static struct {
int from, to;
int fuzziness;
int tolerance;
} data;
void set_replace_colors(int from, int to, int fuzziness)
void set_replace_colors(int from, int to, int tolerance)
{
data.from = from;
data.to = to;
data.fuzziness = MID(0, fuzziness, 255);
data.tolerance = MID(0, tolerance, 255);
}
void apply_replace_color4(Effect *effect)
@ -69,10 +69,10 @@ void apply_replace_color4(Effect *effect)
src_b = _rgba_getb(c);
src_a = _rgba_geta(c);
if ((src_r >= dst_r-data.fuzziness) && (src_r <= dst_r+data.fuzziness) &&
(src_g >= dst_g-data.fuzziness) && (src_g <= dst_g+data.fuzziness) &&
(src_b >= dst_b-data.fuzziness) && (src_b <= dst_b+data.fuzziness) &&
(src_a >= dst_a-data.fuzziness) && (src_a <= dst_a+data.fuzziness))
if ((ABS(src_r-dst_r) <= data.tolerance) &&
(ABS(src_g-dst_g) <= data.tolerance) &&
(ABS(src_b-dst_b) <= data.tolerance) &&
(ABS(src_a-dst_a) <= data.tolerance))
*(dst_address++) = data.to;
else
*(dst_address++) = c;
@ -110,8 +110,8 @@ void apply_replace_color2(Effect *effect)
src_k = _graya_getv(c);
src_a = _graya_geta(c);
if ((src_k >= dst_k-data.fuzziness) && (src_k <= dst_k+data.fuzziness) &&
(src_a >= dst_a-data.fuzziness) && (src_a <= dst_a+data.fuzziness))
if ((ABS(src_k-dst_k) <= data.tolerance) &&
(ABS(src_a-dst_a) <= data.tolerance))
*(dst_address++) = data.to;
else
*(dst_address++) = c;
@ -141,7 +141,7 @@ void apply_replace_color1(Effect *effect)
c = *(src_address++);
if ((c >= data.from-data.fuzziness) && (c <= data.from+data.fuzziness))
if (ABS(c-data.from) <= data.tolerance)
*(dst_address++) = data.to;
else
*(dst_address++) = c;

2
src/effect/replcol.h
View File

@ -21,7 +21,7 @@
struct Effect;
void set_replace_colors(int from, int to, int fuzziness);
void set_replace_colors(int from, int to, int tolerance);
void apply_replace_color4(struct Effect *effect);
void apply_replace_color2(struct Effect *effect);