mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-07-03 14:34:34 +00:00
Build fixes for Linux, some warnings and compatibility fixes for C++17 and up
This commit is contained in:
parent
924bc058b4
commit
74ad8f7804
36 changed files with 126 additions and 225 deletions
|
@ -50,17 +50,17 @@ void DebugFont::setFontSize(float sz)
|
|||
fontDrawSize = sz;
|
||||
}
|
||||
|
||||
float DebugFont::getHeight()
|
||||
float DebugFont::getHeight() const
|
||||
{
|
||||
return fontDrawSize * lines.size() * 1.5f; // vspc in render()
|
||||
}
|
||||
|
||||
float DebugFont::getLineHeight()
|
||||
float DebugFont::getLineHeight() const
|
||||
{
|
||||
return fontDrawSize * 1.5f; // vspc in render()
|
||||
}
|
||||
|
||||
float DebugFont::getStringWidth(const std::string& text)
|
||||
float DebugFont::getStringWidth(const std::string& text) const
|
||||
{
|
||||
int maxchars = 0;
|
||||
int c = 0;
|
||||
|
@ -78,7 +78,7 @@ float DebugFont::getStringWidth(const std::string& text)
|
|||
return fontDrawSize * maxchars * (1.4f * 0.75f);
|
||||
}
|
||||
|
||||
float DebugFont::getActualWidth()
|
||||
float DebugFont::getActualWidth() const
|
||||
{
|
||||
return maxW * (1.4f * 0.75f); // numbers taken from onRender()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue