diff options
author | Tavian Barnes <tavianator@gmail.com> | 2011-06-12 02:37:51 -0600 |
---|---|---|
committer | Tavian Barnes <tavianator@gmail.com> | 2011-06-13 00:16:06 -0600 |
commit | 7acd8ea6673b7a90ed4041408ccf1b024b8a007a (patch) | |
tree | d52199dd7c58e0217bfd1a74e7601d739ad333f5 /libdimension/pigment_map.c | |
parent | 066261810c2fca192677c5c1c01c91d6ecec65a0 (diff) | |
download | dimension-7acd8ea6673b7a90ed4041408ccf1b024b8a007a.tar.xz |
Vast libdimension API and internals improvements.
Couldn't really do these while I was trying to be POV-Ray compatible,
'cause they would've broken compatibility.
Diffstat (limited to 'libdimension/pigment_map.c')
-rw-r--r-- | libdimension/pigment_map.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libdimension/pigment_map.c b/libdimension/pigment_map.c index e97553f..cf49649 100644 --- a/libdimension/pigment_map.c +++ b/libdimension/pigment_map.c @@ -75,8 +75,8 @@ dmnsn_pigment_map_pigment_fn(const dmnsn_pigment *pigment, dmnsn_vector v) dmnsn_pigment *pigment1, *pigment2; dmnsn_evaluate_map(payload->map, dmnsn_pattern_value(payload->pattern, v), &n, &pigment1, &pigment2); - dmnsn_color color1 = pigment1->pigment_fn(pigment1, v); - dmnsn_color color2 = pigment2->pigment_fn(pigment2, v); + dmnsn_color color1 = dmnsn_evaluate_pigment(pigment1, v); + dmnsn_color color2 = dmnsn_evaluate_pigment(pigment2, v); if (payload->flags == DMNSN_PIGMENT_MAP_SRGB) { color1 = dmnsn_color_to_sRGB(color1); @@ -95,8 +95,6 @@ static void dmnsn_pigment_map_initialize_fn(dmnsn_pigment *pigment) { dmnsn_pigment_map_payload *payload = pigment->ptr; - payload->pattern->trans = dmnsn_matrix_mul(pigment->trans, - payload->pattern->trans); dmnsn_initialize_pattern(payload->pattern); dmnsn_map_apply(payload->map, dmnsn_initialize_mapped_pigment); } |