LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Drawable code

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-18 22:06:52 -03:00
parent a844c16657
commit b8b670e0ae
23 changed files with 93 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+4 -4
View File
@@ -1258,24 +1258,24 @@ bool Graphics::isWireframe() const
return states.back().wireframe;
}
void Graphics::print(const std::vector<Font::ColoredString> &str, float x, float y , float angle, float sx, float sy, float ox, float oy, float kx, float ky)
void Graphics::print(const std::vector<Font::ColoredString> &str, const Matrix4 &m)
{
checkSetDefaultFont();
DisplayState &state = states.back();
if (state.font.get() != nullptr)
state.font->print(str, x, y, angle, sx, sy, ox, oy, kx, ky);
state.font->print(str, m);
}
void Graphics::printf(const std::vector<Font::ColoredString> &str, float x, float y, float wrap, Font::AlignMode align, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
void Graphics::printf(const std::vector<Font::ColoredString> &str, float wrap, Font::AlignMode align, const Matrix4 &m)
{
checkSetDefaultFont();
DisplayState &state = states.back();
if (state.font.get() != nullptr)
state.font->printf(str, x, y, wrap, align, angle, sx, sy, ox, oy, kx, ky);
state.font->printf(str, wrap, align, m);
}
/**