X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/113fbd0d57be3df9bc6ac56b44d8bd154cc90d38..refs/heads/master:/badge/util/rectangle.h

diff --git a/badge/util/rectangle.h b/badge/util/rectangle.h
index 8653e6b..70d43ba 100644
--- a/badge/util/rectangle.h
+++ b/badge/util/rectangle.h
@@ -13,7 +13,22 @@ static inline vec2d vec2d_add(vec2d v1, vec2d v2) {
     fixed_point_add(v1.x, v2.x),
     fixed_point_add(v1.y, v2.y)
   };
+  return r;
+}
+
+static inline vec2d vec2d_sub(vec2d v1, vec2d v2) {
+  vec2d r = {
+    fixed_point_sub(v1.x, v2.x),
+    fixed_point_sub(v1.y, v2.y)
+  };
+  return r;
+}
 
+static inline vec2d vec2d_neg(vec2d v) {
+  vec2d r = {
+    fixed_point_neg(v.x),
+    fixed_point_neg(v.y)
+  };
   return r;
 }
 
@@ -22,6 +37,8 @@ typedef struct {
   vec2d extent;
 } rectangle;
 
+static inline rectangle   rectangle_new(vec2d pos, vec2d extent) { rectangle r = { pos, extent }; return r; }
+
 static inline fixed_point rectangle_top   (rectangle const *r) { return r->pos.y; }
 static inline fixed_point rectangle_left  (rectangle const *r) { return r->pos.x; }
 static inline fixed_point rectangle_bottom(rectangle const *r) { return fixed_point_add(rectangle_top (r), r->extent.y); }
@@ -30,23 +47,24 @@ static inline fixed_point rectangle_right (rectangle const *r) { return fixed_po
 static inline fixed_point rectangle_width (rectangle const *r) { return r->extent.x; }
 static inline fixed_point rectangle_height(rectangle const *r) { return r->extent.y; }
 
-static inline vec2d rectangle_mid(rectangle const *r) {
-  vec2d v = { fixed_point_add(r->pos.x, fixed_point_div(r->extent.x, FIXED_POINT(2, 0))),
-	      fixed_point_add(r->pos.y, fixed_point_div(r->extent.y, FIXED_POINT(2, 0)))
-  };
-  return v;
-}
+static inline fixed_point rectangle_mid_x (rectangle const *r) { return fixed_point_add(r->pos.x, fixed_point_div(r->extent.x, FIXED_INT(2))); }
+static inline fixed_point rectangle_mid_y (rectangle const *r) { return fixed_point_add(r->pos.y, fixed_point_div(r->extent.y, FIXED_INT(2))); }
+
+static inline vec2d       rectangle_mid   (rectangle const *r) { vec2d v = { rectangle_mid_x(r), rectangle_mid_y(r) }; return v; }
+
+static inline void rectangle_move_to  (rectangle *r, vec2d       new_pos) { r->pos = new_pos; }
+static inline void rectangle_move_to_x(rectangle *r, fixed_point new_x  ) { r->pos.x = new_x; }
+static inline void rectangle_move_to_y(rectangle *r, fixed_point new_y  ) { r->pos.x = new_y; }
 
-static inline void rectangle_move_to  (rectangle *r, vec2d new_pos) { r->pos = new_pos; }
-static inline void rectangle_move_to_x(rectangle *r, fixed_point    new_x  ) { r->pos.x = new_x; }
-static inline void rectangle_move_to_y(rectangle *r, fixed_point    new_y  ) { r->pos.x = new_y; }
+static inline void rectangle_move_rel (rectangle *r, vec2d       vec    ) { r->pos = vec2d_add(r->pos, vec); }
+static inline void rectangle_expand   (rectangle *r, vec2d       extent ) { r->extent = extent; }
 
 static inline bool rectangle_intersect(rectangle const *r1,
-				       rectangle const *r2) {
+                                       rectangle const *r2) {
   return (fixed_point_lt(rectangle_top   (r1), rectangle_bottom(r2)) &&
-	  fixed_point_gt(rectangle_bottom(r1), rectangle_top   (r2)) &&
-	  fixed_point_lt(rectangle_left  (r1), rectangle_right (r2)) &&
-	  fixed_point_gt(rectangle_right (r1), rectangle_left  (r2)));
+          fixed_point_gt(rectangle_bottom(r1), rectangle_top   (r2)) &&
+          fixed_point_lt(rectangle_left  (r1), rectangle_right (r2)) &&
+          fixed_point_gt(rectangle_right (r1), rectangle_left  (r2)));
 }
 
 #endif