update with master; using VBOs for fonts

1 files changed, 14 insertions, 1 deletions

diff --git a/src/texture.hpp b/src/texture.hpp
index 16987f8..3daebbd 100644
--- a/src/texture.hpp
+++ b/src/texture.hpp
@@ -21,18 +21,31 @@
 #define TEXTURE_HPP_
 
 #include <soil/SOIL.h>
+
+#include <sol/sol.hpp>
+
+#include <GL/glew.h>
 #include <SDL2/SDL_opengl.h>
+#include <glm/glm.hpp>
+
 #include <string>
 
 class Texture
 {
 private:
+    void loadFromString(std::string);
 public:
-    GLuint tex;
+    GLuint tex = 0;
+
+    glm::vec2 offset = glm::vec2(0);
+    glm::vec2 size = glm::vec2(1);
+
     int width;
     int height;
+
     Texture() {};
     Texture(std::string);
+    Texture(sol::object);
 };
 
 #endif//TEXTURE_HPP_