X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=palette.c;h=f76ec54010850a87e4147e8166521eabe80bc682;hb=bb4ed8a33e0e281d86c35260fd43ab108a5b68f7;hp=82da3de2b26f57eb30bf24f93ca8e6e3e6b71f37;hpb=24a125e70e38a140f8060938722bd47612aa2e9b;p=xonotic%2Fdarkplaces.git

diff --git a/palette.c b/palette.c
index 82da3de2..f76ec540 100644
--- a/palette.c
+++ b/palette.c
@@ -1,65 +1,114 @@
 
 #include "quakedef.h"
 
-unsigned int d_8to24table[256];
-//qbyte d_15to8table[32768];
-qbyte host_basepal[768];
+unsigned int palette_complete[256];
+unsigned int palette_nofullbrights[256];
+unsigned int palette_onlyfullbrights[256];
+unsigned int palette_nocolormapnofullbrights[256];
+unsigned int palette_nocolormap[256];
+unsigned int palette_pantsaswhite[256];
+unsigned int palette_shirtaswhite[256];
+unsigned int palette_alpha[256];
+unsigned int palette_font[256];
 
-cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1"};
-cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1"};
-cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0"};
-cvar_t v_overbrightbits = {CVAR_SAVE, "v_overbrightbits", "0"};
-cvar_t v_hwgamma = {0, "v_hwgamma", "1"};
+qbyte host_basepal[768];
 
 void Palette_Setup8to24(void)
 {
 	int i;
+	int fullbright_start, fullbright_end;
+	int pants_start, pants_end;
+	int shirt_start, shirt_end;
+	int reversed_start, reversed_end;
 	qbyte *in, *out;
+	qbyte *colormap;
 
 	in = host_basepal;
-	out = (qbyte *) d_8to24table; // d_8to24table is accessed as 32bit for speed reasons, but is created as 8bit bytes
-	for (i=0 ; i<255 ; i++)
+	out = (qbyte *) palette_complete; // palette is accessed as 32bit for speed reasons, but is created as 8bit bytes
+	for (i = 0;i < 255;i++)
 	{
 		*out++ = *in++;
 		*out++ = *in++;
 		*out++ = *in++;
 		*out++ = 255;
 	}
-	d_8to24table[255] = 0; // completely transparent black
-}
+	palette_complete[255] = 0; // completely transparent black
 
-/*
-void	Palette_Setup15to8(void)
-{
-	qbyte	*pal;
-	unsigned r,g,b;
-	unsigned v;
-	int     r1,g1,b1;
-	int		j,k,l;
-	unsigned short i;
-
-	for (i = 0;i < 32768;i++)
+	// FIXME: fullbright_start should be read from colormap.lmp
+	colormap = FS_LoadFile("gfx/colormap.lmp", true);
+	if (colormap && fs_filesize >= 16385)
+		fullbright_start = 256 - colormap[16384];
+	else
+		fullbright_start = 256;
+	if (colormap)
+		Mem_Free(colormap);
+	fullbright_end = 256;
+	pants_start = 96;
+	pants_end = 112;
+	shirt_start = 16;
+	shirt_end = 32;
+	reversed_start = 128;
+	reversed_end = 224;
+
+	for (i = 0;i < fullbright_start;i++)
+		palette_nofullbrights[i] = palette_complete[i];
+	for (i = fullbright_start;i < 255;i++)
+		palette_nofullbrights[i] = palette_complete[0];
+	palette_nofullbrights[255] = 0;
+
+	for (i = 0;i < 256;i++)
+		palette_onlyfullbrights[i] = palette_complete[0];
+	for (i = fullbright_start;i < fullbright_end;i++)
+		palette_onlyfullbrights[i] = palette_complete[i];
+	palette_onlyfullbrights[255] = 0;
+
+	for (i = 0;i < 256;i++)
+		palette_nocolormapnofullbrights[i] = palette_complete[i];
+	for (i = pants_start;i < pants_end;i++)
+		palette_nocolormapnofullbrights[i] = palette_complete[0];
+	for (i = shirt_start;i < shirt_end;i++)
+		palette_nocolormapnofullbrights[i] = palette_complete[0];
+	for (i = fullbright_start;i < fullbright_end;i++)
+		palette_nocolormapnofullbrights[i] = palette_complete[0];
+	palette_nocolormapnofullbrights[255] = 0;
+
+	for (i = 0;i < 256;i++)
+		palette_nocolormap[i] = palette_complete[i];
+	for (i = pants_start;i < pants_end;i++)
+		palette_nocolormap[i] = palette_complete[0];
+	for (i = shirt_start;i < shirt_end;i++)
+		palette_nocolormap[i] = palette_complete[0];
+	palette_nocolormap[255] = 0;
+
+	for (i = 0;i < 256;i++)
+		palette_pantsaswhite[i] = palette_complete[0];
+	for (i = pants_start;i < pants_end;i++)
 	{
-		r = ((i & 0x001F) << 3)+4;
-		g = ((i & 0x03E0) >> 2)+4;
-		b = ((i & 0x7C00) >> 7)+4;
-		pal = (unsigned char *)d_8to24table;
-		for (v = 0, k = 0, l = 1000000000;v < 256;v++, pal += 4)
-		{
-			r1 = r - pal[0];
-			g1 = g - pal[1];
-			b1 = b - pal[2];
-			j = r1*r1+g1*g1+b1*b1;
-			if (j < l)
-			{
-				k = v;
-				l = j;
-			}
-		}
-		d_15to8table[i] = k;
+		if (i >= reversed_start && i < reversed_end)
+			palette_pantsaswhite[i] = palette_complete[15 - (i - pants_start)];
+		else
+			palette_pantsaswhite[i] = palette_complete[i - pants_start];
 	}
+
+	for (i = 0;i < 256;i++)
+		palette_shirtaswhite[i] = palette_complete[0];
+	for (i = shirt_start;i < shirt_end;i++)
+	{
+		if (i >= reversed_start && i < reversed_end)
+			palette_shirtaswhite[i] = palette_complete[15 - (i - shirt_start)];
+		else
+			palette_shirtaswhite[i] = palette_complete[i - shirt_start];
+	}
+
+	for (i = 0;i < 255;i++)
+		palette_alpha[i] = 0xFFFFFFFF;
+	palette_alpha[255] = 0;
+
+	palette_font[0] = 0;
+	for (i = 1;i < 255;i++)
+		palette_font[i] = palette_complete[i];
+	palette_font[255] = 0;
 }
-*/
 
 void BuildGammaTable8(float prescale, float gamma, float scale, float base, qbyte *out)
 {
@@ -115,69 +164,13 @@ void BuildGammaTable16(float prescale, float gamma, float scale, float base, uns
 	}
 }
 
-qboolean hardwaregammasupported = false;
-void VID_UpdateGamma(qboolean force)
-{
-	static float cachegamma = -1, cachebrightness = -1, cachecontrast = -1;
-	static int cacheoverbrightbits = -1, cachehwgamma = -1;
-
-	// LordHavoc: don't mess with gamma tables if running dedicated
-	if (cls.state == ca_dedicated)
-		return;
-
-	if (!force
-	 && v_gamma.value == cachegamma
-	 && v_contrast.value == cachecontrast
-	 && v_brightness.value == cachebrightness
-	 && v_overbrightbits.integer == cacheoverbrightbits
-	 && v_hwgamma.value == cachehwgamma)
-		return;
-
-	if (v_gamma.value < 0.1)
-		Cvar_SetValue("v_gamma", 0.1);
-	if (v_gamma.value > 5.0)
-		Cvar_SetValue("v_gamma", 5.0);
-
-	if (v_contrast.value < 0.5)
-		Cvar_SetValue("v_contrast", 0.5);
-	if (v_contrast.value > 5.0)
-		Cvar_SetValue("v_contrast", 5.0);
-
-	if (v_brightness.value < 0)
-		Cvar_SetValue("v_brightness", 0);
-	if (v_brightness.value > 0.8)
-		Cvar_SetValue("v_brightness", 0.8);
-
-	cachegamma = v_gamma.value;
-	cachecontrast = v_contrast.value;
-	cachebrightness = v_brightness.value;
-	cacheoverbrightbits = v_overbrightbits.integer;
-
-	hardwaregammasupported = VID_SetGamma((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness);
-	if (!hardwaregammasupported)
-	{
-		Con_Printf("Hardware gamma not supported.\n");
-		Cvar_SetValue("v_hwgamma", 0);
-	}
-	cachehwgamma = v_hwgamma.integer;
-}
-
-void Gamma_Init(void)
-{
-	Cvar_RegisterVariable(&v_gamma);
-	Cvar_RegisterVariable(&v_brightness);
-	Cvar_RegisterVariable(&v_contrast);
-	Cvar_RegisterVariable(&v_hwgamma);
-	Cvar_RegisterVariable(&v_overbrightbits);
-}
-
 void Palette_Init(void)
 {
 	int i;
 	float gamma, scale, base;
 	qbyte *pal;
 	qbyte temp[256];
-	pal = (qbyte *)COM_LoadFile ("gfx/palette.lmp", false);
+	pal = (qbyte *)FS_LoadFile ("gfx/palette.lmp", false);
 	if (!pal)
 		Sys_Error ("Couldn't load gfx/palette.lmp");
 	memcpy(host_basepal, pal, 765);
@@ -205,5 +198,5 @@ void Palette_Init(void)
 		host_basepal[i] = temp[host_basepal[i]];
 
 	Palette_Setup8to24();
-//	Palette_Setup15to8();
 }
+