added rampsize parameter to BuildGammaTable8 and 16

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

diff --git a/palette.c b/palette.c
index 8996f0111f70ac3ba2d1f29446db56b16e3a847e..21974d4de9e8c1b1dd905bb7d141df157ae461d7 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -109,28 +109,28 @@ void Palette_SetupSpecialPalettes(void)
        palette_font[0] = 0;
 }
 
-void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out)
+void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out, int rampsize)
 {
        int i, adjusted;
        double invgamma;
 
        invgamma = 1.0 / gamma;
-       prescale /= 255.0f;
-       for (i = 0;i < 256;i++)
+       prescale /= (double) (rampsize - 1);
+       for (i = 0;i < rampsize;i++)
        {
                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)
+void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out, int rampsize)
 {
        int i, adjusted;
        double invgamma;
 
        invgamma = 1.0 / gamma;
-       prescale /= 255.0f;
-       for (i = 0;i < 256;i++)
+       prescale /= (double) (rampsize - 1);
+       for (i = 0;i < rampsize;i++)
        {
                adjusted = (int) (65535.0 * (pow((double) i * prescale, invgamma) * scale + base) + 0.5);
                out[i] = bound(0, adjusted, 65535);
@@ -164,7 +164,7 @@ void Palette_Init(void)
        scale = bound(0.01, scale, 10.0);
        base = bound(0, base, 0.95);
 
-       BuildGammaTable8(1.0f, gamma, scale, base, texturegammaramp);
+       BuildGammaTable8(1.0f, gamma, scale, base, texturegammaramp, 256);
 
        palfile = (unsigned char *)FS_LoadFile ("gfx/palette.lmp", tempmempool, false, &filesize);
        if (palfile && filesize >= 768)

diff --git a/palette.h b/palette.h
index c0afb198648c8368ddb21f31343bd646d1c3bb9a..53281e07fe1055fe4496059d33a3b7dcd746cdb8 100644 (file)
--- a/palette.h
+++ b/palette.h
@@ -14,8 +14,8 @@ extern unsigned int palette_shirtaswhite[256];
 extern unsigned int palette_transparent[256];
 
 // used by hardware gamma functions in vid_* files
-void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out);
-void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out);
+void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out, int rampsize);
+void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out, int rampsize);
 
 void Palette_Init(void);
 

diff --git a/vid_shared.c b/vid_shared.c
index 0ffc36287966bdd97a2042747df1952459a21795..84129cba3d944279bf04107fa5f917cce1b10da9 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -773,15 +773,15 @@ void VID_UpdateGamma(qboolean force, int rampsize)
 
                if (cachecolorenable)
                {
-                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps);
-                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + vid_gammarampsize);
-                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + vid_gammarampsize*2);
+                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize);
+                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + vid_gammarampsize, rampsize);
+                       BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + vid_gammarampsize*2, rampsize);
                }
                else
                {
-                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps);
-                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize);
-                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize*2);
+                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps, rampsize);
+                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize, rampsize);
+                       BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize*2, rampsize);
                }
 
                // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have