zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed alpha calculations for textured automap.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-31 15:50:08 +01:00
parent d825282726
commit 77cd7bffc5
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/src/polymost.cpp
View file

@ -4903,9 +4903,7 @@ void polymost_fillpolygon(int32_t npoints)
tessectrap((float*)rx1, (float*)ry1, xb1, npoints, &poly); tessectrap((float*)rx1, (float*)ry1, xb1, npoints, &poly);
uint8_t const maskprops = (globalorientation>>7)&DAMETH_MASKPROPS; uint8_t const maskprops = (globalorientation>>7)&DAMETH_MASKPROPS;
handle_blend(maskprops > DAMETH_MASK, 0, maskprops == DAMETH_TRANS2); twod->AddPoly(TileFiles.tiles[globalpicnum], poly, globalpal, globalshade, maskprops);
float alpha = (maskprops > DAMETH_MASK) ? float_trans(maskprops, 0) : 1.f;
twod->AddPoly(TileFiles.tiles[globalpicnum], poly, globalpal, globalshade, alpha);
} }

8
source/common/2d/v_2ddrawer.cpp
View file

@ -706,7 +706,7 @@ void F2DDrawer::rotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
// //
//========================================================================== //==========================================================================
void F2DDrawer::AddPoly(FTexture* img, F2DPolygons& poly, int palette, int shade, float alpha) void F2DDrawer::AddPoly(FTexture* img, F2DPolygons& poly, int palette, int shade, int maskprops)
{ {
RenderCommand dg = {}; RenderCommand dg = {};
int method = 0; int method = 0;
@ -724,7 +724,11 @@ void F2DDrawer::AddPoly(FTexture* img, F2DPolygons& poly, int palette, int shade
#endif #endif
PalEntry p = 0xffffffff; PalEntry p = 0xffffffff;
p.a = (uint8_t)(alpha * 255); if (maskprops > DAMETH_MASK)
{
dg.mRenderStyle = GetBlend(0, maskprops == DAMETH_TRANS2);
p.a = (uint8_t)(float_trans(maskprops, 0) * 255);
}
dg.mTexture = img; dg.mTexture = img;
dg.mRemapIndex = palette | (shade << 16); dg.mRemapIndex = palette | (shade << 16);
dg.mVertCount = poly.vertices.Size(); dg.mVertCount = poly.vertices.Size();

2
source/common/2d/v_2ddrawer.h
View file

@ -127,7 +127,7 @@ public:
public: public:
void AddTexture(FTexture *img, DrawParms &parms); void AddTexture(FTexture *img, DrawParms &parms);
void AddPoly(FTexture* img, F2DPolygons& poly, int palette, int shade, float alpha); void AddPoly(FTexture* img, F2DPolygons& poly, int palette, int shade, int maskprops);
void AddFlatFill(int left, int top, int right, int bottom, FTexture *src, bool local_origin); void AddFlatFill(int left, int top, int right, int bottom, FTexture *src, bool local_origin);
void AddColorOnlyQuad(int left, int top, int width, int height, PalEntry color, FRenderStyle *style = nullptr); void AddColorOnlyQuad(int left, int top, int width, int height, PalEntry color, FRenderStyle *style = nullptr);