kinda big: texture redo, main cleanup

1 files changed, 11 insertions, 13 deletions

diff --git a/include/components.hpp b/include/components.hpp
index 4f8ef56..f6521f8 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -126,15 +126,11 @@ struct Solid {
 
 struct SpriteData {
 
-	SpriteData(std::string path, vec2 offset):
-		offset(offset) {
-			pic = Texture::loadTexture(path);
-			size = Texture::imageDim(path);
-		}
+	SpriteData(std::string path, vec2 offset)
+		: tex(path), offset(offset) {}
 
-	GLuint pic;
+	Texture tex;
 	vec2 offset;
-	vec2 size;
 };
 
 using Frame = std::vector<std::pair<SpriteData, vec2>>;
@@ -193,15 +189,17 @@ struct Sprite {
 		}
 
 		for (auto &s : sprite) {
+			const auto& size = s.first.tex.getDim();
+
 			if (s.second.x < st.x)
 				st.x = s.second.x;
 			if (s.second.y < st.y)
 				st.y = s.second.y;
 
-			if (s.second.x + s.first.size.x > dim.x)
-				dim.x = s.second.x + s.first.size.x;
-			if (s.second.y + s.first.size.y > dim.y)
-				dim.y = s.second.y + s.first.size.y;
+			if (s.second.x + size.x > dim.x)
+				dim.x = s.second.x + size.x;
+			if (s.second.y + size.y > dim.y)
+				dim.y = s.second.y + size.y;
 		}
 
 		return dim;
@@ -299,9 +297,9 @@ public:
 class RenderSystem : public entityx::System<RenderSystem> {
 private:
 	std::string loadTexString;
-	std::atomic<GLuint> loadTexResult;
+	Texture loadTexResult;
 public:
-	GLuint loadTexture(const std::string& file);
+	Texture loadTexture(const std::string& file);
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
 };