diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | balls.h | 16 | ||||
| -rw-r--r-- | partition.cpp (renamed from layers.cpp) | 2 |
3 files changed, 4 insertions, 16 deletions
@@ -2,7 +2,7 @@ CC = g++ CFLAGS = -Wall -pedantic LDFLAGS = -ltbb -lglut -lGLU -lGL -balls: balls.o collision.o point.o vec.o layers.o +balls: balls.o collision.o point.o vec.o partition.o ${CC} -o $@ $^ ${LDFLAGS} @echo done @@ -33,9 +33,6 @@ typedef struct { Color color; } Ball; -typedef continue_node<continue_msg> node_t; -typedef const continue_msg & msg_t; - class Collision { public: Ball *b1, *b2; @@ -53,22 +50,11 @@ public: return a.b1 == b.b1 && a.b2 == b.b2; } - friend ostream &operator<<(ostream& os, Collision const & c) { + friend ostream& operator<<(ostream& os, Collision const & c) { return os << "(" << c.b1 << ", " << c.b2 << ")"; } }; -class CollisionGraph { -private: - graph g; - node_t root; - vector<vector<reference_wrapper<node_t>>> layers; - -public: - CollisionGraph(void); - void run(); -}; - vector<vector<Collision>> partitionCollisions(vector<Ball *> balls); Point addPt(Point p, Point q); diff --git a/layers.cpp b/partition.cpp index f8b3afd..971c74f 100644 --- a/layers.cpp +++ b/partition.cpp @@ -4,6 +4,8 @@ static vector<Collision> completeGraph(vector<Ball *> balls); static vector<Collision> matching(vector<Collision> edges); static vector<Collision> diff(vector<Collision> a, vector<Collision> b); + + vector<vector<Collision>> partitionCollisions(vector<Ball *> balls) { vector<vector<Collision>> layers; |