X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FTexture.h;h=95547bf30e9ec9e9b494495af2442e6d7f12c594;hb=69282e1ff62c877d969d4d202fb83c1581fb1db4;hp=09d3a01ab504e54fd4760542cf86835f7277a466;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git
diff --git a/Source/Texture.h b/Source/Texture.h
index 09d3a01..95547bf 100644
--- a/Source/Texture.h
+++ b/Source/Texture.h
@@ -1,5 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -25,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
{
@@ -33,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