X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FUniverse.h;h=18db4dc782f8dd1d26360f23def88f9eafc4511c;hb=1cb5ed22d7772abe6f9893be90f26f46dbde39f7;hp=563bfd90000b545d56bf754778b5f39d1827ab4a;hpb=3f4f8a92f64df08119a40da4d196b3e92ecdc637;p=space.git

diff --git a/src/world/Universe.h b/src/world/Universe.h
index 563bfd9..18db4dc 100644
--- a/src/world/Universe.h
+++ b/src/world/Universe.h
@@ -1,20 +1,18 @@
 #ifndef SPACE_UNIVERSE_H_
 #define SPACE_UNIVERSE_H_
 
-#include "../entity/Entity.h"
-#include "../math/Vector.h"
+#include "../entity/Ship.h"
+#include "../graphics/Vector.h"
 
 #include <list>
 
 
 namespace space {
 
-class Sector;
-
 class Universe {
 
 public:
-	Universe(Vector<int> size, Vector<int> secSize, Vector<int> areaSize, int numres);
+	Universe(Vector<int> size, Vector<int> secSize, Vector<int> areaSize);
 	~Universe();
 
 	Universe(const Universe &) = delete;
@@ -26,21 +24,57 @@ public:
 	const Vector<int> areaSize;
 
 public:
-	Entity *AddEntity(const Entity &);
-	const std::list<Entity> &Entities() const { return entities; }
+	class Area;
 
-public:
-	void Update(float deltaT);
+	class Sector {
 
-private:
+	public:
+		Sector(const Universe &univ, Vector<int> coords)
+		: univ(univ), coords(coords) { }
+
+	public:
+		Vector<int> SectorCoords() const { return coords; }
+		Vector<int> AreaCoords() const { return univ.areaSize * coords; }
+
+		Area AreaAt(Vector<int> ac) const { return univ.AreaAt(AreaCoords() + ac); }
+
+	private:
+		const Universe &univ;
+		Vector<int> coords;
+
+	};
+
+	class Area {
+
+	public:
+		Area(const Universe &univ, Vector<int> coords)
+		: univ(univ), coords(coords) { }
 
-	int numres;
-	int total;
+	public:
+		Vector<int> SectorCoords() const { return coords / univ.areaSize; }
+		Vector<int> AreaCoords() const { return coords; }
 
-	Sector *sec_begin;
-	Sector *sec_end;
+		Sector ParentSector() const { return univ.SectorAt(SectorCoords()); }
 
-	std::list<Entity> entities;
+	private:
+		const Universe &univ;
+		Vector<int> coords;
+
+	};
+
+public:
+	Sector SectorAt(Vector<int> coords) const { return Sector(*this, coords); }
+	Area AreaAt(Vector<int> coords) const { return Area(*this, coords); }
+
+public:
+	Ship *AddShip(const Ship &);
+	const std::list<Ship> &Ships() const { return ships; }
+
+public:
+	void Update(float deltaT);
+
+private:
+	std::list<Ship> ships;
 
 };