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

2 files changed, 54 insertions, 51 deletions

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