Refactor

1 files changed, 23 insertions, 5 deletions

diff --git a/src/util.c b/src/util.c
index 075c55c..288fab6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <stdio.h>
 
 #include "util.h"
 
@@ -18,18 +19,35 @@ bool timespec_greater(struct timespec a, struct timespec b)
         || (a.tv_sec == b.tv_sec && a.tv_nsec > b.tv_nsec);
 }
 
-bool in_capsule(int px, int py, int x, int y, int w, int h)
+void timespec_print(struct timespec *ts)
+{
+    printf("%ld.%.9ld", ts->tv_sec, ts->tv_nsec);
+}
+
+bool check_rect(int px, int py, int x, int y, int w, int h)
+{
+    return px >= x && px <= x + w && py >= y && py <= y + h;
+}
+
+bool check_circle(int px, int py, int x, int y, int r)
+{
+    int dx = x - px;
+    int dy = y - py;
+    return (dx * dx + dy * dy) <= r * r;
+}
+
+bool check_capsule(int px, int py, int x, int y, int w, int h)
 {
     assert(w >= h);
     int radius = h / 2;
 
     // Trivial case
     if (w == h)
-        return in_circle(px, py, x + radius, y + radius, radius);
+        return check_circle(px, py, x + radius, y + radius, radius);
 
     // General case
-    return in_circle(px, py, x + radius, y + radius, radius)
-        || in_circle(px, py, x + w - radius, y + radius, radius)
-        || in_rect(px, py, x + radius, y, w - 2 * radius, h);
+    return check_circle(px, py, x + radius, y + radius, radius)
+        || check_circle(px, py, x + w - radius, y + radius, radius)
+        || check_rect(px, py, x + radius, y, w - 2 * radius, h);
 }