X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FTexture.h;h=95547bf30e9ec9e9b494495af2442e6d7f12c594;hb=20e924d;hp=9731dca0ff807448cd46a542b9449c2b6f5408fb;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git
diff --git a/Source/Texture.h b/Source/Texture.h
index 9731dca..95547bf 100644
--- a/Source/Texture.h
+++ b/Source/Texture.h
@@ -1,3 +1,23 @@
+/*
+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 .
+*/
+
#ifndef _TEXTURE_H_
#define _TEXTURE_H_
@@ -6,7 +26,27 @@
#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
{
@@ -14,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