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

- undid texture substitution in 2D code.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-10 10:08:17 +01:00
parent 40358febc1
commit 8c241afc40
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/glbackend/glbackend.cpp
View file

@ -549,18 +549,17 @@ void hud_drawsprite(double sx, double sy, int z, double a, int picnum, int dasha
{ {
double dz = z / 65536.; double dz = z / 65536.;
alpha *= (dastat & RS_TRANS1)? glblend[0].def[!!(dastat & RS_TRANS2)].alpha : 1.; alpha *= (dastat & RS_TRANS1)? glblend[0].def[!!(dastat & RS_TRANS2)].alpha : 1.;
TexturePick pick;
int palid = TRANSLATION(Translation_Remap + curbasepal, dapalnum); int palid = TRANSLATION(Translation_Remap + curbasepal, dapalnum);
if (picanm[picnum].sf & PICANM_ANIMTYPE_MASK) if (picanm[picnum].sf & PICANM_ANIMTYPE_MASK)
picnum += animateoffs(picnum, 0); picnum += animateoffs(picnum, 0);
if (!PickTexture(picnum, nullptr, palid, pick)) return; auto tex = tileGetTexture(picnum);
DrawTexture(&twodpsp, pick.texture, sx, sy, DrawTexture(&twodpsp, tex, sx, sy,
DTA_ScaleX, dz * tileWidth(picnum) / pick.texture->GetDisplayWidth() , DTA_ScaleY, dz * tileHeight(picnum) / pick.texture->GetDisplayHeight(), DTA_ScaleX, dz, DTA_ScaleY, dz,
DTA_Color, shadeToLight(dashade), DTA_Color, shadeToLight(dashade),
DTA_TranslationIndex, pick.translation & 0x7fffffff, DTA_TranslationIndex, palid,
DTA_ViewportX, windowxy1.x, DTA_ViewportY, windowxy1.y, DTA_ViewportX, windowxy1.x, DTA_ViewportY, windowxy1.y,
DTA_ViewportWidth, windowxy2.x - windowxy1.x + 1, DTA_ViewportHeight, windowxy2.y - windowxy1.y + 1, DTA_ViewportWidth, windowxy2.x - windowxy1.x + 1, DTA_ViewportHeight, windowxy2.y - windowxy1.y + 1,
DTA_FullscreenScale, (dastat & RS_STRETCH)? FSMode_ScaleToScreen: FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, (dastat & RS_STRETCH)? FSMode_ScaleToScreen: FSMode_ScaleToHeight, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
@ -573,8 +572,6 @@ void hud_drawsprite(double sx, double sy, int z, double a, int picnum, int dasha
DTA_Rotate, a * (-360./2048), DTA_Rotate, a * (-360./2048),
DTA_FlipOffsets, !(dastat & (/*RS_TOPLEFT |*/ RS_CENTER)), DTA_FlipOffsets, !(dastat & (/*RS_TOPLEFT |*/ RS_CENTER)),
DTA_Alpha, alpha, DTA_Alpha, alpha,
DTA_Indexed, false,// !!(pick.translation & 0x80000000),
// todo: pass pick.tintFlags and pick.tintColor
TAG_DONE); TAG_DONE);
} }