X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=image.c;h=3ecbea398671fe3ecb5310f5cae3f1183e5fdf1b;hb=67a5b8dba9431970132086fe1d77e5526d71b23e;hp=2d3882c9c0cb44c6a17012779df67140aef5b8ba;hpb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 2d3882c9..3ecbea39 100644
--- a/image.c
+++ b/image.c
@@ -7,43 +7,99 @@
 int		image_width;
 int		image_height;
 
-void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices)
+#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 (flipdiagonal)
+	if (inputflipdiagonal)
 	{
-		for (y = 0;y < height;y++)
+		for (x = 0;x < inputwidth;x++)
 		{
-			incolumn = inpixels + (flipx ? width - 1 - y : y) * numincomponents;
-			for (x = 0;x < width;x++)
+			for (y = 0;y < inputheight;y++)
 			{
-				in = incolumn + (flipy ? height - 1 - x : x) * width * numincomponents;
-				for (c = 0;c < numoutcomponents;c++)
+				in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+				for (c = 0;c < numoutputcomponents;c++)
 				{
-					index = inputcomponentindices[c];
-					*outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+					index = outputinputcomponentindices[c];
+					if (index & 0x80000000)
+						*outpixels++ = index;
+					else
+						*outpixels++ = in[index];
 				}
 			}
 		}
 	}
 	else
 	{
-		for (y = 0;y < height;y++)
+		for (y = 0;y < inputheight;y++)
 		{
-			inrow = inpixels + (flipy ? height - 1 - y : y) * width * numincomponents;
-			for (x = 0;x < width;x++)
+			for (x = 0;x < inputwidth;x++)
 			{
-				in = inrow + (flipx ? width - 1 - x : x) * numincomponents;
-				for (c = 0;c < numoutcomponents;c++)
+				in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+				for (c = 0;c < numoutputcomponents;c++)
 				{
-					index = inputcomponentindices[c];
-					*outpixels++ = (index & 0x80000000) ? (index - 0x8000000) : in[index];
+					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)
 {
@@ -797,14 +853,12 @@ rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filena
 	return rt;
 }
 
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data)
+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;
@@ -825,7 +879,6 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig
 	}
 	ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
 
-	Mem_Free(buffer);
 	return ret;
 }
 
@@ -1254,7 +1307,7 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 			Mem_Free(resamplerow1);
 		resamplerowsize = outwidth*4;
 		if (!resamplemempool)
-			resamplemempool = Mem_AllocPool("Image Scaling Buffer");
+			resamplemempool = Mem_AllocPool("Image Scaling Buffer", 0, NULL);
 		resamplerow1 = Mem_Alloc(resamplemempool, resamplerowsize*2);
 		resamplerow2 = resamplerow1 + resamplerowsize;
 	}
@@ -1449,8 +1502,8 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 			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] = ((p1[0] + p1[1] + p1[2]) - (p0[0] + p0[1] + p0[2]));
-			n[1] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[2]));
+			n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
+			n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2]));
 			n[2] = ibumpscale;
 			VectorNormalize(n);
 			/*