Updated drawing and various others

include/Drone.h

@@ -61,4 +61,6 @@ class Drone {
   }
 
   std::vector<Tree *> getFoundTrees() { return foundTrees; }
+
+  void clearLists();
 };

include/Tree.h

@@ -8,9 +8,10 @@ class Tree {
   bool diseased;
   bool mapped;
   float radius;
+  int treeID;
 
  public:
-  Tree(b2World *world, const b2Vec2 &position, bool diseased,
+  Tree(b2World *world, int treeID, const b2Vec2 &position, bool diseased,
        bool mapped = false, float radius = 1.0f);
   ~Tree();
 
@@ -20,5 +21,7 @@ class Tree {
   bool isMapped() { return mapped; }
   void setMapped(bool isMapped) { mapped = isMapped; }
   b2Body *getBody() { return body; }
+  void setID(int newID) { treeID = newID; }
+  int getID() { return treeID; }
   void render();
 };

src/Drone.cpp

@@ -97,14 +97,20 @@ void Drone::updateSensorRange() {
   viewSensor = body->CreateFixture(&sFixtureDef);
 }
 
+void Drone::clearLists() {
+  this->foundDiseasedTrees.clear();
+  this->foundDiseasedTreePositions.clear();
+  this->foundTrees.clear();
+}
+
 void Drone::update(std::vector<Drone *> &drones) {
   if (behaviour) {
     behaviour->execute(drones, this);
   }
   // Clear found trees for this cycle?
-  this->foundDiseasedTrees.clear();
-  this->foundDiseasedTreePositions.clear();
-  this->foundTrees.clear();
+  // this->foundDiseasedTrees.clear();
+  // this->foundDiseasedTreePositions.clear();
+  // this->foundTrees.clear();
 
   b2Vec2 position = body->GetPosition();
 

src/Tree.cpp

@@ -2,9 +2,9 @@
 
 #include "ObjectTypes.h"
 
-Tree::Tree(b2World *world, const b2Vec2 &position, bool diseased, bool mapped,
-           float radius)
-    : diseased(diseased), mapped(mapped), radius(radius) {
+Tree::Tree(b2World *world, int treeID, const b2Vec2 &position, bool diseased,
+           bool mapped, float radius)
+    : treeID(treeID), diseased(diseased), mapped(mapped), radius(radius) {
   // Create Box2D body
   b2BodyDef bodyDef;
   bodyDef.type = b2_staticBody;