X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FTexture.h;h=95547bf30e9ec9e9b494495af2442e6d7f12c594;hb=20e924d;hp=e9642b9b047694b8cd57339d7a3e5ecf849c0d08;hpb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;p=lugaru.git
diff --git a/Source/Texture.h b/Source/Texture.h
index e9642b9..95547bf 100644
--- a/Source/Texture.h
+++ b/Source/Texture.h
@@ -26,7 +26,27 @@ along with Lugaru. If not, see .
#include
using namespace std;
-class TextureRes;
+class TextureRes
+{
+private:
+ static vector list;
+
+ GLuint id;
+ string filename;
+ bool hasMipmap;
+ bool isSkin;
+ int skinsize;
+ GLubyte* data;
+ int datalen;
+
+ void load();
+
+public:
+ TextureRes(const string& filename, bool hasMipmap);
+ TextureRes(const string& filename, bool hasMipmap, GLubyte* array, int* skinsize);
+ ~TextureRes();
+ void bind();
+};
class Texture
{
@@ -34,12 +54,10 @@ private:
TextureRes* tex;
public:
inline Texture(): tex(NULL) {}
- void load(const string& filename, bool hasMipmap, bool hasAlpha);
+ void load(const string& filename, bool hasMipmap);
void load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep);
void destroy();
void bind();
-
- static void reloadAll();
};
#endif