diff options
author | Tavian Barnes <tavianator@gmail.com> | 2011-10-19 13:59:24 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@gmail.com> | 2011-10-30 18:11:22 -0400 |
commit | 8e3a7158ecae541692826e7b5998c8ffc810173a (patch) | |
tree | beda4f9f8604f77d0513d5fb02b7ddf53d203d09 /libdimension/pigment_map.c | |
parent | e9810a7b1aae15320e58371b657a2f963562834d (diff) | |
download | dimension-8e3a7158ecae541692826e7b5998c8ffc810173a.tar.xz |
Make API more consistent.
Object methods should be dmnsn_<object>_<fn>().
Diffstat (limited to 'libdimension/pigment_map.c')
-rw-r--r-- | libdimension/pigment_map.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libdimension/pigment_map.c b/libdimension/pigment_map.c index 943bfc1..09665c0 100644 --- a/libdimension/pigment_map.c +++ b/libdimension/pigment_map.c @@ -30,7 +30,7 @@ static void dmnsn_initialize_mapped_pigment(void *ptr) { dmnsn_pigment **pigment = ptr; - dmnsn_initialize_pigment(*pigment); + dmnsn_pigment_initialize(*pigment); } /** Free a pigment in a pigment map. */ @@ -60,7 +60,7 @@ void dmnsn_pigment_map_add_color(dmnsn_map *map, double n, dmnsn_color color) { dmnsn_pigment *pigment = dmnsn_new_solid_pigment(color); - dmnsn_add_map_entry(map, n, &pigment); + dmnsn_map_add_entry(map, n, &pigment); } /** Free a pigment_map payload. */ @@ -80,10 +80,10 @@ dmnsn_pigment_map_pigment_fn(const dmnsn_pigment *pigment, dmnsn_vector v) const dmnsn_pigment_map_payload *payload = pigment->ptr; double n; dmnsn_pigment *pigment1, *pigment2; - dmnsn_evaluate_map(payload->map, dmnsn_pattern_value(payload->pattern, v), + dmnsn_map_evaluate(payload->map, dmnsn_pattern_value(payload->pattern, v), &n, &pigment1, &pigment2); - dmnsn_color color1 = dmnsn_evaluate_pigment(pigment1, v); - dmnsn_color color2 = dmnsn_evaluate_pigment(pigment2, v); + dmnsn_color color1 = dmnsn_pigment_evaluate(pigment1, v); + dmnsn_color color2 = dmnsn_pigment_evaluate(pigment2, v); if (payload->flags == DMNSN_PIGMENT_MAP_SRGB) { color1 = dmnsn_color_to_sRGB(color1); |