]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - image.c
fixed some dynamic lighting bugs related to glowing self
[xonotic/darkplaces.git] / image.c
diff --git a/image.c b/image.c
index 068d01bdf5f320c8a967f356d79fc92cedf690bc..0ce0886ad11365c0b2a027659847ddee307fd806 100644 (file)
--- a/image.c
+++ b/image.c
@@ -1,11 +1,24 @@
 
 #include "quakedef.h"
+#include "image.h"
 
 int            image_width;
 int            image_height;
 
+void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab)
+{
+       while (pixels--)
+       {
+               out[0] = gammar[in[0]];
+               out[1] = gammag[in[1]];
+               out[2] = gammab[in[2]];
+               in += 3;
+               out += 3;
+       }
+}
+
 // note: pal must be 32bit color
-void Image_Copy8bitRGBA(byte *in, byte *out, int pixels, int *pal)
+void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal)
 {
        int *iout = (void *)out;
        while (pixels >= 8)
@@ -42,20 +55,6 @@ void Image_Copy8bitRGBA(byte *in, byte *out, int pixels, int *pal)
                iout[0] = pal[in[0]];
 }
 
-void Image_CopyRGBAGamma(byte *in, byte *out, int pixels)
-{
-       while (pixels--)
-       {
-               out[0] = texgamma[in[0]];
-               out[1] = texgamma[in[1]];
-               out[2] = texgamma[in[2]];
-               out[3] =          in[3] ;
-               in += 4;
-               out += 4;
-       }
-}
-
-
 /*
 =================================================================
 
@@ -85,11 +84,18 @@ typedef struct
 LoadPCX
 ============
 */
-byte* LoadPCX (byte *f, int matchwidth, int matchheight)
+qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
 {
-       pcx_t   pcx;
-       byte    *palette, *a, *b, *image_rgba, *fin, *pbuf;
-       int             x, y, dataByte, runLength;
+       pcx_t pcx;
+       qbyte *a, *b, *image_rgba, *pbuf;
+       const qbyte *palette, *fin, *enddata;
+       int x, y, x2, dataByte;
+
+       if (loadsize < sizeof(pcx) + 768)
+       {
+               Con_Printf ("Bad pcx file\n");
+               return NULL;
+       }
 
        fin = f;
 
@@ -109,55 +115,59 @@ byte* LoadPCX (byte *f, int matchwidth, int matchheight)
        if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || pcx.xmax > 320 || pcx.ymax > 256)
        {
                Con_Printf ("Bad pcx file\n");
-               qfree(f);
                return NULL;
        }
 
        if (matchwidth && (pcx.xmax+1) != matchwidth)
        {
-               qfree(f);
                return NULL;
        }
        if (matchheight && (pcx.ymax+1) != matchheight)
        {
-               qfree(f);
                return NULL;
        }
 
        image_width = pcx.xmax+1;
        image_height = pcx.ymax+1;
 
-       image_rgba = qmalloc(image_width*image_height*4);
+       palette = f + loadsize - 768;
+
+       image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4);
+       if (!image_rgba)
+       {
+               Con_Printf("LoadPCX: not enough memory for %i by %i image\n", image_width, image_height);
+               return NULL;
+       }
        pbuf = image_rgba + image_width*image_height*3;
+       enddata = palette;
 
-       for (y = 0;y < image_height;y++)
+       for (y = 0;y < image_height && fin < enddata;y++)
        {
                a = pbuf + y * image_width;
-               for (x = 0;x < image_width;)
+               for (x = 0;x < image_width && fin < enddata;)
                {
                        dataByte = *fin++;
                        if(dataByte >= 0xC0)
                        {
-                               runLength = dataByte & 0x3F;
+                               if (fin >= enddata)
+                                       break;
+                               x2 = x + (dataByte & 0x3F);
                                dataByte = *fin++;
-                               if (runLength)
-                               {
-                                       x += runLength;
-                                       while(runLength--)
-                                               *a++ = dataByte;
-                               }
+                               if (x2 > image_width)
+                                       x2 = image_width; // technically an error
+                               while(x < x2)
+                                       a[x++] = dataByte;
                        }
                        else
-                       {
-                               x++;
-                               *a++ = dataByte;
-                       }
+                               a[x++] = dataByte;
                }
+               fin += pcx.bytes_per_line - image_width; // the number of bytes per line is always forced to an even number
+               while(x < image_width)
+                       a[x++] = 0;
        }
 
-       palette = fin;
-       a = pbuf;
-       b = image_rgba;
+       a = image_rgba;
+       b = pbuf;
 
        for(x = 0;x < image_width*image_height;x++)
        {
@@ -168,7 +178,6 @@ byte* LoadPCX (byte *f, int matchwidth, int matchheight)
                *a++ = 255;
        }
 
-       qfree(f);
        return image_rgba;
 }
 
@@ -198,15 +207,19 @@ TargaHeader               targa_header;
 LoadTGA
 =============
 */
-byte* LoadTGA (byte *f, int matchwidth, int matchheight)
+qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 {
-       int columns, rows, numPixels, row, column;
-       byte *pixbuf, *image_rgba, *fin;
+       int x, y, row_inc;
+       unsigned char red, green, blue, alpha, run, runlen;
+       qbyte *pixbuf, *image_rgba;
+       const qbyte *fin, *enddata;
 
+       if (loadsize < 18+3)
+               return NULL;
        targa_header.id_length = f[0];
        targa_header.colormap_type = f[1];
        targa_header.image_type = f[2];
-       
+
        targa_header.colormap_index = f[3] + f[4] * 256;
        targa_header.colormap_length = f[5] + f[6] * 256;
        targa_header.colormap_size = f[7];
@@ -222,45 +235,81 @@ byte* LoadTGA (byte *f, int matchwidth, int matchheight)
        targa_header.attributes = f[17];
 
        if (targa_header.image_type != 2 && targa_header.image_type != 10)
-               Host_Error ("LoadTGA: Only type 2 and 10 targa RGB images supported\n");
+       {
+               Con_Printf ("LoadTGA: Only type 2 and 10 targa RGB images supported\n");
+               return NULL;
+       }
 
        if (targa_header.colormap_type != 0     || (targa_header.pixel_size != 32 && targa_header.pixel_size != 24))
-               Host_Error ("LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+       {
+               Con_Printf ("LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+               return NULL;
+       }
 
-       columns = targa_header.width;
-       rows = targa_header.height;
-       numPixels = columns * rows;
+       enddata = f + loadsize;
 
-       image_rgba = qmalloc(numPixels*4);
+       image_width = targa_header.width;
+       image_height = targa_header.height;
+
+       image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+       if (!image_rgba)
+       {
+               Con_Printf ("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
+               return NULL;
+       }
 
        fin = f + 18;
        if (targa_header.id_length != 0)
                fin += targa_header.id_length;  // skip TARGA image comment
-       
+
+       // If bit 5 of attributes isn't set, the image has been stored from bottom to top
+       if ((targa_header.attributes & 0x20) == 0)
+       {
+               pixbuf = image_rgba + (image_height - 1)*image_width*4;
+               row_inc = -image_width*4*2;
+       }
+       else
+       {
+               pixbuf = image_rgba;
+               row_inc = 0;
+       }
+
        if (targa_header.image_type == 2)
        {
                // Uncompressed, RGB images
-               for(row = rows - 1;row >= 0;row--)
+               if (targa_header.pixel_size == 24)
                {
-                       pixbuf = image_rgba + row*columns*4;
-                       for(column = 0;column < columns;column++)
+                       if (fin + image_width * image_height * 3 <= enddata)
                        {
-                               switch (targa_header.pixel_size)
+                               for(y = 0;y < image_height;y++)
                                {
-                               case 24:
-                                       *pixbuf++ = fin[2];
-                                       *pixbuf++ = fin[1];
-                                       *pixbuf++ = fin[0];
-                                       *pixbuf++ = 255;
-                                       fin += 3;
-                                       break;
-                               case 32:
-                                       *pixbuf++ = fin[2];
-                                       *pixbuf++ = fin[1];
-                                       *pixbuf++ = fin[0];
-                                       *pixbuf++ = fin[3];
-                                       fin += 4;
-                                       break;
+                                       for(x = 0;x < image_width;x++)
+                                       {
+                                               *pixbuf++ = fin[2];
+                                               *pixbuf++ = fin[1];
+                                               *pixbuf++ = fin[0];
+                                               *pixbuf++ = 255;
+                                               fin += 3;
+                                       }
+                                       pixbuf += row_inc;
+                               }
+                       }
+               }
+               else
+               {
+                       if (fin + image_width * image_height * 4 <= enddata)
+                       {
+                               for(y = 0;y < image_height;y++)
+                               {
+                                       for(x = 0;x < image_width;x++)
+                                       {
+                                               *pixbuf++ = fin[2];
+                                               *pixbuf++ = fin[1];
+                                               *pixbuf++ = fin[0];
+                                               *pixbuf++ = fin[3];
+                                               fin += 4;
+                                       }
+                                       pixbuf += row_inc;
                                }
                        }
                }
@@ -268,95 +317,105 @@ byte* LoadTGA (byte *f, int matchwidth, int matchheight)
        else if (targa_header.image_type==10)
        {
                // Runlength encoded RGB images
-               unsigned char red = 0, green = 0, blue = 0, alphabyte = 0, packetHeader, packetSize, j;
-               for(row = rows - 1;row >= 0;row--)
+               x = 0;
+               y = 0;
+               while (y < image_height && fin < enddata)
                {
-                       pixbuf = image_rgba + row * columns * 4;
-                       for(column = 0;column < columns;)
+                       runlen = *fin++;
+                       if (runlen & 0x80)
                        {
-                               packetHeader = *fin++;
-                               packetSize = 1 + (packetHeader & 0x7f);
-                               if (packetHeader & 0x80)
+                               // RLE compressed run
+                               runlen = 1 + (runlen & 0x7f);
+                               if (targa_header.pixel_size == 24)
                                {
-                                       // run-length packet
-                                       switch (targa_header.pixel_size)
-                                       {
-                                       case 24:
-                                               blue = *fin++;
-                                               green = *fin++;
-                                               red = *fin++;
-                                               alphabyte = 255;
+                                       if (fin + 3 > enddata)
                                                break;
-                                       case 32:
-                                               blue = *fin++;
-                                               green = *fin++;
-                                               red = *fin++;
-                                               alphabyte = *fin++;
+                                       blue = *fin++;
+                                       green = *fin++;
+                                       red = *fin++;
+                                       alpha = 255;
+                               }
+                               else
+                               {
+                                       if (fin + 4 > enddata)
                                                break;
-                                       }
-       
-                                       for(j = 0;j < packetSize;j++)
+                                       blue = *fin++;
+                                       green = *fin++;
+                                       red = *fin++;
+                                       alpha = *fin++;
+                               }
+
+                               while (runlen && y < image_height)
+                               {
+                                       run = runlen;
+                                       if (run > image_width - x)
+                                               run = image_width - x;
+                                       x += run;
+                                       runlen -= run;
+                                       while(run--)
                                        {
                                                *pixbuf++ = red;
                                                *pixbuf++ = green;
                                                *pixbuf++ = blue;
-                                               *pixbuf++ = alphabyte;
-                                               column++;
-                                               if (column == columns)
-                                               {
-                                                       // run spans across rows
-                                                       column = 0;
-                                                       if (row > 0)
-                                                               row--;
-                                                       else
-                                                               goto breakOut;
-                                                       pixbuf = image_rgba + row * columns * 4;
-                                               }
+                                               *pixbuf++ = alpha;
+                                       }
+                                       if (x == image_width)
+                                       {
+                                               // end of line, advance to next
+                                               x = 0;
+                                               y++;
+                                               pixbuf += row_inc;
                                        }
                                }
-                               else
+                       }
+                       else
+                       {
+                               // RLE uncompressed run
+                               runlen = 1 + (runlen & 0x7f);
+                               while (runlen && y < image_height)
                                {
-                                       // non run-length packet
-                                       for(j = 0;j < packetSize;j++)
+                                       run = runlen;
+                                       if (run > image_width - x)
+                                               run = image_width - x;
+                                       x += run;
+                                       runlen -= run;
+                                       if (targa_header.pixel_size == 24)
                                        {
-                                               switch (targa_header.pixel_size)
+                                               if (fin + run * 3 > enddata)
+                                                       break;
+                                               while(run--)
                                                {
-                                               case 24:
                                                        *pixbuf++ = fin[2];
                                                        *pixbuf++ = fin[1];
                                                        *pixbuf++ = fin[0];
                                                        *pixbuf++ = 255;
                                                        fin += 3;
+                                               }
+                                       }
+                                       else
+                                       {
+                                               if (fin + run * 4 > enddata)
                                                        break;
-                                               case 32:
+                                               while(run--)
+                                               {
                                                        *pixbuf++ = fin[2];
                                                        *pixbuf++ = fin[1];
                                                        *pixbuf++ = fin[0];
                                                        *pixbuf++ = fin[3];
                                                        fin += 4;
-                                                       break;
                                                }
-                                               column++;
-                                               if (column == columns)
-                                               {
-                                                       // pixel packet run spans across rows
-                                                       column = 0;
-                                                       if (row > 0)
-                                                               row--;
-                                                       else
-                                                               goto breakOut;
-                                                       pixbuf = image_rgba + row * columns * 4;
-                                               }                                               
+                                       }
+                                       if (x == image_width)
+                                       {
+                                               // end of line, advance to next
+                                               x = 0;
+                                               y++;
+                                               pixbuf += row_inc;
                                        }
                                }
                        }
-                       breakOut:;
                }
        }
-       
-       image_width = columns;
-       image_height = rows;
-       free(f);
        return image_rgba;
 }
 
@@ -365,41 +424,96 @@ byte* LoadTGA (byte *f, int matchwidth, int matchheight)
 LoadLMP
 ============
 */
-byte* LoadLMP (byte *f, int matchwidth, int matchheight)
+qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight)
 {
-       byte    *image_rgba;
-       int             width, height;
+       qbyte *image_rgba;
+       int width, height;
+
+       if (loadsize < 9)
+       {
+               Con_Printf("LoadLMP: invalid LMP file\n");
+               return NULL;
+       }
 
        // parse the very complicated header *chuckle*
-       width = LittleLong(((int *)f)[0]);
-       height = LittleLong(((int *)f)[1]);
+       width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+       height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
        if ((unsigned) width > 4096 || (unsigned) height > 4096)
        {
-               qfree(f);
-               Host_Error("LoadLMP: invalid size\n");
+               Con_Printf("LoadLMP: invalid size\n");
+               return NULL;
+       }
+       if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight))
+               return NULL;
+
+       if (loadsize < 8 + width * height)
+       {
+               Con_Printf("LoadLMP: invalid LMP file\n");
+               return NULL;
+       }
+
+       image_width = width;
+       image_height = height;
+
+       image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+       if (!image_rgba)
+       {
+               Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height);
+               return NULL;
+       }
+       Image_Copy8bitRGBA(f + 8, image_rgba, image_width * image_height, palette_complete);
+       return image_rgba;
+}
+
+/*
+============
+LoadLMP
+============
+*/
+qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight)
+{
+       qbyte *image_8bit;
+       int width, height;
+
+       if (loadsize < 9)
+       {
+               Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+               return NULL;
        }
-       if (matchwidth && width != matchwidth)
+
+       // parse the very complicated header *chuckle*
+       width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+       height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
+       if ((unsigned) width > 4096 || (unsigned) height > 4096)
        {
-               qfree(f);
+               Con_Printf("LoadLMPAs8Bit: invalid size\n");
                return NULL;
        }
-       if (matchheight && height != matchheight)
+       if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight))
+               return NULL;
+
+       if (loadsize < 8 + width * height)
        {
-               qfree(f);
+               Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
                return NULL;
        }
 
-       image_rgba = qmalloc(width*height*4);
-       Image_Copy8bitRGBA(f + 8, image_rgba, width*height, d_8to24table);
        image_width = width;
        image_height = height;
-       qfree(f);
-       return image_rgba;
+
+       image_8bit = Mem_Alloc(tempmempool, image_width * image_height);
+       if (!image_8bit)
+       {
+               Con_Printf("LoadLMPAs8Bit: not enough memory for %i by %i image\n", image_width, image_height);
+               return NULL;
+       }
+       memcpy(image_8bit, f + 8, image_width * image_height);
+       return image_8bit;
 }
 
-void Image_StripImageExtension (char *in, char *out)
+void Image_StripImageExtension (const char *in, char *out)
 {
-       char *end, *temp;
+       const char *end, *temp;
        end = in + strlen(in);
        if ((end - in) >= 4)
        {
@@ -414,44 +528,63 @@ void Image_StripImageExtension (char *in, char *out)
                strcpy(out, in);
 }
 
-byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight)
+qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-       byte    *f;
-       char    basename[256], name[256];
-       byte    *c;
+       qbyte *f, *data;
+       char basename[256], name[256], *c;
        Image_StripImageExtension(filename, basename); // strip .tga, .pcx and .lmp 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 = '#';
        sprintf (name, "textures/%s.tga", basename);
-       f = COM_LoadMallocFile(name, true);
+       f = COM_LoadFile(name, true);
        if (f)
-               return LoadTGA (f, matchwidth, matchheight);
+       {
+               data = LoadTGA (f, matchwidth, matchheight);
+               Mem_Free(f);
+               return data;
+       }
        sprintf (name, "textures/%s.pcx", basename);
-       f = COM_LoadMallocFile(name, true);
+       f = COM_LoadFile(name, true);
        if (f)
-               return LoadPCX (f, matchwidth, matchheight);
+       {
+               data = LoadPCX (f, matchwidth, matchheight);
+               Mem_Free(f);
+               return data;
+       }
        sprintf (name, "%s.tga", basename);
-       f = COM_LoadMallocFile(name, true);
+       f = COM_LoadFile(name, true);
        if (f)
-               return LoadTGA (f, matchwidth, matchheight);
+       {
+               data = LoadTGA (f, matchwidth, matchheight);
+               Mem_Free(f);
+               return data;
+       }
        sprintf (name, "%s.pcx", basename);
-       f = COM_LoadMallocFile(name, true);
+       f = COM_LoadFile(name, true);
        if (f)
-               return LoadPCX (f, matchwidth, matchheight);
+       {
+               data = LoadPCX (f, matchwidth, matchheight);
+               Mem_Free(f);
+               return data;
+       }
        sprintf (name, "%s.lmp", basename);
-       f = COM_LoadMallocFile(name, true);
+       f = COM_LoadFile(name, true);
        if (f)
-               return LoadLMP (f, matchwidth, matchheight);
+       {
+               data = LoadLMP (f, matchwidth, matchheight);
+               Mem_Free(f);
+               return data;
+       }
        if (complain)
                Con_Printf ("Couldn't load %s.tga, .pcx, .lmp\n", filename);
        return NULL;
 }
 
-int image_makemask (byte *in, byte *out, int size)
+int image_makemask (const qbyte *in, qbyte *out, int size)
 {
-       int             i, count;
+       int i, count;
        count = 0;
        for (i = 0;i < size;i++)
        {
@@ -465,9 +598,9 @@ int image_makemask (byte *in, byte *out, int size)
        return count;
 }
 
-byte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight)
+qbyte* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-       byte    *in, *data;
+       qbyte *in, *data;
        in = data = loadimagepixels(filename, complain, matchwidth, matchheight);
        if (!data)
                return NULL;
@@ -475,61 +608,85 @@ byte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, in
                return data; // some transparency
        else
        {
-               qfree(data);
+               Mem_Free(data);
                return NULL; // all opaque
        }
 }
 
-rtexture_t *loadtextureimage (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-       byte *data;
+       qbyte *data;
        rtexture_t *rt;
        if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
                return 0;
-       rt = R_LoadTexture (filename, image_width, image_height, data, TEXF_ALPHA | TEXF_RGBA | (mipmap ? TEXF_MIPMAP : 0) | (mipmap ? TEXF_PRECACHE : 0));
-       qfree(data);
+       rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
+       Mem_Free(data);
        return rt;
 }
 
-rtexture_t *loadtextureimagemask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-       byte *data;
+       qbyte *data;
        rtexture_t *rt;
        if (!(data = loadimagepixelsmask (filename, complain, matchwidth, matchheight)))
                return 0;
-       rt = R_LoadTexture (filename, image_width, image_height, data, TEXF_ALPHA | TEXF_RGBA | (mipmap ? TEXF_MIPMAP : 0) | (mipmap ? TEXF_PRECACHE : 0));
-       qfree(data);
+       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 *loadtextureimagewithmask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache)
+rtexture_t *image_nmaptex;
+rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-       int count;
-       byte *data;
-       char *filename2;
+       qbyte *data;
        rtexture_t *rt;
        image_masktex = NULL;
+       image_nmaptex = NULL;
        if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
                return 0;
-       rt = R_LoadTexture (filename, image_width, image_height, data, TEXF_ALPHA | TEXF_RGBA | (mipmap ? TEXF_MIPMAP : 0) | (mipmap ? TEXF_PRECACHE : 0));
-       count = image_makemask(data, data, image_width * image_height);
-       if (count)
-       {
-               filename2 = qmalloc(strlen(filename) + 6);
-               sprintf(filename2, "%s_mask", filename);
-               image_masktex = R_LoadTexture (filename2, image_width, image_height, data, TEXF_ALPHA | TEXF_RGBA | (mipmap ? TEXF_MIPMAP : 0) | (mipmap ? TEXF_PRECACHE : 0));
-               qfree(filename2);
-       }
-       qfree(data);
+
+       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;
 }
 
-void Image_WriteTGARGB_preflipped (char *filename, int width, int height, byte *data)
+rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
 {
-       byte *buffer, *in, *out, *end;
+       qbyte *data, *data2;
+       rtexture_t *rt;
+       image_masktex = NULL;
+       image_nmaptex = NULL;
+       if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
+               return 0;
+
+       data2 = 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);
 
-       buffer = qmalloc(width*height*3 + 18);
+       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;
+}
+
+qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data)
+{
+       qboolean ret;
+       qbyte *buffer, *out;
+       const qbyte *in, *end;
+
+       buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
 
        memset (buffer, 0, 18);
        buffer[2] = 2;          // uncompressed type
@@ -549,17 +706,19 @@ void Image_WriteTGARGB_preflipped (char *filename, int width, int height, byte *
                *out++ = in[1];
                *out++ = in[0];
        }
-       COM_WriteFile (filename, buffer, width*height*3 + 18 );
+       ret = COM_WriteFile (filename, buffer, width*height*3 + 18 );
 
-       qfree(buffer);
+       Mem_Free(buffer);
+       return ret;
 }
 
-void Image_WriteTGARGB (char *filename, int width, int height, byte *data)
+void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data)
 {
        int y;
-       byte *buffer, *in, *out, *end;
+       qbyte *buffer, *out;
+       const qbyte *in, *end;
 
-       buffer = qmalloc(width*height*3 + 18);
+       buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
 
        memset (buffer, 0, 18);
        buffer[2] = 2;          // uncompressed type
@@ -584,15 +743,16 @@ void Image_WriteTGARGB (char *filename, int width, int height, byte *data)
        }
        COM_WriteFile (filename, buffer, width*height*3 + 18 );
 
-       qfree(buffer);
+       Mem_Free(buffer);
 }
 
-void Image_WriteTGARGBA (char *filename, int width, int height, byte *data)
+void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyte *data)
 {
        int y;
-       byte *buffer, *in, *out, *end;
+       qbyte *buffer, *out;
+       const qbyte *in, *end;
 
-       buffer = qmalloc(width*height*4 + 18);
+       buffer = Mem_Alloc(tempmempool, width*height*4 + 18);
 
        memset (buffer, 0, 18);
        buffer[2] = 2;          // uncompressed type
@@ -618,12 +778,12 @@ void Image_WriteTGARGBA (char *filename, int width, int height, byte *data)
        }
        COM_WriteFile (filename, buffer, width*height*4 + 18 );
 
-       qfree(buffer);
+       Mem_Free(buffer);
 }
 
-qboolean Image_CheckAlpha(byte *data, int size, qboolean rgba)
+qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba)
 {
-       byte *end;
+       const qbyte *end;
        if (rgba)
        {
                // check alpha bytes
@@ -640,3 +800,547 @@ qboolean Image_CheckAlpha(byte *data, int size, qboolean rgba)
        }
        return 0;
 }
+
+static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
+{
+       int             j, xi, oldx = 0, f, fstep, endx, lerp;
+       fstep = (int) (inwidth*65536.0f/outwidth);
+       endx = (inwidth-1);
+       for (j = 0,f = 0;j < outwidth;j++, f += fstep)
+       {
+               xi = f >> 16;
+               if (xi != oldx)
+               {
+                       in += (xi - oldx) * 4;
+                       oldx = xi;
+               }
+               if (xi < endx)
+               {
+                       lerp = f & 0xFFFF;
+                       *out++ = (qbyte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
+                       *out++ = (qbyte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
+                       *out++ = (qbyte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
+                       *out++ = (qbyte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
+               }
+               else // last pixel of the line has no pixel to lerp to
+               {
+                       *out++ = in[0];
+                       *out++ = in[1];
+                       *out++ = in[2];
+                       *out++ = in[3];
+               }
+       }
+}
+
+static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
+{
+       int             j, xi, oldx = 0, f, fstep, endx, lerp;
+       fstep = (int) (inwidth*65536.0f/outwidth);
+       endx = (inwidth-1);
+       for (j = 0,f = 0;j < outwidth;j++, f += fstep)
+       {
+               xi = f >> 16;
+               if (xi != oldx)
+               {
+                       in += (xi - oldx) * 3;
+                       oldx = xi;
+               }
+               if (xi < endx)
+               {
+                       lerp = f & 0xFFFF;
+                       *out++ = (qbyte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
+                       *out++ = (qbyte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
+                       *out++ = (qbyte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
+               }
+               else // last pixel of the line has no pixel to lerp to
+               {
+                       *out++ = in[0];
+                       *out++ = in[1];
+                       *out++ = in[2];
+               }
+       }
+}
+
+int resamplerowsize = 0;
+qbyte *resamplerow1 = NULL;
+qbyte *resamplerow2 = NULL;
+mempool_t *resamplemempool = NULL;
+
+#define LERPBYTE(i) r = resamplerow1[i];out[i] = (qbyte) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
+void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+{
+       int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
+       qbyte *out;
+       const qbyte *inrow;
+       out = outdata;
+       fstep = (int) (inheight*65536.0f/outheight);
+
+       inrow = indata;
+       oldy = 0;
+       Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
+       Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth);
+       for (i = 0, f = 0;i < outheight;i++,f += fstep)
+       {
+               yi = f >> 16;
+               if (yi < endy)
+               {
+                       lerp = f & 0xFFFF;
+                       if (yi != oldy)
+                       {
+                               inrow = (qbyte *)indata + inwidth4*yi;
+                               if (yi == oldy+1)
+                                       memcpy(resamplerow1, resamplerow2, outwidth4);
+                               else
+                                       Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
+                               Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth);
+                               oldy = yi;
+                       }
+                       j = outwidth - 4;
+                       while(j >= 0)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               LERPBYTE( 3);
+                               LERPBYTE( 4);
+                               LERPBYTE( 5);
+                               LERPBYTE( 6);
+                               LERPBYTE( 7);
+                               LERPBYTE( 8);
+                               LERPBYTE( 9);
+                               LERPBYTE(10);
+                               LERPBYTE(11);
+                               LERPBYTE(12);
+                               LERPBYTE(13);
+                               LERPBYTE(14);
+                               LERPBYTE(15);
+                               out += 16;
+                               resamplerow1 += 16;
+                               resamplerow2 += 16;
+                               j -= 4;
+                       }
+                       if (j & 2)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               LERPBYTE( 3);
+                               LERPBYTE( 4);
+                               LERPBYTE( 5);
+                               LERPBYTE( 6);
+                               LERPBYTE( 7);
+                               out += 8;
+                               resamplerow1 += 8;
+                               resamplerow2 += 8;
+                       }
+                       if (j & 1)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               LERPBYTE( 3);
+                               out += 4;
+                               resamplerow1 += 4;
+                               resamplerow2 += 4;
+                       }
+                       resamplerow1 -= outwidth4;
+                       resamplerow2 -= outwidth4;
+               }
+               else
+               {
+                       if (yi != oldy)
+                       {
+                               inrow = (qbyte *)indata + inwidth4*yi;
+                               if (yi == oldy+1)
+                                       memcpy(resamplerow1, resamplerow2, outwidth4);
+                               else
+                                       Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
+                               oldy = yi;
+                       }
+                       memcpy(out, resamplerow1, outwidth4);
+               }
+       }
+}
+
+void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+{
+       int i, j;
+       unsigned frac, fracstep;
+       // relies on int being 4 bytes
+       int *inrow, *out;
+       out = outdata;
+
+       fracstep = inwidth*0x10000/outwidth;
+       for (i = 0;i < outheight;i++)
+       {
+               inrow = (int *)indata + inwidth*(i*inheight/outheight);
+               frac = fracstep >> 1;
+               j = outwidth - 4;
+               while (j >= 0)
+               {
+                       out[0] = inrow[frac >> 16];frac += fracstep;
+                       out[1] = inrow[frac >> 16];frac += fracstep;
+                       out[2] = inrow[frac >> 16];frac += fracstep;
+                       out[3] = inrow[frac >> 16];frac += fracstep;
+                       out += 4;
+                       j -= 4;
+               }
+               if (j & 2)
+               {
+                       out[0] = inrow[frac >> 16];frac += fracstep;
+                       out[1] = inrow[frac >> 16];frac += fracstep;
+                       out += 2;
+               }
+               if (j & 1)
+               {
+                       out[0] = inrow[frac >> 16];frac += fracstep;
+                       out += 1;
+               }
+       }
+}
+
+void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+{
+       int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
+       qbyte *out;
+       const qbyte *inrow;
+       out = outdata;
+       fstep = (int) (inheight*65536.0f/outheight);
+
+       inrow = indata;
+       oldy = 0;
+       Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
+       Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
+       for (i = 0, f = 0;i < outheight;i++,f += fstep)
+       {
+               yi = f >> 16;
+               if (yi < endy)
+               {
+                       lerp = f & 0xFFFF;
+                       if (yi != oldy)
+                       {
+                               inrow = (qbyte *)indata + inwidth3*yi;
+                               if (yi == oldy+1)
+                                       memcpy(resamplerow1, resamplerow2, outwidth3);
+                               else
+                                       Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
+                               Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
+                               oldy = yi;
+                       }
+                       j = outwidth - 4;
+                       while(j >= 0)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               LERPBYTE( 3);
+                               LERPBYTE( 4);
+                               LERPBYTE( 5);
+                               LERPBYTE( 6);
+                               LERPBYTE( 7);
+                               LERPBYTE( 8);
+                               LERPBYTE( 9);
+                               LERPBYTE(10);
+                               LERPBYTE(11);
+                               out += 12;
+                               resamplerow1 += 12;
+                               resamplerow2 += 12;
+                               j -= 4;
+                       }
+                       if (j & 2)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               LERPBYTE( 3);
+                               LERPBYTE( 4);
+                               LERPBYTE( 5);
+                               out += 6;
+                               resamplerow1 += 6;
+                               resamplerow2 += 6;
+                       }
+                       if (j & 1)
+                       {
+                               LERPBYTE( 0);
+                               LERPBYTE( 1);
+                               LERPBYTE( 2);
+                               out += 3;
+                               resamplerow1 += 3;
+                               resamplerow2 += 3;
+                       }
+                       resamplerow1 -= outwidth3;
+                       resamplerow2 -= outwidth3;
+               }
+               else
+               {
+                       if (yi != oldy)
+                       {
+                               inrow = (qbyte *)indata + inwidth3*yi;
+                               if (yi == oldy+1)
+                                       memcpy(resamplerow1, resamplerow2, outwidth3);
+                               else
+                                       Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
+                               oldy = yi;
+                       }
+                       memcpy(out, resamplerow1, outwidth3);
+               }
+       }
+}
+
+void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+{
+       int i, j, f, inwidth3 = inwidth * 3;
+       unsigned frac, fracstep;
+       qbyte *inrow, *out;
+       out = outdata;
+
+       fracstep = inwidth*0x10000/outwidth;
+       for (i = 0;i < outheight;i++)
+       {
+               inrow = (qbyte *)indata + inwidth3*(i*inheight/outheight);
+               frac = fracstep >> 1;
+               j = outwidth - 4;
+               while (j >= 0)
+               {
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       j -= 4;
+               }
+               if (j & 2)
+               {
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       out += 2;
+               }
+               if (j & 1)
+               {
+                       f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
+                       out += 1;
+               }
+       }
+}
+
+/*
+================
+Image_Resample
+================
+*/
+void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality)
+{
+       if (indepth != 1 || outdepth != 1)
+               Sys_Error("Image_Resample: 3D resampling not supported\n");
+       if (resamplerowsize < outwidth*4)
+       {
+               if (resamplerow1)
+                       Mem_Free(resamplerow1);
+               resamplerowsize = outwidth*4;
+               if (!resamplemempool)
+                       resamplemempool = Mem_AllocPool("Image Scaling Buffer");
+               resamplerow1 = Mem_Alloc(resamplemempool, resamplerowsize*2);
+               resamplerow2 = resamplerow1 + resamplerowsize;
+       }
+       if (bytesperpixel == 4)
+       {
+               if (quality)
+                       Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
+               else
+                       Image_Resample32Nearest(indata, inwidth, inheight, outdata, outwidth, outheight);
+       }
+       else if (bytesperpixel == 3)
+       {
+               if (quality)
+                       Image_Resample24Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
+               else
+                       Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
+       }
+       else
+               Sys_Error("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
+}
+
+// in can be the same as out
+void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
+{
+       int x, y, nextrow;
+       if (*depth != 1 || destdepth != 1)
+               Sys_Error("Image_Resample: 3D resampling not supported\n");
+       nextrow = *width * bytesperpixel;
+       if (*width > destwidth)
+       {
+               *width >>= 1;
+               if (*height > destheight)
+               {
+                       // reduce both
+                       *height >>= 1;
+                       if (bytesperpixel == 4)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
+                                               out[1] = (qbyte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
+                                               out[2] = (qbyte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
+                                               out[3] = (qbyte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
+                                               out += 4;
+                                               in += 8;
+                                       }
+                                       in += nextrow; // skip a line
+                               }
+                       }
+                       else if (bytesperpixel == 3)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
+                                               out[1] = (qbyte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
+                                               out[2] = (qbyte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
+                                               out += 3;
+                                               in += 6;
+                                       }
+                                       in += nextrow; // skip a line
+                               }
+                       }
+                       else
+                               Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+               }
+               else
+               {
+                       // reduce width
+                       if (bytesperpixel == 4)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[4]) >> 1);
+                                               out[1] = (qbyte) ((in[1] + in[5]) >> 1);
+                                               out[2] = (qbyte) ((in[2] + in[6]) >> 1);
+                                               out[3] = (qbyte) ((in[3] + in[7]) >> 1);
+                                               out += 4;
+                                               in += 8;
+                                       }
+                               }
+                       }
+                       else if (bytesperpixel == 3)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[3]) >> 1);
+                                               out[1] = (qbyte) ((in[1] + in[4]) >> 1);
+                                               out[2] = (qbyte) ((in[2] + in[5]) >> 1);
+                                               out += 3;
+                                               in += 6;
+                                       }
+                               }
+                       }
+                       else
+                               Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+               }
+       }
+       else
+       {
+               if (*height > destheight)
+               {
+                       // reduce height
+                       *height >>= 1;
+                       if (bytesperpixel == 4)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[nextrow  ]) >> 1);
+                                               out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
+                                               out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
+                                               out[3] = (qbyte) ((in[3] + in[nextrow+3]) >> 1);
+                                               out += 4;
+                                               in += 4;
+                                       }
+                                       in += nextrow; // skip a line
+                               }
+                       }
+                       else if (bytesperpixel == 3)
+                       {
+                               for (y = 0;y < *height;y++)
+                               {
+                                       for (x = 0;x < *width;x++)
+                                       {
+                                               out[0] = (qbyte) ((in[0] + in[nextrow  ]) >> 1);
+                                               out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
+                                               out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
+                                               out += 3;
+                                               in += 3;
+                                       }
+                                       in += nextrow; // skip a line
+                               }
+                       }
+                       else
+                               Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+               }
+               else
+                       Sys_Error("Image_MipReduce: desired size already achieved\n");
+       }
+}
+
+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;
+       unsigned char *out;
+       float iwidth, iheight, ibumpscale, n[3];
+       iwidth = 1.0f / width;
+       iheight = 1.0f / height;
+       ibumpscale = (255.0f * 3.0f) / (bumpscale * 8.0f);
+       out = outpixels;
+       for (y = 0;y < height;y++)
+       {
+               for (x = 0;x < width;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] = ((p1[0] + p1[1] + p1[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[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] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[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] = 255;
+                       out += 4;
+               }
+       }
+}