X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=palette.c;h=f9d68bf5eeac36becb16ade92747602aff0e8e81;hp=86ffa5a4a20f0e0a57fbfb2713f8db70be8eb5e9;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=f8dbfa56370f06123ab6d61e1bf70a868e110339

diff --git a/palette.c b/palette.c
index 86ffa5a4..f9d68bf5 100644
--- a/palette.c
+++ b/palette.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "image.h"
 
 cvar_t r_colormap_palette = {0, "r_colormap_palette", "gfx/colormap_palette.lmp", "name of a palette lmp file to override the shirt/pants colors of player models. It consists of 16 shirt colors, 16 scoreboard shirt colors, 16 pants colors and 16 scoreboard pants colors"};
 
@@ -15,11 +16,16 @@ unsigned int palette_bgra_alpha[256];
 unsigned int palette_bgra_nocolormap[256];
 unsigned int palette_bgra_nocolormapnofullbrights[256];
 unsigned int palette_bgra_nofullbrights[256];
+unsigned int palette_bgra_nofullbrights_transparent[256];
 unsigned int palette_bgra_onlyfullbrights[256];
+unsigned int palette_bgra_onlyfullbrights_transparent[256];
 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];
+
+unsigned int q2palette_bgra_complete[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] =
@@ -75,7 +81,7 @@ unsigned char host_quakepal[768] =
 	139,0,0,      179,0,0,      215,0,0,      255,0,0,      255,243,147,  255,247,199,  255,255,255,  159,91,83
 }; //                                                    15 ^
 
-void Palette_SetupSpecialPalettes(void)
+static void Palette_SetupSpecialPalettes(void)
 {
 	int i;
 	int fullbright_start, fullbright_end;
@@ -108,6 +114,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;
@@ -116,11 +135,17 @@ void Palette_SetupSpecialPalettes(void)
 		palette_bgra_nofullbrights[i] = palette_bgra_complete[i];
 	for (i = fullbright_start;i < fullbright_end;i++)
 		palette_bgra_nofullbrights[i] = palette_bgra_complete[0];
+	for (i = 0;i < 256;i++)
+		palette_bgra_nofullbrights_transparent[i] = palette_bgra_nofullbrights[i];
+	palette_bgra_nofullbrights_transparent[transparentcolor] = 0;
 
 	for (i = 0;i < 256;i++)
 		palette_bgra_onlyfullbrights[i] = 0;
 	for (i = fullbright_start;i < fullbright_end;i++)
 		palette_bgra_onlyfullbrights[i] = palette_bgra_complete[i];
+	for (i = 0;i < 256;i++)
+		palette_bgra_onlyfullbrights_transparent[i] = palette_bgra_onlyfullbrights[i];
+	palette_bgra_onlyfullbrights_transparent[transparentcolor] = 0;
 
 	for (i = 0;i < 256;i++)
 		palette_bgra_nocolormapnofullbrights[i] = palette_bgra_complete[i];
@@ -169,18 +194,44 @@ void Palette_SetupSpecialPalettes(void)
 	palette_bgra_font[0] = 0;
 }
 
+static void Palette_LoadQ2Colormap(void)
+{
+	fs_offset_t filesize;
+	unsigned char * q2colormapfile = FS_LoadFile("pics/colormap.pcx", tempmempool, true, &filesize);
+	if (q2colormapfile && filesize >= 768)
+	{
+		unsigned char q2palette_rgb[256][3];
+		unsigned char *out = (unsigned char *) q2palette_bgra_complete; // palette is accessed as 32bit for speed reasons, but is created as 8bit bytes
+		int i;
+		LoadPCX_PaletteOnly(q2colormapfile, filesize, q2palette_rgb[0]);
+		// this stops at color 255 because it is a pink transparent color that we don't actually want to preserve color on.
+		for (i = 0;i < 255;i++)
+		{
+			out[i*4+2] = q2palette_rgb[i][0];
+			out[i*4+1] = q2palette_rgb[i][1];
+			out[i*4+0] = q2palette_rgb[i][2];
+			out[i*4+3] = 255;
+		}
+		Mem_Free(q2colormapfile);
+	}
+}
+
 void BuildGammaTable8(float prescale, float gamma, float scale, float base, float contrastboost, unsigned char *out, int rampsize)
 {
 	int i, adjusted;
 	double invgamma;
-	double t;
+	double t, d;
 
 	invgamma = 1.0 / gamma;
 	prescale /= (double) (rampsize - 1);
 	for (i = 0;i < rampsize;i++)
 	{
 		t = i * prescale;
-		t = contrastboost * t / ((contrastboost - 1) * t + 1);
+		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);
 	}
@@ -203,15 +254,15 @@ void BuildGammaTable16(float prescale, float gamma, float scale, float base, flo
 	}
 }
 
-void Palette_Shutdown(void)
+static void Palette_Shutdown(void)
 {
 }
 
-void Palette_NewMap(void)
+static void Palette_NewMap(void)
 {
 }
 
-void Palette_Load(void)
+static void Palette_Load(void)
 {
 	int i;
 	unsigned char *out;
@@ -308,11 +359,13 @@ void Palette_Load(void)
 	}
 
 	Palette_SetupSpecialPalettes();
+
+	Palette_LoadQ2Colormap();
 }
 
 void Palette_Init(void)
 {
-	R_RegisterModule("Palette", Palette_Load, Palette_Shutdown, Palette_NewMap);
+	R_RegisterModule("Palette", Palette_Load, Palette_Shutdown, Palette_NewMap, NULL, NULL);
 	Cvar_RegisterVariable(&r_colormap_palette);
 	Palette_Load();
 }