zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymer: Address an oversight in r4600.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6355 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-10 13:44:10 +00:00
parent b702ebb085
commit 1c4c1e9b55
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/build/src/polymer.cpp
View file

@ -1441,21 +1441,23 @@ void polymer_postrotatesprite(void)
polymer_unbindmaterial(rotatespritematerialbits); polymer_unbindmaterial(rotatespritematerialbits);
} }
static void polymer_drawsearchplane(_prplane *plane, GLubyte *oldcolor, GLubyte modulation, GLubyte *data) static void polymer_setupdiffusemodulation(_prplane *plane, GLubyte modulation, GLubyte *data)
{ {
if (oldcolor)
Bmemcpy(oldcolor, plane->material.diffusemodulation, sizeof(GLubyte) * 4);
plane->material.diffusemodulation[0] = modulation; plane->material.diffusemodulation[0] = modulation;
plane->material.diffusemodulation[1] = ((GLubyte *) data)[0]; plane->material.diffusemodulation[1] = ((GLubyte *) data)[0];
plane->material.diffusemodulation[2] = ((GLubyte *) data)[1]; plane->material.diffusemodulation[2] = ((GLubyte *) data)[1];
plane->material.diffusemodulation[3] = 0xFF; plane->material.diffusemodulation[3] = 0xFF;
}
static void polymer_drawsearchplane(_prplane *plane, GLubyte *oldcolor, GLubyte modulation, GLubyte *data)
{
Bmemcpy(oldcolor, plane->material.diffusemodulation, sizeof(GLubyte) * 4);
polymer_setupdiffusemodulation(plane, modulation, data);
polymer_drawplane(plane); polymer_drawplane(plane);
if (oldcolor)
Bmemcpy(plane->material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4); Bmemcpy(plane->material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4);
} }
void polymer_drawmaskwall(int32_t damaskwallcnt) void polymer_drawmaskwall(int32_t damaskwallcnt)
@ -3909,7 +3911,7 @@ void polymer_updatesprite(int32_t snum)
if (searchit == 2) if (searchit == 2)
{ {
polymer_drawsearchplane(&s->plane, NULL, 0x03, (GLubyte *) &tspr->owner); polymer_setupdiffusemodulation(&s->plane, 0x03, (GLubyte *) &tspr->owner);
s->hash = 0xDEADBEEF; s->hash = 0xDEADBEEF;
} }