ElnuDev/septadrop
ElnuDev/septadrop
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Add thousands comma, prevent tiles and blocks counters from counting on reset

Browse source
This commit is contained in:
Elnu 2022-03-07 20:18:08 -08:00
parent e57b3cc550
commit b20a58b7d3
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/numerals.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 308 B

26
src/Main.cpp
View file

@ -30,13 +30,16 @@
class NumberRenderer {
public:
sf::IntRect numeral_rects[10];
sf::Texture texture;
sf::IntRect comma_rect;
sf::IntRect numeral_rects[10];
NumberRenderer(
sf::Texture _texture,
sf::IntRect _comma_rect,
std::initializer_list<sf::IntRect> _numeral_rects
) {
texture = _texture;
comma_rect = _comma_rect;
sprite = sf::Sprite(texture);
int i = 0;
for (auto numeral_rect = _numeral_rects.begin(); numeral_rect != _numeral_rects.end(); ++numeral_rect) {
@ -50,15 +53,26 @@ class NumberRenderer {
numeral_string.push_back(number_string.back());
auto numeral_rect = numeral_rects[std::stoi(numeral_string)];
int x_offset = -numeral_rect.width;
for (int i = number_string.length() - 1; i >= 0; i--) {
char numeral_string[] = {number_string[i]}; // stoi requires string (char[]) not char
uint digits = number_string.length();
for (int i = digits - 1; i >= 0; i--) {
char numeral_string[] = {number_string[i]};
auto numeral_rect = numeral_rects[std::stoi(numeral_string)];
if ((digits - i) % 3 == 1 && i != digits - 1) {
sprite.setTextureRect(comma_rect);
sprite.setPosition(x + x_offset, y);
window->draw(sprite);
x_offset -= numeral_rect.width;
}
sprite.setTextureRect(numeral_rect);
sprite.setPosition(x + x_offset, y);
window->draw(sprite);
if (i == 0) {
break;
}
if ((digits - i) % 3 == 0) {
x_offset -= comma_rect.width;
continue;
}
numeral_string[0] = number_string[i - 1];
numeral_rect = numeral_rects[std::stoi(numeral_string)];
x_offset -= numeral_rect.width;
@ -239,7 +253,7 @@ int main()
sf::Texture numeral_texture;
numeral_texture.loadFromFile("../res/numerals.png");
NumberRenderer number_renderer(numeral_texture, {
NumberRenderer number_renderer(numeral_texture, sf::IntRect(134, 0, 10, 16), {
sf::IntRect(0, 0, 14, 16),
sf::IntRect(14, 0, 8, 16),
sf::IntRect(22, 0, 14, 16),
@ -403,6 +417,8 @@ int main()
}
}
} else {
tiles += block.get_tiles().size();
blocks++;
for (auto tile : block.get_tiles()) {
grid[tile.y][tile.x] = block.type->tile_type;
}
@ -428,8 +444,6 @@ int main()
}
}
block = Block();
tiles += block.get_tiles().size();
blocks++;
} else if(is_update_frame) {
block.position.y++;
}