From dfda3f2a5e555d3173359134f4994bcd12d129f8 Mon Sep 17 00:00:00 2001 From: majortom6 Date: Fri, 3 Mar 2017 15:18:22 -0600 Subject: -removed the Graphics Data class -replaced with already implemented Rectangle, and put color and side variables in dna (can potentially remove the side variable if it does nothing important) --- src/list.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/list.cpp') diff --git a/src/list.cpp b/src/list.cpp index 826208e..d4b9529 100644 --- a/src/list.cpp +++ b/src/list.cpp @@ -64,21 +64,18 @@ void List::Place() resources.push_back(X); } - for(std::list::iterator it = creatures.begin(); it!= creatures.end(); it++){ - it->Place(); + for(std::list::iterator it = creatures.begin(); it!= creatures.end(); it++) tree.insert(&(*it));; - } - - for(std::list::iterator it = resources.begin(); it!=resources.end(); it++){ - it->Place(); + + for(std::list::iterator it = resources.begin(); it!=resources.end(); it++) tree.insert(&(*it));; - } + } std::vector List::getNear(Organism c) { std::vector near; - near = tree.retrieve(near, c.getGFXD()); + near = tree.retrieve(near, c.getRectangle()); for(std::vector::iterator it = near.begin(); it!= near.end(); it++) if(c.getBestSense() < Distance(c.getRectangle(),(*it)->getRectangle())) @@ -87,7 +84,7 @@ std::vector List::getNear(Organism c) return near; } -std::vector List::drawQuadTree() +std::vector List::drawQuadTree() { return tree.Draw(); } -- cgit v1.2.3