X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=palette.c;h=e397f1559a70a61879a0742814c253cce1b5d3a2;hb=19f4a480fcbe200d55f810915e0629e40e892ad6;hp=89193b8786eb3e80c9565d89c6c69eedcfb5737b;hpb=e2f3aafe7b60f54c50f29d0358132034cfb21e07;p=xonotic%2Fdarkplaces.git

diff --git a/palette.c b/palette.c
index 89193b87..e397f155 100644
--- a/palette.c
+++ b/palette.c
@@ -20,11 +20,12 @@ unsigned int palette_bgra_pantsaswhite[256];
 unsigned int palette_bgra_shirtaswhite[256];
 unsigned int palette_bgra_transparent[256];
 unsigned int palette_bgra_embeddedpic[256];
+unsigned char palette_featureflags[256];
 
 // John Carmack said the quake palette.lmp can be considered public domain because it is not an important asset to id, so I include it here as a fallback if no external palette file is found.
 unsigned char host_quakepal[768] =
 {
-// marked: colormap colors: cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
+// marked: colormap colors: cb = (colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
 // 0x0*
 	0,0,0,        15,15,15,     31,31,31,     47,47,47,     63,63,63,     75,75,75,     91,91,91,     107,107,107,
 	123,123,123,  139,139,139,  155,155,155,  171,171,171,  187,187,187,  203,203,203,  219,219,219,  235,235,235,
@@ -85,6 +86,12 @@ void Palette_SetupSpecialPalettes(void)
 	int transparentcolor;
 	unsigned char *colormap;
 	fs_offset_t filesize;
+	union
+	{
+		int i;
+		unsigned char b[4];
+	}
+	u;
 
 	colormap = FS_LoadFile("gfx/colormap.lmp", tempmempool, true, &filesize);
 	if (colormap && filesize >= 16385)
@@ -102,6 +109,19 @@ void Palette_SetupSpecialPalettes(void)
 	reversed_end = 224;
 	transparentcolor = 255;
 
+	for (i = 0;i < 256;i++)
+		palette_featureflags[i] = PALETTEFEATURE_STANDARD;
+	for (i = reversed_start;i < reversed_end;i++)
+		palette_featureflags[i] = PALETTEFEATURE_REVERSED;
+	for (i = pants_start;i < pants_end;i++)
+		palette_featureflags[i] = PALETTEFEATURE_PANTS;
+	for (i = shirt_start;i < shirt_end;i++)
+		palette_featureflags[i] = PALETTEFEATURE_SHIRT;
+	for (i = fullbright_start;i < fullbright_end;i++)
+		palette_featureflags[i] = PALETTEFEATURE_GLOW;
+	palette_featureflags[0] = PALETTEFEATURE_ZERO;
+	palette_featureflags[transparentcolor] = PALETTEFEATURE_TRANSPARENT;
+
 	for (i = 0;i < 256;i++)
 		palette_bgra_transparent[i] = palette_bgra_complete[i];
 	palette_bgra_transparent[transparentcolor] = 0;
@@ -154,37 +174,49 @@ void Palette_SetupSpecialPalettes(void)
 
 	for (i = 0;i < 256;i++)
 		palette_bgra_alpha[i] = 0xFFFFFFFF;
-	palette_bgra_alpha[transparentcolor] = 0;
+	u.i = 0xFFFFFFFF;
+	u.b[3] = 0;
+	palette_bgra_alpha[transparentcolor] = u.i;
 
 	for (i = 0;i < 256;i++)
 		palette_bgra_font[i] = palette_bgra_complete[i];
 	palette_bgra_font[0] = 0;
 }
 
-void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out, int rampsize)
+void BuildGammaTable8(float prescale, float gamma, float scale, float base, float contrastboost, unsigned char *out, int rampsize)
 {
 	int i, adjusted;
 	double invgamma;
+	double t, d;
 
 	invgamma = 1.0 / gamma;
 	prescale /= (double) (rampsize - 1);
 	for (i = 0;i < rampsize;i++)
 	{
-		adjusted = (int) (255.0 * (pow((double) i * prescale, invgamma) * scale + base) + 0.5);
+		t = i * prescale;
+		d = ((contrastboost - 1) * t + 1);
+		if(d == 0)
+			t = 0; // we could just as well assume 1 here, depending on which side of the division by zero we want to be
+		else
+			t = contrastboost * t / d;
+		adjusted = (int) (255.0 * (pow(t, invgamma) * scale + base) + 0.5);
 		out[i] = bound(0, adjusted, 255);
 	}
 }
 
-void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out, int rampsize)
+void BuildGammaTable16(float prescale, float gamma, float scale, float base, float contrastboost, unsigned short *out, int rampsize)
 {
 	int i, adjusted;
 	double invgamma;
+	double t;
 
 	invgamma = 1.0 / gamma;
 	prescale /= (double) (rampsize - 1);
 	for (i = 0;i < rampsize;i++)
 	{
-		adjusted = (int) (65535.0 * (pow((double) i * prescale, invgamma) * scale + base) + 0.5);
+		t = i * prescale;
+		t = contrastboost * t / ((contrastboost - 1) * t + 1);
+		adjusted = (int) (65535.0 * (pow(t, invgamma) * scale + base) + 0.5);
 		out[i] = bound(0, adjusted, 65535);
 	}
 }
@@ -231,7 +263,7 @@ void Palette_Load(void)
 	scale = bound(0.01, scale, 10.0);
 	base = bound(0, base, 0.95);
 
-	BuildGammaTable8(1.0f, gamma, scale, base, texturegammaramp, 256);
+	BuildGammaTable8(1.0f, gamma, scale, base, 1, texturegammaramp, 256);
 
 	palfile = (unsigned char *)FS_LoadFile ("gfx/palette.lmp", tempmempool, false, &filesize);
 	if (palfile && filesize >= 768)