X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.c;h=2624544f1f30200b70e436e5127619df6f887d80;hb=59d1e032103c4af43759dc4f1b9eaccab7aed1bd;hp=4527c922f7e58bd15b80b879232e85c94f746132;hpb=43cc4b0b887c9bae4437858fda3a5a398b49010b;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 4527c922..2624544f 100644
--- a/image.c
+++ b/image.c
@@ -712,11 +712,6 @@ unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, in
 	return image_buffer;
 }
 
-static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
-{
-	return LoadLMP(f, filesize, matchwidth, matchheight, false);
-}
-
 
 typedef struct q2wal_s
 {
@@ -767,9 +762,13 @@ unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, in
 }
 
 
-void Image_StripImageExtension (const char *in, char *out)
+static void Image_StripImageExtension (const char *in, char *out, size_t size_out)
 {
 	const char *end, *temp;
+
+	if (size_out == 0)
+		return;
+
 	end = in + strlen(in);
 	if ((end - in) >= 4)
 	{
@@ -780,12 +779,15 @@ void Image_StripImageExtension (const char *in, char *out)
 		 || strcmp(temp, ".png") == 0
 		 || strcmp(temp, ".jpg") == 0)
 			end = temp;
-		while (in < end)
+		while (in < end && size_out > 1)
+		{
 			*out++ = *in++;
+			size_out--;
+		}
 		*out++ = 0;
 	}
 	else
-		strcpy(out, in);
+		strlcpy(out, in, size_out);
 }
 
 typedef struct imageformat_s
@@ -801,17 +803,22 @@ imageformat_t imageformats_tenebrae[] =
 	{"override/%s.tga", LoadTGA},
 	{"override/%s.png", PNG_LoadImage},
 	{"override/%s.jpg", JPEG_LoadImage},
+	{"override/%s.pcx", LoadPCX},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_nopath[] =
 {
+	{"override/%s.tga", LoadTGA},
+	{"override/%s.png", PNG_LoadImage},
+	{"override/%s.jpg", JPEG_LoadImage},
 	{"textures/%s.tga", LoadTGA},
 	{"textures/%s.png", PNG_LoadImage},
 	{"textures/%s.jpg", JPEG_LoadImage},
 	{"%s.tga", LoadTGA},
 	{"%s.png", PNG_LoadImage},
 	{"%s.jpg", JPEG_LoadImage},
+	{"%s.pcx", LoadPCX},
 	{NULL, NULL}
 };
 
@@ -831,7 +838,6 @@ imageformat_t imageformats_gfx[] =
 	{"%s.png", PNG_LoadImage},
 	{"%s.jpg", JPEG_LoadImage},
 	{"%s.pcx", LoadPCX},
-	{"%s.lmp", LoadLMPRGBA},
 	{NULL, NULL}
 };
 
@@ -854,8 +860,7 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 		Mem_CheckSentinelsGlobal();
 	if (developer_texturelogging.integer)
 		Log_Printf("textures.log", "%s\n", filename);
-	strlcpy(basename, filename, sizeof(basename));
-	Image_StripImageExtension(basename, basename); // strip filename extensions to allow replacement by other types
+	Image_StripImageExtension(filename, basename, sizeof(basename)); // strip filename extensions to allow replacement by other types
 	// replace *'s with #, so commandline utils don't get confused when dealing with the external files
 	for (c = basename;*c;c++)
 		if (*c == '*')
@@ -895,6 +900,11 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 					Mem_CheckSentinelsGlobal();
 				return data;
 			}
+			else
+			{
+				if (developer.integer >= 1)
+					Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
+			}
 		}
 	}
 	if (complain)
@@ -1353,12 +1363,22 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 // in can be the same as out
 void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
 {
+	const unsigned char *inrow;
 	int x, y, nextrow;
 	if (*depth != 1 || destdepth != 1)
 	{
 		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		if (*width > destwidth)
+			*width >>= 1;
+		if (*height > destheight)
+			*height >>= 1;
+		if (*depth > destdepth)
+			*depth >>= 1;
 		return;
 	}
+	// note: if given odd width/height this discards the last row/column of
+	// pixels, rather than doing a proper box-filter scale down
+	inrow = in;
 	nextrow = *width * bytesperpixel;
 	if (*width > destwidth)
 	{
@@ -1369,9 +1389,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 			*height >>= 1;
 			if (bytesperpixel == 4)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow * 2)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
 						out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
@@ -1380,14 +1400,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 						out += 4;
 						in += 8;
 					}
-					in += nextrow; // skip a line
 				}
 			}
 			else if (bytesperpixel == 3)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow * 2)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
 						out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
@@ -1395,7 +1414,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 						out += 3;
 						in += 6;
 					}
-					in += nextrow; // skip a line
 				}
 			}
 			else
@@ -1406,9 +1424,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 			// reduce width
 			if (bytesperpixel == 4)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
 						out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
@@ -1421,9 +1439,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 			}
 			else if (bytesperpixel == 3)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
 						out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
@@ -1445,9 +1463,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 			*height >>= 1;
 			if (bytesperpixel == 4)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow * 2)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
 						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1456,14 +1474,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 						out += 4;
 						in += 4;
 					}
-					in += nextrow; // skip a line
 				}
 			}
 			else if (bytesperpixel == 3)
 			{
-				for (y = 0;y < *height;y++)
+				for (y = 0;y < *height;y++, inrow += nextrow * 2)
 				{
-					for (x = 0;x < *width;x++)
+					for (in = inrow, x = 0;x < *width;x++)
 					{
 						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
 						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1471,7 +1488,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 						out += 3;
 						in += 3;
 					}
-					in += nextrow; // skip a line
 				}
 			}
 			else
@@ -1484,64 +1500,42 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
 {
-	int x, y;
-	const unsigned char *p0, *p1, *p2;
+	int x, y, x1, x2, y1, y2;
+	const unsigned char *b, *row[3];
+	int p[5];
 	unsigned char *out;
 	float iwidth, iheight, ibumpscale, n[3];
 	iwidth = 1.0f / width;
 	iheight = 1.0f / height;
-	ibumpscale = (255.0f * 3.0f) / bumpscale;
+	ibumpscale = (255.0f * 6.0f) / bumpscale;
 	out = outpixels;
-	for (y = 0;y < height;y++)
+	for (y = 0, y1 = height-1;y < height;y1 = y, y++)
 	{
-		for (x = 0;x < width;x++)
+		y2 = y + 1;if (y2 >= height) y2 = 0;
+		row[0] = inpixels + (y1 * width) * 4;
+		row[1] = inpixels + (y  * width) * 4;
+		row[2] = inpixels + (y2 * width) * 4;
+		for (x = 0, x1 = width-1;x < width;x1 = x, x++)
 		{
-			p0 = inpixels + (y * width + x) * 4;
-			if (x == width - 1)
-			{
-				if (clamp)
-					p1 = inpixels + (y * width + x) * 4;
-				else
-					p1 = inpixels + (y * width) * 4;
-			}
-			else
-				p1 = inpixels + (y * width + x + 1) * 4;
-			if (y == height - 1)
-			{
-				if (clamp)
-					p2 = inpixels + (y * width + x) * 4;
-				else
-					p2 = inpixels + x * 4;
-			}
-			else
-				p2 = inpixels + ((y + 1) * width + x) * 4;
-			/*
-			dv[0][0] = iwidth;
-			dv[0][1] = 0;
-			dv[0][2] = ((p0[0] + p0[1] + p0[2]) * ibumpscale) - ((p1[0] + p1[1] + p1[2]) * ibumpscale);
-			dv[1][0] = 0;
-			dv[1][1] = iheight;
-			dv[1][2] = ((p2[0] + p2[1] + p2[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale);
-			n[0] = dv[0][1]*dv[1][2]-dv[0][2]*dv[1][1];
-			n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2];
-			n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0];
-			*/
-			n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
-			n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2]));
-			n[2] = ibumpscale;
-			VectorNormalize(n);
-			/*
-			// this should work for the bottom right triangle if anyone wants
-			// code for that for some reason
-			n[0] = ((p3[0] + p3[1] + p3[2]) - (p1[0] + p1[1] + p1[2]));
-			n[1] = ((p2[0] + p2[1] + p2[2]) - (p3[0] + p3[1] + p3[2]));
+			x2 = x + 1;if (x2 >= width) x2 = 0;
+			// left, right
+			b = row[1] + x1 * 4;p[0] = (b[0] + b[1] + b[2]);
+			b = row[1] + x2 * 4;p[1] = (b[0] + b[1] + b[2]);
+			// above, below
+			b = row[0] + x  * 4;p[2] = (b[0] + b[1] + b[2]);
+			b = row[2] + x  * 4;p[3] = (b[0] + b[1] + b[2]);
+			// center
+			b = row[1] + x  * 4;p[4] = (b[0] + b[1] + b[2]);
+			// calculate a normal from the slopes
+			n[0] = p[0] - p[1];
+			n[1] = p[3] - p[2];
 			n[2] = ibumpscale;
 			VectorNormalize(n);
-			*/
+			// turn it into a dot3 rgb vector texture
 			out[0] = (int)(128.0f + n[0] * 127.0f);
 			out[1] = (int)(128.0f + n[1] * 127.0f);
 			out[2] = (int)(128.0f + n[2] * 127.0f);
-			out[3] = (p0[0] + p0[1] + p0[2]) / 3;
+			out[3] = (p[4]) / 3;
 			out += 4;
 		}
 	}
@@ -1553,8 +1547,7 @@ int image_loadskin(imageskin_t *s, const char *shadername)
 	unsigned char *bumppixels;
 	int bumppixels_width, bumppixels_height;
 	char name[MAX_QPATH];
-	strlcpy(name, shadername, sizeof(name));
-	Image_StripImageExtension(name, name);
+	Image_StripImageExtension(shadername, name, sizeof(name));
 	memset(s, 0, sizeof(*s));
 	s->basepixels = loadimagepixels(name, false, 0, 0);
 	if (s->basepixels == NULL)