Merge pull request #100 from OpenVicProject/change/colour_t_to_struct

4 files changed, 14 insertions, 8 deletions

diff --git a/src/openvic-simulation/interface/GFX.cpp b/src/openvic-simulation/interface/GFX.cpp
index f9ae56b..3624655 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<std::unique_ptr<Sprite>&&> callback) {
 	return expect_dictionary_keys(
diff --git a/src/openvic-simulation/interface/GFX.hpp b/src/openvic-simulation/interface/GFX.hpp
index c7523b3..cdc49c2 100644
--- a/src/openvic-simulation/interface/GFX.hpp
+++ b/src/openvic-simulation/interface/GFX.hpp
@@ -8,7 +8,7 @@ namespace OpenVic {
 
 namespace OpenVic::GFX {
 
-	struct Font : HasIdentifierAndColour {
+	struct Font : HasIdentifierAndAlphaColour {
 		friend class OpenVic::UIManager;
 
 	private:
@@ -16,7 +16,7 @@ namespace OpenVic::GFX {
 
 		// TODO - colorcodes, effect
 
-		Font(std::string_view new_identifier, colour_t new_colour, std::string_view new_fontname);
+		Font(std::string_view new_identifier, colour_argb_t new_colour, std::string_view new_fontname);
 
 	public:
 		Font(Font&&) = default;
diff --git a/src/openvic-simulation/interface/UI.cpp b/src/openvic-simulation/interface/UI.cpp
index 3fc8295..344fc15 100644
--- a/src/openvic-simulation/interface/UI.cpp
+++ b/src/openvic-simulation/interface/UI.cpp
@@ -1,17 +1,23 @@
 #include "UI.hpp"
 
+#include "openvic-simulation/types/Colour.hpp"
+
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 using namespace OpenVic::GFX;
 using namespace OpenVic::GUI;
 
-bool UIManager::add_font(std::string_view identifier, colour_t colour, std::string_view fontname) {
+bool UIManager::add_font(std::string_view identifier, colour_argb_t colour, std::string_view fontname) {
 	if (identifier.empty()) {
 		Logger::error("Invalid font identifier - empty!");
 		return false;
 	}
+	if (colour.alpha == colour_argb_t::colour_traits::null) {
+		Logger::error("Invalid colour for font ", identifier, " - completely transparent! (", colour, ")");
+		return false;
+	}
 	if (fontname.empty()) {
-		Logger::error("Invalid culture colour for ", identifier, ": ", colour_to_hex_string(colour));
+		Logger::error("Invalid fontname for font ", identifier, " - empty!");
 		return false;
 	}
 	return fonts.add_item({ identifier, colour, fontname }, duplicate_warning_callback);
@@ -19,7 +25,7 @@ bool UIManager::add_font(std::string_view identifier, colour_t colour, std::stri
 
 bool UIManager::_load_font(ast::NodeCPtr node) {
 	std::string_view identifier, fontname;
-	colour_t colour = NULL_COLOUR;
+	colour_argb_t colour = colour_argb_t::null();
 	bool ret = expect_dictionary_keys(
 		"name", ONE_EXACTLY, expect_string(assign_variable_callback(identifier)),
 		"fontname", ONE_EXACTLY, expect_string(assign_variable_callback(fontname)),
diff --git a/src/openvic-simulation/interface/UI.hpp b/src/openvic-simulation/interface/UI.hpp
index ce9336c..286e4f7 100644
--- a/src/openvic-simulation/interface/UI.hpp
+++ b/src/openvic-simulation/interface/UI.hpp
@@ -12,7 +12,7 @@ namespace OpenVic {
 		bool _load_font(ast::NodeCPtr node);
 
 	public:
-		bool add_font(std::string_view identifier, colour_t colour, std::string_view fontname);
+		bool add_font(std::string_view identifier, colour_argb_t colour, std::string_view fontname);
 
 		bool load_gfx_file(ast::NodeCPtr root);
 		bool load_gui_file(std::string_view scene_name, ast::NodeCPtr root);