updated to latest blah version

This commit is contained in:
Noel Berry 2021-04-06 17:46:30 -07:00
parent 4740c54465
commit 37a5afc52c
2 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 3f07c03fa51162cee4dbe53abf4a958bb6c35cda Subproject commit 78b8140f539b0d0911b4426826201fcf95e568bf

View File

@ -57,7 +57,7 @@ void Content::load()
packer.padding = 0; packer.padding = 0;
// load the main font // load the main font
font = SpriteFont(path() + "fonts/dogica.ttf", 8, SpriteFont::ASCII); font = SpriteFont(path() + "fonts/dogica.ttf", 8, SpriteFont::CharRange::ASCII);
font.line_gap = 4; font.line_gap = 4;
// load sprites // load sprites
@ -118,8 +118,8 @@ void Content::load()
packer.pack(); packer.pack();
sprite_atlas = Texture::create(packer.pages[0]); sprite_atlas = Texture::create(packer.pages[0]);
subtextures.expand(packer.entries.size()); subtextures.expand(packer.entries().size());
for (auto& entry : packer.entries) for (auto& entry : packer.entries())
subtextures[entry.id] = Subtexture(sprite_atlas, entry.packed, entry.frame); subtextures[entry.id] = Subtexture(sprite_atlas, entry.packed, entry.frame);
} }