Change the color namespace to ColorValue. Need to come up with the organizational theme for the code.
This commit is contained in:
parent
56b26e1c4a
commit
2f8c9bd1a9
4 changed files with 7 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
namespace color {
|
||||
namespace ColorValue {
|
||||
const sf::Color BLACK{1, 4, 2};
|
||||
const sf::Color DARK_DARK{9, 29, 16};
|
||||
const sf::Color DARK_MID{14, 50, 26};
|
||||
|
|
|
@ -23,9 +23,9 @@ struct Panel {
|
|||
bool has_border = false;
|
||||
bool must_clear = true;
|
||||
bool grid = false;
|
||||
sf::Color default_bg = color::BLACK;
|
||||
sf::Color default_fg = color::LIGHT_LIGHT;
|
||||
sf::Color border_color = color::MID;
|
||||
sf::Color default_bg = ColorValue::BLACK;
|
||||
sf::Color default_fg = ColorValue::LIGHT_LIGHT;
|
||||
sf::Color border_color = ColorValue::MID;
|
||||
int border_px = UI_PANEL_BORDER_PX;
|
||||
|
||||
bool $dirty = true;
|
||||
|
|
|
@ -20,8 +20,8 @@ SFMLRender::SFMLRender() :
|
|||
$window(sf::VideoMode($config.video_x,$config.video_y), "Roguish"),
|
||||
$map_font_size(0),
|
||||
$line_spacing(0),
|
||||
$default_fg(color::LIGHT_MID),
|
||||
$default_bg(color::BLACK),
|
||||
$default_fg(ColorValue::LIGHT_MID),
|
||||
$default_bg(ColorValue::BLACK),
|
||||
$ansi($default_fg, $default_bg)
|
||||
{
|
||||
// force true color, but maybe I want to support different color sets
|
||||
|
@ -30,7 +30,7 @@ SFMLRender::SFMLRender() :
|
|||
$ui_text.setFont($font);
|
||||
$ui_text.setPosition(0,0);
|
||||
$ui_text.setCharacterSize($config.ui_font_size);
|
||||
$ui_text.setFillColor(color::LIGHT_MID);
|
||||
$ui_text.setFillColor(ColorValue::LIGHT_MID);
|
||||
sf::Glyph glyph = $font.getGlyph($config.ui_base_char, $config.ui_font_size, false);
|
||||
$ui_bounds = glyph.bounds;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
TODAY'S GOAL:
|
||||
* color namespace is too ambiguous
|
||||
|
||||
* Pathing::compute_paths can take a starting level to implement lower directions, or possibly setting a value lower?
|
||||
|
||||
* Fix " room should always be found"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue