Added direct theme support and will slowly move more things into this struct for configuring the look.
This commit is contained in:
parent
b9deb3a0de
commit
a18d60dcb0
9 changed files with 48 additions and 67 deletions
|
@ -12,5 +12,6 @@ namespace sfml {
|
|||
void sound_stop(const string& name);
|
||||
std::shared_ptr<sf::Shader> shader_get(const std::string& name);
|
||||
bool shader_updated();
|
||||
guecs::Theme theme();
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
#pragma once
|
||||
#include <SFML/Graphics/Color.hpp>
|
||||
|
||||
namespace ColorValue {
|
||||
constexpr const sf::Color BLACK{0, 0, 0};
|
||||
constexpr const sf::Color DARK_DARK{10, 10, 10};
|
||||
constexpr const sf::Color DARK_MID{30, 30, 30};
|
||||
constexpr const sf::Color DARK_LIGHT{60, 60, 60};
|
||||
constexpr const sf::Color MID{100, 100, 100};
|
||||
constexpr const sf::Color LIGHT_DARK{150, 150, 150};
|
||||
constexpr const sf::Color LIGHT_MID{200, 200, 200};
|
||||
constexpr const sf::Color LIGHT_LIGHT{230, 230, 230};
|
||||
constexpr const sf::Color WHITE{255, 255, 255};
|
||||
constexpr const sf::Color TRANSPARENT = sf::Color::Transparent;
|
||||
}
|
|
@ -1,31 +1,21 @@
|
|||
#pragma once
|
||||
#include <SFML/Graphics.hpp>
|
||||
#include "guecs/dbc.hpp"
|
||||
#include "guecs/sfml/color.hpp"
|
||||
#include "guecs/lel.hpp"
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
#include <any>
|
||||
#include "guecs/theme.hpp"
|
||||
|
||||
namespace guecs {
|
||||
using std::shared_ptr, std::wstring, std::string;
|
||||
|
||||
constexpr const int PADDING = 3;
|
||||
constexpr const int BORDER_PX = 1;
|
||||
constexpr const int TEXT_SIZE = 30;
|
||||
constexpr const int LABEL_SIZE = 20;
|
||||
constexpr const sf::Color FILL_COLOR = ColorValue::DARK_MID;
|
||||
constexpr const sf::Color TEXT_COLOR = ColorValue::LIGHT_LIGHT;
|
||||
constexpr const sf::Color BG_COLOR = ColorValue::MID;
|
||||
constexpr const sf::Color BORDER_COLOR = ColorValue::MID;
|
||||
constexpr const char *FONT_FILE_NAME="assets/text.otf";
|
||||
|
||||
struct Textual {
|
||||
std::wstring content;
|
||||
unsigned int size = TEXT_SIZE;
|
||||
sf::Color color = TEXT_COLOR;
|
||||
int padding = PADDING;
|
||||
unsigned int size = THEME.TEXT_SIZE;
|
||||
sf::Color color = THEME.TEXT_COLOR;
|
||||
int padding = THEME.PADDING;
|
||||
bool centered = false;
|
||||
shared_ptr<sf::Font> font = nullptr;
|
||||
shared_ptr<sf::Text> text = nullptr;
|
||||
|
@ -39,7 +29,7 @@ namespace guecs {
|
|||
Label(Args... args) : Textual(args...)
|
||||
{
|
||||
centered = true;
|
||||
size = LABEL_SIZE;
|
||||
size = THEME.LABEL_SIZE;
|
||||
}
|
||||
|
||||
Label() {
|
||||
|
@ -55,7 +45,7 @@ namespace guecs {
|
|||
// or there's a static config function you call once,
|
||||
// that's passed an object with all the necessary gear
|
||||
string name;
|
||||
int padding = PADDING;
|
||||
int padding = THEME.PADDING;
|
||||
std::shared_ptr<sf::Sprite> sprite = nullptr;
|
||||
|
||||
void init(lel::Cell &cell);
|
||||
|
@ -63,10 +53,10 @@ namespace guecs {
|
|||
};
|
||||
|
||||
struct Rectangle {
|
||||
int padding = PADDING;
|
||||
sf::Color color = FILL_COLOR;
|
||||
sf::Color border_color = BORDER_COLOR;
|
||||
int border_px = BORDER_PX;
|
||||
int padding = THEME.PADDING;
|
||||
sf::Color color = THEME.FILL_COLOR;
|
||||
sf::Color border_color = THEME.BORDER_COLOR;
|
||||
int border_px = THEME.BORDER_PX;
|
||||
shared_ptr<sf::RectangleShape> shape = nullptr;
|
||||
|
||||
void init(lel::Cell& cell);
|
||||
|
@ -74,7 +64,7 @@ namespace guecs {
|
|||
|
||||
struct Meter {
|
||||
float percent = 1.0f;
|
||||
sf::Color color = ColorValue::BLACK;
|
||||
sf::Color color = THEME.BG_COLOR_DARK;
|
||||
Rectangle bar;
|
||||
|
||||
void init(lel::Cell& cell);
|
||||
|
@ -108,10 +98,10 @@ namespace guecs {
|
|||
float y = 0.0f;
|
||||
float w = 0.0f;
|
||||
float h = 0.0f;
|
||||
sf::Color color = BG_COLOR;
|
||||
sf::Color color = THEME.BG_COLOR;
|
||||
shared_ptr<sf::RectangleShape> shape = nullptr;
|
||||
|
||||
Background(lel::Parser& parser, sf::Color bg_color=BG_COLOR) :
|
||||
Background(lel::Parser& parser, sf::Color bg_color=THEME.BG_COLOR) :
|
||||
x(parser.grid_x),
|
||||
y(parser.grid_y),
|
||||
w(parser.grid_w),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue