X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FTexture.cpp;h=4b4b9ea7636e50e8811cdb1b114b679f93ca658b;hb=80262de6f860d9aead05ffa42bdb245c0c888b37;hp=fe732bfd3314e9802afb354776fa57b0a948aba7;hpb=3f8ee86c6085b5d6c7ee31b916d0e022239750ab;p=lugaru.git

diff --git a/Source/Graphic/Texture.cpp b/Source/Graphic/Texture.cpp
index fe732bf..4b4b9ea 100644
--- a/Source/Graphic/Texture.cpp
+++ b/Source/Graphic/Texture.cpp
@@ -39,8 +39,9 @@ void TextureRes::load()
 
     skinsize = texture.sizeX;
     GLuint type = GL_RGBA;
-    if (texture.bpp == 24)
+    if (texture.bpp == 24) {
         type = GL_RGB;
+    }
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
@@ -62,9 +63,11 @@ void TextureRes::load()
         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)
+        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);
@@ -76,21 +79,32 @@ 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)
+TextureRes::TextureRes(const string& _filename, bool _hasMipmap)
+    : id(0)
+    , filename(_filename)
+    , hasMipmap(_hasMipmap)
+    , isSkin(false)
+    , skinsize(0)
+    , data(NULL)
+    , datalen(0)
 {
     load();
 }
 
-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)
+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++)
+    for (int i = 0; i < datalen; i++) {
         array[i] = data[i];
+    }
 }
 
 TextureRes::~TextureRes()
@@ -101,28 +115,19 @@ TextureRes::~TextureRes()
 
 void Texture::load(const string& filename, bool hasMipmap)
 {
-    destroy();
-    tex = new TextureRes(Folders::getResourcePath(filename), hasMipmap);
+    tex.reset(new TextureRes(Folders::getResourcePath(filename), hasMipmap));
 }
 
 void Texture::load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep)
 {
-    destroy();
-    tex = new TextureRes(Folders::getResourcePath(filename), hasMipmap, array, skinsizep);
-}
-
-void Texture::destroy()
-{
-    if (tex) {
-        delete tex;
-        tex = NULL;
-    }
+    tex.reset(new TextureRes(Folders::getResourcePath(filename), hasMipmap, array, skinsizep));
 }
 
 void Texture::bind()
 {
-    if (tex)
+    if (tex) {
         tex->bind();
-    else
+    } else {
         glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }