eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index 3e1bd563c4b0666e9cbf9f34ed77f9a6dc8a6969..67bcd0cccbac6a26b3b2ff34e2392f9780b89f18 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -11,10 +11,8 @@ unsigned int palette_shirtaswhite[256];
 unsigned int palette_alpha[256];
 unsigned int palette_font[256];
 
-qbyte host_basepal[768];
-
 // 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.
-qbyte host_quakepal[768] =
+unsigned char host_quakepal[768] =
 {
 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,15,11,7,23,15,11,31,23,11,39,27,15,47,35,19,55,43,23,63,47,23,75,55,27,83,59,27,91,67,31,99,75,31,107,83,31,115,87,31,123,95,35,131,103,35,143,111,35,11,11,15,19,19,27,27,27,39,39,39,51,47,47,63,55,55,75,63,63,87,71,71,103,79,79,115,91,91,127,99,99,
 139,107,107,151,115,115,163,123,123,175,131,131,187,139,139,203,0,0,0,7,7,0,11,11,0,19,19,0,27,27,0,35,35,0,43,43,7,47,47,7,55,55,7,63,63,7,71,71,7,75,75,11,83,83,11,91,91,11,99,99,11,107,107,15,7,0,0,15,0,0,23,0,0,31,0,0,39,0,0,47,0,0,55,0,0,63,0,0,71,0,0,79,0,0,87,0,0,95,0,0,103,0,0,111,0,0,119,0,0,127,0,0,19,19,0,27,27,0,35,35,0,47,43,0,55,47,0,67,
@@ -24,28 +22,15 @@ qbyte host_quakepal[768] =
 43,175,47,47,159,47,47,143,47,47,127,47,47,111,47,47,95,43,43,79,35,35,63,27,27,47,19,19,31,11,11,15,43,0,0,59,0,0,75,7,0,95,7,0,111,15,0,127,23,7,147,31,7,163,39,11,183,51,15,195,75,27,207,99,43,219,127,59,227,151,79,231,171,95,239,191,119,247,211,139,167,123,59,183,155,55,199,195,55,231,227,87,127,191,255,171,231,255,215,255,255,103,0,0,139,0,0,179,0,0,215,0,0,255,0,0,255,243,147,255,247,199,255,255,255,159,91,83
 };
 
-void Palette_Setup8to24(void)
+void Palette_SetupSpecialPalettes(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 *) 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;
-       }
-       palette_complete[255] = 0; // completely transparent black
+       unsigned char *colormap;
 
-       // FIXME: fullbright_start should be read from colormap.lmp
        colormap = FS_LoadFile("gfx/colormap.lmp", tempmempool, true);
        if (colormap && fs_filesize >= 16385)
                fullbright_start = 256 - colormap[16384];
@@ -121,7 +106,7 @@ void Palette_Setup8to24(void)
        palette_font[255] = 0;
 }
 
-void BuildGammaTable8(float prescale, float gamma, float scale, float base, qbyte *out)
+void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out)
 {
        int i, adjusted;
        double invgamma, d;
@@ -179,30 +164,21 @@ void Palette_Init(void)
 {
        int i;
        float gamma, scale, base;
-       qbyte *pal;
-       qbyte temp[256];
-       pal = (qbyte *)FS_LoadFile ("gfx/palette.lmp", tempmempool, false);
-       if (pal && fs_filesize >= 768)
-       {
-               memcpy(host_basepal, pal, 765);
-               Mem_Free(pal);
-       }
-       else
-       {
-               Con_DPrint("Couldn't load gfx/palette.lmp, falling back on internal palette\n");
-               memcpy(host_basepal, host_quakepal, 765);
-       }
-       host_basepal[765] = host_basepal[766] = host_basepal[767] = 0; // LordHavoc: force the transparent color to black
+       unsigned char *in, *out, *palfile;
+       unsigned char texturegammaramp[256];
 
        gamma = 1;
        scale = 1;
        base = 0;
+// COMMANDLINEOPTION: Client: -texgamma <number> sets the quake palette gamma, allowing you to make quake textures brighter/darker, not recommended
        i = COM_CheckParm("-texgamma");
        if (i)
                gamma = atof(com_argv[i + 1]);
+// COMMANDLINEOPTION: Client: -texcontrast <number> sets the quake palette contrast, allowing you to make quake textures brighter/darker, not recommended
        i = COM_CheckParm("-texcontrast");
        if (i)
                scale = atof(com_argv[i + 1]);
+// COMMANDLINEOPTION: Client: -texbrightness <number> sets the quake palette brightness (brightness of black), allowing you to make quake textures brighter/darker, not recommended
        i = COM_CheckParm("-texbrightness");
        if (i)
                base = atof(com_argv[i + 1]);
@@ -210,10 +186,28 @@ void Palette_Init(void)
        scale = bound(0.01, scale, 10.0);
        base = bound(0, base, 0.95);
 
-       BuildGammaTable8(1.0f, gamma, scale, base, temp);
-       for (i = 3;i < 765;i++)
-               host_basepal[i] = temp[host_basepal[i]];
+       BuildGammaTable8(1.0f, gamma, scale, base, texturegammaramp);
+
+       palfile = (unsigned char *)FS_LoadFile ("gfx/palette.lmp", tempmempool, false);
+       if (palfile && fs_filesize >= 768)
+               in = palfile;
+       else
+       {
+               Con_DPrint("Couldn't load gfx/palette.lmp, falling back on internal palette\n");
+               in = host_quakepal;
+       }
+       out = (unsigned char *) palette_complete; // palette is accessed as 32bit for speed reasons, but is created as 8bit bytes
+       for (i = 0;i < 255;i++)
+       {
+               *out++ = texturegammaramp[*in++];
+               *out++ = texturegammaramp[*in++];
+               *out++ = texturegammaramp[*in++];
+               *out++ = 255;
+       }
+       palette_complete[255] = 0; // completely transparent black
+       if (palfile)
+               Mem_Free(palfile);
 
-       Palette_Setup8to24();
+       Palette_SetupSpecialPalettes();
 }