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

Amend r4394: don't use full brightness (glColor() factor 1) with hightiles.

Browse source 
This is done by factoring out some polymer.c:polymer_getbuildmaterial() code
into polymer_eligible_for_artmapping() and using that. The one in polymer.c
can still determine to not use ART mapping on some ("rare"?) occasions, so
it's not 100% in sync.

git-svn-id: https://svn.eduke32.com/eduke32@4407 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-03-30 13:53:09 +00:00
parent 2d889c74f7
commit 7da6380dcb
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/include/polymer.h
View file

@ -351,6 +351,12 @@ static inline void polymer_invalidateartmap(int32_t tilenum)
}
}
// Compare with eligible_for_tileshades()
static inline int32_t polymer_eligible_for_artmap(int32_t tilenum, const pthtyp *pth)
{
return ((!pth || !pth->hicr) && tilenum < (MAXTILES - 4));
}
# ifdef POLYMER_C
// CORE

1
polymer/eduke32/build/include/polymost.h
View file

@ -56,6 +56,7 @@ extern int32_t r_usetileshades;
extern int16_t globalpicnum;
extern int32_t globalpal;
// Compare with polymer_eligible_for_artmap()
static inline int32_t eligible_for_tileshades(int32_t picnum, int32_t pal)
{
return (!usehightile || !hicfindsubst(picnum, pal, 0)) &&

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

@ -4621,7 +4621,7 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
}
// Lazily fill in all the textures we need, move this to precaching later
if (pr_artmapping && (!pth || !pth->hicr) && tilenum < (MAXTILES - 4)) {
if (pr_artmapping && polymer_eligible_for_artmap(tilenum, pth)) {
if (!prartmaps[tilenum]) {
char *tilebuffer = (char *)waloff[tilenum];
char *tempbuffer = (char *)Bmalloc(tilesizx[tilenum] * tilesizy[tilenum]);

3
polymer/eduke32/build/src/polymost.c
View file

@ -1526,7 +1526,8 @@ void drawpoly(double *dpx, double *dpy, int32_t n, int32_t method)
float pc[4];
#ifdef POLYMER
if (getrendermode() == REND_POLYMER && pr_artmapping)
if (getrendermode() == REND_POLYMER && pr_artmapping &&
polymer_eligible_for_artmap(globalpicnum, pth))
pc[0] = pc[1] = pc[2] = 1.0f;
else
#endif