Merge pull request #6 from feresr/main

clang not valid constexp -> update blah lib to latest master
This commit is contained in:
Noel Berry 2022-05-07 18:14:52 -07:00 committed by GitHub
commit f62a60cb3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
.vscode .vscode
out out
CMakeSettings.json CMakeSettings.json
build/*

@ -1 +1 @@
Subproject commit 9beb7eff58ae78810fa7f4d9830f8c46c0c0531a Subproject commit b2bcf66a37eb2925cf55fb2cf73e7b2f8b33d785

View File

@ -347,8 +347,8 @@ void Game::render()
{ {
auto w = Content::font.width_of(ending); auto w = Content::font.width_of(ending);
auto pos = Point(room.x * width + width / 2, room.y * height + 20); auto pos = Point(room.x * width + width / 2, room.y * height + 20);
batch.str(Content::font, ending, pos + Point(0, 1), TextAlign::Top, 8, Color::black); batch.str(Content::font, ending, pos + Point(0, 1), Vec2f(0.0, 0.0), 8, Color::black);
batch.str(Content::font, ending, pos, TextAlign::Top, 8, Color::white); batch.str(Content::font, ending, pos, Vec2f(0.0, 0.0), 8, Color::white);
} }
// end camera offset // end camera offset