X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=palette.c;h=5b8743423eb53201554ecd4d3e7141a6a560bca9;hp=85cd474f86ed049a837a388e5af7578f2c4ee62c;hb=HEAD;hpb=f907c4fc957c38598251e0dd7ed38e972d9af909 diff --git a/palette.c b/palette.c index 85cd474f..eac0ca34 100644 --- a/palette.c +++ b/palette.c @@ -1,7 +1,8 @@ #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"}; +cvar_t r_colormap_palette = {CF_CLIENT, "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"}; unsigned char palette_rgb[256][3]; unsigned char palette_rgb_pantscolormap[16][3]; @@ -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,43 +194,75 @@ void Palette_SetupSpecialPalettes(void) palette_bgra_font[0] = 0; } -void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out, int rampsize) +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, 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); } } -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; @@ -224,22 +281,22 @@ void Palette_Load(void) scale = 1; base = 0; // COMMANDLINEOPTION: Client: -texgamma sets the quake palette gamma, allowing you to make quake textures brighter/darker, not recommended - i = COM_CheckParm("-texgamma"); + i = Sys_CheckParm("-texgamma"); if (i) - gamma = atof(com_argv[i + 1]); + gamma = atof(sys.argv[i + 1]); // COMMANDLINEOPTION: Client: -texcontrast sets the quake palette contrast, allowing you to make quake textures brighter/darker, not recommended - i = COM_CheckParm("-texcontrast"); + i = Sys_CheckParm("-texcontrast"); if (i) - scale = atof(com_argv[i + 1]); + scale = atof(sys.argv[i + 1]); // COMMANDLINEOPTION: Client: -texbrightness sets the quake palette brightness (brightness of black), allowing you to make quake textures brighter/darker, not recommended - i = COM_CheckParm("-texbrightness"); + i = Sys_CheckParm("-texbrightness"); if (i) - base = atof(com_argv[i + 1]); + base = atof(sys.argv[i + 1]); gamma = bound(0.01, gamma, 10.0); 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) @@ -302,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(); }