mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2025-06-29 19:25:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

spritefont takes a vector instead of a null-terminated charset

Browse Source
This commit is contained in:
Noel Berry
2021-03-20 23:24:18 -07:00
parent d388931dd3
commit 9b42bba16e
6 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/drawing/spritefont.cpp
View File

@ -5,6 +5,15 @@
using namespace Blah;
CharacterRange::CharacterRange()
: from(0), to(0) {}
CharacterRange::CharacterRange(u32 single)
: from(single), to(single) {}
CharacterRange::CharacterRange(u32 from, u32 to)
: from(from), to(to) {}
const CharacterSet CharacterRange::ASCII = CharacterSet({ CharacterRange(32, 128) });
SpriteFont::SpriteFont()
{
size = 0;
@ -13,25 +22,22 @@ SpriteFont::SpriteFont()
line_gap = 0;
}
const u32 ascii[]{ 32, 128, 0 };
const u32* SpriteFont::ASCII = ascii;
SpriteFont::SpriteFont(const char* file, float size)
{
build(file, size, ASCII);
build(file, size, CharacterRange::ASCII);
}
SpriteFont::SpriteFont(const char* file, float size, const u32* charset)
SpriteFont::SpriteFont(const char* file, float size, const CharacterSet& charset)
{
build(file, size, charset);
}
SpriteFont::SpriteFont(const Font& font, float size)
{
build(font, size, ASCII);
build(font, size, CharacterRange::ASCII);
}
SpriteFont::SpriteFont(const Font& font, float size, const u32* charset)
SpriteFont::SpriteFont(const Font& font, float size, const CharacterSet& charset)
{
build(font, size, charset);
}
@ -157,7 +163,7 @@ float SpriteFont::height_of(const String& text) const
return height - line_gap;
}
void SpriteFont::build(const char* file, float sz, const u32* charset)
void SpriteFont::build(const char* file, float sz, const CharacterSet& charset)
{
dispose();
@ -166,7 +172,7 @@ void SpriteFont::build(const char* file, float sz, const u32* charset)
build(font, sz, charset);
}
void SpriteFont::build(const Font& font, float size, const u32* charset)
void SpriteFont::build(const Font& font, float size, const CharacterSet& charset)
{
dispose();
@ -187,11 +193,10 @@ void SpriteFont::build(const Font& font, float size, const u32* charset)
std::unordered_map<u32, int> glyphs;
Vector<Color> buffer;
auto ranges = charset;
while (*ranges != 0)
for (auto& range : charset)
{
auto from = *ranges;
auto to = *(ranges + 1);
auto from = range.from;
auto to = range.to + 1;
BLAH_ASSERT(to >= from, "Charset Range must be in pairs of [min,max]");
@ -218,8 +223,6 @@ void SpriteFont::build(const Font& font, float size, const u32* charset)
packer.add(i, ch.width, ch.height, buffer.data());
}
}
ranges += 2;
}
buffer.clear();

4
src/graphics/framebuffer.cpp
View File

@ -12,7 +12,7 @@ FrameBufferRef FrameBuffer::create(int width, int height)
FrameBufferRef FrameBuffer::create(int width, int height, const TextureFormat* attachments, int attachment_count)
{
BLAH_ASSERT(width > 0 && height > 0, "FrameBuffer width and height must be larger than 0");
BLAH_ASSERT(attachment_count <= BLAH_ATTACHMENTS, "Exceeded maximum attachment count");
BLAH_ASSERT(attachment_count <= Attachments::MaxCapacity, "Exceeded maximum attachment count");
BLAH_ASSERT(attachment_count > 0, "At least one attachment must be provided");
int color_count = 0;
@ -29,7 +29,7 @@ FrameBufferRef FrameBuffer::create(int width, int height, const TextureFormat* a
}
BLAH_ASSERT(depth_count <= 1, "FrameBuffer can only have 1 Depth/Stencil Texture");
BLAH_ASSERT(color_count <= BLAH_ATTACHMENTS - 1, "Exceeded maximum Color attachment count");
BLAH_ASSERT(color_count <= Attachments::MaxCapacity - 1, "Exceeded maximum Color attachment count");
return GraphicsBackend::create_framebuffer(width, height, attachments, attachment_count);
}