mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-29 04:50:42 +00:00
- re-enabled GPalette and disabled brightmaps.
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:
parent
6bd4f77c5b
commit
4178d48fb6
1 changed files with 2 additions and 3 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue