mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-25 05:21:02 +00:00
- minor reformatting.
This commit is contained in:
parent
47bfbb5e08
commit
a399d79f8a
8 changed files with 17 additions and 24 deletions
|
@ -65,7 +65,7 @@ FCanvasTexture::~FCanvasTexture ()
|
|||
Unload ();
|
||||
}
|
||||
|
||||
const uint8_t *FCanvasTexture::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FCanvasTexture::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
bNeedsUpdate = true;
|
||||
if (Canvas == NULL)
|
||||
|
|
|
@ -59,7 +59,7 @@ FSkyBox::~FSkyBox()
|
|||
//
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
const uint8_t *FSkyBox::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FSkyBox::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
if (faces[0]) return faces[0]->GetColumn(column, spans_out);
|
||||
return NULL;
|
||||
|
|
|
@ -17,7 +17,7 @@ public:
|
|||
|
||||
FSkyBox();
|
||||
~FSkyBox();
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf);
|
||||
bool UseBasePalette();
|
||||
|
|
|
@ -961,15 +961,9 @@ void FDummyTexture::SetSize (int width, int height)
|
|||
}
|
||||
|
||||
// This must never be called
|
||||
const uint8_t *FDummyTexture::GetColumn (unsigned int column, const Span **spans_out)
|
||||
uint8_t *FDummyTexture::MakeTexture (FRenderStyle)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// And this also must never be called
|
||||
const uint8_t *FDummyTexture::GetPixels ()
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
@ -996,7 +990,7 @@ CCMD (printspans)
|
|||
{
|
||||
const FTexture::Span *spans;
|
||||
Printf ("%4d:", x);
|
||||
tex->GetColumn (x, &spans);
|
||||
tex->GetColumn(x, &spans);
|
||||
while (spans->Length != 0)
|
||||
{
|
||||
Printf (" (%4d,%4d)", spans->TopOffset, spans->TopOffset+spans->Length-1);
|
||||
|
|
|
@ -601,12 +601,11 @@ protected:
|
|||
};
|
||||
|
||||
// A texture that doesn't really exist
|
||||
class FDummyTexture : public FTexture
|
||||
class FDummyTexture : public FWorldTexture
|
||||
{
|
||||
public:
|
||||
FDummyTexture ();
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
uint8_t *MakeTexture(FRenderStyle);
|
||||
void SetSize (int width, int height);
|
||||
};
|
||||
|
||||
|
@ -618,7 +617,7 @@ public:
|
|||
~FWarpTexture ();
|
||||
|
||||
virtual int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate=0, FCopyInfo *inf = NULL);
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
const uint32_t *GetPixelsBgra() override;
|
||||
void Unload ();
|
||||
|
@ -653,7 +652,7 @@ public:
|
|||
FCanvasTexture (const char *name, int width, int height);
|
||||
~FCanvasTexture ();
|
||||
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
const uint32_t *GetPixelsBgra() override;
|
||||
void Unload ();
|
||||
|
|
|
@ -117,7 +117,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra()
|
|||
return PixelsBgra.data();
|
||||
}
|
||||
|
||||
const uint8_t *FWarpTexture::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FWarpTexture::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
uint64_t time =screen->FrameTime;
|
||||
|
||||
|
|
|
@ -177,7 +177,7 @@ class FFontChar1 : public FTexture
|
|||
{
|
||||
public:
|
||||
FFontChar1 (FTexture *sourcelump);
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
void SetSourceRemap(const uint8_t *sourceremap);
|
||||
void Unload ();
|
||||
|
@ -198,7 +198,7 @@ public:
|
|||
FFontChar2 (int sourcelump, int sourcepos, int width, int height, int leftofs=0, int topofs=0);
|
||||
~FFontChar2 ();
|
||||
|
||||
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetColumn(unsigned int column, const Span **spans_out);
|
||||
const uint8_t *GetPixels ();
|
||||
void SetSourceRemap(const uint8_t *sourceremap);
|
||||
void Unload ();
|
||||
|
@ -559,7 +559,7 @@ void RecordTextureColors (FTexture *pic, uint8_t *usedcolors)
|
|||
for (x = pic->GetWidth() - 1; x >= 0; x--)
|
||||
{
|
||||
const FTexture::Span *spans;
|
||||
const uint8_t *column = pic->GetColumn (x, &spans);
|
||||
const uint8_t *column = pic->GetColumn(x, &spans);
|
||||
|
||||
while (spans->Length != 0)
|
||||
{
|
||||
|
@ -1692,7 +1692,7 @@ void FFontChar1::MakeTexture ()
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
const uint8_t *FFontChar1::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FFontChar1::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
if (Pixels == NULL)
|
||||
{
|
||||
|
@ -1814,7 +1814,7 @@ const uint8_t *FFontChar2::GetPixels ()
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
const uint8_t *FFontChar2::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FFontChar2::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
if (Pixels == NULL)
|
||||
{
|
||||
|
|
|
@ -1008,7 +1008,7 @@ void FPaletteTester::SetTranslation(int num)
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
const uint8_t *FPaletteTester::GetColumn (unsigned int column, const Span **spans_out)
|
||||
const uint8_t *FPaletteTester::GetColumn(unsigned int column, const Span **spans_out)
|
||||
{
|
||||
if (CurTranslation != WantTranslation)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue