duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Binary-search optimisations and fixes

Browse source
This commit is contained in:
Clownacy 2020-09-18 02:03:05 +01:00
parent 4763aecdbd
commit b0974c3def
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Font.cpp
View file

@ -1073,19 +1073,11 @@ static Glyph* GetGlyph(Font *font, unsigned long unicode_value)
size_t left = 0; size_t left = 0;
size_t right = font->total_local_glyphs; size_t right = font->total_local_glyphs;
while (right - left >= 2) for (;;)
{ {
size_t index = left + (right - left) / 2; size_t index = (left + right) / 2;
if (font->local_glyphs[index].unicode_value < unicode_value) if (font->local_glyphs[index].unicode_value == unicode_value)
{
left = index;
}
else if (font->local_glyphs[index].unicode_value > unicode_value)
{
right = index;
}
else
{ {
const Glyph *local_glyph = &font->local_glyphs[index]; const Glyph *local_glyph = &font->local_glyphs[index];
@ -1104,6 +1096,14 @@ static Glyph* GetGlyph(Font *font, unsigned long unicode_value)
return glyph; return glyph;
} }
if (index == left)
break;
if (font->local_glyphs[index].unicode_value < unicode_value)
left = index;
else //if (font->local_glyphs[index].unicode_value > unicode_value)
right = index;
} }
#endif #endif