diff options
author | Adam NAILI | 2017-12-28 16:22:43 +0100 |
---|---|---|
committer | Adam NAILI | 2017-12-28 16:22:43 +0100 |
commit | aaf57e5ee1e0cf74afdbdf56293f1afd7e79e6b0 (patch) | |
tree | 6526fefe48549d97368aa882d862bbf468426c9e /include | |
parent | 46fecbfedfc61658caeb721565fd36f49c0d3db9 (diff) | |
download | morpher-aaf57e5ee1e0cf74afdbdf56293f1afd7e79e6b0.tar.gz |
Reworking signatures of pictureframe function, beginning of implementation, debug tests
Diffstat (limited to 'include')
-rw-r--r-- | include/gui/pictureframe.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/gui/pictureframe.h b/include/gui/pictureframe.h index de9ae1c..1f5407c 100644 --- a/include/gui/pictureframe.h +++ b/include/gui/pictureframe.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <blender/canvas.h> | 4 | #include <blender/canvas.h> |
5 | #include <morpher/morphing.h> | 5 | #include <morpher/morphing.h> |
6 | #include "component.h" | ||
6 | 7 | ||
7 | /** | 8 | /** |
8 | * File: pictureframe.h | 9 | * File: pictureframe.h |
@@ -12,6 +13,7 @@ | |||
12 | * Type of functions needed to split CartesianMapping and keep only the CartesianVector needed, related to the type of PictureFrame involved | 13 | * Type of functions needed to split CartesianMapping and keep only the CartesianVector needed, related to the type of PictureFrame involved |
13 | */ | 14 | */ |
14 | typedef CartesianVector (*CartesianMappingDivision)(const CartesianMapping *cartesianMapping); | 15 | typedef CartesianVector (*CartesianMappingDivision)(const CartesianMapping *cartesianMapping); |
16 | |||
15 | /** | 17 | /** |
16 | * Struct: PictureFrame | 18 | * Struct: PictureFrame |
17 | * Represents a component to print pictures. | 19 | * Represents a component to print pictures. |
@@ -47,7 +49,8 @@ CartesianVector pictureframe_origin_split(const CartesianMapping *cartesianMappi | |||
47 | */ | 49 | */ |
48 | CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping); | 50 | CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping); |
49 | 51 | ||
50 | void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_pos, int y_pos, CartesianMappingDivision cartesianMappingDivision); | 52 | void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_pos, int y_pos, |
53 | CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas); | ||
51 | 54 | ||
52 | void pictureframe_free(PictureFrame *pictureFrame); | 55 | void pictureframe_free(PictureFrame *pictureFrame); |
53 | 56 | ||