Skip to content

Commit

Permalink
- removed the unused BaseBlend* variables and the testblend CCMD.
Browse files Browse the repository at this point in the history
When this was still working it was software rendering only anyway so no real loss here.
  • Loading branch information
coelckers committed Nov 8, 2022
1 parent dab6170 commit 706d465
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 54 deletions.
32 changes: 0 additions & 32 deletions src/r_data/v_palette.cpp
Expand Up @@ -84,35 +84,3 @@ void InitPalette ()

}

CCMD (testblend)
{
FString colorstring;
int color;
float amt;

if (argv.argc() < 3)
{
Printf ("testblend <color> <amount>\n");
}
else
{
if ( !(colorstring = V_GetColorStringByName (argv[1])).IsEmpty() )
{
color = V_GetColorFromString (colorstring);
}
else
{
color = V_GetColorFromString (argv[1]);
}
amt = (float)atof (argv[2]);
if (amt > 1.0f)
amt = 1.0f;
else if (amt < 0.0f)
amt = 0.0f;
BaseBlendR = RPART(color);
BaseBlendG = GPART(color);
BaseBlendB = BPART(color);
BaseBlendA = amt;
}
}

12 changes: 0 additions & 12 deletions src/rendering/r_utility.cpp
Expand Up @@ -1058,18 +1058,6 @@ void R_SetupFrame (FRenderViewpoint &viewpoint, FViewWindow &viewwindow, AActor
if (R_OldBlend != newblend)
{
R_OldBlend = newblend;
if (APART(newblend))
{
BaseBlendR = RPART(newblend);
BaseBlendG = GPART(newblend);
BaseBlendB = BPART(newblend);
BaseBlendA = APART(newblend) / 255.f;
}
else
{
BaseBlendR = BaseBlendG = BaseBlendB = 0;
BaseBlendA = 0.f;
}
}

validcount++;
Expand Down
6 changes: 0 additions & 6 deletions src/rendering/swrenderer/r_swscene.cpp
Expand Up @@ -39,12 +39,6 @@
#include "d_main.h"
#include "v_draw.h"

// [RH] Base blending values (for e.g. underwater)
int BaseBlendR, BaseBlendG, BaseBlendB;
float BaseBlendA;



class FSWPaletteTexture : public FImageSource
{
public:
Expand Down
4 changes: 0 additions & 4 deletions src/st_stuff.h
Expand Up @@ -5,8 +5,4 @@ struct event_t;

bool ST_Responder(event_t* ev);

// [RH] Base blending values (for e.g. underwater)
extern int BaseBlendR, BaseBlendG, BaseBlendB;
extern float BaseBlendA;

#endif

0 comments on commit 706d465

Please sign in to comment.