teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- re-enabled GPalette and disabled brightmaps.

Browse source 
In order to finish this I need the switchover, but brightmaps need an update of the texture code which requires merging a few more WIP changes before the code can be fixed.
This commit is contained in:
Christoph Oelckers 2020-05-25 00:08:59 +02:00
parent 6bd4f77c5b
commit 4178d48fb6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/glbackend/gl_texture.cpp
View file

@ -253,8 +253,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
applytint = true; applytint = true;
if (!(h.f & HICTINT_APPLYOVERPALSWAP)) usepalswap = 0; if (!(h.f & HICTINT_APPLYOVERPALSWAP)) usepalswap = 0;
} }
lookuppal = palmanager.LookupPalette(usepalette, usepalswap, false); lookuppal = TRANSLATION(usepalette + Translation_Remap, usepalswap);
//lookuppal = TRANSLATION(usepalette + Translation_Remap, usepalswap);
} }
} }
@ -358,7 +357,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
} }
else if (TextureType == TT_TRUECOLOR) else if (TextureType == TT_TRUECOLOR)
{ {
lookuppal = palmanager.LookupPalette(usepalette, usepalswap, true); lookuppal = -1;// Needs some work on the texture management first. palmanager.LookupPalette(usepalette, usepalswap, true);
if (lookuppal >= 0) if (lookuppal >= 0)
{ {
auto htex = LoadTexture(tex, TT_BRIGHTMAP, lookuppal); auto htex = LoadTexture(tex, TT_BRIGHTMAP, lookuppal);