mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
Entity text should use space more effectivly
This commit is contained in:
parent
14d383ef15
commit
410c4b3250
|
@ -1786,11 +1786,11 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize = -1)
|
virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth)
|
||||||
{
|
{
|
||||||
int WidthOfText = CalculateTextWidth(pText, TextLength, 0, 100);
|
int WidthOfText = CalculateTextWidth(pText, TextLength, 0, 100);
|
||||||
|
|
||||||
int FontSize = 100.f / ((float)WidthOfText / (float)MaxSize);
|
int FontSize = 100.f / ((float)WidthOfText / (float)MaxWidth);
|
||||||
|
|
||||||
if (MaxSize > 0 && FontSize > MaxSize)
|
if (MaxSize > 0 && FontSize > MaxSize)
|
||||||
FontSize = MaxSize;
|
FontSize = MaxSize;
|
||||||
|
|
|
@ -101,7 +101,7 @@ public:
|
||||||
virtual void RenderTextContainer(int TextContainerIndex, STextRenderColor *pTextColor, STextRenderColor *pTextOutlineColor, float X, float Y) = 0;
|
virtual void RenderTextContainer(int TextContainerIndex, STextRenderColor *pTextColor, STextRenderColor *pTextOutlineColor, float X, float Y) = 0;
|
||||||
|
|
||||||
virtual void UploadEntityLayerText(void* pTexBuff, int ImageColorChannelCount, int TexWidth, int TexHeight, const char *pText, int Length, float x, float y, int FontHeight) = 0;
|
virtual void UploadEntityLayerText(void* pTexBuff, int ImageColorChannelCount, int TexWidth, int TexHeight, const char *pText, int Length, float x, float y, int FontHeight) = 0;
|
||||||
virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize = -1) = 0;
|
virtual int AdjustFontSize(const char *pText, int TextLength, int MaxSize, int MaxWidth) = 0;
|
||||||
virtual int CalculateTextWidth(const char *pText, int TextLength, int FontWidth, int FontHeight) = 0;
|
virtual int CalculateTextWidth(const char *pText, int TextLength, int FontWidth, int FontHeight) = 0;
|
||||||
|
|
||||||
// old foolish interface
|
// old foolish interface
|
||||||
|
|
|
@ -191,13 +191,13 @@ int CMapImages::GetTextureScale()
|
||||||
return m_TextureScale;
|
return m_TextureScale;
|
||||||
}
|
}
|
||||||
|
|
||||||
IGraphics::CTextureHandle CMapImages::UploadEntityLayerText(int TextureSize, int YOffset)
|
IGraphics::CTextureHandle CMapImages::UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset)
|
||||||
{
|
{
|
||||||
void *pMem = calloc(1024 * 1024 * 4, 1);
|
void *pMem = calloc(1024 * 1024 * 4, 1);
|
||||||
|
|
||||||
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, YOffset, 0);
|
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, MaxWidth, YOffset, 0);
|
||||||
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, YOffset, 1);
|
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, MaxWidth, YOffset, 1);
|
||||||
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, YOffset, 2, 255);
|
UpdateEntityLayerText(pMem, 4, 1024, 1024, TextureSize, MaxWidth, YOffset, 2, 255);
|
||||||
|
|
||||||
int TextureLoadFlag = (Graphics()->HasTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
|
int TextureLoadFlag = (Graphics()->HasTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
|
||||||
IGraphics::CTextureHandle Texture = Graphics()->LoadTextureRaw(1024, 1024, CImageInfo::FORMAT_RGBA, pMem, CImageInfo::FORMAT_RGBA, TextureLoadFlag);
|
IGraphics::CTextureHandle Texture = Graphics()->LoadTextureRaw(1024, 1024, CImageInfo::FORMAT_RGBA, pMem, CImageInfo::FORMAT_RGBA, TextureLoadFlag);
|
||||||
|
@ -206,7 +206,7 @@ IGraphics::CTextureHandle CMapImages::UploadEntityLayerText(int TextureSize, int
|
||||||
return Texture;
|
return Texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMapImages::UpdateEntityLayerText(void* pTexBuffer, int ImageColorChannelCount, int TexWidth, int TexHeight, int TextureSize, int YOffset, int NumbersPower, int MaxNumber)
|
void CMapImages::UpdateEntityLayerText(void* pTexBuffer, int ImageColorChannelCount, int TexWidth, int TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber)
|
||||||
{
|
{
|
||||||
char aBuf[4];
|
char aBuf[4];
|
||||||
int DigitsCount = NumbersPower+1;
|
int DigitsCount = NumbersPower+1;
|
||||||
|
@ -218,8 +218,8 @@ void CMapImages::UpdateEntityLayerText(void* pTexBuffer, int ImageColorChannelCo
|
||||||
|
|
||||||
str_format(aBuf, 4, "%d", CurrentNumber);
|
str_format(aBuf, 4, "%d", CurrentNumber);
|
||||||
|
|
||||||
int CurrentNumberSuitableFontSize = TextRender()->AdjustFontSize(aBuf, DigitsCount, TextureSize);
|
int CurrentNumberSuitableFontSize = TextRender()->AdjustFontSize(aBuf, DigitsCount, TextureSize, MaxWidth);
|
||||||
int UniversalSuitableFontSize = CurrentNumberSuitableFontSize*0.9; // should be smoothed enough to fit any digits combination
|
int UniversalSuitableFontSize = CurrentNumberSuitableFontSize*0.95f; // should be smoothed enough to fit any digits combination
|
||||||
|
|
||||||
int ApproximateTextWidth = TextRender()->CalculateTextWidth(aBuf, DigitsCount, 0, UniversalSuitableFontSize);
|
int ApproximateTextWidth = TextRender()->CalculateTextWidth(aBuf, DigitsCount, 0, UniversalSuitableFontSize);
|
||||||
int XOffSet = (64-ApproximateTextWidth)/2;
|
int XOffSet = (64-ApproximateTextWidth)/2;
|
||||||
|
@ -243,16 +243,16 @@ void CMapImages::InitOverlayTextures()
|
||||||
|
|
||||||
if(m_OverlayBottomTexture == -1)
|
if(m_OverlayBottomTexture == -1)
|
||||||
{
|
{
|
||||||
m_OverlayBottomTexture = UploadEntityLayerText(TextureSize/2, 32+TextureToVerticalCenterOffset/2);
|
m_OverlayBottomTexture = UploadEntityLayerText(TextureSize/2, 64, 32+TextureToVerticalCenterOffset/2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_OverlayTopTexture == -1)
|
if(m_OverlayTopTexture == -1)
|
||||||
{
|
{
|
||||||
m_OverlayTopTexture = UploadEntityLayerText(TextureSize/2, TextureToVerticalCenterOffset/2);
|
m_OverlayTopTexture = UploadEntityLayerText(TextureSize/2, 64, TextureToVerticalCenterOffset/2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_OverlayCenterTexture == -1)
|
if(m_OverlayCenterTexture == -1)
|
||||||
{
|
{
|
||||||
m_OverlayCenterTexture = UploadEntityLayerText(TextureSize, TextureToVerticalCenterOffset);
|
m_OverlayCenterTexture = UploadEntityLayerText(TextureSize, 64, TextureToVerticalCenterOffset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,8 @@ private:
|
||||||
int m_TextureScale;
|
int m_TextureScale;
|
||||||
|
|
||||||
void InitOverlayTextures();
|
void InitOverlayTextures();
|
||||||
IGraphics::CTextureHandle UploadEntityLayerText(int TextureSize, int YOffset);
|
IGraphics::CTextureHandle UploadEntityLayerText(int TextureSize, int MaxWidth, int YOffset);
|
||||||
void UpdateEntityLayerText(void* pTexBuffer, int ImageColorChannelCount, int TexWidth, int TexHeight, int TextureSize, int YOffset, int NumbersPower, int MaxNumber = -1);
|
void UpdateEntityLayerText(void* pTexBuffer, int ImageColorChannelCount, int TexWidth, int TexHeight, int TextureSize, int MaxWidth, int YOffset, int NumbersPower, int MaxNumber = -1);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue