zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change HICTINT_USEONART so that it applies tints to pal 0 of 8-bit tiles instead of their palswapped selves. Add HICTINT_APPLYOVERPALSWAP which applies tints to palswapped 8-bit tiles. Add HICTINT_APPLYOVERALTPAL, which applies tints to alt-pals of hightile textures. 

git-svn-id: https://svn.eduke32.com/eduke32@5055 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-03-09 20:32:11 +00:00
parent 92afedcb11
commit 74b264dcb1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polymer/eduke32/build/include/hightile.h
View File

@ -86,8 +86,10 @@ enum
HICTINT_INVERT = 2, HICTINT_INVERT = 2,
HICTINT_COLORIZE = 4, HICTINT_COLORIZE = 4,
HICTINT_USEONART = 8, HICTINT_USEONART = 8,
HICTINT_APPLYOVERPALSWAP = 16,
HICTINT_APPLYOVERALTPAL = 32,
HICEFFECTMASK = (1|2|4|8), HICEFFECTMASK = (1|2|4|8|16|32),
}; };
#define GRAYSCALE_COEFF_RED 0.3 #define GRAYSCALE_COEFF_RED 0.3

2
polymer/eduke32/build/src/polymost.c
View File

@ -1527,7 +1527,7 @@ static void drawpoly(vec2f_t *dpxy, int32_t n, int32_t method)
{ {
if (pth && (pth->flags & PTH_HIGHTILE)) if (pth && (pth->flags & PTH_HIGHTILE))
{ {
if (pth->palnum != globalpal) if (pth->palnum != globalpal || (hictinting[globalpal].f & HICTINT_APPLYOVERALTPAL))
hictinting_apply(pc, globalpal); hictinting_apply(pc, globalpal);
if (have_basepal_tint()) if (have_basepal_tint())

3
polymer/eduke32/build/src/texcache.c
View File

@ -36,6 +36,9 @@ static pthtyp *texcache_tryart(int32_t dapicnum, int32_t dapalnum, int32_t dasha
const int32_t j = dapicnum&(GLTEXCACHEADSIZ-1); const int32_t j = dapicnum&(GLTEXCACHEADSIZ-1);
pthtyp *pth; pthtyp *pth;
if ((hictinting[dapalnum].f & HICTINT_USEONART) && !(hictinting[dapalnum].f & HICTINT_APPLYOVERPALSWAP))
dapalnum = 0;
// load from art // load from art
for (pth=texcache.list[j]; pth; pth=pth->next) for (pth=texcache.list[j]; pth; pth=pth->next)
if (pth->picnum == dapicnum && pth->palnum == dapalnum && pth->shade == dashade && if (pth->picnum == dapicnum && pth->palnum == dapalnum && pth->shade == dashade &&