added resources

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index b69cc85a0cdb18578a3eee5e87472fe0196fc485..9f78eaeb592b2660d7a9264cbe748dfc4004148e 100644 (file)
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -31,7 +31,9 @@ Application::Application(Canvas &c)
 , last(SDL_GetTicks())
 , running(false)
 , paused(false) {
-
+       univ.AddResource(Resource("Liquid Hydrogen", 70));
+       univ.AddResource(Resource("Liquid Qxygen", 1141));
+       univ.AddResource(Resource("Water", 999));
 }
 
 

diff --git a/src/world/Resource.cpp b/src/world/Resource.cpp
index ca2440c5203d10d6373dcb2b5a8c478e49c13f58..24cc28b9b4a4b7f97aa59b66d5335e374ba780c7 100644 (file)
--- a/src/world/Resource.cpp
+++ b/src/world/Resource.cpp
@@ -4,14 +4,14 @@
 namespace space {
 
 Resource::Resource()
-: id(-1)
-, name(nullptr) {
+: Resource("Nullpointerium", 1) {
 
 }
 
-Resource::Resource(int id, const char *name)
-: id(id)
-, name(name) {
+Resource::Resource(const char *name, float dens)
+: id(-1)
+, name(name)
+, density(dens) {
 
 }
 

diff --git a/src/world/Resource.h b/src/world/Resource.h
index 45de3443af2da316d3aa432d5aa3b4487d21d3c8..29d7d15a7bd716e9d02a43ee4883f362389b852a 100644 (file)
--- a/src/world/Resource.h
+++ b/src/world/Resource.h
@@ -7,15 +7,12 @@ class Resource {
 
 public:
        Resource();
-       Resource(int id, const char *name);
+       Resource(const char *name, float density);
 
 public:
-       int ID() const { return id; }
-       const char *Name() const { return name; }
-
-private:
        int id;
        const char *name;
+       float density;
 
 };
 

diff --git a/src/world/Universe.cpp b/src/world/Universe.cpp
index c5bb915805a324cd240541ffb2f12173cf44d39b..0866af32f600c12581deed44c9e2dc4190872d5a 100644 (file)
--- a/src/world/Universe.cpp
+++ b/src/world/Universe.cpp
@@ -23,6 +23,12 @@ Ship *Universe::AddShip(const Ship &s) {
        return &ships.back();
 }
 
+int Universe::AddResource(const Resource &r) {
+       resources.emplace_back(r);
+       resources.back().id = resources.size();
+       return resources.back();
+}
+
 
 void Universe::Update(float delta) {
        for (Ship &s : ships) {

diff --git a/src/world/Universe.h b/src/world/Universe.h
index 18db4dc782f8dd1d26360f23def88f9eafc4511c..5b3fccaf51dd896535ab35b232caec2b83615e45 100644 (file)
--- a/src/world/Universe.h
+++ b/src/world/Universe.h
@@ -5,6 +5,7 @@
 #include "../graphics/Vector.h"
 
 #include <list>
+#include <vector>
 
 
 namespace space {
@@ -70,11 +71,15 @@ public:
        Ship *AddShip(const Ship &);
        const std::list<Ship> &Ships() const { return ships; }
 
+       int AddResource(const Resource &);
+       const Resource &GetResource(int id) const { return resources[id]; }
+
 public:
        void Update(float deltaT);
 
 private:
        std::list<Ship> ships;
+       std::vector<Resource> resources;
 
 };