added support to image loader for loading mask as well (used for fog effects), remove...

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 430b18fb42aaff809088cd158e78d638224d390f..b228149acb884aa6eb4b18bfef5f4c185b5ec9f2 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -69,38 +69,43 @@ void * Mod_LoadSpriteFrame (void * pin, mspriteframe_t **ppframe, int framenum,
        pspriteframe->right = width + origin[0];
 
        sprintf (name, "%s_%i", loadmodel->name, framenum);
-       pspriteframe->gl_texturenum = GL_LoadTexture (name, width, height, (byte *)(pinframe + 1), true, true, bytesperpixel);
-       // make fog version (just alpha)
-       pixbuf = pixel = malloc(width*height*4);
-       inpixel = (byte *)(pinframe + 1);
-       if (bytesperpixel == 1)
+       pspriteframe->gl_texturenum = loadtextureimagewithmask(name, 0, 0, false, true);
+       pspriteframe->gl_fogtexturenum = image_masktexnum;
+       if (pspriteframe->gl_texturenum == 0)
        {
-               for (i = 0;i < width*height;i++)
+               pspriteframe->gl_texturenum = GL_LoadTexture (name, width, height, (byte *)(pinframe + 1), true, true, bytesperpixel);
+               // make fog version (just alpha)
+               pixbuf = pixel = malloc(width*height*4);
+               inpixel = (byte *)(pinframe + 1);
+               if (bytesperpixel == 1)
                {
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       if (*inpixel++ != 255)
+                       for (i = 0;i < width*height;i++)
+                       {
                                *pixel++ = 255;
-                       else
-                               *pixel++ = 0;
+                               *pixel++ = 255;
+                               *pixel++ = 255;
+                               if (*inpixel++ != 255)
+                                       *pixel++ = 255;
+                               else
+                                       *pixel++ = 0;
+                       }
                }
-       }
-       else
-       {
-               inpixel+=3;
-               for (i = 0;i < width*height;i++)
+               else
                {
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       *pixel++ = *inpixel;
-                       inpixel+=4;
+                       inpixel+=3;
+                       for (i = 0;i < width*height;i++)
+                       {
+                               *pixel++ = 255;
+                               *pixel++ = 255;
+                               *pixel++ = 255;
+                               *pixel++ = *inpixel;
+                               inpixel+=4;
+                       }
                }
+               sprintf (name, "%s_%ifog", loadmodel->name, framenum);
+               pspriteframe->gl_fogtexturenum = GL_LoadTexture (name, width, height, pixbuf, true, true, 4);
+               free(pixbuf);
        }
-       sprintf (name, "%s_%ifog", loadmodel->name, framenum);
-       pspriteframe->gl_fogtexturenum = GL_LoadTexture (name, width, height, pixbuf, true, true, 4);
-       free(pixbuf);
 
        return (void *)((byte *)pinframe + sizeof (dspriteframe_t) + size);
 }