From 7acd8ea6673b7a90ed4041408ccf1b024b8a007a Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 12 Jun 2011 02:37:51 -0600 Subject: 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. --- libdimension/pigment_map.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libdimension/pigment_map.c') 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); } -- cgit v1.2.3