X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.c;h=3ecbea398671fe3ecb5310f5cae3f1183e5fdf1b;hb=511c0afa8e95fb7dca7017db29b91ff37b72f4be;hp=27fc794148762ed70fa2e4beeac839f3c76c0833;hpb=6abc2eef23f8062c5cbd880a681eb611b0b858a7;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 27fc7941..3ecbea39 100644
--- a/image.c
+++ b/image.c
@@ -7,6 +7,100 @@
 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--)
@@ -95,7 +189,7 @@ qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < (int)sizeof(pcx) + 768)
 	{
-		Con_Printf ("Bad pcx file\n");
+		Con_Print("Bad pcx file\n");
 		return NULL;
 	}
 
@@ -118,7 +212,7 @@ qbyte* LoadPCX (qbyte *f, int matchwidth, int matchheight)
 	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 && image_width != matchwidth) || (matchheight && image_height != matchheight))
@@ -195,7 +289,7 @@ TargaHeader;
 
 void PrintTargaHeader(TargaHeader *t)
 {
-	Con_Printf("TargaHeader:\n");
+	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);
@@ -241,7 +335,7 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
 	targa_header.height = image_height = f[14] + f[15] * 256;
 	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
 	{
-		Con_Printf("LoadTGA: invalid size\n");
+		Con_Print("LoadTGA: invalid size\n");
 		PrintTargaHeader(&targa_header);
 		return NULL;
 	}
@@ -257,7 +351,7 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
 	{
 		if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
 		{
-			Con_Printf ("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
+			Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
@@ -266,19 +360,19 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
 	{
 		if (targa_header.pixel_size != 8)
 		{
-			Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+			Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
 		if (targa_header.colormap_length > 256)
 		{
-			Con_Printf ("LoadTGA: only up to 256 colormap_length supported\n");
+			Con_Print("LoadTGA: only up to 256 colormap_length supported\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
 		if (targa_header.colormap_index)
 		{
-			Con_Printf ("LoadTGA: colormap_index not supported\n");
+			Con_Print("LoadTGA: colormap_index not supported\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
@@ -304,7 +398,7 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
 		}
 		else
 		{
-			Con_Printf ("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
+			Con_Print("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
@@ -313,28 +407,28 @@ qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight)
 	{
 		if (targa_header.pixel_size != 8)
 		{
-			Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+			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);
+		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;
 	}
 
 	if (targa_header.attributes & 0x10)
 	{
-		Con_Printf ("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
+		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;
 	}
 
@@ -438,7 +532,7 @@ qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < 9)
 	{
-		Con_Printf("LoadLMP: invalid LMP file\n");
+		Con_Print("LoadLMP: invalid LMP file\n");
 		return NULL;
 	}
 
@@ -455,7 +549,7 @@ qbyte *LoadLMP (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < 8 + image_width * image_height)
 	{
-		Con_Printf("LoadLMP: invalid LMP file\n");
+		Con_Print("LoadLMP: invalid LMP file\n");
 		return NULL;
 	}
 
@@ -487,7 +581,7 @@ qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < (int) sizeof(q2wal_t))
 	{
-		Con_Printf("LoadWAL: invalid WAL file\n");
+		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
@@ -503,7 +597,7 @@ qbyte *LoadWAL (qbyte *f, int matchwidth, int matchheight)
 
 	if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
 	{
-		Con_Printf("LoadWAL: invalid WAL file\n");
+		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
@@ -530,7 +624,7 @@ qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < 9)
 	{
-		Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+		Con_Print("LoadLMPAs8Bit: invalid LMP file\n");
 		return NULL;
 	}
 
@@ -547,7 +641,7 @@ qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight)
 
 	if (fs_filesize < 8 + image_width * image_height)
 	{
-		Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+		Con_Print("LoadLMPAs8Bit: invalid LMP file\n");
 		return NULL;
 	}
 
@@ -617,22 +711,27 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth,
 	for (i = 0;imageformats[i].formatstring;i++)
 	{
 		sprintf (name, imageformats[i].formatstring, basename);
-		if ((f = FS_LoadFile(name, true)) && (data = imageformats[i].loadfunc(f, matchwidth, matchheight)))
+		f = FS_LoadFile(name, tempmempool, true);
+		if (f)
 		{
+			data = imageformats[i].loadfunc(f, matchwidth, matchheight);
 			Mem_Free(f);
-			Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
-			if (developer_memorydebug.integer)
-				Mem_CheckSentinelsGlobal();
-			return data;
+			if (data)
+			{
+				Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+				if (developer_memorydebug.integer)
+					Mem_CheckSentinelsGlobal();
+				return data;
+			}
 		}
 	}
 	if (complain)
 	{
-		Con_Printf ("Couldn't load %s using ", filename);
+		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);
+			Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
 		}
 	}
 	if (developer_memorydebug.integer)
@@ -754,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;
@@ -782,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;
 }
 
@@ -1211,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;
 	}
@@ -1406,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);
 			/*