controlled entity

[space.git] / src / world / Universe.h

diff --git a/src/world/Universe.h b/src/world/Universe.h
index 29e4ecb92b726f6e97bf65e38d6ea4aafecdacd1..563bfd90000b545d56bf754778b5f39d1827ab4a 100644 (file)
--- a/src/world/Universe.h
+++ b/src/world/Universe.h
@@ -1,6 +1,12 @@
 #ifndef SPACE_UNIVERSE_H_
 #define SPACE_UNIVERSE_H_
 
+#include "../entity/Entity.h"
+#include "../math/Vector.h"
+
+#include <list>
+
+
 namespace space {
 
 class Sector;
@@ -8,20 +14,34 @@ class Sector;
 class Universe {
 
 public:
-       Universe(int w, int h, int sec_w, int sec_h, int numres);
+       Universe(Vector<int> size, Vector<int> secSize, Vector<int> areaSize, int numres);
        ~Universe();
-private:
-       Universe(const Universe &);
-       Universe &operator =(const Universe &);
+
+       Universe(const Universe &) = delete;
+       Universe &operator =(const Universe &) = delete;
+
+public:
+       const Vector<int> size;
+       const Vector<int> secSize;
+       const Vector<int> areaSize;
+
+public:
+       Entity *AddEntity(const Entity &);
+       const std::list<Entity> &Entities() const { return entities; }
+
+public:
+       void Update(float deltaT);
 
 private:
-       int w;
-       int h;
+
        int numres;
        int total;
+
        Sector *sec_begin;
        Sector *sec_end;
 
+       std::list<Entity> entities;
+
 };
 
 }