allow .alpha to fade out water/refraction/reflection surfaces (only tested on refract...

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index 85cd474f86ed049a837a388e5af7578f2c4ee62c..af4131469d45cacdfb616ca9c5849e06db1f085f 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -20,6 +20,7 @@ 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] =
@@ -108,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;
@@ -169,30 +183,40 @@ void Palette_SetupSpecialPalettes(void)
        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);
        }
 }
@@ -239,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)
@@ -306,7 +330,7 @@ void Palette_Load(void)
 
 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();
 }