X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.cpp;h=08010c389f3ed0c84951e768edbf61424c8111ec;hb=ff29f47f799d99cec7c2a6aa2cf818da2b931fc5;hp=65150bc6ca1e7dd1fe81db41933eb84ab6acece4;hpb=efbc6ee855217635d97671a3a2d65bc18908b840;p=lugaru.git
diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index 65150bc..08010c3 100644
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -1,71 +1,39 @@
/*
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 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.
-This program is distributed in the hope that it will be useful,
+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.
+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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
#include "gamegl.h"
#include "Texture.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
using namespace std;
-extern TGAImageRec texture;
extern bool trilinear;
-
-class TextureRes
-{
-private:
- static vector list;
-
- GLuint id;
- string filename;
- bool hasMipmap;
- bool hasAlpha;
- bool isSkin;
- int skinsize;
- GLubyte* data;
- int datalen;
- GLubyte* skindata;
-
- void load();
-
-public:
- TextureRes(const string& filename, bool hasMipmap, bool hasAlpha);
- TextureRes(const string& filename, bool hasMipmap, GLubyte* array, int* skinsize);
- ~TextureRes();
- void bind();
-
- static void reloadAll();
-};
-
-
vector TextureRes::list;
void TextureRes::load()
{
- //load image into 'texture' global var
- if (!skindata) {
- unsigned char filenamep[256];
- CopyCStringToPascal(ConvertFileName(filename.c_str()), filenamep);
- upload_image(filenamep, hasAlpha);
- }
+ ImageRec texture;
+
+ //load image into 'texture'
+ load_image(ConvertFileName(filename.c_str()), texture);
skinsize = texture.sizeX;
GLuint type = GL_RGBA;
@@ -88,18 +56,14 @@ void TextureRes::load()
}
if (isSkin) {
- if (skindata) {
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, skinsize, skinsize, 0, GL_RGB, GL_UNSIGNED_BYTE, skindata);
- } else {
- 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);
- }
+ 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);
}
@@ -112,7 +76,7 @@ void TextureRes::bind()
TextureRes::TextureRes(const string& _filename, bool _hasMipmap, bool _hasAlpha):
id(0), filename(_filename), hasMipmap(_hasMipmap), hasAlpha(_hasAlpha), isSkin(false),
- skinsize(0), data(NULL), datalen(0), skindata(NULL)
+ skinsize(0), data(NULL), datalen(0)
{
load();
list.push_back(this);
@@ -120,13 +84,12 @@ TextureRes::TextureRes(const string& _filename, bool _hasMipmap, bool _hasAlpha)
TextureRes::TextureRes(const string& _filename, bool _hasMipmap, GLubyte* array, int* skinsizep):
id(0), filename(_filename), hasMipmap(_hasMipmap), hasAlpha(false), isSkin(true),
- skinsize(0), data(NULL), datalen(0), skindata(NULL)
+ skinsize(0), data(NULL), datalen(0)
{
load();
*skinsizep = skinsize;
for (int i = 0; i < datalen; i++)
array[i] = data[i];
- skindata = array;
list.push_back(this);
}
@@ -141,17 +104,6 @@ TextureRes::~TextureRes()
}
}
-void TextureRes::reloadAll()
-{
- for (vector::iterator it = list.begin(); it != list.end(); it++) {
- (*it)->id = 0;
- (*it)->load();
- }
-}
-
-
-
-
void Texture::load(const string& filename, bool hasMipmap, bool hasAlpha)
{
destroy();
@@ -179,9 +131,3 @@ void Texture::bind()
else
glBindTexture(GL_TEXTURE_2D, 0);
}
-
-void Texture::reloadAll()
-{
- TextureRes::reloadAll();
-}
-