Skip to content

Commit a21a1a2

Browse files
committed
Reformatted code of SpriteSet class.
1 parent 81ac069 commit a21a1a2

File tree

4 files changed

+512
-355
lines changed

4 files changed

+512
-355
lines changed

Source/Core/FontEngineDefault/FontFaceLayer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ bool FontFaceLayer::Generate(
131131
{
132132
if (glyph.color_format == ColorFormat::RGBA8)
133133
{
134-
sprite_set_handle = sprite_set.add(glyph_dimensions.x, glyph_dimensions.y, glyph.bitmap_data);
134+
sprite_set_handle = sprite_set.Add(glyph_dimensions.x, glyph_dimensions.y, glyph.bitmap_data);
135135
}
136136
else
137137
{
@@ -140,19 +140,19 @@ bool FontFaceLayer::Generate(
140140
for (int i = 0; i < glyph_pixel_count; ++i)
141141
for (int c = 0; c < 4; ++c)
142142
unpacked_bitmap[i * 4 + c] = glyph.bitmap_data[i];
143-
sprite_set_handle = sprite_set.add(glyph_dimensions.x, glyph_dimensions.y, unpacked_bitmap.data());
143+
sprite_set_handle = sprite_set.Add(glyph_dimensions.x, glyph_dimensions.y, unpacked_bitmap.data());
144144
}
145145
}
146146
else
147147
{
148148
Vector<unsigned char> processed_bitmap(glyph_dimensions.x * glyph_dimensions.y * 4);
149149
effect->GenerateGlyphTexture(processed_bitmap.data(), glyph_dimensions, glyph_dimensions.x * 4, glyph);
150-
sprite_set_handle = sprite_set.add(glyph_dimensions.x, glyph_dimensions.y, processed_bitmap.data());
150+
sprite_set_handle = sprite_set.Add(glyph_dimensions.x, glyph_dimensions.y, processed_bitmap.data());
151151
}
152152
sprite_set_handle_map.emplace(character, sprite_set_handle);
153-
const auto sprite_data = sprite_set.get(sprite_set_handle);
153+
const auto sprite_data = sprite_set.Get(sprite_set_handle);
154154
// Set the character's texture index.
155-
box.texture_index = sprite_data.textureId;
155+
box.texture_index = sprite_data.texture_id;
156156
// Generate the character's texture coordinates.
157157
const float texture_size = 1024.f;
158158
box.texcoords[0].x = static_cast<float>(sprite_data.x) / texture_size;
@@ -192,7 +192,7 @@ bool FontFaceLayer::Generate(
192192
}
193193
*/
194194

195-
sprite_set_textures = sprite_set.getTextures();
195+
sprite_set_textures = sprite_set.GetTextures();
196196
const FontEffect* effect_ptr = effect.get();
197197
const int handle_version = handle->GetVersion();
198198

@@ -300,7 +300,7 @@ void FontFaceLayer::RemoveGlyphs(const Vector<Character> &characters)
300300
for (const auto character : characters)
301301
{
302302
character_boxes.erase(character);
303-
sprite_set.remove(sprite_set_handle_map[character]);
303+
sprite_set.Remove(sprite_set_handle_map[character]);
304304
sprite_set_handle_map.erase(character);
305305
}
306306
}

Source/Core/FontEngineDefault/LruList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ unsigned LruList<T>::getLastEntryAge() const {
170170
return size == 0 ? 0 : currentEpoch - pool[tailIndex].lastUsed;
171171
}
172172

173-
#endif // GRAPHICS_LRULIST_H
173+
#endif // GRAPHICS_LRULIST_H

0 commit comments

Comments
 (0)