zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- minor reformatting.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-18 14:18:42 +01:00
parent 47bfbb5e08
commit a399d79f8a
8 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/textures/canvastexture.cpp
View file

@ -65,7 +65,7 @@ FCanvasTexture::~FCanvasTexture ()
Unload (); 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; bNeedsUpdate = true;
if (Canvas == NULL) if (Canvas == NULL)

2
src/textures/skyboxtexture.cpp
View file

@ -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); if (faces[0]) return faces[0]->GetColumn(column, spans_out);
return NULL; return NULL;

2
src/textures/skyboxtexture.h
View file

@ -17,7 +17,7 @@ public:
FSkyBox(); FSkyBox();
~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 (); const uint8_t *GetPixels ();
int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf); int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf);
bool UseBasePalette(); bool UseBasePalette();

12
src/textures/texture.cpp
View file

@ -961,15 +961,9 @@ void FDummyTexture::SetSize (int width, int height)
} }
// This must never be called // This must never be called
const uint8_t *FDummyTexture::GetColumn (unsigned int column, const Span **spans_out) uint8_t *FDummyTexture::MakeTexture (FRenderStyle)
{ {
return NULL; return nullptr;
}
// And this also must never be called
const uint8_t *FDummyTexture::GetPixels ()
{
return NULL;
} }
//========================================================================== //==========================================================================
@ -996,7 +990,7 @@ CCMD (printspans)
{ {
const FTexture::Span *spans; const FTexture::Span *spans;
Printf ("%4d:", x); Printf ("%4d:", x);
tex->GetColumn (x, &spans); tex->GetColumn(x, &spans);
while (spans->Length != 0) while (spans->Length != 0)
{ {
Printf (" (%4d,%4d)", spans->TopOffset, spans->TopOffset+spans->Length-1); Printf (" (%4d,%4d)", spans->TopOffset, spans->TopOffset+spans->Length-1);

9
src/textures/textures.h
View file

@ -601,12 +601,11 @@ protected:
}; };
// A texture that doesn't really exist // A texture that doesn't really exist
class FDummyTexture : public FTexture class FDummyTexture : public FWorldTexture
{ {
public: public:
FDummyTexture (); FDummyTexture ();
const uint8_t *GetColumn (unsigned int column, const Span **spans_out); uint8_t *MakeTexture(FRenderStyle);
const uint8_t *GetPixels ();
void SetSize (int width, int height); void SetSize (int width, int height);
}; };
@ -618,7 +617,7 @@ public:
~FWarpTexture (); ~FWarpTexture ();
virtual int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate=0, FCopyInfo *inf = NULL); 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 uint8_t *GetPixels ();
const uint32_t *GetPixelsBgra() override; const uint32_t *GetPixelsBgra() override;
void Unload (); void Unload ();
@ -653,7 +652,7 @@ public:
FCanvasTexture (const char *name, int width, int height); FCanvasTexture (const char *name, int width, int height);
~FCanvasTexture (); ~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 uint8_t *GetPixels ();
const uint32_t *GetPixelsBgra() override; const uint32_t *GetPixelsBgra() override;
void Unload (); void Unload ();

2
src/textures/warptexture.cpp
View file

@ -117,7 +117,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra()
return PixelsBgra.data(); 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; uint64_t time =screen->FrameTime;

10
src/v_font.cpp
View file

@ -177,7 +177,7 @@ class FFontChar1 : public FTexture
{ {
public: public:
FFontChar1 (FTexture *sourcelump); 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 (); const uint8_t *GetPixels ();
void SetSourceRemap(const uint8_t *sourceremap); void SetSourceRemap(const uint8_t *sourceremap);
void Unload (); void Unload ();
@ -198,7 +198,7 @@ public:
FFontChar2 (int sourcelump, int sourcepos, int width, int height, int leftofs=0, int topofs=0); FFontChar2 (int sourcelump, int sourcepos, int width, int height, int leftofs=0, int topofs=0);
~FFontChar2 (); ~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 (); const uint8_t *GetPixels ();
void SetSourceRemap(const uint8_t *sourceremap); void SetSourceRemap(const uint8_t *sourceremap);
void Unload (); void Unload ();
@ -559,7 +559,7 @@ void RecordTextureColors (FTexture *pic, uint8_t *usedcolors)
for (x = pic->GetWidth() - 1; x >= 0; x--) for (x = pic->GetWidth() - 1; x >= 0; x--)
{ {
const FTexture::Span *spans; const FTexture::Span *spans;
const uint8_t *column = pic->GetColumn (x, &spans); const uint8_t *column = pic->GetColumn(x, &spans);
while (spans->Length != 0) 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) 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) if (Pixels == NULL)
{ {

2
src/v_video.cpp
View file

@ -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) if (CurTranslation != WantTranslation)
{ {