update with master; using VBOs for fonts

1 files changed, 113 insertions, 15 deletions

diff --git a/src/texture.cpp b/src/texture.cpp
index 5604812..2870b9f 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -1,20 +1,118 @@
+/**
+ * @file texture.cpp
+ * Handles all texture loading 
+ *
+ * Copyright (C) 2019  Belle-Isle, Andrew <drumsetmonkey@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "texture.hpp"
 
+#include <unordered_map>
+#include <iostream>
+
+struct TextureData
+{
+    GLuint tex = 0;
+    int width = 0;
+    int height= 0;
+};
+
+// Stores a list of all textures we've already loaded. This makes sure we don't
+// waste our precious CPU cycles reloading a texture.
+std::unordered_map<std::string, TextureData> textureCache;
+
+TextureData loadTexture(std::string filename)
+{
+    TextureData tex;
+
+    // Search to see if this texture has already been loading
+    auto cacheSearch = textureCache.find(filename);
+
+    if (cacheSearch == textureCache.end()) {
+    // If this texture hasn't been loading
+
+        unsigned char* image = SOIL_load_image(filename.c_str(),
+                                               &(tex.width), &(tex.height), 0,
+                                               SOIL_LOAD_RGBA);
+
+        glGenTextures(1, &(tex.tex));
+        glBindTexture(GL_TEXTURE_2D, tex.tex);
+        glPixelStoref(GL_UNPACK_ALIGNMENT, 1);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0,
+                     GL_RGBA, GL_UNSIGNED_BYTE, image);
+
+        SOIL_free_image_data(image);
+
+        // Add new texture to the texture cache
+        textureCache.emplace(filename, tex);
+
+    } else {
+    // If this texture has been loaded, just return the loaded texture
+        tex = cacheSearch->second;
+    }
+
+    return tex;
+}
+
+void Texture::loadFromString(std::string filename)
+{
+    TextureData d = loadTexture(filename);
+
+    tex = d.tex;
+    width = d.width;
+    height = d.height;
+}
+
 Texture::Texture(std::string filename)
 {
-    unsigned char* image = SOIL_load_image(filename.c_str(),
-                                           &width, &height, 0,
-                                           SOIL_LOAD_RGBA);
-
-    glGenTextures(1, &tex);				// Turns "object" into a texture
-	glBindTexture(GL_TEXTURE_2D, tex);	// Binds "object" to the top of the stack
-	glPixelStoref(GL_UNPACK_ALIGNMENT, 1);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);	// Sets the "min" filter
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	// The the "max" filter of the stack
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // Wrap the texture to the matrix
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); //
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
-				 GL_RGBA, GL_UNSIGNED_BYTE, image);
-
-    SOIL_free_image_data(image);
+    loadFromString(filename);
+}
+
+Texture::Texture(sol::object param)
+{
+    if (param.get_type() == sol::type::string) {
+        loadFromString(param.as<std::string>());
+    } else if (param.get_type() == sol::type::table) {
+        sol::table tab = param;
+
+        // If there is a filename given, load that file to get image data
+        if (tab["file"] == sol::type::string)
+            loadFromString(tab.get<std::string>("file"));
+        else
+            return; // If we don't have image data just return a null image
+
+        if (tab["offset"] == sol::type::table) {
+            sol::table off = tab["offset"];
+            if (off["x"] == sol::type::number)
+                offset.x = off.get<float>("x")/width;
+            if (off["y"] == sol::type::number)
+                offset.y = off.get<float>("y")/height;
+        }
+
+        if (tab["size"] == sol::type::table) {
+            sol::table siz = tab["size"];
+            if (siz["x"] == sol::type::number)
+                size.x = siz.get<float>("x")/width;
+            if (siz["y"] == sol::type::number)
+                size.y = siz.get<float>("y")/height;
+        }
+    }
 }