zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 08:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymer: Account for HICTINT_APPLYOVERALTPAL and HICTINT_USEONART.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5142 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-14 08:06:51 +00:00
parent 0d5b933bb3
commit 68e4248cd2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/eduke32/build/src/polymer.c
View file

@ -3883,12 +3883,14 @@ static void polymer_drawartsky(int16_t tilenum, char palnum, int8_t shad
if (pth && (pth->flags & PTH_HIGHTILE)) if (pth && (pth->flags & PTH_HIGHTILE))
{ {
if (pth->palnum != palnum) if (pth->palnum != palnum || (hictinting[palnum].f & HICTINT_APPLYOVERALTPAL))
hictinting_apply(glcolors[i], palnum); hictinting_apply(glcolors[i], palnum);
if (have_basepal_tint()) if (have_basepal_tint())
hictinting_apply(glcolors[i], MAXPALOOKUPS-1); hictinting_apply(glcolors[i], MAXPALOOKUPS-1);
} }
else if (hictinting[palnum].f & HICTINT_USEONART)
hictinting_apply(glcolors[i], palnum);
i++; i++;
} }
@ -3964,12 +3966,14 @@ static void polymer_drawskybox(int16_t tilenum, char palnum, int8_t shad
if (pth && (pth->flags & PTH_HIGHTILE)) if (pth && (pth->flags & PTH_HIGHTILE))
{ {
if (pth->palnum != palnum) if (pth->palnum != palnum || (hictinting[palnum].f & HICTINT_APPLYOVERALTPAL))
hictinting_apply(color, palnum); hictinting_apply(color, palnum);
if (have_basepal_tint()) if (have_basepal_tint())
hictinting_apply(color, MAXPALOOKUPS-1); hictinting_apply(color, MAXPALOOKUPS-1);
} }
else if (hictinting[palnum].f & HICTINT_USEONART)
hictinting_apply(color, palnum);
bglColor4f(color[0], color[1], color[2], 1.0); bglColor4f(color[0], color[1], color[2], 1.0);
bglBindTexture(GL_TEXTURE_2D, pth ? pth->glpic : 0); bglBindTexture(GL_TEXTURE_2D, pth ? pth->glpic : 0);
@ -4657,13 +4661,15 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
if (pth->flags & PTH_HIGHTILE) if (pth->flags & PTH_HIGHTILE)
{ {
if (pth->palnum != pal) if (pth->palnum != pal || (hictinting[pal].f & HICTINT_APPLYOVERALTPAL))
hictinting_apply_ub(material->diffusemodulation, pal); hictinting_apply_ub(material->diffusemodulation, pal);
// fullscreen tint on global palette change... this is used for nightvision and underwater tinting // fullscreen tint on global palette change... this is used for nightvision and underwater tinting
if (!usinghighpal && have_basepal_tint()) if (!usinghighpal && have_basepal_tint())
hictinting_apply_ub(material->diffusemodulation, MAXPALOOKUPS-1); hictinting_apply_ub(material->diffusemodulation, MAXPALOOKUPS-1);
} }
else if (hictinting[pal].f & HICTINT_USEONART)
hictinting_apply_ub(material->diffusemodulation, pal);
// PR_BIT_GLOW_MAP // PR_BIT_GLOW_MAP
if (r_fullbrights && pth->flags & PTH_HASFULLBRIGHT) if (r_fullbrights && pth->flags & PTH_HASFULLBRIGHT)