Refactor canvas

Signed-off-by: pacien <pacien.trangirard@pacien.net>

3 files changed, 103 insertions, 23 deletions

diff --git a/include/painter/canvas.h b/include/painter/canvas.h
new file mode 100644
index 0000000..e354938
--- /dev/null
+++ b/include/painter/canvas.h
@@ -0,0 +1,76 @@
+#ifndef UPEM_MORPHING_CANVAS
+#define UPEM_MORPHING_CANVAS
+
+/**
+ * File: canvas.h
+ * "Everyday is a good day when you paint" – Bob Ross
+ */
+
+#include <MLV/MLV_image.h>
+#include "common/geom.h"
+#include "painter/color.h"
+
+/**
+ * Type: Canvas
+ * Represents a fixed size RGBa pixel matrix.
+ */
+typedef struct {
+  MLV_Image *mlv;
+} Canvas;
+
+/**
+ * Function: canvas_create
+ * Initialises a canvas of the given size
+ *
+ * Parameters:
+ *   width  - the width in pixels
+ *   height - the height in pixels
+ */
+Canvas *canvas_create(IntVector width, IntVector height);
+
+/**
+ * Function: canvas_destroy
+ * Frees all memory allocated to a canvas.
+ *
+ * Parameters:
+ *   *c - the canvas to destroy
+ */
+void canvas_destroy(Canvas *c);
+
+/**
+ * Function: canvas_set_pixel
+ * Sets the pixel colour at the given coordinates.
+ *
+ * Parameters:
+ *   *c    - the canvas to alter
+ *   pos   - the coordinate of the pixel to set
+ *   color - the new colour to set
+ */
+void canvas_set_pixel(Canvas *c, CartesianVector pos, Color color);
+
+/**
+ * Function: canvas_get_pixel
+ * Returns the colour of the pixel at the given position.
+ *
+ * Parameters:
+ *   *c  - the base canvas
+ *   pos - the coordinate of the pixel to get
+ *
+ * Returns:
+ *   The colour of the requested pixel
+ */
+Color canvas_get_pixel(Canvas *c, CartesianVector pos);
+
+/**
+ * Function: canvas_get_dim
+ * Returns the size (in pixels) of the given canvas.
+ *
+ * Parameters:
+ *   *c - the canvas
+ *
+ * Returns:
+ *   The size of the canvas
+ */
+CartesianVector canvas_get_dim(Canvas *c);
+
+#endif
diff --git a/src/blender/canvas.c b/src/blender/canvas.c
deleted file mode 100644
index b7cd9dc..0000000
--- a/src/blender/canvas.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "blender/canvas.h"
-
-void canvas_init(Canvas *canvas, IntVector width, IntVector height) {
-  canvas->mlv = MLV_create_image(width, height);
-}
-
-void canvas_free(Canvas *canvas) {
-  MLV_free_image(canvas->mlv);
-}
-
-void canvas_set_pixel(Canvas *canvas, CartesianVector position, Color color) {
-  MLV_set_pixel_on_image(position.x, position.y, color.mlv, canvas->mlv);
-}
-
-Color canvas_get_pixel(Canvas *canvas, CartesianVector position) {
-  int r, g, b, a;
-  MLV_get_pixel_on_image(canvas->mlv, position.x, position.y, &r, &g, &b, &a);
-  return (Color) {{r, g, b, a}};
-}
-
-CartesianVector canvas_get_dim(Canvas *canvas) {
-  return (CartesianVector) {MLV_get_image_width(canvas->mlv), MLV_get_image_height(canvas->mlv)};
-}
diff --git a/src/painter/canvas.c b/src/painter/canvas.c
new file mode 100644
index 0000000..53deeb9
--- /dev/null
+++ b/src/painter/canvas.c
@@ -0,0 +1,27 @@
+#include "painter/canvas.h"
+#include "common/mem.h"
+
+Canvas *canvas_create(IntVector width, IntVector height) {
+  Canvas *c = malloc_or_die(sizeof(Canvas));
+  c->mlv = MLV_create_image(width, height);
+  return c;
+}
+
+void canvas_destroy(Canvas *c) {
+  MLV_free_image(c->mlv);
+  free(c);
+}
+
+void canvas_set_pixel(Canvas *c, CartesianVector pos, Color color) {
+  MLV_set_pixel_on_image(pos.x, pos.y, color.mlv, c->mlv);
+}
+
+Color canvas_get_pixel(Canvas *c, CartesianVector pos) {
+  int r, g, b, a;
+  MLV_get_pixel_on_image(c->mlv, pos.x, pos.y, &r, &g, &b, &a);
+  return (Color) {{a, b, g, r}};
+}
+
+CartesianVector canvas_get_dim(Canvas *c) {
+  return (CartesianVector) {MLV_get_image_width(c->mlv), MLV_get_image_height(c->mlv)};
+}