From 14c36420a37678b75b30f3b4d1dec7eddb053eef Mon Sep 17 00:00:00 2001 From: Tom Barrett Date: Sun, 26 Mar 2017 06:46:12 -0500 Subject: -all organisms now in one list -plants do not reproduce yet, this is needed --- inc/constants.hpp | 7 +++---- inc/list.hpp | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/constants.hpp b/inc/constants.hpp index 76a40c1..a9039bf 100644 --- a/inc/constants.hpp +++ b/inc/constants.hpp @@ -3,9 +3,8 @@ // General const int HERBAVORES = 100; -const int CARNIVORES = 50;; -const int MINIMUM_PLANTS = 4000; -const int PLANTS = 5000; +const int CARNIVORES = 5; +const int PLANTS = 3000; const int WINDOW_X = 1000; const int WINDOW_Y = 1000; const float BOUNDS = 30; @@ -43,7 +42,7 @@ const int NUM_UNIFORMS = 3; const float SIDES = 5; // Quadtree -const int MAX_OBJECTS = 5; +const int MAX_OBJECTS = 10; const int MAX_LEVELS = 20; // Camera diff --git a/inc/list.hpp b/inc/list.hpp index f43ba07..e2b94e5 100644 --- a/inc/list.hpp +++ b/inc/list.hpp @@ -19,11 +19,9 @@ class List std::vector getNear(Organism o); - std::list resources; - std::list creatures; + std::list organisms; Quadtree tree; - std::vector drawQuadTree(); }; #endif -- cgit v1.2.3