Move Colour to core/object

src/openvic-simulation/console/ConsoleInstance.cpp

@@ -12,6 +12,7 @@
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
@@ -21,7 +22,6 @@
 #include "openvic-simulation/misc/Event.hpp"
 #include "openvic-simulation/research/Invention.hpp"
 #include "openvic-simulation/research/Technology.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 
 using namespace OpenVic;

src/openvic-simulation/console/ConsoleInstance.hpp

@@ -11,7 +11,7 @@
 
 #include "openvic-simulation/core/memory/Formatting.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/utility/Getters.hpp"

src/openvic-simulation/types/Colour.cpp → src/openvic-simulation/core/object/Colour.cpp

@@ -1,5 +1,7 @@
 #include "Colour.hpp"
 
+#include <cstdint>
+
 namespace OpenVic {
 	template struct basic_colour_t<std::uint8_t, std::uint32_t>;
 	template struct basic_colour_t<std::uint8_t, std::uint32_t, rgb_colour_traits<std::uint8_t, std::uint32_t>>;

src/openvic-simulation/types/Colour.hpp → src/openvic-simulation/core/object/Colour.hpp

@@ -2,22 +2,17 @@
 
 #include <algorithm>
 #include <array>
-#include <bit>
 #include <cassert>
-#include <cctype>
 #include <charconv>
 #include <climits>
-#include <cmath>
 #include <cstdint>
 #include <limits>
 #include <ostream>
 #include <span>
-#include <string>
 #include <string_view>
 #include <system_error>
 #include <tuple>
 #include <type_traits>
-#include <utility>
 
 #include <fmt/base.h>
 #include <fmt/format.h>
@@ -141,7 +136,8 @@
 
 	/* Colour represented by an unsigned integer, either 24-bit RGB or 32-bit ARGB. */
 	template<typename ValueT, typename ColourIntT, typename ColourTraits = colour_traits<ValueT, ColourIntT>>
-	struct basic_colour_t {
+	class basic_colour_t {
+	public:
 		/* PROPERTY generated getter functions will return colours by value, rather than const reference. */
 		using ov_return_by_value = void;
 
@@ -170,7 +166,7 @@
 		value_type blue;
 		OV_NO_UNIQUE_ADDRESS _alpha_t alpha;
 
-		static constexpr std::integral_constant<std::size_t, std::is_same_v<decltype(alpha), value_type> ? 4 : 3> size = {};
+		static constexpr std::integral_constant<std::size_t, std::same_as<decltype(alpha), value_type> ? 4 : 3> size = {};
 
 		OV_SPEED_INLINE static constexpr basic_colour_t fill_as(value_type value) {
 			if constexpr (colour_traits::has_alpha) {
@@ -887,7 +883,7 @@
 
 		auto write_value = [&](T::value_type const& comp) {
 			ctx.advance_to(out);
 			switch (_value_format_type) {
 			case value_format_type::value:	  _colour_value.format(comp, ctx); break;
 			case value_format_type::integer:  _integer.format(comp, ctx); break;
 			case value_format_type::floating: _floating.format(double(comp) / T::max_value, ctx); break;

src/openvic-simulation/country/CountryDefinition.cpp

@@ -5,14 +5,14 @@
 #include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
 
 #include "openvic-simulation/core/memory/FixedVector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/politics/Government.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/politics/PartyPolicy.hpp"
 #include "openvic-simulation/population/Culture.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Logger.hpp"

src/openvic-simulation/dataloader/NodeTools.cpp

@@ -15,8 +15,8 @@
 #include <range/v3/iterator/operations.hpp>
 #include <range/v3/view/enumerate.hpp>
 
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/fixed_point/String.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Getters.hpp"

src/openvic-simulation/dataloader/NodeTools.hpp

@@ -20,11 +20,11 @@
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/stl/MutableIterator.hpp"
 #include "openvic-simulation/core/string/Utility.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"

src/openvic-simulation/interface/UI.cpp

@@ -1,8 +1,8 @@
 #include "UI.hpp"
 
 #include "openvic-simulation/DefinitionManager.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 
 using namespace OpenVic;

src/openvic-simulation/map/MapDefinition.cpp

@@ -18,13 +18,13 @@
 
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/io/BMP.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"

src/openvic-simulation/map/MapDefinition.hpp

@@ -9,11 +9,11 @@
 
 #include "openvic-simulation/core/io/BMP.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/map/Region.hpp"
 #include "openvic-simulation/map/TerrainType.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/Vector.hpp"

src/openvic-simulation/map/Mapmode.hpp

@@ -6,7 +6,7 @@
 
 #include <type_safe/strong_typedef.hpp>
 
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"

src/openvic-simulation/map/Region.cpp

@@ -1,7 +1,7 @@
 #include "Region.hpp"
 
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 
 using namespace OpenVic;
 

src/openvic-simulation/map/TerrainType.cpp

@@ -4,8 +4,8 @@
 
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/memory/FixedVector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 
 using namespace OpenVic;

src/openvic-simulation/politics/Ideology.cpp

@@ -1,6 +1,6 @@
 #include "Ideology.hpp"
 
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;

src/openvic-simulation/population/Culture.cpp

@@ -1,10 +1,11 @@
 #include "Culture.hpp"
+
 #include <string_view>
 
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/core/string/Utility.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 

src/openvic-simulation/population/Religion.cpp

@@ -1,6 +1,6 @@
 #include "Religion.hpp"
 
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;

src/openvic-simulation/types/HasIdentifier.hpp

@@ -8,9 +8,9 @@
 
 #include <fmt/base.h>
 
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/core/template/Functional.hpp" // IWYU pragma: keep: bug fix for std::reference_wrapper hash & equality
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 namespace OpenVic {

tests/src/types/Colour.cpp → tests/src/core/object/Colour.cpp

@@ -1,12 +1,13 @@
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 
-#include <cmath>
-#include <cstdlib>
+#include <cstdint>
 #include <string_view>
 
+#include <fmt/format.h>
+
 #include "Colour.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp" // IWYU pragma: keep
+#include "types/Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>

tests/src/types/Colour.hpp → tests/src/core/object/Colour.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <cmath>
+#include <cstdint>
 
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>

tests/src/dataloader/NodeTools.cpp

@@ -22,13 +22,13 @@
 #include <range/v3/view/iota.hpp>
 #include <range/v3/view/transform.hpp>
 
-#include "openvic-simulation/types/Colour.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/String.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
 
-#include "../types/Colour.hpp" // IWYU pragma: keep
+#include "../core/object/Colour.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
 #include "types/Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>

tests/src/economy/trading/GoodMarket.cpp

@@ -3,9 +3,9 @@
 
 #include <optional>
 
+#include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"