Merge pull request #275 from OpenVicProject/concept-pie-charts

Allow GFXPieChartTexture to use any distribution with identifiers and colours rather than just those derived from HasIdentifierAndColour

2 files changed, 34 insertions, 21 deletions

diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
index 97a6956..0dcc8ff 100644
--- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
@@ -59,7 +59,12 @@ namespace OpenVic {
 			 *  - Nationality (Culture)
 			 *  - Issues
 			 *  - Vote */
-			std::array<fixed_point_map_t<HasIdentifierAndColour const*>, DISTRIBUTION_COUNT> distributions;
+			fixed_point_map_t<PopType const*> workforce_distribution;
+			fixed_point_map_t<Religion const*> religion_distribution;
+			fixed_point_map_t<Ideology const*> ideology_distribution;
+			fixed_point_map_t<Culture const*> culture_distribution;
+			fixed_point_map_t<Issue const*> issue_distribution;
+			fixed_point_map_t<CountryParty const*> vote_distribution;
 
 			enum PopSortKey {
 				NONE, SORT_SIZE, SORT_TYPE, SORT_CULTURE, SORT_RELIGION, SORT_LOCATION, SORT_MILITANCY, SORT_CONSCIOUSNESS,
diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp
index c96ef02..1bef050 100644
--- a/extension/src/openvic-extension/singletons/PopulationMenu.cpp
+++ b/extension/src/openvic-extension/singletons/PopulationMenu.cpp
@@ -379,9 +379,12 @@ Error MenuSingleton::_population_menu_update_pops() {
 Error MenuSingleton::_population_menu_update_filtered_pops() {
 	population_menu.filtered_pops.clear();
 
-	for (fixed_point_map_t<HasIdentifierAndColour const*>& distribution : population_menu.distributions) {
-		distribution.clear();
-	}
+	population_menu.workforce_distribution.clear();
+	population_menu.religion_distribution.clear();
+	population_menu.ideology_distribution.clear();
+	population_menu.culture_distribution.clear();
+	population_menu.issue_distribution.clear();
+	population_menu.vote_distribution.clear();
 
 	for (Pop const* pop : population_menu.pops) {
 		if (population_menu.pop_filters[&pop->get_type()].selected) {
@@ -390,20 +393,22 @@ Error MenuSingleton::_population_menu_update_filtered_pops() {
 	}
 
 	for (Pop const* pop : population_menu.filtered_pops) {
-		population_menu.distributions[0][&pop->get_type()] += pop->get_size();
-		population_menu.distributions[1][&pop->get_religion()] += pop->get_size();
-		population_menu.distributions[2] +=
-			pop->get_ideologies() * fixed_point_t::parse(pop->get_size());
-		population_menu.distributions[3][&pop->get_culture()] += pop->get_size();
-		population_menu.distributions[4] +=
-			cast_map<HasIdentifierAndColour>(pop->get_issues() * fixed_point_t::parse(pop->get_size()));
-		population_menu.distributions[5] +=
-			pop->get_votes() * fixed_point_t::parse(pop->get_size());
+		const fixed_point_t pop_size = fixed_point_t::parse(pop->get_size());
+
+		population_menu.workforce_distribution[&pop->get_type()] += pop->get_size();
+		population_menu.religion_distribution[&pop->get_religion()] += pop->get_size();
+		population_menu.ideology_distribution += pop->get_ideologies() * fixed_point_t::parse(pop->get_size());
+		population_menu.culture_distribution[&pop->get_culture()] += pop->get_size();
+		population_menu.issue_distribution += pop->get_issues() * fixed_point_t::parse(pop->get_size());
+		population_menu.vote_distribution += pop->get_votes() * fixed_point_t::parse(pop->get_size());
 	}
 
-	for (fixed_point_map_t<HasIdentifierAndColour const*>& distribution : population_menu.distributions) {
-		normalise_fixed_point_map(distribution);
-	}
+	normalise_fixed_point_map(population_menu.workforce_distribution);
+	normalise_fixed_point_map(population_menu.religion_distribution);
+	normalise_fixed_point_map(population_menu.ideology_distribution);
+	normalise_fixed_point_map(population_menu.culture_distribution);
+	normalise_fixed_point_map(population_menu.issue_distribution);
+	normalise_fixed_point_map(population_menu.vote_distribution);
 
 	return _population_menu_sort_pops();
 }
@@ -825,11 +830,14 @@ PackedStringArray MenuSingleton::get_population_menu_distribution_setup_info() c
 
 TypedArray<Array> MenuSingleton::get_population_menu_distribution_info() const {
 	TypedArray<Array> array;
-	ERR_FAIL_COND_V(array.resize(population_menu.distributions.size()) != OK, {});
-
-	for (int32_t idx = 0; idx < array.size(); ++idx) {
-		array[idx] = GFXPieChartTexture::distribution_to_slices_array(population_menu.distributions[idx]);
-	}
+	ERR_FAIL_COND_V(array.resize(population_menu_t::DISTRIBUTION_COUNT) != OK, {});
+
+	array[0] = GFXPieChartTexture::distribution_to_slices_array(population_menu.workforce_distribution);
+	array[1] = GFXPieChartTexture::distribution_to_slices_array(population_menu.religion_distribution);
+	array[2] = GFXPieChartTexture::distribution_to_slices_array(population_menu.ideology_distribution);
+	array[3] = GFXPieChartTexture::distribution_to_slices_array(population_menu.culture_distribution);
+	array[4] = GFXPieChartTexture::distribution_to_slices_array(population_menu.issue_distribution);
+	array[5] = GFXPieChartTexture::distribution_to_slices_array(population_menu.vote_distribution);
 
 	return array;
 }