edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor IGraphics::CheckImageDivisibility

Browse source 
Put the context name in quotation marks in the warning message.

Rename parameter `pFileName` to `pContextName`, as this name does not necessarily describe a file.

Rename parameter `Img` to `Image` for consistency.
This commit is contained in:
Robert Müller 2024-03-02 21:56:58 +01:00
parent dac12c7afd
commit 82bf71e780
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/engine/client/graphics_threaded.cpp
View file

@ -651,42 +651,43 @@ bool CGraphics_Threaded::LoadPng(CImageInfo &Image, const char *pFilename, int S
return true; return true;
} }
bool CGraphics_Threaded::CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) bool CGraphics_Threaded::CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize)
{ {
dbg_assert(DivX != 0 && DivY != 0, "Passing 0 to this function is not allowed."); dbg_assert(DivX != 0 && DivY != 0, "Passing 0 to this function is not allowed.");
bool ImageIsValid = true; bool ImageIsValid = true;
bool WidthBroken = Img.m_Width == 0 || (Img.m_Width % DivX) != 0; bool WidthBroken = Image.m_Width == 0 || (Image.m_Width % DivX) != 0;
bool HeightBroken = Img.m_Height == 0 || (Img.m_Height % DivY) != 0; bool HeightBroken = Image.m_Height == 0 || (Image.m_Height % DivY) != 0;
if(WidthBroken || HeightBroken) if(WidthBroken || HeightBroken)
{ {
SWarning NewWarning; SWarning NewWarning;
str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), pFileName, DivX, DivY); char aContextNameQuoted[128];
str_format(aContextNameQuoted, sizeof(aContextNameQuoted), "\"%s\"", pContextName);
str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg),
Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), aContextNameQuoted, DivX, DivY);
m_vWarnings.emplace_back(NewWarning); m_vWarnings.emplace_back(NewWarning);
ImageIsValid = false; ImageIsValid = false;
} }
if(AllowResize && !ImageIsValid && Img.m_Width > 0 && Img.m_Height > 0) if(AllowResize && !ImageIsValid && Image.m_Width > 0 && Image.m_Height > 0)
{ {
int NewWidth = DivX; int NewWidth = DivX;
int NewHeight = DivY; int NewHeight = DivY;
if(WidthBroken) if(WidthBroken)
{ {
NewWidth = maximum<int>(HighestBit(Img.m_Width), DivX); NewWidth = maximum<int>(HighestBit(Image.m_Width), DivX);
NewHeight = (NewWidth / DivX) * DivY; NewHeight = (NewWidth / DivX) * DivY;
} }
else else
{ {
NewHeight = maximum<int>(HighestBit(Img.m_Height), DivY); NewHeight = maximum<int>(HighestBit(Image.m_Height), DivY);
NewWidth = (NewHeight / DivY) * DivX; NewWidth = (NewHeight / DivY) * DivX;
} }
uint8_t *pNewImg = ResizeImage(Img.m_pData, Img.m_Width, Img.m_Height, NewWidth, NewHeight, Img.PixelSize()); uint8_t *pNewImage = ResizeImage(Image.m_pData, Image.m_Width, Image.m_Height, NewWidth, NewHeight, Image.PixelSize());
free(Img.m_pData); free(Image.m_pData);
Img.m_pData = pNewImg; Image.m_pData = pNewImage;
Img.m_Width = NewWidth; Image.m_Width = NewWidth;
Img.m_Height = NewHeight; Image.m_Height = NewHeight;
ImageIsValid = true; ImageIsValid = true;
} }

2
src/engine/client/graphics_threaded.h
View file

@ -983,7 +983,7 @@ public:
IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) override; IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) override;
bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) override; bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) override;
bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) override; bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) override;
bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override; bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override;
void CopyTextureBufferSub(uint8_t *pDestBuffer, const CImageInfo &SourceImage, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override; void CopyTextureBufferSub(uint8_t *pDestBuffer, const CImageInfo &SourceImage, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override;

2
src/engine/graphics.h
View file

@ -331,7 +331,7 @@ public:
virtual bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) = 0; virtual bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) = 0;
virtual bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) = 0; virtual bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) = 0;
virtual bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) = 0; virtual bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) = 0;
// destination and source buffer require to have the same width and height // destination and source buffer require to have the same width and height