RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

2048: Use the original colors

Browse source
This commit is contained in:
Sergey Bugaev 2020-08-18 14:11:42 +03:00 • committed by Andreas Kling
parent 70356429ae
commit 50d81f1e14
2 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Games/2048/2048.cpp
View file

@ -283,39 +283,48 @@ void TwentyFortyEightGame::keydown_event(GUI::KeyEvent& event)
} }
} }
void TwentyFortyEightGame::paint_event(GUI::PaintEvent&) Gfx::Color TwentyFortyEightGame::background_color_for_cell(u32 value)
{ {
static auto color_for_entry = [&](u32 entry) -> Color { switch (value) {
constexpr static u8 blend_alpha = 128;
switch (entry) {
case 0: case 0:
return palette().base().lightened(); return Color::from_rgb(0xcdc1b4);
case 2: case 2:
return palette().base().blend(Color(Color::LightGray).with_alpha(blend_alpha)); return Color::from_rgb(0xeee4da);
case 4: case 4:
return palette().base().blend(Color(Color::WarmGray).with_alpha(blend_alpha)); return Color::from_rgb(0xede0c8);
case 8: case 8:
return palette().base().blend(Color(Color::MidMagenta).with_alpha(blend_alpha)); return Color::from_rgb(0xf2b179);
case 16: case 16:
return palette().base().blend(Color(Color::Magenta).with_alpha(blend_alpha)); return Color::from_rgb(0xf59563);
case 32: case 32:
return palette().base().blend(Color(Color::Cyan).with_alpha(blend_alpha)); return Color::from_rgb(0xf67c5f);
case 64: case 64:
return palette().base().blend(Color(Color::DarkCyan).with_alpha(blend_alpha)); return Color::from_rgb(0xf65e3b);
case 128: case 128:
return palette().base().blend(Color(Color::MidBlue).with_alpha(blend_alpha)); return Color::from_rgb(0xedcf72);
case 256: case 256:
return palette().base().blend(Color(Color::Blue).with_alpha(blend_alpha)); return Color::from_rgb(0xedcc61);
case 512: case 512:
return palette().base().blend(Color(Color::DarkBlue).with_alpha(blend_alpha)); return Color::from_rgb(0xedc850);
case 1024: case 1024:
return palette().base().blend(Color(Color::Yellow).with_alpha(blend_alpha)); return Color::from_rgb(0xedc53f);
case 2048: case 2048:
return palette().base().blend(Color(Color::Green).with_alpha(blend_alpha)); return Color::from_rgb(0xedc22e);
default: default:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
}; }
Gfx::Color TwentyFortyEightGame::text_color_for_cell(u32 value)
{
if (value <= 4)
return Color::from_rgb(0x776e65);
return Color::from_rgb(0xf9f6f2);
}
void TwentyFortyEightGame::paint_event(GUI::PaintEvent&)
{
Color background_color = Color::from_rgb(0xbbada0);
GUI::Painter painter(*this); GUI::Painter painter(*this);
@ -330,7 +339,7 @@ void TwentyFortyEightGame::paint_event(GUI::PaintEvent&)
static_cast<int>(m_padding + (m_cell_size + m_padding) * m_rows) static_cast<int>(m_padding + (m_cell_size + m_padding) * m_rows)
}; };
field_rect.center_within({ 0, score_height, width(), height() - score_height }); field_rect.center_within({ 0, score_height, width(), height() - score_height });
painter.fill_rect(field_rect, Color::White); painter.fill_rect(field_rect, background_color);
for (auto column = 0; column < m_columns; ++column) { for (auto column = 0; column < m_columns; ++column) {
for (auto row = 0; row < m_rows; ++row) { for (auto row = 0; row < m_rows; ++row) {
@ -341,9 +350,9 @@ void TwentyFortyEightGame::paint_event(GUI::PaintEvent&)
m_cell_size, m_cell_size,
}; };
auto entry = m_states.last().board[row][column]; auto entry = m_states.last().board[row][column];
painter.fill_rect(rect, color_for_entry(entry)); painter.fill_rect(rect, background_color_for_cell(entry));
if (entry > 0) if (entry > 0)
painter.draw_text(rect, String::number(entry), font(), Gfx::TextAlignment::Center, palette().color(ColorRole::BaseText)); painter.draw_text(rect, String::number(entry), font(), Gfx::TextAlignment::Center, text_color_for_cell(entry));
} }
} }
} }

2
Games/2048/2048.h
View file

@ -61,6 +61,8 @@ private:
u32 m_starting_tile { 2 }; u32 m_starting_tile { 2 };
size_t m_current_turn { 0 }; size_t m_current_turn { 0 };
Color background_color_for_cell(u32 value);
Color text_color_for_cell(u32 value);
float m_padding { 0 }; float m_padding { 0 };
float m_cell_size { 0 }; float m_cell_size { 0 };