X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.h;h=e9642b9b047694b8cd57339d7a3e5ecf849c0d08;hb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;hp=f50af0eef4c44c32bad01637a749cd0c3fd903db;hpb=cfdbe0ad0521045b27a60dbb1c963ea6dfdcda5a;p=lugaru.git

diff --git a/Source/Texture.h b/Source/Texture.h
index f50af0e..e9642b9 100644
--- a/Source/Texture.h
+++ b/Source/Texture.h
@@ -1,40 +1,45 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+
+This file is part of Lugaru.
+
+Lugaru 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 2 of the License, or
+(at your option) any later version.
+
+Lugaru 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 Lugaru.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef _TEXTURE_H_
 #define _TEXTURE_H_
 
 #include <map>
+#include <vector>
 #include <string>
+using namespace std;
+
+class TextureRes;
+
+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();
 
-//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;
-
-		void load();
-
-	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