major refactor of texture system

[lugaru.git] / Source / Texture.h

diff --git a/Source/Texture.h b/Source/Texture.h
index f50af0eef4c44c32bad01637a749cd0c3fd903db..a684bd53f565e5d4e589a3c6b0a15006bafa139f 100644 (file)
--- a/Source/Texture.h
+++ b/Source/Texture.h
@@ -2,39 +2,23 @@
 #define _TEXTURE_H_
 
 #include <map>
+#include <vector>
 #include <string>
+using namespace std;
 
-//keeps track of which textures are loaded
-class Texture {
-       private:
-               static std::map<std::string,Texture> textures;
-       
-               bool isSkin;
-               std::string fileName;
-               GLuint id;
-               bool mipmap;
-               bool hasalpha;
-               GLubyte* array;
-               int arraySize;
-               int skinsize;
+class TextureRes;
 
-               void load();
+class Texture {
+private:
+    TextureRes* tex;
+public:
+    inline Texture(): tex(NULL) {}
+    void load(const string& filename, bool hasMipmap, bool hasAlpha);
+    void load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep);
+    void destroy();
+    void bind();
 
-       public:
-               Texture():
-                       isSkin(false), skinsize(0), arraySize(0),
-                       fileName(""), id(0), mipmap(false), hasalpha(false), array(NULL) { }
-               ~Texture();
-               Texture (const std::string& _fileName, bool _mipmap, bool _hasalpha):
-                       isSkin(false), skinsize(0), arraySize(0), array(NULL),
-                       fileName(_fileName), id(0), mipmap(_mipmap), hasalpha(_hasalpha) { }
-               Texture (const std::string& _fileName, bool _mipmap, bool _hasalpha, bool _isSkin):
-                       isSkin(_isSkin), skinsize(0), arraySize(0), array(NULL),
-                       fileName(_fileName), id(0), mipmap(_mipmap), hasalpha(_hasalpha) { }
-               GLuint getId() const { return id; }
-               
-               static GLuint Load(const std::string& fileName, bool mipmap, bool hasalpha);
-               static GLuint Load(const std::string& fileName, bool mipmap, bool hasalpha, GLubyte* array, int* skinsize);
+    static void reloadAll();
 };
 
 #endif