github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-08 02:54:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

WinGL: Added automatic atlas textures, fixed some bugs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4188 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2011-11-22 20:33:47 +00:00
parent 045cd0f256
commit d3a6feee5a
30 changed files with 842 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Draw/DrawText.cpp
View file

@ -180,7 +180,7 @@ void Draw::DrawText(int x, int y, const String& text, Font font, Color ink, cons
Size GetTextSize(const wchar *text, Font font, int n)
{
#ifdef flagWINGL
return GetTextSize(text, Resources::GetFont(font), n);
return GetTextSize(text, resources.GetFont(font), n);
#else
FontInfo fi = font.Info();
if(n < 0)