From 3770de7a03879a8ff6b8cf22b402217c19fa2b53 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Mon, 18 Dec 2023 21:41:57 -0500 Subject: Change colour_t to be a strongly typed structure Make RGB default of `colour_t` Distinguish RGB and ARGB colors by type and colour_traits Add `_colour` and `_argb` colour user-defined literals Add `OpenVic::utility::unreachable` --- src/openvic-simulation/interface/GFX.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/openvic-simulation/interface/GFX.cpp') diff --git a/src/openvic-simulation/interface/GFX.cpp b/src/openvic-simulation/interface/GFX.cpp index 927b832..6f5ebf9 100644 --- a/src/openvic-simulation/interface/GFX.cpp +++ b/src/openvic-simulation/interface/GFX.cpp @@ -4,8 +4,8 @@ using namespace OpenVic; using namespace OpenVic::GFX; using namespace OpenVic::NodeTools; -Font::Font(std::string_view new_identifier, colour_t new_colour, std::string_view new_fontname) - : HasIdentifierAndColour { new_identifier, new_colour, false, true }, fontname { new_fontname } {} +Font::Font(std::string_view new_identifier, colour_argb_t new_colour, std::string_view new_fontname) + : HasIdentifierAndAlphaColour { new_identifier, new_colour, false }, fontname { new_fontname } {} node_callback_t Sprite::expect_sprite(callback_t&&> callback) { return expect_dictionary_keys( -- cgit v1.2.3-56-ga3b1