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

7 files changed, 336 insertions, 52 deletions

diff --git a/include/blender/blender.h b/include/blender/blender.h
index 8e89208..26ff802 100644
--- a/include/blender/blender.h
+++ b/include/blender/blender.h
@@ -8,7 +8,7 @@
 
 #include "common/time.h"
 #include "blender/canvas.h"
-#include "morpher/morpher.h"
+#include "morpher/morphing.h"
 
 /**
  * Function: blender_blend_canvas
diff --git a/include/common/geom.h b/include/common/geom.h
index a843c76..b3564a5 100644
--- a/include/common/geom.h
+++ b/include/common/geom.h
@@ -38,6 +38,46 @@ typedef struct {
   CartesianVector origin, target;
 } CartesianMapping;
 
+
+/**
+ * Function: m
+ * Shorthand for an identity mapping.
+ *
+ * Parameters:
+ *   x - the x-coordinate
+ *   y - the y-coordinate
+ *
+ * Returns:
+ *   A cartesian identity mapping
+ */
+CartesianMapping m(int x, int y);
+
+/**
+ * Function: v
+ * Shorthand for a vector.
+ *
+ * Parameters:
+ *   x - the x-coordinate
+ *   y - the y-coordinate
+ *
+ * Returns:
+ *   An integer vector
+ */
+CartesianVector v(int x, int y);
+
+/**
+ * Function: mappings_equals
+ * Compares two cartesian mappings.
+ *
+ * Parameters:
+ *   m1 - the first mapping
+ *   m2 - the second mapping
+ *
+ * Returns:
+ *   T(m1 is equal to m2)
+ */
+bool mappings_equals(CartesianMapping m1, CartesianMapping m2);
+
 /**
  * Function: vector_equals
  * Compares two cartesian vectors.
@@ -51,4 +91,18 @@ typedef struct {
  */
 bool vector_equals(CartesianVector v1, CartesianVector v2);
 
+/**
+ * Function: triangle_area
+ * Computes the area of a triangle.
+ *
+ * Parameters:
+ *   v1 - first vertex
+ *   v2 - second vertex
+ *   v3 - third vertex
+ *
+ * Returns:
+ *   The area of the triangle spawned by the three supplied vertices
+ */
+IntVector triangle_area(CartesianVector v1, CartesianVector v2, CartesianVector v3);
+
 #endif
diff --git a/include/common/matrix.h b/include/common/matrix.h
deleted file mode 100644
index fe4a12a..0000000
--- a/include/common/matrix.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef UPEM_MORPHING_MATRIX
-#define UPEM_MORPHING_MATRIX
-
-/**
- * File: matrix.h
- * Matrices representation and useful operations.
- *
- * See also:
- *   The film
- */
-
-#include "geom.h"
-
-/**
- * Struct: IntSquareMatrix
- * Represents a square integer matrix.
- *
- * Fields:
- *   **elements - NULL-terminated array of element pointers
- *   dim        - dimension
- */
-typedef struct {
-  IntVector **elements;
-  IntVector dim;
-} IntSquareMatrix;
-
-/**
- * Function: matrix_int_det
- * Computes and returns the determinant of a square integer matrix.
- *
- * Parameters:
- *   *matrix - pointer to input matrix
- *
- * Returns:
- *   The integer determinant
- */
-IntVector matrix_int_det(IntSquareMatrix *matrix);
-
-/**
- * Function: matrix_reshape
- * Reshapes a flat vector into a bi-dimensional row pointer array.
- *
- * Parameters:
- *   **bi_dim - pointer to the result row array
- *   *flat    - flat vector
- *   width    - number of elements per row
- *   height   - number of rows
- */
-void matrix_reshape(IntVector **bi_dim, IntVector *flat, int width, int height);
-
-#endif
diff --git a/include/morpher/matrix.h b/include/morpher/matrix.h
new file mode 100644
index 0000000..8118727
--- /dev/null
+++ b/include/morpher/matrix.h
@@ -0,0 +1,41 @@
+#ifndef UPEM_MORPHING_MATRIX
+#define UPEM_MORPHING_MATRIX
+
+/**
+ * File: matrix.h
+ * Determinant operations.
+ *
+ * See also:
+ *   The film
+ */
+
+#include "common/geom.h"
+
+/**
+ * Function: matrix_int_det2
+ * Computes and returns the determinant of a square integer matrix of size 2.
+ *
+ * Parameters:
+ *   uij - element at the i-th row and j-th column, counting from 1
+ *
+ * Returns:
+ *   The integer determinant
+ */
+IntVector matrix_int_det2(IntVector u11, IntVector u12,
+                          IntVector u21, IntVector u22);
+
+/**
+ * Function: matrix_int_det3
+ * Computes and returns the determinant of a square integer matrix of size 3.
+ *
+ * Parameters:
+ *   uij - element at the i-th row and j-th column, counting from 1
+ *
+ * Returns:
+ *   The integer determinant
+ */
+IntVector matrix_int_det3(IntVector u11, IntVector u12, IntVector u13,
+                          IntVector u21, IntVector u22, IntVector u23,
+                          IntVector u31, IntVector u32, IntVector u33);
+
+#endif
diff --git a/include/morpher/morphing.h b/include/morpher/morphing.h
new file mode 100644
index 0000000..028cd87
--- /dev/null
+++ b/include/morpher/morphing.h
@@ -0,0 +1,58 @@
+#ifndef UPEM_MORPHING_MORPHING
+#define UPEM_MORPHING_MORPHING
+
+/**
+ * File: morphing.h
+ * Coordinate mapping for morphing transforms.
+ */
+
+#include "common/geom.h"
+#include "common/time.h"
+#include "morpher/trianglemap.h"
+
+/**
+ * Struct: Morphing
+ * Represents an abstract coordinate transform from a source to a destination coordinate matrix,
+ * constrained by a given set of points.
+ *
+ * Fields:
+ *   dim     - dimension in pixels
+ *   *first  - the first triangle in the linked list
+ *   *center - the center triangle
+ */
+typedef struct {
+  CartesianVector dim;
+  TriangleMap *first, *center;
+} Morphing;
+
+/**
+ * Function: morphing_init
+ * Initialises a morphing.
+ *
+ * Parameters:
+ *   width  - coordinate matrix width in pixels
+ *   height - coordinate matrix height in pixels
+ */
+Morphing *morphing_create(IntVector width, IntVector height);
+
+/**
+ * Function: morphing_free
+ * Frees any resources allocated to a morphing.
+ *
+ * Parameters:
+ *   *m - pointer to the morphing to destroy
+ */
+void morphing_destroy(Morphing *m);
+
+/**
+ * Function: morphing_add_constraint
+ * Adds a constraint point to a morphing.
+ *
+ * Parameters:
+ *   *m          - pointer to the morphing to alter
+ *   origin      - constraint point coordinates on the origin matrix
+ *   destination - constraint point coordinates on the target matrix
+ */
+void morphing_add_constraint(Morphing *m, CartesianVector origin, CartesianVector destination);
+
+#endif
diff --git a/include/morpher/quadrilateral.h b/include/morpher/quadrilateral.h
new file mode 100644
index 0000000..c8cf3a1
--- /dev/null
+++ b/include/morpher/quadrilateral.h
@@ -0,0 +1,39 @@
+#ifndef UPEM_MORPHING_QUADRILATERAL
+#define UPEM_MORPHING_QUADRILATERAL
+
+/**