X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.cpp;h=dd2d1cc63ff0e0b7760bcfa4bb7324c3ba8a35b0;hb=cc92cb7b7f9b87cb791c504bf930d622d74db368;hp=ef20536da7b37f7268607d0a52ba0e44df69569e;hpb=801987203c1ae03f2d9592a92d933fdba73854c2;p=lugaru.git

diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index ef20536..dd2d1cc 100644
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -1,154 +1,133 @@
+/*
+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/>.
+*/
+
 #include "gamegl.h"
 #include "Texture.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 
 using namespace std;
 
-extern TGAImageRec texture;
 extern bool trilinear;
 
+vector<TextureRes*> TextureRes::list;
 
-class TextureRes {
-private:
-    static vector<TextureRes*> list;
-
-    GLuint id;
-    string filename;
-    bool hasMipmap;
-    bool hasAlpha;
-    bool isSkin;
-    int skinsize;
-    GLubyte* data;
-    int datalen;
-    GLubyte* skindata;
-
-    void load();
+void TextureRes::load()
+{
+    ImageRec texture;
 
-public:
-    TextureRes(const string& filename, bool hasMipmap, bool hasAlpha);
-    TextureRes(const string& filename, bool hasMipmap, GLubyte* array, int* skinsize);
-    ~TextureRes();
-    void bind();
+    //load image into 'texture'
+    load_image(ConvertFileName(filename.c_str()), texture);
 
-    static void reloadAll();
-};
+    skinsize = texture.sizeX;
+    GLuint type = GL_RGBA;
+    if (texture.bpp == 24)
+        type = GL_RGB;
 
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-vector<TextureRes*> TextureRes::list;
+    glDeleteTextures(1, &id);
+    glGenTextures(1, &id);
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
-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);
+    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);
     }
-	
-	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){
-        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);
-        }
-	}else{
+
+    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);
+void TextureRes::bind()
+{
+    glBindTexture(GL_TEXTURE_2D, id);
 }
 
-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) {
+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),hasAlpha(false),isSkin(true),
-    skinsize(0),data(NULL),datalen(0),skindata(NULL) {
+    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];
-    skindata=array;
+    *skinsizep = skinsize;
+    for (int i = 0; i < datalen; i++)
+        array[i] = data[i];
     list.push_back(this);
 }
 
-TextureRes::~TextureRes(){
+TextureRes::~TextureRes()
+{
     free(data);
-    glDeleteTextures(1,&id);
-    for(vector<TextureRes*>::iterator it=list.begin();it!=list.end();it++)
-        if(*it==this){
+    glDeleteTextures(1, &id);
+    for (vector<TextureRes*>::iterator it = list.begin(); it != list.end(); it++)
+        if (*it == this) {
             list.erase(it);
             break;
         }
 }
 
-void TextureRes::reloadAll(){
-    for(vector<TextureRes*>::iterator it=list.begin();it!=list.end();it++){
-        (*it)->id=0;
-        (*it)->load();
-    }
-}
-
-
-
-
-void Texture::load(const string& filename, bool hasMipmap, bool hasAlpha){
+void Texture::load(const string& filename, bool hasMipmap)
+{
     destroy();
-    tex=new TextureRes(filename,hasMipmap,hasAlpha);
+    tex = new TextureRes(filename, hasMipmap);
 }
 
-void Texture::load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep){
+void Texture::load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep)
+{
     destroy();
-    tex=new TextureRes(filename,hasMipmap,array,skinsizep);
+    tex = new TextureRes(filename, hasMipmap, array, skinsizep);
 }
 
-void Texture::destroy(){
-    if(tex){
+void Texture::destroy()
+{
+    if (tex) {
         delete tex;
-        tex=NULL;
+        tex = NULL;
     }
 }
 
-void Texture::bind(){
-    if(tex)
+void Texture::bind()
+{
+    if (tex)
         tex->bind();
     else
-        glBindTexture(GL_TEXTURE_2D,0);
+        glBindTexture(GL_TEXTURE_2D, 0);
 }
-
-void Texture::reloadAll(){
-    TextureRes::reloadAll();
-}
-