mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Big speedup to path rendering on GL/software.

Browse source
This commit is contained in:
jules 2013-11-07 14:38:59 +00:00
parent a081f0f641
commit a53110de06
1 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

64
modules/juce_graphics/geometry/juce_EdgeTable.cpp
View file

@ -332,57 +332,51 @@ void EdgeTable::sanitiseLevels (const bool useNonZeroWinding) noexcept
if (num > 0)
{
LineItem* items = reinterpret_cast<LineItem*> (lineStart + 1);
LineItem* const itemsEnd = items + num;
// sort the X coords
std::sort (items, items + num);
// merge duplicate X coords
for (int i = 0; i < num - 1; ++i)
{
if (items[i].x == items[i + 1].x)
{
items[i].level += items[i + 1].level;
memmove (items + i + 1, items + i + 2, (size_t) (num - i - 2) * sizeof (LineItem));
--num;
--lineStart[0];
--i;
}
}
std::sort (items, itemsEnd);
const LineItem* src = items;
int correctedNum = num;
int level = 0;
if (useNonZeroWinding)
while (src < itemsEnd)
{
while (--num > 0)
{
level += items->level;
int corrected = std::abs (level);
if (corrected >> 8)
corrected = 255;
level += src->level;
const int x = src->x;
++src;
items->level = corrected;
++items;
}
}
else
{
while (--num > 0)
while (src < itemsEnd && src->x == x)
{
level += items->level;
int corrected = std::abs (level);
if (corrected >> 8)
level += src->level;
++src;
--correctedNum;
}
int corrected = std::abs (level);
if (corrected >> 8)
{
if (useNonZeroWinding)
{
corrected = 255;
}
else
{
corrected &= 511;
if (corrected >> 8)
corrected = 511 - corrected;
}
items->level = corrected;
++items;
}
items->x = x;
items->level = corrected;
++items;
}
items->level = 0; // force the last level to 0, just in case something went wrong in creating the table
lineStart[0] = correctedNum;
(items - 1)->level = 0; // force the last level to 0, just in case something went wrong in creating the table
}
lineStart += lineStrideElements;