Merge remote-tracking branch 'origin/master' into gui

7 files changed, 241 insertions, 114 deletions

diff --git a/include/blender/blender.h b/include/blender/blender.h
deleted file mode 100644
index 26ff802..0000000
--- a/include/blender/blender.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef UPEM_MORPHING_BLENDER
-#define UPEM_MORPHING_BLENDER
-
-/**
- * File: blender.h
- * Will it blend? That is the question.
- */
-
-#include "common/time.h"
-#include "blender/canvas.h"
-#include "morpher/morphing.h"
-
-/**
- * Function: blender_blend_canvas
- * Blends two canvas by applying the given morphing at the requested time frame.
- *
- * Parameters:
- *   *canvas   - pointer to the canvas to paint
- *   *source   - source image
- *   *target   - target image
- *   *morphing - morphing transform to apply
- *   frame     - the interpolation distance from the origin canvas [0;1]
- */
-void blender_blend_canvas(Canvas *canvas, Canvas *source, Canvas *target, Morphing *morphing, TimeVector frame);
-
-#endif
diff --git a/include/blender/canvas.h b/include/blender/canvas.h
deleted file mode 100644
index aae217d..0000000
--- a/include/blender/canvas.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef UPEM_MORPHING_CANVAS
-#define UPEM_MORPHING_CANVAS
-
-/**
- * File: canvas.h
- *
- * See also:
- *   Freedom, according to Bob Ross
- */
-
-#include <MLV/MLV_image.h>
-#include "common/geom.h"
-#include "color.h"
-
-/**
- * Type: Canvas
- * Represents a fixed size RGBa pixel matrix.
- */
-typedef struct {
-  MLV_Image *mlv;
-} Canvas;
-
-/**
- * Function: canvas_init
- * Initialises a canvas of the given size
- *
- * Parameters:
- *   *canvas - the canvas to initialise
- *   width   - the width in pixels
- *   height  - the height in pixels
- */
-void canvas_init(Canvas *canvas, IntVector width, IntVector height);
-
-/**
- * Function: canvas_free
- * Frees all memory allocated to a canvas.
- *
- * Parameters:
- *   *canvas - the canvas to destroy
- */
-void canvas_free(Canvas *canvas);
-
-/**
- * Function: canvas_set_pixel
- * Sets the pixel colour at the given coordinates.
- *
- * Parameters:
- *   *canvas  - the canvas to alter
- *   position - the cartesian coordinates of the pixel to set
- *   color    - the new colour to set
- */
-void canvas_set_pixel(Canvas *canvas, CartesianVector position, Color color);
-
-/**
- * Function: canvas_get_pixel
- * Returns the colour of the pixel at the given position.
- *
- * Parameters:
- *   *canvas - the base canvas
- *   position - the position in cartesian coordinates
- *
- * Returns:
- *   The colour of the requested pixel
- */
-Color canvas_get_pixel(Canvas *canvas, CartesianVector position);
-
-/**
- * Function: canvas_get_dim
- * Returns the size (in pixels) of the given canvas.
- *
- * Parameters:
- *   *canvas - the canvas
- *
- * Returns:
- *   The size of the canvas
- */
-CartesianVector canvas_get_dim(Canvas *canvas);
-
-#endif
diff --git a/include/common/geom.h b/include/common/geom.h
index b3564a5..334e95c 100644
--- a/include/common/geom.h
+++ b/include/common/geom.h
@@ -15,6 +15,12 @@
 typedef int32_t IntVector;
 
 /**
+ * Type: RealVector
+ * An abstract 1-D real vector.
+ */
+typedef double RealVector;
+
+/**
  * Struct: CartesianVector
  * An abstract 2-D vector in cartesian coordinates.
  *
@@ -27,6 +33,19 @@ typedef struct {
 } CartesianVector;
 
 /**
+ * Struct: BarycentricVector
+ * An abstract barycentric coordinate tuple relative to a triangle.
+ * The third barycentric coordinate is deduced from the first two ones.
+ *
+ * Fields:
+ *   a - the first barycentric coordinate
+ *   b - the second barycentric coordinate
+ */
+typedef struct {
+  RealVector a, b;
+} BarycentricVector;
+
+/**
  * Struct: CartesianMapping
  * A tuple of cartesian vectors representing a mapping.
  *
@@ -38,6 +57,16 @@ typedef struct {
   CartesianVector origin, target;
 } CartesianMapping;
 
+/**
+ * Struct: Triangle
+ * Represents a simple triangle with three vertices.
+ *
+ * Fields:
+ *   v[] - array of vertices
+ */
+typedef struct {
+  CartesianVector v[3];
+} Triangle;
 
 /**
  * Function: m
@@ -66,6 +95,19 @@ CartesianMapping m(int x, int y);
 CartesianVector v(int x, int y);
 
 /**
+ * Function: b
+ * Shorthand for a barycentric vector.
+ *
+ * Parameters:
+ *   a - the a-coordinate
+ *   b - the b-coordinate
+ *
+ * Returns:
+ *   A barycentric vector
+ */
+BarycentricVector b(double a, double b);
+
+/**
  * Function: mappings_equals
  * Compares two cartesian mappings.
  *
@@ -92,17 +134,54 @@ bool mappings_equals(CartesianMapping m1, CartesianMapping m2);
 bool vector_equals(CartesianVector v1, CartesianVector v2);
 
 /**
- * Function: triangle_area
- * Computes the area of a triangle.
+ * Function: barycentric_vector_equals
+ * Compares two barycentric vectors.
+ *
+ * Parameters:
+ *   v1 - the first vector
+ *   v2 - the second vector
+ *
+ * Returns:
+ *   T(v1 is equal to v2)
+ */
+bool barycentric_vector_equals(BarycentricVector b1, BarycentricVector b2);
+
+/**
+ * Function: square_area
+ * Computes the area of a square spawned by three positively oriented vertices.
+ *
+ * Parameters:
+ *   vi - vertices
+ *
+ * Returns:
+ *   The area of the square
+ */
+IntVector square_area(CartesianVector v1, CartesianVector v2, CartesianVector v3);
+
+/**
+ * Function: cartesian_to_barycentric
+ * Computes and returns the barycentric coordinates of a given point in the given reference triangle.
+ *
+ * Parameters:
+ *   t - reference triangle
+ *   p - the vector to convert
+ *
+ * Returns:
+ *   The barycentric coordinates vector
+ */
+BarycentricVector cartesian_to_barycentric(Triangle t, CartesianVector p);
+
+/**
+ * Function: barycentric_to_cartesian
+ * Computes and returns the cartesian coordinates of a given point in the given reference triangle.
  *
  * Parameters:
- *   v1 - first vertex
- *   v2 - second vertex
- *   v3 - third vertex
+ *   t - reference triangle
+ *   p - the vector to convert
  *
  * Returns: