zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: partial transparency wasn't taken into account

Browse source 
Smoothing of edges could mark textures as non-transparent when hqNx upscale filter is used
See http://forum.drdteam.org/viewtopic.php?t=6812
This commit is contained in:
alexey.lysiuk 2016-03-09 13:17:42 +02:00
parent 03e3410d7f
commit 7134f53638
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gl/textures/gl_texture.cpp
View file

@ -547,6 +547,7 @@ bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h)
int x,y; int x,y;
bool trans=buffer[MSB]==0; // If I set this to false here the code won't detect textures bool trans=buffer[MSB]==0; // If I set this to false here the code won't detect textures
// that only contain transparent pixels. // that only contain transparent pixels.
bool semitrans = false;
unsigned char * l1; unsigned char * l1;
if (h<=1 || w<=1) return false; // makes (a) no sense and (b) doesn't work with this code! if (h<=1 || w<=1) return false; // makes (a) no sense and (b) doesn't work with this code!
@ -555,35 +556,44 @@ bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h)
if (l1[MSB]==0 && !CHKPIX(1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
l1+=4; l1+=4;
for(x=1;x<w-1;x++, l1+=4) for(x=1;x<w-1;x++, l1+=4)
{ {
if (l1[MSB]==0 && !CHKPIX(-1) && !CHKPIX(1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(-1) && !CHKPIX(1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
} }
if (l1[MSB]==0 && !CHKPIX(-1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(-1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
l1+=4; l1+=4;
for(y=1;y<h-1;y++) for(y=1;y<h-1;y++)
{ {
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
l1+=4; l1+=4;
for(x=1;x<w-1;x++, l1+=4) for(x=1;x<w-1;x++, l1+=4)
{ {
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1) && !CHKPIX(1) && !CHKPIX(-w-1) && !CHKPIX(-w+1) && !CHKPIX(w-1) && !CHKPIX(w+1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1) && !CHKPIX(1) && !CHKPIX(-w-1) && !CHKPIX(-w+1) && !CHKPIX(w-1) && !CHKPIX(w+1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
} }
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1)) CHKPIX(w); if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1)) CHKPIX(w);
else if (l1[MSB]<255) semitrans=true;
l1+=4; l1+=4;
} }
if (l1[MSB]==0 && !CHKPIX(-w)) CHKPIX(1); if (l1[MSB]==0 && !CHKPIX(-w)) CHKPIX(1);
else if (l1[MSB]<255) semitrans=true;
l1+=4; l1+=4;
for(x=1;x<w-1;x++, l1+=4) for(x=1;x<w-1;x++, l1+=4)
{ {
if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1)) CHKPIX(1); if (l1[MSB]==0 && !CHKPIX(-w) && !CHKPIX(-1)) CHKPIX(1);
else if (l1[MSB]<255) semitrans=true;
} }
if (l1[MSB]==0 && !CHKPIX(-w)) CHKPIX(-1); if (l1[MSB]==0 && !CHKPIX(-w)) CHKPIX(-1);
else if (l1[MSB]<255) semitrans=true;
return trans; return trans || semitrans;
} }
//=========================================================================== //===========================================================================