zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 08:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use GZDoom's texture backend to read hightile textures. (Hightile tinting code moved to the shader but isn't active yet.

Browse source 
- remove all code for faking gamma correction through palette manipulated images.
This commit is contained in:
Christoph Oelckers 2019-10-05 21:59:03 +02:00
parent cd0dabf2ae
commit 93ad83b380
15 changed files with 149 additions and 592 deletions
Download patch file Download diff file Expand all files Collapse all files

14
source/build/src/voxmodel.cpp
View file

@ -39,8 +39,6 @@ static voxmodel_t *gvox;
//pitch must equal xsiz*4
FHardwareTexture *gloadtex(const int32_t *picbuf, int32_t xsiz, int32_t ysiz, int32_t is8bit, int32_t dapal)
{
const char *const cptr = &britable[gammabrightness ? 0 : curbrightness][0];
// Correct for GL's RGB order; also apply gamma here:
const coltype *const pic = (const coltype *)picbuf;
coltype *pic2 = (coltype *)Xmalloc(xsiz*ysiz*sizeof(coltype));
@ -49,9 +47,9 @@ FHardwareTexture *gloadtex(const int32_t *picbuf, int32_t xsiz, int32_t ysiz, in
{
for (bssize_t i=xsiz*ysiz-1; i>=0; i--)
{
pic2[i].b = cptr[pic[i].r];
pic2[i].g = cptr[pic[i].g];
pic2[i].r = cptr[pic[i].b];
pic2[i].b = pic[i].r;
pic2[i].g = pic[i].g;
pic2[i].r = pic[i].b;
pic2[i].a = 255;
}
}
@ -64,9 +62,9 @@ FHardwareTexture *gloadtex(const int32_t *picbuf, int32_t xsiz, int32_t ysiz, in
{
const int32_t ii = palookup[dapal][pic[i].a];
pic2[i].b = cptr[curpalette[ii].b];
pic2[i].g = cptr[curpalette[ii].g];
pic2[i].r = cptr[curpalette[ii].r];
pic2[i].b = curpalette[ii].b;
pic2[i].g = curpalette[ii].g;
pic2[i].r = curpalette[ii].r;
pic2[i].a = 255;
}
}