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

- made the backdrop texture also inherit from FWorldTexture.

Browse source 
In this case the only benefit is one less piece of GetColumn duplication - this texture is simply not usable in-game, unlike the BarShader.
This commit is contained in:
Christoph Oelckers 2018-03-18 13:12:25 +01:00
parent 494504229f
commit de8db297a6
1 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/textures/backdroptexture.cpp
View file

@ -56,7 +56,7 @@
//
//=============================================================================
struct FBackdropTexture : public FTexture
class FBackdropTexture : public FWorldTexture
{
enum
{
@ -77,15 +77,12 @@ struct FBackdropTexture : public FTexture
public:
FBackdropTexture();
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
const uint8_t *GetPixels();
void Unload();
bool CheckModified();
bool CheckModified() override;
uint8_t *MakeTexture(FRenderStyle style) override;
protected:
uint32_t costab[COS_SIZE];
uint8_t *Pixels;
static const Span DummySpan[2];
uint8_t Pixels[160*144];
int LastRenderTic;
uint32_t time1, time2, time3, time4;
@ -170,8 +167,6 @@ static uint8_t pattern2[1024] =
7, 7, 0, 5, 1, 6, 7, 9,12, 9,12,21,22,25,24,22,23,25,24,18,24,22,17,13,10, 9,10, 9, 6,11, 6, 5,
};
const FTexture::Span FBackdropTexture::DummySpan[2] = { { 0, 160 }, { 0, 0 } };
//=============================================================================
//
//
@ -180,7 +175,7 @@ const FTexture::Span FBackdropTexture::DummySpan[2] = { { 0, 160 }, { 0, 0 } };
FBackdropTexture::FBackdropTexture()
{
Pixels = nullptr;
PixelsAreStatic = 3;
Width = 144;
Height = 160;
WidthBits = 8;
@ -214,39 +209,14 @@ bool FBackdropTexture::CheckModified()
return LastRenderTic != gametic;
}
void FBackdropTexture::Unload()
{
if (Pixels != nullptr) delete[] Pixels;
Pixels = nullptr;
}
//=============================================================================
//
//
// There's no point making this work as a regular texture as it is made to
// work with special translations. As an alpha texture it should be fine.
//
//=============================================================================
const uint8_t *FBackdropTexture::GetColumn(unsigned int column, const Span **spans_out)
{
if (LastRenderTic != gametic)
{
Render();
}
column = clamp(column, 0u, 143u);
if (spans_out != nullptr)
{
*spans_out = DummySpan;
}
return Pixels + column*160;
}
//=============================================================================
//
//
//
//=============================================================================
const uint8_t *FBackdropTexture::GetPixels()
uint8_t *FBackdropTexture::MakeTexture(FRenderStyle style)
{
if (LastRenderTic != gametic)
{
@ -266,7 +236,6 @@ void FBackdropTexture::Render()
uint8_t *from;
int width, height, pitch;
if (Pixels == nullptr) Pixels = new uint8_t[160 * 144];
width = 160;
height = 144;
pitch = width;