zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: FGLTexture::CreateTexBuffer needs to be more careful with setting the texture's translucency information.

Browse source 
First, if it has already been determined the value should be left alone and second, for translated textures the generated buffer is inconclusive so in that case it cannot be used at all.
This commit is contained in:
Christoph Oelckers 2016-12-29 14:33:53 +01:00
parent 605a60d1d6
commit a3070e8846
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_sprite.cpp
View file

@ -916,7 +916,7 @@ void GLSprite::Process(AActor* thing, sector_t * sector, int thruportal)
RenderStyle = LegacyRenderStyles[STYLE_Translucent]; RenderStyle = LegacyRenderStyles[STYLE_Translucent];
OverrideShader = gl_fuzztype + 4; OverrideShader = gl_fuzztype + 4;
trans = 0.99f; // trans may not be 1 here trans = 0.99f; // trans may not be 1 here
hw_styleflags |= STYLEHW_NoAlphaTest; hw_styleflags = STYLEHW_NoAlphaTest;
} }
else else
{ {

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

@ -187,6 +187,7 @@ unsigned char * FGLTexture::CreateTexBuffer(int translation, int & w, int & h, F
{ {
unsigned char * buffer; unsigned char * buffer;
int W, H; int W, H;
int isTransparent = -1;
// Textures that are already scaled in the texture lump will not get replaced // Textures that are already scaled in the texture lump will not get replaced
@ -224,14 +225,16 @@ unsigned char * FGLTexture::CreateTexBuffer(int translation, int & w, int & h, F
int trans = tex->CopyTrueColorPixels(&imgCreate, exx, exx); int trans = tex->CopyTrueColorPixels(&imgCreate, exx, exx);
bmp.CopyPixelDataRGB(0, 0, imgCreate.GetPixels(), W, H, 4, W * 4, 0, CF_BGRA); bmp.CopyPixelDataRGB(0, 0, imgCreate.GetPixels(), W, H, 4, W * 4, 0, CF_BGRA);
tex->CheckTrans(buffer, W*H, trans); tex->CheckTrans(buffer, W*H, trans);
bIsTransparent = tex->gl_info.mIsTransparent; isTransparent = tex->gl_info.mIsTransparent;
if (bIsTransparent == -1) bIsTransparent = isTransparent;
} }
} }
else if (translation<=0) else if (translation<=0)
{ {
int trans = tex->CopyTrueColorPixels(&bmp, exx, exx); int trans = tex->CopyTrueColorPixels(&bmp, exx, exx);
tex->CheckTrans(buffer, W*H, trans); tex->CheckTrans(buffer, W*H, trans);
bIsTransparent = tex->gl_info.mIsTransparent; isTransparent = tex->gl_info.mIsTransparent;
if (bIsTransparent == -1) bIsTransparent = isTransparent;
} }
else else
{ {
@ -239,7 +242,8 @@ unsigned char * FGLTexture::CreateTexBuffer(int translation, int & w, int & h, F
// Since FTexture's method is doing exactly that by calling GetPixels let's use that here // Since FTexture's method is doing exactly that by calling GetPixels let's use that here
// to do all the dirty work for us. ;) // to do all the dirty work for us. ;)
tex->FTexture::CopyTrueColorPixels(&bmp, exx, exx); tex->FTexture::CopyTrueColorPixels(&bmp, exx, exx);
bIsTransparent = 0; isTransparent = 0;
// This is not conclusive for setting the texture's transparency info.
} }
// if we just want the texture for some checks there's no need for upsampling. // if we just want the texture for some checks there's no need for upsampling.
@ -247,7 +251,7 @@ unsigned char * FGLTexture::CreateTexBuffer(int translation, int & w, int & h, F
// [BB] The hqnx upsampling (not the scaleN one) destroys partial transparency, don't upsamle textures using it. // [BB] The hqnx upsampling (not the scaleN one) destroys partial transparency, don't upsamle textures using it.
// [BB] Potentially upsample the buffer. // [BB] Potentially upsample the buffer.
return gl_CreateUpsampledTextureBuffer ( tex, buffer, W, H, w, h, !!bIsTransparent); return gl_CreateUpsampledTextureBuffer ( tex, buffer, W, H, w, h, !!isTransparent);
} }