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

love.math.random now uses a slight variant of Xorshift (Xorshift*).

Browse Source
This commit is contained in:
Alex Szpakowski
2015-10-26 20:47:56 -03:00
parent f92e6552d4
commit c03ce3a9ab
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+14 -7
View File
@@ -434,9 +434,16 @@ std::vector<Font::DrawCommand> Font::generateVertices(const Codepoints &codepoin
}
// Sort draw commands by texture first, and quad position in memory second
// (using the struct's < operator).
std::sort(drawcommands.begin(), drawcommands.end());
const auto drawsort = [](const DrawCommand &a, const DrawCommand &b) -> bool
{
// Texture binds are expensive, so we should sort by that first.
if (a.texture != b.texture)
return a.texture < b.texture;
else
return a.startvertex < b.startvertex;
};
std::sort(drawcommands.begin(), drawcommands.end(), drawsort);
if (dx > maxwidth)
maxwidth = (int) dx;
@@ -929,10 +936,10 @@ bool Font::getConstant(AlignMode in, const char *&out)
StringMap<Font::AlignMode, Font::ALIGN_MAX_ENUM>::Entry Font::alignModeEntries[] =
{
{ "left", Font::ALIGN_LEFT },
{ "right", Font::ALIGN_RIGHT },
{ "center", Font::ALIGN_CENTER },
{ "justify", Font::ALIGN_JUSTIFY },
{ "left", ALIGN_LEFT },
{ "right", ALIGN_RIGHT },
{ "center", ALIGN_CENTER },
{ "justify", ALIGN_JUSTIFY },
};
StringMap<Font::AlignMode, Font::ALIGN_MAX_ENUM> Font::alignModes(Font::alignModeEntries, sizeof(Font::alignModeEntries));