-void Texture::load() {
- GLuint type;
-
- LOGFUNC;
-
- LOG(std::string("Loading texture...") + fileName);
-
- unsigned char fileNamep[256];
- CopyCStringToPascal(ConvertFileName(fileName.c_str()), fileNamep);
- //Load Image
- upload_image( fileNamep ,hasalpha);
-
- //Alpha channel?
- if ( texture.bpp == 24 )
- type = GL_RGB;
- else
- type = GL_RGBA;
-
- glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
-
- if(!id)
- glGenTextures( 1, &id );
- glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-
- glBindTexture( GL_TEXTURE_2D, id);
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
- if(mipmap)
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (trilinear?GL_LINEAR_MIPMAP_LINEAR:GL_LINEAR_MIPMAP_NEAREST) );
- else
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-
- skinsize=texture.sizeX;
-
- if(isSkin) {
- int tempnum=0;
- int nb = (texture.sizeY*texture.sizeX*(texture.bpp/8));
- array = (GLubyte*)malloc(nb*sizeof(GLubyte));
- for(int i=0;i<nb;i++) {
- if((i+1)%4||type==GL_RGB) {
- array[tempnum]=texture.data[i];
- tempnum++;
- }
- }
- arraySize=tempnum;
-
- gluBuild2DMipmaps( GL_TEXTURE_2D, type, texture.sizeX, texture.sizeY, GL_RGB, GL_UNSIGNED_BYTE, array );
- } else {
- gluBuild2DMipmaps( GL_TEXTURE_2D, type, texture.sizeX, texture.sizeY, type, GL_UNSIGNED_BYTE, texture.data );
- }
+vector<TextureRes*> TextureRes::list;
+
+void TextureRes::load()
+{
+ ImageRec texture;
+
+ //load image into 'texture'
+ load_image(ConvertFileName(filename.c_str()), texture);
+
+ skinsize = texture.sizeX;
+ GLuint type = GL_RGBA;
+ if (texture.bpp == 24)
+ type = GL_RGB;
+
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+ glDeleteTextures(1, &id);
+ glGenTextures(1, &id);
+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+ glBindTexture(GL_TEXTURE_2D, id);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ if (hasMipmap) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (trilinear ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR_MIPMAP_NEAREST));
+ glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+ } else {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ }
+
+ if (isSkin) {
+ free(data);
+ const int nb = texture.sizeY * texture.sizeX * (texture.bpp / 8);
+ data = (GLubyte*)malloc(nb * sizeof(GLubyte));
+ datalen = 0;
+ for (int i = 0; i < nb; i++)
+ if ((i + 1) % 4 || type == GL_RGB)
+ data[datalen++] = texture.data[i];
+ glTexImage2D(GL_TEXTURE_2D, 0, type, texture.sizeX, texture.sizeY, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
+ } else {
+ glTexImage2D(GL_TEXTURE_2D, 0, type, texture.sizeX, texture.sizeY, 0, type, GL_UNSIGNED_BYTE, texture.data);
+ }
+}
+
+void TextureRes::bind()
+{
+ glBindTexture(GL_TEXTURE_2D, id);
+}
+
+TextureRes::TextureRes(const string& _filename, bool _hasMipmap):
+ id(0), filename(_filename), hasMipmap(_hasMipmap), isSkin(false),
+ skinsize(0), data(NULL), datalen(0)
+{
+ load();
+ list.push_back(this);
+}
+
+TextureRes::TextureRes(const string& _filename, bool _hasMipmap, GLubyte* array, int* skinsizep):
+ id(0), filename(_filename), hasMipmap(_hasMipmap), isSkin(true),
+ skinsize(0), data(NULL), datalen(0)
+{
+ load();
+ *skinsizep = skinsize;
+ for (int i = 0; i < datalen; i++)
+ array[i] = data[i];
+ list.push_back(this);
+}
+
+TextureRes::~TextureRes()
+{
+ free(data);
+ glDeleteTextures(1, &id);
+ for (vector<TextureRes*>::iterator it = list.begin(); it != list.end(); it++)
+ if (*it == this) {
+ list.erase(it);
+ break;
+ }