teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 05:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't rely on repeating texture samplers to flip polymer sprites and request clamped textures for sprite textures. Fixes bug 2869362.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1551 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-12-03 07:37:34 +00:00
parent 20cade406c
commit 0bd458fa42
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -949,7 +949,7 @@ void polymer_drawsprite(int32_t snum)
float xratio, yratio, ang; float xratio, yratio, ang;
float spos[3]; float spos[3];
GLfloat *inbuffer; GLfloat *inbuffer;
uint8_t curpriority; uint8_t curpriority, flipu, flipv;
if (pr_verbosity >= 3) OSD_Printf("PR : Sprite %i...\n", snum); if (pr_verbosity >= 3) OSD_Printf("PR : Sprite %i...\n", snum);
@ -1027,6 +1027,8 @@ void polymer_drawsprite(int32_t snum)
inbuffer = vertsprite; inbuffer = vertsprite;
flipu = flipv = 0;
if (pr_billboardingmode && !((tspr->cstat>>4) & 3)) if (pr_billboardingmode && !((tspr->cstat>>4) & 3))
{ {
// do surgery on the face tspr to make it look like a wall sprite // do surgery on the face tspr to make it look like a wall sprite
@ -1067,7 +1069,7 @@ void polymer_drawsprite(int32_t snum)
bglRotatef(-ang, 0.0f, 1.0f, 0.0f); bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
if (tspr->cstat & 8) { if (tspr->cstat & 8) {
bglRotatef(-180.0, 0.0f, 0.0f, 1.0f); bglRotatef(-180.0, 0.0f, 0.0f, 1.0f);
spriteplane.material.diffusescale[0] = -spriteplane.material.diffusescale[0]; flipu = !flipu;
} }
bglTranslatef((float)(-xoff), 1.0f, (float)(yoff)); bglTranslatef((float)(-xoff), 1.0f, (float)(yoff));
bglScalef((float)(xsize), 1.0f, (float)(ysize)); bglScalef((float)(xsize), 1.0f, (float)(ysize));
@ -1081,18 +1083,33 @@ void polymer_drawsprite(int32_t snum)
} }
if ((tspr->cstat & 4) && (((tspr->cstat>>4) & 3) != 2)) if ((tspr->cstat & 4) && (((tspr->cstat>>4) & 3) != 2))
spriteplane.material.diffusescale[0] = -spriteplane.material.diffusescale[0]; flipu = !flipu;
if (!(tspr->cstat & 4) && (((tspr->cstat>>4) & 3) == 2)) if (!(tspr->cstat & 4) && (((tspr->cstat>>4) & 3) == 2))
spriteplane.material.diffusescale[0] = -spriteplane.material.diffusescale[0]; flipu = !flipu;
if ((tspr->cstat & 8) && (((tspr->cstat>>4) & 3) != 2)) if ((tspr->cstat & 8) && (((tspr->cstat>>4) & 3) != 2))
spriteplane.material.diffusescale[1] = -spriteplane.material.diffusescale[1]; flipv = !flipv;
bglGetFloatv(GL_MODELVIEW_MATRIX, spritemodelview); bglGetFloatv(GL_MODELVIEW_MATRIX, spritemodelview);
bglPopMatrix(); bglPopMatrix();
Bmemcpy(spriteplane.buffer, inbuffer, sizeof(GLfloat) * 4 * 5); Bmemcpy(spriteplane.buffer, inbuffer, sizeof(GLfloat) * 4 * 5);
if (flipu || flipv)
{
i = 0;
while (i < 4)
{
if (flipu)
spriteplane.buffer[(i * 5) + 3] =
(spriteplane.buffer[(i * 5) + 3] - 1.0f) * -1.0f;
if (flipv)
spriteplane.buffer[(i * 5) + 4] =
(spriteplane.buffer[(i * 5) + 4] - 1.0f) * -1.0f;
i++;
}
}
i = 0; i = 0;
while (i < 4) while (i < 4)
{ {
@ -4296,7 +4313,7 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
loadtile(tilenum); loadtile(tilenum);
pth = NULL; pth = NULL;
pth = gltexcache(tilenum, pal, 0); pth = gltexcache(tilenum, pal, (material == &spriteplane.material) ? 4 : 0);
if (pth) if (pth)
material->diffusemap = pth->glpic; material->diffusemap = pth->glpic;