games/roguish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the color namespace to ColorValue. Need to come up with the organizational theme for the code.

Browse source
This commit is contained in:
Zed A. Shaw 2024-12-05 09:24:56 -05:00
parent 56b26e1c4a
commit 2f8c9bd1a9
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
color.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace color { namespace ColorValue {
const sf::Color BLACK{1, 4, 2}; const sf::Color BLACK{1, 4, 2};
const sf::Color DARK_DARK{9, 29, 16}; const sf::Color DARK_DARK{9, 29, 16};
const sf::Color DARK_MID{14, 50, 26}; const sf::Color DARK_MID{14, 50, 26};

6
panel.hpp
View file

@ -23,9 +23,9 @@ struct Panel {
bool has_border = false; bool has_border = false;
bool must_clear = true; bool must_clear = true;
bool grid = false; bool grid = false;
sf::Color default_bg = color::BLACK; sf::Color default_bg = ColorValue::BLACK;
sf::Color default_fg = color::LIGHT_LIGHT; sf::Color default_fg = ColorValue::LIGHT_LIGHT;
sf::Color border_color = color::MID; sf::Color border_color = ColorValue::MID;
int border_px = UI_PANEL_BORDER_PX; int border_px = UI_PANEL_BORDER_PX;
bool $dirty = true; bool $dirty = true;

6
render.cpp
View file

@ -20,8 +20,8 @@ SFMLRender::SFMLRender() :
$window(sf::VideoMode($config.video_x,$config.video_y), "Roguish"), $window(sf::VideoMode($config.video_x,$config.video_y), "Roguish"),
$map_font_size(0), $map_font_size(0),
$line_spacing(0), $line_spacing(0),
$default_fg(color::LIGHT_MID), $default_fg(ColorValue::LIGHT_MID),
$default_bg(color::BLACK), $default_bg(ColorValue::BLACK),
$ansi($default_fg, $default_bg) $ansi($default_fg, $default_bg)
{ {
// force true color, but maybe I want to support different color sets // force true color, but maybe I want to support different color sets
@ -30,7 +30,7 @@ SFMLRender::SFMLRender() :
$ui_text.setFont($font); $ui_text.setFont($font);
$ui_text.setPosition(0,0); $ui_text.setPosition(0,0);
$ui_text.setCharacterSize($config.ui_font_size); $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); sf::Glyph glyph = $font.getGlyph($config.ui_base_char, $config.ui_font_size, false);
$ui_bounds = glyph.bounds; $ui_bounds = glyph.bounds;
} }

2
status.txt
View file

@ -1,6 +1,4 @@
TODAY'S GOAL: 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? * Pathing::compute_paths can take a starting level to implement lower directions, or possibly setting a value lower?
* Fix " room should always be found" * Fix " room should always be found"