From 28fee77230c77ae3429544b40df5a992769add53 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 2 Dec 2017 20:39:43 +0100 Subject: Change local utility function scope Signed-off-by: pacien --- src/blender/blender.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/blender') diff --git a/src/blender/blender.c b/src/blender/blender.c index 738811d..99abedd 100644 --- a/src/blender/blender.c +++ b/src/blender/blender.c @@ -3,12 +3,12 @@ #include #include "morpher/morpher.h" -static ColorComponent blend_components(ColorComponent origin, ColorComponent target, TimeVector frame) { +static inline ColorComponent blend_components(ColorComponent origin, ColorComponent target, TimeVector frame) { + // https://www.youtube.com/watch?v=LKnqECcg6Gw return (ColorComponent) sqrt((TIME_UNIT - frame) * pow(origin, 2) + frame * pow(target, 2)); } -Color blender_blend_colors(Color origin, Color target, TimeVector frame) { - assert(frame >= TIME_ORIGIN && frame <= TIME_UNIT); +static inline Color blend_colors(Color origin, Color target, TimeVector frame) { return (Color) {{blend_components(origin.rgba.r, target.rgba.r, frame), blend_components(origin.rgba.g, target.rgba.g, frame), blend_components(origin.rgba.b, target.rgba.b, frame), @@ -34,11 +34,7 @@ void blender_blend_canvas(Canvas *canvas, Canvas *source, Canvas *target, Morphi point.y = flat_dim / dim.y; mapping = morpher_get_point_mapping(morphing, point, frame); - - pixel = blender_blend_colors(canvas_get_pixel(source, mapping.origin), - canvas_get_pixel(target, mapping.target), - frame); - + pixel = blend_colors(canvas_get_pixel(source, mapping.origin), canvas_get_pixel(target, mapping.target), frame); canvas_set_pixel(canvas, point, pixel); } } -- cgit v1.2.3