refactor

3 files changed, 22 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 8bd89f1..b4e8116 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,12 @@ CC = g++
 CFLAGS = -Wall -pedantic
 LDFLAGS = -ltbb -lglut -lGLU -lGL
 
-balls: balls.o collision.o
+balls: balls.o collision.o geometry.o
 	${CC} -o $@ $^ ${LDFLAGS}
 	@echo done
 
 %.o: %.cpp balls.h
-	${CC} -c ${CFLAGS} $<
\ No newline at end of file
+	${CC} -c ${CFLAGS} $<
+
+clean:
+	rm -f ./*.o balls
\ No newline at end of file
diff --git a/balls.cpp b/balls.cpp
index 621fb13..45704a5 100644
--- a/balls.cpp
+++ b/balls.cpp
@@ -116,19 +116,3 @@ animate(int v) {
 	display();
 	glutTimerFunc(FRAME_TIME_MS, animate, 0);
 }
-
-Point
-ptAddVec(Point p, Vector v) {
-	p.x += v.x;
-	p.y += v.y;
-	return p;
-}
-
-Rectangle
-insetRect(Rectangle r, double n) {
-	r.min.x += n;
-	r.min.y += n;
-	r.max.x -= n;
-	r.max.y -= n;
-	return r;
-}
diff --git a/geometry.cpp b/geometry.cpp
new file mode 100644
index 0000000..ae2c8ae
--- /dev/null
+++ b/geometry.cpp
@@ -0,0 +1,17 @@
+#include "balls.h"
+
+Point
+ptAddVec(Point p, Vector v) {
+	p.x += v.x;
+	p.y += v.y;
+	return p;
+}
+
+Rectangle
+insetRect(Rectangle r, double n) {
+	r.min.x += n;
+	r.min.y += n;
+	r.max.x -= n;
+	r.max.y -= n;
+	return r;
+}