]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - image.c
WIN32: changed stricmp and strnicmp to have an underscore prefix
[xonotic/darkplaces.git] / image.c
diff --git a/image.c b/image.c
index fc73fd1bbbb15b697f61d38bcdf6cc8269cce808..bc58a7247e43c155f1b73b3e7485f076751a54a0 100644 (file)
--- a/image.c
+++ b/image.c
@@ -300,7 +300,7 @@ LoadTGA
 */
 unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
 {
-       int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
+       int x, y, pix_inc, row_inc, red, green, blue, alpha, runlen, alphabits;
        unsigned char *pixbuf, *image_rgba;
        const unsigned char *fin, *enddata;
        unsigned char *p;
@@ -386,35 +386,35 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
        }
 
        // check our pixel_size restrictions according to image_type
-       if (targa_header.image_type == 2 || targa_header.image_type == 10)
+       switch (targa_header.image_type & ~8)
        {
+       case 2:
                if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
                {
                        Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
                        PrintTargaHeader(&targa_header);
                        return NULL;
                }
-       }
-       else if (targa_header.image_type == 1 || targa_header.image_type == 9)
-       {
-               if (targa_header.pixel_size != 8)
+               break;
+       case 3:
+               // set up a palette to make the loader easier
+               for (x = 0;x < 256;x++)
                {
-                       Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
-                       PrintTargaHeader(&targa_header);
-                       return NULL;
+                       palette[x*4+2] = x;
+                       palette[x*4+1] = x;
+                       palette[x*4+0] = x;
+                       palette[x*4+3] = 255;
                }
-       }
-       else if (targa_header.image_type == 3 || targa_header.image_type == 11)
-       {
+               // fall through to colormap case
+       case 1:
                if (targa_header.pixel_size != 8)
                {
                        Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
                        PrintTargaHeader(&targa_header);
                        return NULL;
                }
-       }
-       else
-       {
+               break;
+       default:
                Con_Printf("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type);
                PrintTargaHeader(&targa_header);
                return NULL;
@@ -453,80 +453,215 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
                row_inc = 0;
        }
 
-       compressed = targa_header.image_type == 9 || targa_header.image_type == 10 || targa_header.image_type == 11;
        x = 0;
        y = 0;
        red = green = blue = alpha = 255;
-       while (y < image_height)
-       {
-               // decoder is mostly the same whether it's compressed or not
-               readpixelcount = 1000000;
-               runlen = 1000000;
-               if (compressed && fin < enddata)
+       pix_inc = 1;
+       if ((targa_header.image_type & ~8) == 2)
+               pix_inc = targa_header.pixel_size / 8;
+       switch (targa_header.image_type)
+       {
+       case 1: // colormapped, uncompressed
+       case 3: // greyscale, uncompressed
+               if (fin + image_width * image_height * pix_inc > enddata)
+                       break;
+               for (y = 0;y < image_height;y++, pixbuf += row_inc)
                {
-                       runlen = *fin++;
-                       // high bit indicates this is an RLE compressed run
-                       if (runlen & 0x80)
-                               readpixelcount = 1;
-                       runlen = 1 + (runlen & 0x7f);
+                       for (x = 0;x < image_width;x++)
+                       {
+                               p = palette + *fin++ * 4;
+                               *pixbuf++ = p[0];
+                               *pixbuf++ = p[1];
+                               *pixbuf++ = p[2];
+                               *pixbuf++ = p[3];
+                       }
                }
-
-               while((runlen--) && y < image_height)
+               break;
+       case 2:
+               // BGR or BGRA, uncompressed
+               if (fin + image_width * image_height * pix_inc > enddata)
+                       break;
+               if (targa_header.pixel_size == 32 && alphabits)
                {
-                       if (readpixelcount > 0)
+                       for (y = 0;y < image_height;y++, pixbuf += row_inc)
                        {
-                               readpixelcount--;
-                               red = green = blue = alpha = 255;
-                               if (fin < enddata)
+                               for (x = 0;x < image_width;x++, fin += pix_inc)
                                {
-                                       switch(targa_header.image_type)
+                                       *pixbuf++ = fin[2];
+                                       *pixbuf++ = fin[1];
+                                       *pixbuf++ = fin[0];
+                                       *pixbuf++ = fin[3];
+                               }
+                       }
+               }
+               else
+               {
+                       for (y = 0;y < image_height;y++, pixbuf += row_inc)
+                       {
+                               for (x = 0;x < image_width;x++, fin += pix_inc)
+                               {
+                                       *pixbuf++ = fin[2];
+                                       *pixbuf++ = fin[1];
+                                       *pixbuf++ = fin[0];
+                                       *pixbuf++ = 255;
+                               }
+                       }
+               }
+               break;
+       case 9: // colormapped, RLE
+       case 11: // greyscale, RLE
+               for (y = 0;y < image_height;y++, pixbuf += row_inc)
+               {
+                       for (x = 0;x < image_width;)
+                       {
+                               if (fin >= enddata)
+                                       break; // error - truncated file
+                               runlen = *fin++;
+                               if (runlen & 0x80)
+                               {
+                                       // RLE - all pixels the same color
+                                       runlen += 1 - 0x80;
+                                       if (fin + pix_inc > enddata)
+                                               break; // error - truncated file
+                                       if (x + runlen > image_width)
+                                               break; // error - line exceeds width
+                                       p = palette + *fin++ * 4;
+                                       red = p[0];
+                                       green = p[1];
+                                       blue = p[2];
+                                       alpha = p[3];
+                                       for (;runlen--;x++)
                                        {
-                                       case 1:
-                                       case 9:
-                                               // colormapped
-                                               pindex = *fin++;
-                                               if (pindex >= targa_header.colormap_length)
-                                                       pindex = 0; // error
-                                               p = palette + pindex * 4;
-                                               red = p[0];
-                                               green = p[1];
-                                               blue = p[2];
-                                               alpha = p[3];
-                                               break;
-                                       case 2:
-                                       case 10:
-                                               // BGR or BGRA
-                                               blue = *fin++;
-                                               if (fin < enddata)
-                                                       green = *fin++;
-                                               if (fin < enddata)
-                                                       red = *fin++;
-                                               if (targa_header.pixel_size == 32 && fin < enddata)
-                                                       alpha = *fin++;
-                                               break;
-                                       case 3:
-                                       case 11:
-                                               // greyscale
-                                               red = green = blue = *fin++;
-                                               break;
+                                               *pixbuf++ = red;
+                                               *pixbuf++ = green;
+                                               *pixbuf++ = blue;
+                                               *pixbuf++ = alpha;
+                                       }
+                               }
+                               else
+                               {
+                                       // uncompressed - all pixels different color
+                                       runlen++;
+                                       if (fin + pix_inc * runlen > enddata)
+                                               break; // error - truncated file
+                                       if (x + runlen > image_width)
+                                               break; // error - line exceeds width
+                                       for (;runlen--;x++)
+                                       {
+                                               p = palette + *fin++ * 4;
+                                               *pixbuf++ = p[0];
+                                               *pixbuf++ = p[1];
+                                               *pixbuf++ = p[2];
+                                               *pixbuf++ = p[3];
+                                       }
+                               }
+                       }
+               }
+               break;
+       case 10:
+               // BGR or BGRA, RLE
+               if (targa_header.pixel_size == 32 && alphabits)
+               {
+                       for (y = 0;y < image_height;y++, pixbuf += row_inc)
+                       {
+                               for (x = 0;x < image_width;)
+                               {
+                                       if (fin >= enddata)
+                                               break; // error - truncated file
+                                       runlen = *fin++;
+                                       if (runlen & 0x80)
+                                       {
+                                               // RLE - all pixels the same color
+                                               runlen += 1 - 0x80;
+                                               if (fin + pix_inc > enddata)
+                                                       break; // error - truncated file
+                                               if (x + runlen > image_width)
+                                                       break; // error - line exceeds width
+                                               red = fin[2];
+                                               green = fin[1];
+                                               blue = fin[0];
+                                               alpha = fin[3];
+                                               fin += pix_inc;
+                                               for (;runlen--;x++)
+                                               {
+                                                       *pixbuf++ = red;
+                                                       *pixbuf++ = green;
+                                                       *pixbuf++ = blue;
+                                                       *pixbuf++ = alpha;
+                                               }
+                                       }
+                                       else
+                                       {
+                                               // uncompressed - all pixels different color
+                                               runlen++;
+                                               if (fin + pix_inc * runlen > enddata)
+                                                       break; // error - truncated file
+                                               if (x + runlen > image_width)
+                                                       break; // error - line exceeds width
+                                               for (;runlen--;x++, fin += pix_inc)
+                                               {
+                                                       *pixbuf++ = fin[2];
+                                                       *pixbuf++ = fin[1];
+                                                       *pixbuf++ = fin[0];
+                                                       *pixbuf++ = fin[3];
+                                               }
                                        }
-                                       if (!alphabits)
-                                               alpha = 255;
                                }
                        }
-                       *pixbuf++ = red;
-                       *pixbuf++ = green;
-                       *pixbuf++ = blue;
-                       *pixbuf++ = alpha;
-                       x++;
-                       if (x == image_width)
+               }
+               else
+               {
+                       for (y = 0;y < image_height;y++, pixbuf += row_inc)
                        {
-                               // end of line, advance to next
-                               x = 0;
-                               y++;
-                               pixbuf += row_inc;
+                               for (x = 0;x < image_width;)
+                               {
+                                       if (fin >= enddata)
+                                               break; // error - truncated file
+                                       runlen = *fin++;
+                                       if (runlen & 0x80)
+                                       {
+                                               // RLE - all pixels the same color
+                                               runlen += 1 - 0x80;
+                                               if (fin + pix_inc > enddata)
+                                                       break; // error - truncated file
+                                               if (x + runlen > image_width)
+                                                       break; // error - line exceeds width
+                                               red = fin[2];
+                                               green = fin[1];
+                                               blue = fin[0];
+                                               alpha = 255;
+                                               fin += pix_inc;
+                                               for (;runlen--;x++)
+                                               {
+                                                       *pixbuf++ = red;
+                                                       *pixbuf++ = green;
+                                                       *pixbuf++ = blue;
+                                                       *pixbuf++ = alpha;
+                                               }
+                                       }
+                                       else
+                                       {
+                                               // uncompressed - all pixels different color
+                                               runlen++;
+                                               if (fin + pix_inc * runlen > enddata)
+                                                       break; // error - truncated file
+                                               if (x + runlen > image_width)
+                                                       break; // error - line exceeds width
+                                               for (;runlen--;x++, fin += pix_inc)
+                                               {
+                                                       *pixbuf++ = fin[2];
+                                                       *pixbuf++ = fin[1];
+                                                       *pixbuf++ = fin[0];
+                                                       *pixbuf++ = 255;
+                                               }
+                                       }
+                               }
                        }
                }
+               break;
+       default:
+               // unknown image_type
+               break;
        }
 
        return image_rgba;
@@ -577,11 +712,6 @@ unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, in
        return image_buffer;
 }
 
-static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
-{
-       return LoadLMP(f, filesize, matchwidth, matchheight, false);
-}
-
 
 typedef struct q2wal_s
 {
@@ -632,33 +762,38 @@ unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, in
 }
 
 
-void Image_StripImageExtension (const char *in, char *out)
+void Image_StripImageExtension (const char *in, char *out, size_t size_out)
 {
-       const char *end, *temp;
-       end = in + strlen(in);
-       if ((end - in) >= 4)
-       {
-               temp = end - 4;
-               if (strcmp(temp, ".tga") == 0
-                || strcmp(temp, ".pcx") == 0
-                || strcmp(temp, ".lmp") == 0
-                || strcmp(temp, ".png") == 0
-                || strcmp(temp, ".jpg") == 0)
-                       end = temp;
-               while (in < end)
-                       *out++ = *in++;
-               *out++ = 0;
-       }
+       const char *ext;
+
+       if (size_out == 0)
+               return;
+
+       ext = FS_FileExtension(in);
+       if (ext && (!strcmp(ext, "tga") || !strcmp(ext, "pcx") || !strcmp(ext, "lmp") || !strcmp(ext, "png") || !strcmp(ext, "jpg")))
+               FS_StripExtension(in, out, size_out);
        else
-               strcpy(out, in);
+               strlcpy(out, in, size_out);
 }
 
-struct imageformat_s
+typedef struct imageformat_s
 {
        const char *formatstring;
        unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int matchwidth, int matchheight);
 }
-imageformats[] =
+imageformat_t;
+
+// GAME_TENEBRAE only
+imageformat_t imageformats_tenebrae[] =
+{
+       {"override/%s.tga", LoadTGA},
+       {"override/%s.png", PNG_LoadImage},
+       {"override/%s.jpg", JPEG_LoadImage},
+       {"override/%s.pcx", LoadPCX},
+       {NULL, NULL}
+};
+
+imageformat_t imageformats_nopath[] =
 {
        {"override/%s.tga", LoadTGA},
        {"override/%s.png", PNG_LoadImage},
@@ -666,56 +801,105 @@ imageformats[] =
        {"textures/%s.tga", LoadTGA},
        {"textures/%s.png", PNG_LoadImage},
        {"textures/%s.jpg", JPEG_LoadImage},
-       {"textures/%s.pcx", LoadPCX},
-       {"textures/%s.wal", LoadWAL},
        {"%s.tga", LoadTGA},
        {"%s.png", PNG_LoadImage},
        {"%s.jpg", JPEG_LoadImage},
        {"%s.pcx", LoadPCX},
-       {"%s.lmp", LoadLMPRGBA},
+       {NULL, NULL}
+};
+
+imageformat_t imageformats_textures[] =
+{
+       {"%s.tga", LoadTGA},
+       {"%s.png", PNG_LoadImage},
+       {"%s.jpg", JPEG_LoadImage},
+       {"%s.pcx", LoadPCX},
+       {"%s.wal", LoadWAL},
+       {NULL, NULL}
+};
+
+imageformat_t imageformats_gfx[] =
+{
+       {"%s.tga", LoadTGA},
+       {"%s.png", PNG_LoadImage},
+       {"%s.jpg", JPEG_LoadImage},
+       {"%s.pcx", LoadPCX},
+       {NULL, NULL}
+};
+
+imageformat_t imageformats_other[] =
+{
+       {"%s.tga", LoadTGA},
+       {"%s.png", PNG_LoadImage},
+       {"%s.jpg", JPEG_LoadImage},
+       {"%s.pcx", LoadPCX},
        {NULL, NULL}
 };
 
 unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-       int i;
        fs_offset_t filesize;
+       imageformat_t *firstformat, *format;
        unsigned char *f, *data = NULL;
        char basename[MAX_QPATH], name[MAX_QPATH], *c;
        if (developer_memorydebug.integer)
                Mem_CheckSentinelsGlobal();
        if (developer_texturelogging.integer)
                Log_Printf("textures.log", "%s\n", filename);
-       strlcpy(basename, filename, sizeof(basename));
-       Image_StripImageExtension(basename, basename); // strip filename extensions to allow replacement by other types
+       Image_StripImageExtension(filename, basename, sizeof(basename)); // strip filename extensions to allow replacement by other types
        // replace *'s with #, so commandline utils don't get confused when dealing with the external files
        for (c = basename;*c;c++)
                if (*c == '*')
                        *c = '#';
-       for (i = 0;imageformats[i].formatstring;i++)
+       name[0] = 0;
+       if (strchr(basename, '/'))
+       {
+               int i;
+               for (i = 0;i < (int)sizeof(name)-1 && basename[i] != '/';i++)
+                       name[i] = basename[i];
+               name[i] = 0;
+       }
+       if (gamemode == GAME_TENEBRAE)
+               firstformat = imageformats_tenebrae;
+       else if (!strcasecmp(name, "textures"))
+               firstformat = imageformats_textures;
+       else if (!strcasecmp(name, "gfx"))
+               firstformat = imageformats_gfx;
+       else if (!strchr(basename, '/'))
+               firstformat = imageformats_nopath;
+       else
+               firstformat = imageformats_other;
+       // now try all the formats in the selected list
+       for (format = firstformat;format->formatstring;format++)
        {
-               sprintf (name, imageformats[i].formatstring, basename);
+               sprintf (name, format->formatstring, basename);
                f = FS_LoadFile(name, tempmempool, true, &filesize);
                if (f)
                {
-                       data = imageformats[i].loadfunc(f, filesize, matchwidth, matchheight);
+                       data = format->loadfunc(f, filesize, matchwidth, matchheight);
                        Mem_Free(f);
                        if (data)
                        {
-                               Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+                               if (developer.integer >= 10)
+                                       Con_Printf("loaded image %s (%dx%d)\n", name, image_width, image_height);
                                if (developer_memorydebug.integer)
                                        Mem_CheckSentinelsGlobal();
                                return data;
                        }
+                       else
+                       {
+                               if (developer.integer >= 1)
+                                       Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
+                       }
                }
        }
        if (complain)
        {
                Con_Printf("Couldn't load %s using ", filename);
-               for (i = 0;imageformats[i].formatstring;i++)
+               for (format = firstformat;format->formatstring;format++)
                {
-                       sprintf (name, imageformats[i].formatstring, basename);
-                       Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
+                       sprintf (name, format->formatstring, basename);
+                       Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
                }
        }
        if (developer_memorydebug.integer)
@@ -723,37 +907,6 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
        return NULL;
 }
 
-int image_makemask (const unsigned char *in, unsigned char *out, int size)
-{
-       int i, count;
-       count = 0;
-       for (i = 0;i < size;i++)
-       {
-               out[0] = out[1] = out[2] = 255;
-               out[3] = in[3];
-               if (in[3] != 255)
-                       count++;
-               in += 4;
-               out += 4;
-       }
-       return count;
-}
-
-unsigned char* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight)
-{
-       unsigned char *in, *data;
-       in = data = loadimagepixels(filename, complain, matchwidth, matchheight);
-       if (!data)
-               return NULL;
-       if (image_makemask(data, data, image_width * image_height))
-               return data; // some transparency
-       else
-       {
-               Mem_Free(data);
-               return NULL; // all opaque
-       }
-}
-
 rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
        unsigned char *data;
@@ -765,78 +918,6 @@ rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int ma
        return rt;
 }
 
-rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
-{
-       unsigned char *data;
-       rtexture_t *rt;
-       if (!(data = loadimagepixelsmask (filename, complain, matchwidth, matchheight)))
-               return 0;
-       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
-       Mem_Free(data);
-       return rt;
-}
-
-rtexture_t *image_masktex;
-rtexture_t *image_nmaptex;
-rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
-{
-       unsigned char *data;
-       rtexture_t *rt;
-       image_masktex = NULL;
-       image_nmaptex = NULL;
-       if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
-               return 0;
-
-       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
-
-       if (flags & TEXF_ALPHA && image_makemask(data, data, image_width * image_height))
-               image_masktex = R_LoadTexture2D(pool, va("%s_mask", filename), image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
-
-       Mem_Free(data);
-       return rt;
-}
-
-rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
-{
-       unsigned char *data, *data2;
-       rtexture_t *rt;
-       image_masktex = NULL;
-       image_nmaptex = NULL;
-       if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
-               return 0;
-
-       data2 = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-
-       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
-
-       Image_HeightmapToNormalmap(data, data2, image_width, image_height, (flags & TEXF_CLAMP) != 0, bumpscale);
-       image_nmaptex = R_LoadTexture2D(pool, va("%s_nmap", filename), image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL);
-
-       if (flags & TEXF_ALPHA && image_makemask(data, data2, image_width * image_height))
-               image_masktex = R_LoadTexture2D(pool, va("%s_mask", filename), image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL);
-
-       Mem_Free(data2);
-
-       Mem_Free(data);
-       return rt;
-}
-
-rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
-{
-       unsigned char *data, *data2;
-       rtexture_t *rt;
-       if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
-               return 0;
-       data2 = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-
-       Image_HeightmapToNormalmap(data, data2, image_width, image_height, (flags & TEXF_CLAMP) != 0, bumpscale);
-       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL);
-
-       Mem_Free(data2);
-       Mem_Free(data);
-       return rt;
-}
-
 qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer)
 {
        qboolean ret;
@@ -866,13 +947,13 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig
        return ret;
 }
 
-void Image_WriteTGARGB (const char *filename, int width, int height, const unsigned char *data)
+void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data)
 {
        int y;
        unsigned char *buffer, *out;
        const unsigned char *in, *end;
 
-       buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*3 + 18);
+       buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*4 + 18);
 
        memset (buffer, 0, 18);
        buffer[2] = 2;          // uncompressed type
@@ -880,82 +961,58 @@ void Image_WriteTGARGB (const char *filename, int width, int height, const unsig
        buffer[13] = (width >> 8) & 0xFF;
        buffer[14] = (height >> 0) & 0xFF;
        buffer[15] = (height >> 8) & 0xFF;
-       buffer[16] = 24;        // pixel size
 
-       // swap rgb to bgr and flip upside down
-       out = buffer + 18;
-       for (y = height - 1;y >= 0;y--)
+       for (y = 3;y < width*height*4;y += 4)
+               if (data[y] < 255)
+                       break;
+
+       if (y < width*height*4)
        {
-               in = data + y * width * 3;
-               end = in + width * 3;
-               for (;in < end;in += 3)
+               // save the alpha channel
+               buffer[16] = 32;        // pixel size
+               buffer[17] = 8; // 8 bits of alpha
+
+               // swap rgba to bgra and flip upside down
+               out = buffer + 18;
+               for (y = height - 1;y >= 0;y--)
                {
-                       *out++ = in[2];
-                       *out++ = in[1];
-                       *out++ = in[0];
+                       in = data + y * width * 4;
+                       end = in + width * 4;
+                       for (;in < end;in += 4)
+                       {
+                               *out++ = in[2];
+                               *out++ = in[1];
+                               *out++ = in[0];
+                               *out++ = in[3];
+                       }
                }
+               FS_WriteFile (filename, buffer, width*height*4 + 18 );
        }
-       FS_WriteFile (filename, buffer, width*height*3 + 18 );
-
-       Mem_Free(buffer);
-}
-
-void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data)
-{
-       int y;
-       unsigned char *buffer, *out;
-       const unsigned char *in, *end;
-
-       buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*4 + 18);
-
-       memset (buffer, 0, 18);
-       buffer[2] = 2;          // uncompressed type
-       buffer[12] = (width >> 0) & 0xFF;
-       buffer[13] = (width >> 8) & 0xFF;
-       buffer[14] = (height >> 0) & 0xFF;
-       buffer[15] = (height >> 8) & 0xFF;
-       buffer[16] = 32;        // pixel size
-       buffer[17] = 8; // transparent flag? (seems to be needed by gimp)
-
-       // swap rgba to bgra and flip upside down
-       out = buffer + 18;
-       for (y = height - 1;y >= 0;y--)
+       else
        {
-               in = data + y * width * 4;
-               end = in + width * 4;
-               for (;in < end;in += 4)
+               // save only the color channels
+               buffer[16] = 24;        // pixel size
+               buffer[17] = 0; // 8 bits of alpha
+
+               // swap rgba to bgr and flip upside down
+               out = buffer + 18;
+               for (y = height - 1;y >= 0;y--)
                {
-                       *out++ = in[2];
-                       *out++ = in[1];
-                       *out++ = in[0];
-                       *out++ = in[3];
+                       in = data + y * width * 4;
+                       end = in + width * 4;
+                       for (;in < end;in += 4)
+                       {
+                               *out++ = in[2];
+                               *out++ = in[1];
+                               *out++ = in[0];
+                       }
                }
+               FS_WriteFile (filename, buffer, width*height*3 + 18 );
        }
-       FS_WriteFile (filename, buffer, width*height*4 + 18 );
 
        Mem_Free(buffer);
 }
 
-qboolean Image_CheckAlpha(const unsigned char *data, int size, qboolean rgba)
-{
-       const unsigned char *end;
-       if (rgba)
-       {
-               // check alpha bytes
-               for (end = data + size * 4, data += 3;data < end;data += 4)
-                       if (*data < 255)
-                               return 1;
-       }
-       else
-       {
-               // color 255 is transparent
-               for (end = data + size;data < end;data++)
-                       if (*data == 255)
-                               return 1;
-       }
-       return 0;
-}
-
 static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
 {
        int             j, xi, oldx = 0, f, fstep, endx, lerp;
@@ -1322,12 +1379,22 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 // in can be the same as out
 void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
 {
+       const unsigned char *inrow;
        int x, y, nextrow;
        if (*depth != 1 || destdepth != 1)
        {
                Con_Printf ("Image_Resample: 3D resampling not supported\n");
+               if (*width > destwidth)
+                       *width >>= 1;
+               if (*height > destheight)
+                       *height >>= 1;
+               if (*depth > destdepth)
+                       *depth >>= 1;
                return;
        }
+       // note: if given odd width/height this discards the last row/column of
+       // pixels, rather than doing a proper box-filter scale down
+       inrow = in;
        nextrow = *width * bytesperpixel;
        if (*width > destwidth)
        {
@@ -1338,9 +1405,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        *height >>= 1;
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
                                                out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
@@ -1349,14 +1416,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 4;
                                                in += 8;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
                                                out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
@@ -1364,7 +1430,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 3;
                                                in += 6;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else
@@ -1375,9 +1440,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        // reduce width
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
@@ -1390,9 +1455,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
@@ -1414,9 +1479,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        *height >>= 1;
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1425,14 +1490,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 4;
                                                in += 4;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1440,7 +1504,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 3;
                                                in += 3;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else
@@ -1453,179 +1516,43 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
 {
-       int x, y;
-       const unsigned char *p0, *p1, *p2;
+       int x, y, x1, x2, y1, y2;
+       const unsigned char *b, *row[3];
+       int p[5];
        unsigned char *out;
        float iwidth, iheight, ibumpscale, n[3];
        iwidth = 1.0f / width;
        iheight = 1.0f / height;
-       ibumpscale = (255.0f * 3.0f) / bumpscale;
+       ibumpscale = (255.0f * 6.0f) / bumpscale;
        out = outpixels;
-       for (y = 0;y < height;y++)
+       for (y = 0, y1 = height-1;y < height;y1 = y, y++)
        {
-               for (x = 0;x < width;x++)
+               y2 = y + 1;if (y2 >= height) y2 = 0;
+               row[0] = inpixels + (y1 * width) * 4;
+               row[1] = inpixels + (y  * width) * 4;
+               row[2] = inpixels + (y2 * width) * 4;
+               for (x = 0, x1 = width-1;x < width;x1 = x, x++)
                {
-                       p0 = inpixels + (y * width + x) * 4;
-                       if (x == width - 1)
-                       {
-                               if (clamp)
-                                       p1 = inpixels + (y * width + x) * 4;
-                               else
-                                       p1 = inpixels + (y * width) * 4;
-                       }
-                       else
-                               p1 = inpixels + (y * width + x + 1) * 4;
-                       if (y == height - 1)
-                       {
-                               if (clamp)
-                                       p2 = inpixels + (y * width + x) * 4;
-                               else
-                                       p2 = inpixels + x * 4;
-                       }
-                       else
-                               p2 = inpixels + ((y + 1) * width + x) * 4;
-                       /*
-                       dv[0][0] = iwidth;
-                       dv[0][1] = 0;
-                       dv[0][2] = ((p0[0] + p0[1] + p0[2]) * ibumpscale) - ((p1[0] + p1[1] + p1[2]) * ibumpscale);
-                       dv[1][0] = 0;
-                       dv[1][1] = iheight;
-                       dv[1][2] = ((p2[0] + p2[1] + p2[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale);
-                       n[0] = dv[0][1]*dv[1][2]-dv[0][2]*dv[1][1];
-                       n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2];
-                       n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0];
-                       */
-                       n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
-                       n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2]));
-                       n[2] = ibumpscale;
-                       VectorNormalize(n);
-                       /*
-                       // this should work for the bottom right triangle if anyone wants
-                       // code for that for some reason
-                       n[0] = ((p3[0] + p3[1] + p3[2]) - (p1[0] + p1[1] + p1[2]));
-                       n[1] = ((p2[0] + p2[1] + p2[2]) - (p3[0] + p3[1] + p3[2]));
+                       x2 = x + 1;if (x2 >= width) x2 = 0;
+                       // left, right
+                       b = row[1] + x1 * 4;p[0] = (b[0] + b[1] + b[2]);
+                       b = row[1] + x2 * 4;p[1] = (b[0] + b[1] + b[2]);
+                       // above, below
+                       b = row[0] + x  * 4;p[2] = (b[0] + b[1] + b[2]);
+                       b = row[2] + x  * 4;p[3] = (b[0] + b[1] + b[2]);
+                       // center
+                       b = row[1] + x  * 4;p[4] = (b[0] + b[1] + b[2]);
+                       // calculate a normal from the slopes
+                       n[0] = p[0] - p[1];
+                       n[1] = p[3] - p[2];
                        n[2] = ibumpscale;
                        VectorNormalize(n);
-                       */
-                       out[0] = 128.0f + n[0] * 127.0f;
-                       out[1] = 128.0f + n[1] * 127.0f;
-                       out[2] = 128.0f + n[2] * 127.0f;
-                       out[3] = (p0[0] + p0[1] + p0[2]) / 3;
+                       // turn it into a dot3 rgb vector texture
+                       out[0] = (int)(128.0f + n[0] * 127.0f);
+                       out[1] = (int)(128.0f + n[1] * 127.0f);
+                       out[2] = (int)(128.0f + n[2] * 127.0f);
+                       out[3] = (p[4]) / 3;
                        out += 4;
                }
        }
 }
-
-int image_loadskin(imageskin_t *s, const char *shadername)
-{
-       int j;
-       unsigned char *bumppixels;
-       int bumppixels_width, bumppixels_height;
-       char name[MAX_QPATH];
-       strlcpy(name, shadername, sizeof(name));
-       Image_StripImageExtension(name, name);
-       memset(s, 0, sizeof(*s));
-       s->basepixels = loadimagepixels(name, false, 0, 0);
-       if (s->basepixels == NULL)
-               return false;
-       s->basepixels_width = image_width;
-       s->basepixels_height = image_height;
-
-       bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
-       if (Image_CheckAlpha(s->basepixels, s->basepixels_width * s->basepixels_height, true))
-       {
-               s->maskpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
-               s->maskpixels_width = s->basepixels_width;
-               s->maskpixels_height = s->basepixels_height;
-               memcpy(s->maskpixels, s->basepixels, s->maskpixels_width * s->maskpixels_height * 4);
-               for (j = 0;j < s->basepixels_width * s->basepixels_height * 4;j += 4)
-               {
-                       s->maskpixels[j+0] = 255;
-                       s->maskpixels[j+1] = 255;
-                       s->maskpixels[j+2] = 255;
-               }
-       }
-
-       // _luma is supported for tenebrae compatibility
-       // (I think it's a very stupid name, but oh well)
-       if ((s->glowpixels = loadimagepixels(va("%s_glow", name), false, 0, 0)) != NULL
-        || (s->glowpixels = loadimagepixels(va("%s_luma", name), false, 0, 0)) != NULL)
-       {
-               s->glowpixels_width = image_width;
-               s->glowpixels_height = image_height;
-       }
-       // _norm is the name used by tenebrae
-       // (I don't like the name much)
-       if ((s->nmappixels = loadimagepixels(va("%s_norm", name), false, 0, 0)) != NULL)
-       {
-               s->nmappixels_width = image_width;
-               s->nmappixels_height = image_height;
-       }
-       else if ((bumppixels = loadimagepixels(va("%s_bump", name), false, 0, 0)) != NULL)
-       {
-               bumppixels_width = image_width;
-               bumppixels_height = image_height;
-       }
-       if ((s->glosspixels = loadimagepixels(va("%s_gloss", name), false, 0, 0)) != NULL)
-       {
-               s->glosspixels_width = image_width;
-               s->glosspixels_height = image_height;
-       }
-       if ((s->pantspixels = loadimagepixels(va("%s_pants", name), false, 0, 0)) != NULL)
-       {
-               s->pantspixels_width = image_width;
-               s->pantspixels_height = image_height;
-       }
-       if ((s->shirtpixels = loadimagepixels(va("%s_shirt", name), false, 0, 0)) != NULL)
-       {
-               s->shirtpixels_width = image_width;
-               s->shirtpixels_height = image_height;
-       }
-
-       if (s->nmappixels == NULL)
-       {
-               if (bumppixels != NULL)
-               {
-                       if (r_shadow_bumpscale_bumpmap.value > 0)
-                       {
-                               s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
-                               s->nmappixels_width = bumppixels_width;
-                               s->nmappixels_height = bumppixels_height;
-                               Image_HeightmapToNormalmap(bumppixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_bumpmap.value);
-                       }
-               }
-               else
-               {
-                       if (r_shadow_bumpscale_basetexture.value > 0)
-                       {
-                               s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
-                               s->nmappixels_width = s->basepixels_width;
-                               s->nmappixels_height = s->basepixels_height;
-                               Image_HeightmapToNormalmap(s->basepixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_basetexture.value);
-                       }
-               }
-       }
-       if (bumppixels != NULL)
-               Mem_Free(bumppixels);
-       return true;
-}
-
-void image_freeskin(imageskin_t *s)
-{
-       if (s->basepixels)
-               Mem_Free(s->basepixels);
-       if (s->maskpixels)
-               Mem_Free(s->maskpixels);
-       if (s->nmappixels)
-               Mem_Free(s->nmappixels);
-       if (s->glowpixels)
-               Mem_Free(s->glowpixels);
-       if (s->glosspixels)
-               Mem_Free(s->glosspixels);
-       if (s->pantspixels)
-               Mem_Free(s->pantspixels);
-       if (s->shirtpixels)
-               Mem_Free(s->shirtpixels);
-       memset(s, 0, sizeof(*s));
-}
-