eliminated special case for gamma 1.0 as it was making worse gamma ramps than the...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5874 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/palette.c b/palette.c
index c536b332e90b1891dd1bcd60c76ac6fd9bf21214..8996f0111f70ac3ba2d1f29446db56b16e3a847e 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -112,54 +112,28 @@ void Palette_SetupSpecialPalettes(void)
 void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out)
 {
        int i, adjusted;
-       double invgamma, d;
+       double invgamma;
 
-       gamma = bound(0.1, gamma, 5.0);
-       if (gamma == 1) // LordHavoc: dodge the math
-       {
-               for (i = 0;i < 256;i++)
-               {
-                       adjusted = (int) (i * prescale * scale + base * 255.0);
-                       out[i] = bound(0, adjusted, 255);
-               }
-       }
-       else
+       invgamma = 1.0 / gamma;
+       prescale /= 255.0f;
+       for (i = 0;i < 256;i++)
        {
-               invgamma = 1.0 / gamma;
-               prescale /= 255.0f;
-               for (i = 0;i < 256;i++)
-               {
-                       d = pow((double) i * prescale, invgamma) * scale + base;
-                       adjusted = (int) (255.0 * d);
-                       out[i] = bound(0, adjusted, 255);
-               }
+               adjusted = (int) (255.0 * (pow((double) i * prescale, 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 i, adjusted;
-       double invgamma, d;
+       double invgamma;
 
-       gamma = bound(0.1, gamma, 5.0);
-       if (gamma == 1) // LordHavoc: dodge the math
-       {
-               for (i = 0;i < 256;i++)
-               {
-                       adjusted = (int) (i * 256.0 * prescale * scale + base * 65535.0);
-                       out[i] = bound(0, adjusted, 65535);
-               }
-       }
-       else
+       invgamma = 1.0 / gamma;
+       prescale /= 255.0f;
+       for (i = 0;i < 256;i++)
        {
-               invgamma = 1.0 / gamma;
-               prescale /= 255.0f;
-               for (i = 0;i < 256;i++)
-               {
-                       d = pow((double) i * prescale, invgamma) * scale + base;
-                       adjusted = (int) (65535.0 * d);
-                       out[i] = bound(0, adjusted, 65535);
-               }
+               adjusted = (int) (65535.0 * (pow((double) i * prescale, invgamma) * scale + base) + 0.5);
+               out[i] = bound(0, adjusted, 65535);
        }
 }