diff options
Diffstat (limited to 'src/blender')
-rw-r--r-- | src/blender/blender.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/blender/blender.c b/src/blender/blender.c index 99abedd..08cafa4 100644 --- a/src/blender/blender.c +++ b/src/blender/blender.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "blender/blender.h" | 1 | #include "blender/blender.h" |
2 | #include <assert.h> | 2 | #include <assert.h> |
3 | #include <math.h> | 3 | #include <math.h> |
4 | #include "morpher/morpher.h" | ||
5 | 4 | ||
6 | static inline ColorComponent blend_components(ColorComponent origin, ColorComponent target, TimeVector frame) { | 5 | static inline ColorComponent blend_components(ColorComponent origin, ColorComponent target, TimeVector frame) { |
7 | // https://www.youtube.com/watch?v=LKnqECcg6Gw | 6 | // https://www.youtube.com/watch?v=LKnqECcg6Gw |
@@ -21,7 +20,7 @@ void blender_blend_canvas(Canvas *canvas, Canvas *source, Canvas *target, Morphi | |||
21 | CartesianMapping mapping; | 20 | CartesianMapping mapping; |
22 | Color pixel; | 21 | Color pixel; |
23 | 22 | ||
24 | dim = morpher_get_dim(morphing); | 23 | dim = morphing->dim; |
25 | 24 | ||
26 | assert(dim.x > 0 && dim.y > 0); | 25 | assert(dim.x > 0 && dim.y > 0); |
27 | assert(vector_equals(dim, canvas_get_dim(canvas))); | 26 | assert(vector_equals(dim, canvas_get_dim(canvas))); |
@@ -33,7 +32,7 @@ void blender_blend_canvas(Canvas *canvas, Canvas *source, Canvas *target, Morphi | |||
33 | point.x = flat_dim % dim.y; | 32 | point.x = flat_dim % dim.y; |
34 | point.y = flat_dim / dim.y; | 33 | point.y = flat_dim / dim.y; |
35 | 34 | ||
36 | mapping = morpher_get_point_mapping(morphing, point, frame); | 35 | mapping = (CartesianMapping) {point, point}; |
37 | pixel = blend_colors(canvas_get_pixel(source, mapping.origin), canvas_get_pixel(target, mapping.target), frame); | 36 | pixel = blend_colors(canvas_get_pixel(source, mapping.origin), canvas_get_pixel(target, mapping.target), frame); |
38 | canvas_set_pixel(canvas, point, pixel); | 37 | canvas_set_pixel(canvas, point, pixel); |
39 | } | 38 | } |