X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=image.c;h=1c2af789c08d237f193845880108a3cdf1f22877;hp=287d43e12d01a5eee35711029ea777379504cdfb;hb=78e21223665bd6ce8cd026ac90cea3a917a6ae20;hpb=6fb3daf04a26ac42b15c02c2276f6820ffe795a8

diff --git a/image.c b/image.c
index 287d43e1..1c2af789 100644
--- a/image.c
+++ b/image.c
@@ -1,10 +1,106 @@
 
 #include "quakedef.h"
 #include "image.h"
+#include "jpeg.h"
+#include "r_shadow.h"
 
 int		image_width;
 int		image_height;
 
+#if 1
+// written by LordHavoc in a readable way, optimized by Vic, further optimized by LordHavoc (the non-special index case), readable version preserved below this
+void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
+{
+	int index, c, x, y;
+	const qbyte *in, *line;
+	int row_inc = (inputflipy ? -inputwidth : inputwidth) * numinputcomponents, col_inc = (inputflipx ? -1 : 1) * numinputcomponents;
+	int row_ofs = (inputflipy ? (inputheight - 1) * inputwidth * numinputcomponents : 0), col_ofs = (inputflipx ? (inputwidth - 1) * numinputcomponents : 0);
+
+	for (c = 0; c < numoutputcomponents; c++)
+		if (outputinputcomponentindices[c] & 0x80000000)
+			break;
+	if (c < numoutputcomponents)
+	{
+		// special indices used
+		if (inputflipdiagonal)
+		{
+			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+					for (c = 0; c < numoutputcomponents; c++)
+						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
+		}
+		else
+		{
+			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+					for (c = 0; c < numoutputcomponents; c++)
+						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
+		}
+	}
+	else
+	{
+		// special indices not used
+		if (inputflipdiagonal)
+		{
+			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+					for (c = 0; c < numoutputcomponents; c++)
+						outpixels[c] = in[outputinputcomponentindices[c]];
+		}
+		else
+		{
+			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+					for (c = 0; c < numoutputcomponents; c++)
+						outpixels[c] = in[outputinputcomponentindices[c]];
+		}
+	}
+}
+#else
+// intentionally readable version
+void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
+{
+	int index, c, x, y;
+	const qbyte *in, *inrow, *incolumn;
+	if (inputflipdiagonal)
+	{
+		for (x = 0;x < inputwidth;x++)
+		{
+			for (y = 0;y < inputheight;y++)
+			{
+				in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+				for (c = 0;c < numoutputcomponents;c++)
+				{
+					index = outputinputcomponentindices[c];
+					if (index & 0x80000000)
+						*outpixels++ = index;
+					else
+						*outpixels++ = in[index];
+				}
+			}
+		}
+	}
+	else
+	{
+		for (y = 0;y < inputheight;y++)
+		{
+			for (x = 0;x < inputwidth;x++)
+			{
+				in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+				for (c = 0;c < numoutputcomponents;c++)
+				{
+					index = outputinputcomponentindices[c];
+					if (index & 0x80000000)
+						*outpixels++ = index;
+					else
+						*outpixels++ = in[index];
+				}
+			}
+		}
+	}
+}
+#endif
+
 void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab)
 {
 	while (pixels--)
@@ -91,9 +187,9 @@ qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
 	const qbyte *palette, *fin, *enddata;
 	int x, y, x2, dataByte;
 
-	if (loadsize < (int)sizeof(pcx) + 768)
+	if (fs_filesize < (int)sizeof(pcx) + 768)
 	{
-		Con_Printf ("Bad pcx file\n");
+		Con_Print("Bad pcx file\n");
 		return NULL;
 	}
 
@@ -112,25 +208,17 @@ qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
 	pcx.bytes_per_line = LittleShort (pcx.bytes_per_line);
 	pcx.palette_type = LittleShort (pcx.palette_type);
 
-	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || pcx.xmax > 320 || pcx.ymax > 256)
+	image_width = pcx.xmax + 1 - pcx.xmin;
+	image_height = pcx.ymax + 1 - pcx.ymin;
+	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
 	{
-		Con_Printf ("Bad pcx file\n");
+		Con_Print("Bad pcx file\n");
 		return NULL;
 	}
-
-	if (matchwidth && (pcx.xmax+1) != matchwidth)
-	{
-		return NULL;
-	}
-	if (matchheight && (pcx.ymax+1) != matchheight)
-	{
+	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
-	}
 
-	image_width = pcx.xmax+1;
-	image_height = pcx.ymax+1;
-
-	palette = f + loadsize - 768;
+	palette = f + fs_filesize - 768;
 
 	image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4);
 	if (!image_rgba)
@@ -199,8 +287,22 @@ typedef struct _TargaHeader
 }
 TargaHeader;
 
-TargaHeader		targa_header;
-
+void PrintTargaHeader(TargaHeader *t)
+{
+	Con_Print("TargaHeader:\n");
+	Con_Printf("uint8 id_length = %i;\n", t->id_length);
+	Con_Printf("uint8 colormap_type = %i;\n", t->colormap_type);
+	Con_Printf("uint8 image_type = %i;\n", t->image_type);
+	Con_Printf("uint16 colormap_index = %i;\n", t->colormap_index);
+	Con_Printf("uint16 colormap_length = %i;\n", t->colormap_length);
+	Con_Printf("uint8 colormap_size = %i;\n", t->colormap_size);
+	Con_Printf("uint16 x_origin = %i;\n", t->x_origin);
+	Con_Printf("uint16 y_origin = %i;\n", t->y_origin);
+	Con_Printf("uint16 width = %i;\n", t->width);
+	Con_Printf("uint16 height = %i;\n", t->height);
+	Con_Printf("uint8 pixel_size = %i;\n", t->pixel_size);
+	Con_Printf("uint8 attributes = %i;\n", t->attributes);
+}
 
 /*
 =============
@@ -209,13 +311,17 @@ LoadTGA
 */
 qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 {
-	int x, y, row_inc;
-	unsigned char red, green, blue, alpha, run, runlen;
+	int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
 	qbyte *pixbuf, *image_rgba;
 	const qbyte *fin, *enddata;
+	TargaHeader targa_header;
+	unsigned char palette[256*4], *p;
 
-	if (loadsize < 18+3)
+	if (fs_filesize < 19)
 		return NULL;
+
+	enddata = f + fs_filesize;
+
 	targa_header.id_length = f[0];
 	targa_header.colormap_type = f[1];
 	targa_header.image_type = f[2];
@@ -225,43 +331,118 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 	targa_header.colormap_size = f[7];
 	targa_header.x_origin = f[8] + f[9] * 256;
 	targa_header.y_origin = f[10] + f[11] * 256;
-	targa_header.width = f[12] + f[13] * 256;
-	targa_header.height = f[14] + f[15] * 256;
-	if (matchwidth && targa_header.width != matchwidth)
+	targa_header.width = image_width = f[12] + f[13] * 256;
+	targa_header.height = image_height = f[14] + f[15] * 256;
+	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+	{
+		Con_Print("LoadTGA: invalid size\n");
+		PrintTargaHeader(&targa_header);
 		return NULL;
-	if (matchheight && targa_header.height != matchheight)
+	}
+	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 	targa_header.pixel_size = f[16];
 	targa_header.attributes = f[17];
 
-	if (targa_header.image_type != 2 && targa_header.image_type != 10)
+	// advance to end of header
+	fin = f + 18;
+
+	// skip TARGA image comment (usually 0 bytes)
+	fin += targa_header.id_length;
+
+	// read/skip the colormap if present (note: according to the TARGA spec it
+	// can be present even on truecolor or greyscale images, just not used by
+	// the image data)
+	if (targa_header.colormap_type)
 	{
-		Con_Printf ("LoadTGA: Only type 2 and 10 targa RGB images supported\n");
-		return NULL;
+		if (targa_header.colormap_length > 256)
+		{
+			Con_Print("LoadTGA: only up to 256 colormap_length supported\n");
+			PrintTargaHeader(&targa_header);
+			return NULL;
+		}
+		if (targa_header.colormap_index)
+		{
+			Con_Print("LoadTGA: colormap_index not supported\n");
+			PrintTargaHeader(&targa_header);
+			return NULL;
+		}
+		if (targa_header.colormap_size == 24)
+		{
+			for (x = 0;x < targa_header.colormap_length;x++)
+			{
+				palette[x*4+2] = *fin++;
+				palette[x*4+1] = *fin++;
+				palette[x*4+0] = *fin++;
+				palette[x*4+3] = 255;
+			}
+		}
+		else if (targa_header.colormap_size == 32)
+		{
+			for (x = 0;x < targa_header.colormap_length;x++)
+			{
+				palette[x*4+2] = *fin++;
+				palette[x*4+1] = *fin++;
+				palette[x*4+0] = *fin++;
+				palette[x*4+3] = *fin++;
+			}
+		}
+		else
+		{
+			Con_Print("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
+			PrintTargaHeader(&targa_header);
+			return NULL;
+		}
 	}
 
-	if (targa_header.colormap_type != 0	|| (targa_header.pixel_size != 32 && targa_header.pixel_size != 24))
+	// check our pixel_size restrictions according to image_type
+	if (targa_header.image_type == 2 || targa_header.image_type == 10)
+	{
+		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)
 	{
-		Con_Printf ("LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+		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 if (targa_header.image_type == 3 || targa_header.image_type == 11)
+	{
+		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
+	{
+		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;
 	}
 
-	enddata = f + loadsize;
-
-	image_width = targa_header.width;
-	image_height = targa_header.height;
+	if (targa_header.attributes & 0x10)
+	{
+		Con_Print("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
+		return NULL;
+	}
 
 	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);
+		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)
 	{
@@ -274,148 +455,90 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 		row_inc = 0;
 	}
 
-	if (targa_header.image_type == 2)
+	// number of attribute bits per pixel, we only support 0 or 8
+	alphabits = targa_header.attributes & 0x0F;
+	if (alphabits != 8 && alphabits != 0)
 	{
-		// Uncompressed, RGB images
-		if (targa_header.pixel_size == 24)
-		{
-			if (fin + image_width * image_height * 3 <= 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++ = 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;
-				}
-			}
-		}
+		Con_Print("LoadTGA: only 0 or 8 attribute (alpha) bits supported\n");
+		return NULL;
 	}
-	else if (targa_header.image_type==10)
+
+	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)
 	{
-		// Runlength encoded RGB images
-		x = 0;
-		y = 0;
-		while (y < image_height && fin < enddata)
+		// decoder is mostly the same whether it's compressed or not
+		readpixelcount = 1000000;
+		runlen = 1000000;
+		if (compressed && fin < enddata)
 		{
 			runlen = *fin++;
+			// high bit indicates this is an RLE compressed run
 			if (runlen & 0x80)
+				readpixelcount = 1;
+			runlen = 1 + (runlen & 0x7f);
+		}
+
+		while((runlen--) && y < image_height)
+		{
+			if (readpixelcount > 0)
 			{
-				// RLE compressed run
-				runlen = 1 + (runlen & 0x7f);
-				if (targa_header.pixel_size == 24)
+				readpixelcount--;
+				red = green = blue = alpha = 255;
+				if (fin < enddata)
 				{
-					if (fin + 3 > enddata)
+					switch(targa_header.image_type)
+					{
+					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;
-					blue = *fin++;
-					green = *fin++;
-					red = *fin++;
-					alpha = 255;
-				}
-				else
-				{
-					if (fin + 4 > enddata)
+					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;
-					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++ = alpha;
-					}
-					if (x == image_width)
-					{
-						// end of line, advance to next
-						x = 0;
-						y++;
-						pixbuf += row_inc;
 					}
+					if (!alphabits)
+						alpha = 255;
 				}
 			}
-			else
+			*pixbuf++ = red;
+			*pixbuf++ = green;
+			*pixbuf++ = blue;
+			*pixbuf++ = alpha;
+			x++;
+			if (x == image_width)
 			{
-				// RLE uncompressed run
-				runlen = 1 + (runlen & 0x7f);
-				while (runlen && y < image_height)
-				{
-					run = runlen;
-					if (run > image_width - x)
-						run = image_width - x;
-					x += run;
-					runlen -= run;
-					if (targa_header.pixel_size == 24)
-					{
-						if (fin + run * 3 > enddata)
-							break;
-						while(run--)
-						{
-							*pixbuf++ = fin[2];
-							*pixbuf++ = fin[1];
-							*pixbuf++ = fin[0];
-							*pixbuf++ = 255;
-							fin += 3;
-						}
-					}
-					else
-					{
-						if (fin + run * 4 > enddata)
-							break;
-						while(run--)
-						{
-							*pixbuf++ = fin[2];
-							*pixbuf++ = fin[1];
-							*pixbuf++ = fin[0];
-							*pixbuf++ = fin[3];
-							fin += 4;
-						}
-					}
-					if (x == image_width)
-					{
-						// end of line, advance to next
-						x = 0;
-						y++;
-						pixbuf += row_inc;
-					}
-				}
+				// end of line, advance to next
+				x = 0;
+				y++;
+				pixbuf += row_inc;
 			}
 		}
 	}
+
 	return image_rgba;
 }
 
@@ -424,93 +547,101 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 LoadLMP
 ============
 */
-qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight)
+qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit)
 {
-	qbyte *image_rgba;
-	int width, height;
+	qbyte *image_buffer;
 
-	if (loadsize < 9)
+	if (fs_filesize < 9)
 	{
-		Con_Printf("LoadLMP: invalid LMP file\n");
+		Con_Print("LoadLMP: invalid LMP file\n");
 		return NULL;
 	}
 
 	// 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)
+	image_width = BuffLittleLong(f);
+	image_height = BuffLittleLong(f + 4);
+	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
 	{
-		Con_Printf("LoadLMP: invalid size\n");
+		Con_Printf("LoadLMP: invalid size %ix%i\n", image_width, image_height);
 		return NULL;
 	}
-	if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight))
+	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 
-	if (loadsize < 8 + width * height)
+	if (fs_filesize < (fs_offset_t)(8 + image_width * image_height))
 	{
-		Con_Printf("LoadLMP: invalid LMP file\n");
+		Con_Print("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)
+	if (loadAs8Bit)
 	{
-		Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height);
-		return NULL;
+		image_buffer = Mem_Alloc(tempmempool, image_width * image_height);
+		memcpy(image_buffer, f + 8, image_width * image_height);
 	}
-	Image_Copy8bitRGBA(f + 8, image_rgba, image_width * image_height, palette_complete);
-	return image_rgba;
+	else
+	{
+		image_buffer = Mem_Alloc(tempmempool, image_width * image_height * 4);
+		Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete);
+	}
+	return image_buffer;
 }
 
-/*
-============
-LoadLMP
-============
-*/
-qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight)
+static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight)
+{
+	return LoadLMP(f, matchwidth, matchheight, false);
+}
+
+
+typedef struct
 {
-	qbyte *image_8bit;
-	int width, height;
+	char		name[32];
+	unsigned	width, height;
+	unsigned	offsets[MIPLEVELS];		// four mip maps stored
+	char		animname[32];			// next frame in animation chain
+	int			flags;
+	int			contents;
+	int			value;
+} q2wal_t;
+
+qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight)
+{
+	qbyte *image_rgba;
+	const q2wal_t *inwal = (const void *)f;
 
-	if (loadsize < 9)
+	if (fs_filesize < (int) sizeof(q2wal_t))
 	{
-		Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
-	// 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)
+	image_width = LittleLong(inwal->width);
+	image_height = LittleLong(inwal->height);
+	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
 	{
-		Con_Printf("LoadLMPAs8Bit: invalid size\n");
+		Con_Printf("LoadWAL: invalid size %ix%i\n", image_width, image_height);
 		return NULL;
 	}
-	if ((matchwidth && width != matchwidth) || (matchheight && height != matchheight))
+	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 
-	if (loadsize < 8 + width * height)
+	if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
 	{
-		Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
-	image_width = width;
-	image_height = height;
-
-	image_8bit = Mem_Alloc(tempmempool, image_width * image_height);
-	if (!image_8bit)
+	image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+	if (!image_rgba)
 	{
-		Con_Printf("LoadLMPAs8Bit: not enough memory for %i by %i image\n", image_width, image_height);
+		Con_Printf("LoadLMP: 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;
+	Image_Copy8bitRGBA(f + LittleLong(inwal->offsets[0]), image_rgba, image_width * image_height, palette_complete);
+	return image_rgba;
 }
 
+
 void Image_StripImageExtension (const char *in, char *out)
 {
 	const char *end, *temp;
@@ -518,7 +649,11 @@ void Image_StripImageExtension (const char *in, char *out)
 	if ((end - in) >= 4)
 	{
 		temp = end - 4;
-		if (strcmp(temp, ".tga") == 0 || strcmp(temp, ".pcx") == 0 || strcmp(temp, ".lmp") == 0)
+		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++;
@@ -528,57 +663,69 @@ void Image_StripImageExtension (const char *in, char *out)
 		strcpy(out, in);
 }
 
+struct
+{
+	const char *formatstring;
+	qbyte *(*loadfunc)(const qbyte *f, int matchwidth, int matchheight);
+}
+imageformats[] =
+{
+	{"override/%s.tga", LoadTGA},
+	{"override/%s.jpg", JPEG_LoadImage},
+	{"textures/%s.tga", LoadTGA},
+	{"textures/%s.jpg", JPEG_LoadImage},
+	{"textures/%s.pcx", LoadPCX},
+	{"textures/%s.wal", LoadWAL},
+	{"%s.tga", LoadTGA},
+	{"%s.jpg", JPEG_LoadImage},
+	{"%s.pcx", LoadPCX},
+	{"%s.lmp", LoadLMPRGBA},
+	{NULL, NULL}
+};
+
 qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-	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
+	int i;
+	qbyte *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
 	// 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_LoadFile(name, true);
-	if (f)
-	{
-		data = LoadTGA (f, matchwidth, matchheight);
-		Mem_Free(f);
-		return data;
-	}
-	sprintf (name, "textures/%s.pcx", basename);
-	f = COM_LoadFile(name, true);
-	if (f)
+	for (i = 0;imageformats[i].formatstring;i++)
 	{
-		data = LoadPCX (f, matchwidth, matchheight);
-		Mem_Free(f);
-		return data;
-	}
-	sprintf (name, "%s.tga", basename);
-	f = COM_LoadFile(name, true);
-	if (f)
-	{
-		data = LoadTGA (f, matchwidth, matchheight);
-		Mem_Free(f);
-		return data;
-	}
-	sprintf (name, "%s.pcx", basename);
-	f = COM_LoadFile(name, true);
-	if (f)
-	{
-		data = LoadPCX (f, matchwidth, matchheight);
-		Mem_Free(f);
-		return data;
+		sprintf (name, imageformats[i].formatstring, basename);
+		f = FS_LoadFile(name, tempmempool, true);
+		if (f)
+		{
+			data = imageformats[i].loadfunc(f, matchwidth, matchheight);
+			Mem_Free(f);
+			if (data)
+			{
+				Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+				if (developer_memorydebug.integer)
+					Mem_CheckSentinelsGlobal();
+				return data;
+			}
+		}
 	}
-	sprintf (name, "%s.lmp", basename);
-	f = COM_LoadFile(name, true);
-	if (f)
+	if (complain)
 	{
-		data = LoadLMP (f, matchwidth, matchheight);
-		Mem_Free(f);
-		return data;
+		Con_Printf("Couldn't load %s using ", filename);
+		for (i = 0;imageformats[i].formatstring;i++)
+		{
+			sprintf (name, imageformats[i].formatstring, basename);
+			Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
+		}
 	}
-	if (complain)
-		Con_Printf ("Couldn't load %s.tga, .pcx, .lmp\n", filename);
+	if (developer_memorydebug.integer)
+		Mem_CheckSentinelsGlobal();
 	return NULL;
 }
 
@@ -680,14 +827,28 @@ rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *f
 	return rt;
 }
 
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data)
+rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
+{
+	qbyte *data, *data2;
+	rtexture_t *rt;
+	if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
+		return 0;
+	data2 = 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 qbyte *data, qbyte *buffer)
 {
 	qboolean ret;
-	qbyte *buffer, *out;
+	qbyte *out;
 	const qbyte *in, *end;
 
-	buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
-
 	memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
 	buffer[12] = (width >> 0) & 0xFF;
@@ -706,9 +867,8 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig
 		*out++ = in[1];
 		*out++ = in[0];
 	}
-	ret = COM_WriteFile (filename, buffer, width*height*3 + 18 );
+	ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
 
-	Mem_Free(buffer);
 	return ret;
 }
 
@@ -741,7 +901,7 @@ void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte
 			*out++ = in[0];
 		}
 	}
-	COM_WriteFile (filename, buffer, width*height*3 + 18 );
+	FS_WriteFile (filename, buffer, width*height*3 + 18 );
 
 	Mem_Free(buffer);
 }
@@ -761,6 +921,7 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt
 	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;
@@ -776,7 +937,7 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt
 			*out++ = in[3];
 		}
 	}
-	COM_WriteFile (filename, buffer, width*height*4 + 18 );
+	FS_WriteFile (filename, buffer, width*height*4 + 18 );
 
 	Mem_Free(buffer);
 }
@@ -861,20 +1022,20 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth,
 	}
 }
 
-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;
+	qbyte *resamplerow1;
+	qbyte *resamplerow2;
 	out = outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
+	resamplerow1 = Mem_Alloc(tempmempool, outwidth*4*2);
+	resamplerow2 = resamplerow1 + outwidth*4;
+
 	inrow = indata;
 	oldy = 0;
 	Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
@@ -960,9 +1121,13 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 			memcpy(out, resamplerow1, outwidth4);
 		}
 	}
+
+	Mem_Free(resamplerow1);
+	resamplerow1 = NULL;
+	resamplerow2 = NULL;
 }
 
-void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j;
 	unsigned frac, fracstep;
@@ -1004,9 +1169,14 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 	int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
 	qbyte *out;
 	const qbyte *inrow;
+	qbyte *resamplerow1;
+	qbyte *resamplerow2;
 	out = outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
+	resamplerow1 = Mem_Alloc(tempmempool, outwidth*3*2);
+	resamplerow2 = resamplerow1 + outwidth*3;
+
 	inrow = indata;
 	oldy = 0;
 	Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
@@ -1085,6 +1255,9 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 			memcpy(out, resamplerow1, outwidth3);
 		}
 	}
+	Mem_Free(resamplerow1);
+	resamplerow1 = NULL;
+	resamplerow2 = NULL;
 }
 
 void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
@@ -1130,23 +1303,16 @@ 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;
+		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		return;
 	}
 	if (bytesperpixel == 4)
 	{
 		if (quality)
 			Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 		else
-			Image_Resample32Nearest(indata, inwidth, inheight, outdata, outwidth, outheight);
+			Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 	}
 	else if (bytesperpixel == 3)
 	{
@@ -1156,7 +1322,7 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 			Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 	}
 	else
-		Sys_Error("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
+		Con_Printf ("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
 }
 
 // in can be the same as out
@@ -1164,7 +1330,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 {
 	int x, y, nextrow;
 	if (*depth != 1 || destdepth != 1)
-		Sys_Error("Image_Resample: 3D resampling not supported\n");
+	{
+		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		return;
+	}
 	nextrow = *width * bytesperpixel;
 	if (*width > destwidth)
 	{
@@ -1205,7 +1374,7 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
 		{
@@ -1240,7 +1409,7 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 	}
 	else
@@ -1281,14 +1450,13 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
-			Sys_Error("Image_MipReduce: desired size already achieved\n");
+			Con_Printf ("Image_MipReduce: desired size already achieved\n");
 	}
 }
 
-extern cvar_t r_shadow_bumpscale;
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
 {
 	int x, y;
@@ -1297,7 +1465,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 	float iwidth, iheight, ibumpscale, n[3];
 	iwidth = 1.0f / width;
 	iheight = 1.0f / height;
-	ibumpscale = (255.0f * 3.0f) / (bumpscale * r_shadow_bumpscale.value);
+	ibumpscale = (255.0f * 3.0f) / bumpscale;
 	out = outpixels;
 	for (y = 0;y < height;y++)
 	{
@@ -1325,7 +1493,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 			/*
 			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[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);
@@ -1334,14 +1502,136 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 			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[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]));
 			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[3] = (p0[0] + p0[1] + p0[2]) / 3;
 			out += 4;
 		}
 	}
 }
+
+int image_loadskin(imageskin_t *s, char *shadername)
+{
+	int j;
+	qbyte *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 = 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 = 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 = 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));
+}
+