From d113649c115b687a30a2040161d8570907c9141b Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 12 Oct 2023 00:36:22 +0100 Subject: Improved path CLI args + path caching setting --- extension/deps/openvic-simulation | 2 +- extension/src/openvic-extension/GameSingleton.cpp | 33 ++++++++++++++-------- extension/src/openvic-extension/GameSingleton.hpp | 3 ++ .../src/openvic-extension/LoadLocalisation.cpp | 4 +-- extension/src/openvic-extension/Utilities.cpp | 10 +++---- extension/src/openvic-extension/Utilities.hpp | 11 +++++++- 6 files changed, 42 insertions(+), 21 deletions(-) (limited to 'extension') diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index 0479592..19e5829 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit 04795924456062db1631686a90f13d963791ad34 +Subproject commit 19e5829e47e9d823f1f979d1f2c95fdb9aae5bb4 diff --git a/extension/src/openvic-extension/GameSingleton.cpp b/extension/src/openvic-extension/GameSingleton.cpp index ade6ec9..b294691 100644 --- a/extension/src/openvic-extension/GameSingleton.cpp +++ b/extension/src/openvic-extension/GameSingleton.cpp @@ -10,11 +10,16 @@ using namespace godot; using namespace OpenVic; +using OpenVic::Utilities::std_to_godot_string; +using OpenVic::Utilities::std_view_to_godot_string; +using OpenVic::Utilities::godot_to_std_string; + GameSingleton* GameSingleton::singleton = nullptr; void GameSingleton::_bind_methods() { ClassDB::bind_static_method("GameSingleton", D_METHOD("setup_logger"), &GameSingleton::setup_logger); ClassDB::bind_method(D_METHOD("load_defines_compatibility_mode", "file_paths"), &GameSingleton::load_defines_compatibility_mode); + ClassDB::bind_static_method("GameSingleton", D_METHOD("search_for_game_path", "hint_path"), &GameSingleton::search_for_game_path, DEFVAL(String{})); ClassDB::bind_method(D_METHOD("lookup_file", "path"), &GameSingleton::lookup_file); ClassDB::bind_method(D_METHOD("setup_game"), &GameSingleton::setup_game); @@ -83,13 +88,13 @@ void GameSingleton::draw_pie_chart(Ref image, Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius) { - OpenVic::draw_pie_chart(image, stopAngles, colours, radius, shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, + Utilities::draw_pie_chart(image, stopAngles, colours, radius, shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, trim_colour, trim_size, gradient_falloff, gradient_base, donut, donut_inner_trim, donut_inner_radius); } Ref GameSingleton::load_image(String const& path) { - return load_godot_image(path); + return Utilities::load_godot_image(path); } GameSingleton* GameSingleton::get_singleton() { @@ -211,9 +216,9 @@ Dictionary GameSingleton::_distribution_to_dictionary(distribution_t const& dist Dictionary dict; for (distribution_t::value_type const& p : dist) { Dictionary sub_dict; - sub_dict[get_piechart_info_size_key()] = p.second; - sub_dict[get_piechart_info_colour_key()] = to_godot_color(p.first->get_colour()); - dict[std_to_godot_string(p.first->get_identifier())] = sub_dict; + sub_dict[get_piechart_info_size_key()] = p.second.to_float(); + sub_dict[get_piechart_info_colour_key()] = Utilities::to_godot_color(p.first->get_colour()); + dict[std_view_to_godot_string(p.first->get_identifier())] = sub_dict; } return dict; } @@ -223,18 +228,18 @@ Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { if (province == nullptr) return {}; Dictionary ret; - ret[get_province_info_province_key()] = std_to_godot_string(province->get_identifier()); + ret[get_province_info_province_key()] = std_view_to_godot_string(province->get_identifier()); Region const* region = province->get_region(); - if (region != nullptr) ret[get_province_info_region_key()] = std_to_godot_string(region->get_identifier()); + if (region != nullptr) ret[get_province_info_region_key()] = std_view_to_godot_string(region->get_identifier()); Good const* rgo = province->get_rgo(); - if (rgo != nullptr) ret[get_province_info_rgo_key()] = std_to_godot_string(rgo->get_identifier()); + if (rgo != nullptr) ret[get_province_info_rgo_key()] = std_view_to_godot_string(rgo->get_identifier()); ret[get_province_info_life_rating_key()] = province->get_life_rating(); TerrainType const* terrain_type = province->get_terrain_type(); - if (terrain_type != nullptr) ret[get_province_info_terrain_type_key()] = std_to_godot_string(terrain_type->get_identifier()); + if (terrain_type != nullptr) ret[get_province_info_terrain_type_key()] = std_view_to_godot_string(terrain_type->get_identifier()); ret[get_province_info_total_population_key()] = province->get_total_population(); distribution_t const& pop_types = province->get_pop_type_distribution(); @@ -252,7 +257,7 @@ Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { BuildingInstance const& building = buildings[idx]; Dictionary building_dict; - building_dict[get_building_info_building_key()] = std_to_godot_string(building.get_identifier()); + building_dict[get_building_info_building_key()] = std_view_to_godot_string(building.get_identifier()); building_dict[get_building_info_level_key()] = static_cast(building.get_current_level()); building_dict[get_building_info_expansion_state_key()] = static_cast(building.get_expansion_state()); building_dict[get_building_info_start_date_key()] = std_to_godot_string(building.get_start_date().to_string()); @@ -325,7 +330,7 @@ int32_t GameSingleton::get_mapmode_count() const { String GameSingleton::get_mapmode_identifier(int32_t index) const { Mapmode const* mapmode = game_manager.get_map().get_mapmode_by_index(index); - if (mapmode != nullptr) return std_to_godot_string(mapmode->get_identifier()); + if (mapmode != nullptr) return std_view_to_godot_string(mapmode->get_identifier()); return String {}; } @@ -450,7 +455,7 @@ Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& ter static constexpr int32_t SHEET_DIMS = 8, SHEET_SIZE = SHEET_DIMS * SHEET_DIMS; // Load the terrain texture sheet and prepare to slice it up - Ref terrain_sheet = load_godot_image(terrain_texturesheet_path); + Ref terrain_sheet = Utilities::load_godot_image(terrain_texturesheet_path); if (terrain_sheet.is_null()) { UtilityFunctions::push_error("Failed to load terrain texture sheet: ", terrain_texturesheet_path); return FAILED; @@ -530,6 +535,10 @@ Error GameSingleton::load_defines_compatibility_mode(PackedStringArray const& fi return err; } +String GameSingleton::search_for_game_path(String hint_path) { + return std_to_godot_string(Dataloader::search_for_game_path(godot_to_std_string(hint_path)).string()); +} + String GameSingleton::lookup_file(String const& path) const { return std_to_godot_string(dataloader.lookup_file(godot_to_std_string(path)).string()); } diff --git a/extension/src/openvic-extension/GameSingleton.hpp b/extension/src/openvic-extension/GameSingleton.hpp index 56c9e88..8145a39 100644 --- a/extension/src/openvic-extension/GameSingleton.hpp +++ b/extension/src/openvic-extension/GameSingleton.hpp @@ -44,6 +44,7 @@ namespace OpenVic { godot::Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, godot::Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius); + static godot::Ref load_image(godot::String const& path); static GameSingleton* get_singleton(); @@ -58,6 +59,8 @@ namespace OpenVic { */ godot::Error load_defines_compatibility_mode(godot::PackedStringArray const& file_paths); + static godot::String search_for_game_path(godot::String hint_path = {}); + godot::String lookup_file(godot::String const& path) const; /* Post-load/restart game setup - reset the game to post-load state diff --git a/extension/src/openvic-extension/LoadLocalisation.cpp b/extension/src/openvic-extension/LoadLocalisation.cpp index 9ab7298..418f01c 100644 --- a/extension/src/openvic-extension/LoadLocalisation.cpp +++ b/extension/src/openvic-extension/LoadLocalisation.cpp @@ -146,8 +146,8 @@ bool LoadLocalisation::add_message(std::string_view key, Dataloader::locale_t lo return false; } } - const StringName godot_key = std_to_godot_string(std::string { key }); - const StringName godot_localisation = std_to_godot_string(std::string { localisation }); + const StringName godot_key = Utilities::std_view_to_godot_string(key); + const StringName godot_localisation = Utilities::std_view_to_godot_string(localisation); if (0) { const StringName old_localisation = translation->get_message(godot_key); if (!old_localisation.is_empty()) { diff --git a/extension/src/openvic-extension/Utilities.cpp b/extension/src/openvic-extension/Utilities.cpp index 649550f..ea7e888 100644 --- a/extension/src/openvic-extension/Utilities.cpp +++ b/extension/src/openvic-extension/Utilities.cpp @@ -13,10 +13,10 @@ using namespace godot; using namespace OpenVic; static Ref load_dds_image(String const& path) { - gli::texture2d texture { gli::load_dds(godot_to_std_string(path)) }; + gli::texture2d texture { gli::load_dds(Utilities::godot_to_std_string(path)) }; if (texture.empty()) { UtilityFunctions::push_error("Failed to load DDS file: ", path); - return {}; + return nullptr; } static constexpr gli::format expected_format = gli::FORMAT_BGRA8_UNORM_PACK8; @@ -25,7 +25,7 @@ static Ref load_dds_image(String const& path) { texture = gli::convert(texture, expected_format); if (texture.empty()) { UtilityFunctions::push_error("Failed to convert DDS file: ", path); - return {}; + return nullptr; } } @@ -43,7 +43,7 @@ static Ref load_dds_image(String const& path) { return Image::create_from_data(extent.x, extent.y, false, Image::FORMAT_RGBA8, pixels); } -Ref OpenVic::load_godot_image(String const& path) { +Ref Utilities::load_godot_image(String const& path) { if (path.begins_with("res://")) { ResourceLoader* loader = ResourceLoader::get_singleton(); return loader ? loader->load(path) : nullptr; @@ -116,7 +116,7 @@ static Color pie_chart_fragment(Vector2 UV, float radius, Array const& stopAngle } } -void OpenVic::draw_pie_chart(Ref image, +void Utilities::draw_pie_chart(Ref image, Array const& stopAngles, Array const& colours, float radius, Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, diff --git a/extension/src/openvic-extension/Utilities.hpp b/extension/src/openvic-extension/Utilities.hpp index 32e7cb5..68e72d2 100644 --- a/extension/src/openvic-extension/Utilities.hpp +++ b/extension/src/openvic-extension/Utilities.hpp @@ -3,10 +3,11 @@ #include #include +#include #define ERR(x) ((x) ? OK : FAILED) -namespace OpenVic { +namespace OpenVic::Utilities { inline std::string godot_to_std_string(godot::String const& str) { return str.ascii().get_data(); @@ -16,10 +17,18 @@ namespace OpenVic { return str.c_str(); } + inline godot::String std_view_to_godot_string(std::string_view str) { + return std_to_godot_string(static_cast(str)); + } + inline godot::Color to_godot_color(colour_t colour) { return { colour_byte_to_float((colour >> 16) & 0xFF), colour_byte_to_float((colour >> 8) & 0xFF), colour_byte_to_float(colour & 0xFF) }; } + inline godot::Vector2i to_godot_ivec2(ivec2_t vec) { + return { vec.x, vec.y }; + } + godot::Ref load_godot_image(godot::String const& path); void draw_pie_chart(godot::Ref image, -- cgit v1.2.3-56-ga3b1 From 9304fd4e109c27a7dfb487a15c9a52c4055ee485 Mon Sep 17 00:00:00 2001 From: hop311 Date: Sat, 28 Oct 2023 10:40:07 +0100 Subject: Astyle formatting (with manual cleanup) --- .astylesrc | 217 +++++++++++++++++++++ astyle.sh | 13 ++ extension/deps/openvic-simulation | 2 +- extension/src/openvic-extension/Checksum.hpp | 4 +- extension/src/openvic-extension/GameSingleton.cpp | 184 ++++++++++------- .../src/openvic-extension/LoadLocalisation.cpp | 11 +- extension/src/openvic-extension/MapMesh.cpp | 12 +- extension/src/openvic-extension/Utilities.cpp | 12 +- extension/src/openvic-extension/register_types.cpp | 3 +- 9 files changed, 367 insertions(+), 91 deletions(-) create mode 100644 .astylesrc create mode 100644 astyle.sh (limited to 'extension') diff --git a/.astylesrc b/.astylesrc new file mode 100644 index 0000000..7891dcc --- /dev/null +++ b/.astylesrc @@ -0,0 +1,217 @@ +# @file Astyle code automatic formatting settings +# @see http://astyle.sourceforge.net/astyle.html#_General_Information + +# +# Java style uses attached braces. +# +# int Foo(bool isBar) { +# if (isBar) { +# bar(); +# return 1; +# } else +# return 0; +# } +# +--style=attach + +# +# Indent using all tab characters, if possible. If a continuation line is not an even number of tabs, +# spaces will be added at the end. Treat each tab as # spaces (e.g. -T6 / --indent=force-tab=6). +# # must be between 2 and 20. If no # is set, treats tabs as 4 spaces. +# +--indent=force-tab=4 + +# +# Add extra indentation to namespace blocks. This option has no effect on Java files. +# +--indent-namespaces + +# +# Indent multi-line preprocessor definitions ending with a backslash. Should be used with --convert-tabs for proper results. +# Does a pretty good job, but cannot perform miracles in obfuscated preprocessor definitions. +# Without this option the preprocessor statements remain unchanged. +# +--indent-preproc-define + +# +# Indent C++ comments beginning in column one. By default C++ comments beginning in column one are assumed to be +# commented-out code and not indented. This option will allow the comments to be indented with the code. +# +--indent-col1-comments + +# +# Indent, instead of align, continuation lines following lines that contain an opening paren '(' or an assignment '='. +# This includes function definitions and declarations and return statements. +# The indentation can be modified by using the following indent-continuation option. +# This option may be preferred for editors displaying proportional fonts. +# +--indent-after-parens + +# +# Set the continuation indent for a line that ends with an opening paren '(' or an assignment '='. +# This includes function definitions and declarations. It will also modify the previous indent-after-paren option. +# The value for # indicates a number of indents. The valid values are the integer values from 0 thru 4. +# If this option is not used, the default value of 1 is used. +# +--indent-continuation=1 + +# +# Set the minimal indent that is added when a header is built of multiple lines. +# This indent helps to easily separate the header from the command statements that follow. +# The value for # indicates a number of indents and is a minimum value. +# The indent may be greater to align with the data on the previous line. +# The valid values are: +# 0 - no minimal indent. The lines will be aligned with the paren on the preceding line. +# 1 - indent at least one additional indent. +# 2 - indent at least two additional indents. +# 3 - indent at least one-half an additional indent. This is intended for large indents (e.g. 8). +# The default value is 2, two additional indents. +# +--min-conditional-indent=0 + +# +# Set the maximum of # spaces to indent a continuation line. The # indicates a number of columns and +# must not be less than 40 or greater than 120. If no value is set, the default value of 40 will be used. +# This option will prevent continuation lines from extending too far to the right. +# Setting a larger value will allow the code to be extended further to the right. +# +#--max-continuation-indent=40 + +# +# Indent labels so that they appear one indent less than +# the current indentation level, rather than being +# flushed completely to the left (which is the default). +# +--indent-labels + +# +# This option improves indentation of C++ lambda functions. As it currently does not work well with +# complex lambda function bodies, this feature is not enabled by default. +# +#--lambda-indent + +# +# Attach a pointer or reference operator (*, &, or ^) to either the variable type (left) or variable name (right), or place it between the type and name (middle). +# +--align-pointer=type + +# +# This option will align references separate from pointers. Pointers are not changed by this option. +# If pointers and references are to be aligned the same, use the previous align-pointer option. +# +--align-reference=type + +# +# Add brackets to unbracketed one line conditional statements (e.g. 'if', 'for', 'while'...). +# The statement must be on a single line. The brackets will be added according to the currently requested predefined style or bracket type. +# If no style or bracket type is requested the brackets will be attached. +# If --add-one-line-brackets is also used the result will be one line brackets. +# +--add-braces + +# Don't break complex statements and multiple statements residing on a single line. +# +#--keep-one-line-statements + +# +# The option max?code?length will break a line if the code exceeds # characters. +# The valid values are 50 thru 200. Lines without logical conditionals will break on a logical conditional (||, &&, ...), comma, paren, semicolon, or space. +# Some code will not be broken, such as comments, quotes, and arrays. If used with keep?one?line?blocks or add-one-line-brackets the blocks will NOT be broken. +# If used with keep?one?line?statements the statements will be broken at a semicolon if the line goes over the maximum length. +# If there is no available break point within the max code length, the line will be broken at the first available break point after the max code length. +# +--max-code-length=128 + +# +# By default logical conditionals will be placed first on the new line. +# The option break?after?logical will cause the logical conditionals to be placed last on the previous line. This option has no effect without max?code?length. +# +#--break-after-logical + +# +# Indent a C type, C#, or Java file. C type files are C, C++, C++/CLI, and Objective-C. The option is usually set from the file extension for each file. +# +--mode=c + +# +# Verbose display mode. Display optional information, such as release number, date, option file locations, and statistical data. +# +--verbose + +# +# Formatted files display mode. Display only the files that have been formatted. Do not display files that are unchanged. +# +--formatted + +# +# Force use of the specified line end style. Valid options are windows (CRLF), linux (LF), and macold (CR). +# MacOld style is the format for Mac OS 9 and earlier. OS X uses the Linux style. +# If one of these options is not used the line ends will be determined automatically from the input file. +# When redirection is used on Windows the output will always have Windows line ends. This option will be ignored. +# +--lineend=linux + +# +# Insert space padding around operators. This will also pad commas. Any end of line comments will remain +# in the original column, if possible. Note that there is no option to unpad. Once padded, they stay padded. +# +--pad-oper + +# +# Insert space padding between a header (e.g. 'if', 'for', 'while'...) and the following paren. +# Any end of line comments will remain in the original column, if possible. +# This can be used with unpad-paren to remove unwanted spaces. +# +--pad-header + +# +# Remove extra space padding around parens on the inside and outside. Any end of line comments will remain in the original +# column, if possible. This option can be used in combination with the paren padding options pad-paren, pad-paren-out, +# pad-paren-in, and pad-header above. Only padding that has not been requested by other options will be removed. +# For example, if a source has parens padded on both the inside and outside, and you want inside only. +# You need to use unpad-paren to remove the outside padding, and pad-paren-in to retain the inside padding. +# Using only pad-paren-in> would not remove the outside padding. +# +--unpad-paren + +# +# Remove padding around square brackets on both the outside and the inside. +# +--unpad-brackets + +# +# Remove superfluous empty lines exceeding the given number. +# +--squeeze-lines=1 + +# +# Remove superfluous whitespace +# +--squeeze-ws + +# +# Attach the return type to the function name. The two options are for the function definitions (-xf), +# and the function declarations or signatures (-xh). They are intended to undo the --break-return-type options. +# If used with --break-return-type, the result will be to break the return type. +# This option has no effect on Objective-C functions. +# +--attach-return-type + +# +# Closes whitespace between the ending angle brackets of template definitions. +# Closing the ending angle brackets is now allowed by the C++11 standard. +# Be sure your compiler supports this before making the changes. +# +--close-templates + +# +# Do not retain a backup of the original file. The original file is purged after it is formatted. +# +--suffix=none + +# +# Preserve the original file's date and time modified. +# The time modified will be changed a few microseconds to force the changed files to compile. +# This option is not effective if redirection is used to rename the input file. +# +--preserve-date diff --git a/astyle.sh b/astyle.sh new file mode 100644 index 0000000..4500290 --- /dev/null +++ b/astyle.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +echo "\n\nFormatting openvic-extension with astyle:\n" +astyle --options=.astylesrc --recursive ./extension/src/*.?pp + +if [ -d ./extension/deps/openvic-simulation ]; then + cd ./extension/deps/openvic-simulation + if [ -f ./astyle.sh ]; then + ./astyle.sh + fi +fi + +exit 0 diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index 19e5829..370567a 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit 19e5829e47e9d823f1f979d1f2c95fdb9aae5bb4 +Subproject commit 370567abbd8a9e2929915a3faba95e3e35c20bcc diff --git a/extension/src/openvic-extension/Checksum.hpp b/extension/src/openvic-extension/Checksum.hpp index b12a9cd..38839df 100644 --- a/extension/src/openvic-extension/Checksum.hpp +++ b/extension/src/openvic-extension/Checksum.hpp @@ -15,7 +15,9 @@ namespace OpenVic { } public: - inline static Checksum* get_singleton() { return _checksum; } + inline static Checksum* get_singleton() { + return _checksum; + } inline Checksum() { ERR_FAIL_COND(_checksum != nullptr); diff --git a/extension/src/openvic-extension/GameSingleton.cpp b/extension/src/openvic-extension/GameSingleton.cpp index b294691..877fb4a 100644 --- a/extension/src/openvic-extension/GameSingleton.cpp +++ b/extension/src/openvic-extension/GameSingleton.cpp @@ -16,70 +16,75 @@ using OpenVic::Utilities::godot_to_std_string; GameSingleton* GameSingleton::singleton = nullptr; +#define BM ClassDB::bind_method +#define BSM ClassDB::bind_static_method + void GameSingleton::_bind_methods() { - ClassDB::bind_static_method("GameSingleton", D_METHOD("setup_logger"), &GameSingleton::setup_logger); - ClassDB::bind_method(D_METHOD("load_defines_compatibility_mode", "file_paths"), &GameSingleton::load_defines_compatibility_mode); - ClassDB::bind_static_method("GameSingleton", D_METHOD("search_for_game_path", "hint_path"), &GameSingleton::search_for_game_path, DEFVAL(String{})); - ClassDB::bind_method(D_METHOD("lookup_file", "path"), &GameSingleton::lookup_file); - ClassDB::bind_method(D_METHOD("setup_game"), &GameSingleton::setup_game); - - ClassDB::bind_method(D_METHOD("get_province_index_from_uv_coords", "coords"), &GameSingleton::get_province_index_from_uv_coords); - ClassDB::bind_method(D_METHOD("get_province_info_from_index", "index"), &GameSingleton::get_province_info_from_index); - ClassDB::bind_method(D_METHOD("get_width"), &GameSingleton::get_width); - ClassDB::bind_method(D_METHOD("get_height"), &GameSingleton::get_height); - ClassDB::bind_method(D_METHOD("get_aspect_ratio"), &GameSingleton::get_aspect_ratio); - ClassDB::bind_method(D_METHOD("get_terrain_texture"), &GameSingleton::get_terrain_texture); - ClassDB::bind_method(D_METHOD("get_province_shape_image_subdivisions"), &GameSingleton::get_province_shape_image_subdivisions); - ClassDB::bind_method(D_METHOD("get_province_shape_texture"), &GameSingleton::get_province_shape_texture); - ClassDB::bind_method(D_METHOD("get_province_colour_texture"), &GameSingleton::get_province_colour_texture); - - ClassDB::bind_method(D_METHOD("get_mapmode_count"), &GameSingleton::get_mapmode_count); - ClassDB::bind_method(D_METHOD("get_mapmode_identifier", "index"), &GameSingleton::get_mapmode_identifier); - ClassDB::bind_method(D_METHOD("set_mapmode", "identifier"), &GameSingleton::set_mapmode); - ClassDB::bind_method(D_METHOD("get_selected_province_index"), &GameSingleton::get_selected_province_index); - ClassDB::bind_method(D_METHOD("set_selected_province", "index"), &GameSingleton::set_selected_province); - - ClassDB::bind_method(D_METHOD("expand_building", "province_index", "building_type_identifier"), &GameSingleton::expand_building); - - ClassDB::bind_method(D_METHOD("set_paused", "paused"), &GameSingleton::set_paused); - ClassDB::bind_method(D_METHOD("toggle_paused"), &GameSingleton::toggle_paused); - ClassDB::bind_method(D_METHOD("is_paused"), &GameSingleton::is_paused); - ClassDB::bind_method(D_METHOD("increase_speed"), &GameSingleton::increase_speed); - ClassDB::bind_method(D_METHOD("decrease_speed"), &GameSingleton::decrease_speed); - ClassDB::bind_method(D_METHOD("can_increase_speed"), &GameSingleton::can_increase_speed); - ClassDB::bind_method(D_METHOD("can_decrease_speed"), &GameSingleton::can_decrease_speed); - ClassDB::bind_method(D_METHOD("get_longform_date"), &GameSingleton::get_longform_date); - ClassDB::bind_method(D_METHOD("try_tick"), &GameSingleton::try_tick); + BSM("GameSingleton", D_METHOD("setup_logger"), &GameSingleton::setup_logger); + BM(D_METHOD("load_defines_compatibility_mode", "file_paths"), &GameSingleton::load_defines_compatibility_mode); + BSM("GameSingleton", D_METHOD("search_for_game_path", "hint_path"), &GameSingleton::search_for_game_path, DEFVAL(String{})); + BM(D_METHOD("lookup_file", "path"), &GameSingleton::lookup_file); + BM(D_METHOD("setup_game"), &GameSingleton::setup_game); + + BM(D_METHOD("get_province_index_from_uv_coords", "coords"), &GameSingleton::get_province_index_from_uv_coords); + BM(D_METHOD("get_province_info_from_index", "index"), &GameSingleton::get_province_info_from_index); + BM(D_METHOD("get_width"), &GameSingleton::get_width); + BM(D_METHOD("get_height"), &GameSingleton::get_height); + BM(D_METHOD("get_aspect_ratio"), &GameSingleton::get_aspect_ratio); + BM(D_METHOD("get_terrain_texture"), &GameSingleton::get_terrain_texture); + BM(D_METHOD("get_province_shape_image_subdivisions"), &GameSingleton::get_province_shape_image_subdivisions); + BM(D_METHOD("get_province_shape_texture"), &GameSingleton::get_province_shape_texture); + BM(D_METHOD("get_province_colour_texture"), &GameSingleton::get_province_colour_texture); + + BM(D_METHOD("get_mapmode_count"), &GameSingleton::get_mapmode_count); + BM(D_METHOD("get_mapmode_identifier", "index"), &GameSingleton::get_mapmode_identifier); + BM(D_METHOD("set_mapmode", "identifier"), &GameSingleton::set_mapmode); + BM(D_METHOD("get_selected_province_index"), &GameSingleton::get_selected_province_index); + BM(D_METHOD("set_selected_province", "index"), &GameSingleton::set_selected_province); + + BM(D_METHOD("expand_building", "province_index", "building_type_identifier"), &GameSingleton::expand_building); + + BM(D_METHOD("set_paused", "paused"), &GameSingleton::set_paused); + BM(D_METHOD("toggle_paused"), &GameSingleton::toggle_paused); + BM(D_METHOD("is_paused"), &GameSingleton::is_paused); + BM(D_METHOD("increase_speed"), &GameSingleton::increase_speed); + BM(D_METHOD("decrease_speed"), &GameSingleton::decrease_speed); + BM(D_METHOD("can_increase_speed"), &GameSingleton::can_increase_speed); + BM(D_METHOD("can_decrease_speed"), &GameSingleton::can_decrease_speed); + BM(D_METHOD("get_longform_date"), &GameSingleton::get_longform_date); + BM(D_METHOD("try_tick"), &GameSingleton::try_tick); ADD_SIGNAL(MethodInfo("state_updated")); ADD_SIGNAL(MethodInfo("province_selected", PropertyInfo(Variant::INT, "index"))); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_province_key"), &GameSingleton::get_province_info_province_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_region_key"), &GameSingleton::get_province_info_region_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_life_rating_key"), &GameSingleton::get_province_info_life_rating_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_terrain_type_key"), &GameSingleton::get_province_info_terrain_type_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_total_population_key"), &GameSingleton::get_province_info_total_population_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_pop_types_key"), &GameSingleton::get_province_info_pop_types_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_pop_ideologies_key"), &GameSingleton::get_province_info_pop_ideologies_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_pop_cultures_key"), &GameSingleton::get_province_info_pop_cultures_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_rgo_key"), &GameSingleton::get_province_info_rgo_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_province_info_buildings_key"), &GameSingleton::get_province_info_buildings_key); - - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_building_key"), &GameSingleton::get_building_info_building_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_level_key"), &GameSingleton::get_building_info_level_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_expansion_state_key"), &GameSingleton::get_building_info_expansion_state_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_start_date_key"), &GameSingleton::get_building_info_start_date_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_end_date_key"), &GameSingleton::get_building_info_end_date_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_expansion_progress_key"), &GameSingleton::get_building_info_expansion_progress_key); - - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_piechart_info_size_key"), &GameSingleton::get_piechart_info_size_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_piechart_info_colour_key"), &GameSingleton::get_piechart_info_colour_key); - - ClassDB::bind_static_method("GameSingleton", D_METHOD("draw_pie_chart", "image", "stopAngles", "colours", "radius", + BSM("GameSingleton", D_METHOD("get_province_info_province_key"), &GameSingleton::get_province_info_province_key); + BSM("GameSingleton", D_METHOD("get_province_info_region_key"), &GameSingleton::get_province_info_region_key); + BSM("GameSingleton", D_METHOD("get_province_info_life_rating_key"), &GameSingleton::get_province_info_life_rating_key); + BSM("GameSingleton", D_METHOD("get_province_info_terrain_type_key"), &GameSingleton::get_province_info_terrain_type_key); + BSM("GameSingleton", D_METHOD("get_province_info_total_population_key"), + &GameSingleton::get_province_info_total_population_key); + BSM("GameSingleton", D_METHOD("get_province_info_pop_types_key"), &GameSingleton::get_province_info_pop_types_key); + BSM("GameSingleton", D_METHOD("get_province_info_pop_ideologies_key"), &GameSingleton::get_province_info_pop_ideologies_key); + BSM("GameSingleton", D_METHOD("get_province_info_pop_cultures_key"), &GameSingleton::get_province_info_pop_cultures_key); + BSM("GameSingleton", D_METHOD("get_province_info_rgo_key"), &GameSingleton::get_province_info_rgo_key); + BSM("GameSingleton", D_METHOD("get_province_info_buildings_key"), &GameSingleton::get_province_info_buildings_key); + + BSM("GameSingleton", D_METHOD("get_building_info_building_key"), &GameSingleton::get_building_info_building_key); + BSM("GameSingleton", D_METHOD("get_building_info_level_key"), &GameSingleton::get_building_info_level_key); + BSM("GameSingleton", D_METHOD("get_building_info_expansion_state_key"), &GameSingleton::get_building_info_expansion_state_key); + BSM("GameSingleton", D_METHOD("get_building_info_start_date_key"), &GameSingleton::get_building_info_start_date_key); + BSM("GameSingleton", D_METHOD("get_building_info_end_date_key"), &GameSingleton::get_building_info_end_date_key); + BSM("GameSingleton", D_METHOD("get_building_info_expansion_progress_key"), + &GameSingleton::get_building_info_expansion_progress_key); + + BSM("GameSingleton", D_METHOD("get_piechart_info_size_key"), &GameSingleton::get_piechart_info_size_key); + BSM("GameSingleton", D_METHOD("get_piechart_info_colour_key"), &GameSingleton::get_piechart_info_colour_key); + + BSM("GameSingleton", D_METHOD("draw_pie_chart", "image", "stopAngles", "colours", "radius", "shadow_displacement", "shadow_tightness", "shadow_radius", "shadow_thickness", "trim_colour", "trim_size", "gradient_falloff", "gradient_base", "donut", "donut_inner_trim", "donut_inner_radius"), &GameSingleton::draw_pie_chart); - ClassDB::bind_static_method("GameSingleton", D_METHOD("load_image", "path"), &GameSingleton::load_image); + BSM("GameSingleton", D_METHOD("load_image", "path"), &GameSingleton::load_image); } void GameSingleton::draw_pie_chart(Ref image, @@ -88,7 +93,8 @@ void GameSingleton::draw_pie_chart(Ref image, Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius) { - Utilities::draw_pie_chart(image, stopAngles, colours, radius, shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, + Utilities::draw_pie_chart(image, stopAngles, colours, radius, shadow_displacement, + shadow_tightness, shadow_radius, shadow_thickness, trim_colour, trim_size, gradient_falloff, gradient_base, donut, donut_inner_trim, donut_inner_radius); } @@ -109,15 +115,24 @@ void GameSingleton::_on_state_updated() { /* REQUIREMENTS: * MAP-21, MAP-23, MAP-25, MAP-32, MAP-33, MAP-34 */ -GameSingleton::GameSingleton() : game_manager { [this]() { _on_state_updated(); } } { +GameSingleton::GameSingleton() : game_manager { + [this]() { + _on_state_updated(); + } } { ERR_FAIL_COND(singleton != nullptr); singleton = this; } void GameSingleton::setup_logger() { - Logger::set_info_func([](std::string&& str) { UtilityFunctions::print(std_to_godot_string(str)); }); - Logger::set_warning_func([](std::string&& str) { UtilityFunctions::push_warning(std_to_godot_string(str)); }); - Logger::set_error_func([](std::string&& str) { UtilityFunctions::push_error(std_to_godot_string(str)); }); + Logger::set_info_func([](std::string&& str) { + UtilityFunctions::print(std_to_godot_string(str)); + }); + Logger::set_warning_func([](std::string&& str) { + UtilityFunctions::push_warning(std_to_godot_string(str)); + }); + Logger::set_error_func([](std::string&& str) { + UtilityFunctions::push_error(std_to_godot_string(str)); + }); } GameSingleton::~GameSingleton() { @@ -231,23 +246,33 @@ Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { ret[get_province_info_province_key()] = std_view_to_godot_string(province->get_identifier()); Region const* region = province->get_region(); - if (region != nullptr) ret[get_province_info_region_key()] = std_view_to_godot_string(region->get_identifier()); + if (region != nullptr) { + ret[get_province_info_region_key()] = std_view_to_godot_string(region->get_identifier()); + } Good const* rgo = province->get_rgo(); - if (rgo != nullptr) ret[get_province_info_rgo_key()] = std_view_to_godot_string(rgo->get_identifier()); + if (rgo != nullptr) { + ret[get_province_info_rgo_key()] = std_view_to_godot_string(rgo->get_identifier()); + } ret[get_province_info_life_rating_key()] = province->get_life_rating(); TerrainType const* terrain_type = province->get_terrain_type(); - if (terrain_type != nullptr) ret[get_province_info_terrain_type_key()] = std_view_to_godot_string(terrain_type->get_identifier()); + if (terrain_type != nullptr) { + ret[get_province_info_terrain_type_key()] = std_view_to_godot_string(terrain_type->get_identifier()); + } ret[get_province_info_total_population_key()] = province->get_total_population(); distribution_t const& pop_types = province->get_pop_type_distribution(); - if (!pop_types.empty()) ret[get_province_info_pop_types_key()] = _distribution_to_dictionary(pop_types); + if (!pop_types.empty()) { + ret[get_province_info_pop_types_key()] = _distribution_to_dictionary(pop_types); + } //distribution_t const& ideologies = province->get_ideology_distribution(); //if (!ideologies.empty()) ret[get_province_info_pop_ideologies_key()] = _distribution_to_dictionary(ideologies); distribution_t const& cultures = province->get_culture_distribution(); - if (!cultures.empty()) ret[get_province_info_pop_cultures_key()] = _distribution_to_dictionary(cultures); + if (!cultures.empty()) { + ret[get_province_info_pop_cultures_key()] = _distribution_to_dictionary(cultures); + } std::vector const& buildings = province->get_buildings(); if (!buildings.empty()) { @@ -305,8 +330,9 @@ Error GameSingleton::_update_colour_image() { colour_data_array.resize(colour_data_array_size); Error err = OK; - if (!game_manager.get_map().generate_mapmode_colours(mapmode_index, colour_data_array.ptrw())) + if (!game_manager.get_map().generate_mapmode_colours(mapmode_index, colour_data_array.ptrw())) { err = FAILED; + } static constexpr int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(Province::index_t) * 4); if (province_colour_image.is_null()) { @@ -320,7 +346,9 @@ Error GameSingleton::_update_colour_image() { province_colour_texture = ImageTexture::create_from_image(province_colour_image); ERR_FAIL_NULL_V_EDMSG(province_colour_texture, FAILED, "Failed to create province colour texture"); - } else province_colour_texture->update(province_colour_image); + } else { + province_colour_texture->update(province_colour_image); + } return err; } @@ -330,7 +358,9 @@ int32_t GameSingleton::get_mapmode_count() const { String GameSingleton::get_mapmode_identifier(int32_t index) const { Mapmode const* mapmode = game_manager.get_map().get_mapmode_by_index(index); - if (mapmode != nullptr) return std_view_to_godot_string(mapmode->get_identifier()); + if (mapmode != nullptr) { + return std_view_to_godot_string(mapmode->get_identifier()); + } return String {}; } @@ -431,7 +461,9 @@ Error GameSingleton::_load_map_images(bool flip_vertical) { province_shape_data + (v * divided_dims.y + y) * province_dims.x + u * divided_dims.x, divided_dims.x * sizeof(Map::shape_pixel_t)); - const Ref province_shape_subimage = Image::create_from_data(divided_dims.x, divided_dims.y, false, Image::FORMAT_RGB8, index_data_array); + const Ref province_shape_subimage = Image::create_from_data( + divided_dims.x, divided_dims.y, + false, Image::FORMAT_RGB8, index_data_array); if (province_shape_subimage.is_null()) { UtilityFunctions::push_error("Failed to create province shape image (", u, ", ", v, ")"); err = FAILED; @@ -446,7 +478,9 @@ Error GameSingleton::_load_map_images(bool flip_vertical) { err = FAILED; } - if (_update_colour_image() != OK) err = FAILED; + if (_update_colour_image() != OK) { + err = FAILED; + } return err; } @@ -463,7 +497,8 @@ Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& ter terrain_sheet->flip_y(); const int32_t sheet_width = terrain_sheet->get_width(), sheet_height = terrain_sheet->get_height(); if (sheet_width < 1 || sheet_width % SHEET_DIMS != 0 || sheet_width != sheet_height) { - UtilityFunctions::push_error("Invalid terrain texture sheet dims: ", sheet_width, "x", sheet_height, " (must be square with dims positive multiples of ", SHEET_DIMS, ")"); + UtilityFunctions::push_error("Invalid terrain texture sheet dims: ", sheet_width, "x", sheet_height, + " (must be square with dims positive multiples of ", SHEET_DIMS, ")"); return FAILED; } const int32_t slice_size = sheet_width / SHEET_DIMS; @@ -513,9 +548,8 @@ Error GameSingleton::load_defines_compatibility_mode(PackedStringArray const& fi UtilityFunctions::push_error("Failed to load defines!"); err = FAILED; } - if (_load_terrain_variants_compatibility_mode( - std_to_godot_string(dataloader.lookup_file(terrain_texture_file).string()) - ) != OK) { + if (_load_terrain_variants_compatibility_mode(std_to_godot_string( + dataloader.lookup_file(terrain_texture_file).string())) != OK) { UtilityFunctions::push_error("Failed to load terrain variants!"); err = FAILED; } diff --git a/extension/src/openvic-extension/LoadLocalisation.cpp b/extension/src/openvic-extension/LoadLocalisation.cpp index 418f01c..6ed92fd 100644 --- a/extension/src/openvic-extension/LoadLocalisation.cpp +++ b/extension/src/openvic-extension/LoadLocalisation.cpp @@ -101,8 +101,9 @@ Error LoadLocalisation::load_locale_dir(String const& dir_path, String const& lo Error err = OK; for (String const& file_name : files) { if (file_name.get_extension().to_lower() == "csv") { - if (_load_file_into_translation(dir_path.path_join(file_name), translation) != OK) + if (_load_file_into_translation(dir_path.path_join(file_name), translation) != OK) { err = FAILED; + } } } return err; @@ -128,10 +129,11 @@ Error LoadLocalisation::load_localisation_dir(String const& dir_path) const { } Error err = OK; for (String const& locale_name : dirs) { - if (locale_name != server->standardize_locale(locale_name)) + if (locale_name != server->standardize_locale(locale_name)) { UtilityFunctions::push_error("Invalid locale directory name: ", locale_name); - else if (load_locale_dir(dir_path.path_join(locale_name), locale_name) == OK) + } else if (load_locale_dir(dir_path.path_join(locale_name), locale_name) == OK) { continue; + } err = FAILED; } return err; @@ -151,7 +153,8 @@ bool LoadLocalisation::add_message(std::string_view key, Dataloader::locale_t lo if (0) { const StringName old_localisation = translation->get_message(godot_key); if (!old_localisation.is_empty()) { - UtilityFunctions::push_warning("Changing translation ", godot_key, " (", Dataloader::locale_names[locale], ") from \"", old_localisation, "\" to \"", godot_localisation, "\""); + UtilityFunctions::push_warning("Changing translation ", godot_key, " (", Dataloader::locale_names[locale], ") from \"", + old_localisation, "\" to \"", godot_localisation, "\""); } } translation->add_message(godot_key, godot_localisation); diff --git a/extension/src/openvic-extension/MapMesh.cpp b/extension/src/openvic-extension/MapMesh.cpp index 269360a..39cee41 100644 --- a/extension/src/openvic-extension/MapMesh.cpp +++ b/extension/src/openvic-extension/MapMesh.cpp @@ -21,10 +21,14 @@ void MapMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_core_aabb"), &MapMesh::get_core_aabb); ClassDB::bind_method(D_METHOD("is_valid_uv_coord"), &MapMesh::is_valid_uv_coord); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "aspect_ratio", PROPERTY_HINT_NONE, "suffix:m"), "set_aspect_ratio", "get_aspect_ratio"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "repeat_proportion", PROPERTY_HINT_NONE, "suffix:m"), "set_repeat_proportion", "get_repeat_proportion"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "aspect_ratio", PROPERTY_HINT_NONE, "suffix:m"), + "set_aspect_ratio", "get_aspect_ratio"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "repeat_proportion", PROPERTY_HINT_NONE, "suffix:m"), + "set_repeat_proportion", "get_repeat_proportion"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), + "set_subdivide_width", "get_subdivide_width"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), + "set_subdivide_depth", "get_subdivide_depth"); } void MapMesh::_request_update() { diff --git a/extension/src/openvic-extension/Utilities.cpp b/extension/src/openvic-extension/Utilities.cpp index ea7e888..87f0422 100644 --- a/extension/src/openvic-extension/Utilities.cpp +++ b/extension/src/openvic-extension/Utilities.cpp @@ -35,7 +35,7 @@ static Ref load_dds_image(String const& path) { UtilityFunctions::print("needs_bgr_to_rgb = ", needs_bgr_to_rgb); if (needs_bgr_to_rgb) { for (size_t i = 0; i < pixels.size(); i += 4) { - std::swap(pixels[i], pixels[i+2]); + std::swap(pixels[i], pixels[i + 2]); } } @@ -60,7 +60,9 @@ static Vector2 getPolar(Vector2 UVin, Vector2 center) { Vector2 relcoord = (UVin - center); float dist = relcoord.length(); float theta = std::numbers::pi / 2 + atan2(relcoord.y, relcoord.x); - if (theta < 0.0f) theta += std::numbers::pi * 2; + if (theta < 0.0f) { + theta += std::numbers::pi * 2; + } return { dist, theta }; } @@ -84,7 +86,8 @@ static Color pie_chart_fragment(Vector2 UV, float radius, Array const& stopAngle Vector2 shadow_polar = getPolar(UV, shadow_displacement); float shadow_peak = radius + (radius - donut_inner_radius) / 2.0; - float shadow_gradient = shadow_thickness + parabola_shadow(shadow_tightness * -10.0, shadow_polar.x + shadow_peak - shadow_radius); + float shadow_gradient = shadow_thickness + parabola_shadow(shadow_tightness * -10.0, + shadow_polar.x + shadow_peak - shadow_radius); // Inner hole of the donut => make it transparent if (donut && dist <= donut_inner_radius) { @@ -133,8 +136,7 @@ void Utilities::draw_pie_chart(Ref image, for (int32_t y = 0; y < size; ++y) { for (int32_t x = 0; x < size; ++x) { image->set_pixel(x, y, pie_chart_fragment( - { static_cast(x) / static_cast(size), - static_cast(y) / static_cast(size) }, + Vector2 { static_cast(x), static_cast(y) } / size, radius, stopAngles, colours, shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, trim_colour, trim_size, gradient_falloff, gradient_base, diff --git a/extension/src/openvic-extension/register_types.cpp b/extension/src/openvic-extension/register_types.cpp index 273bb85..c954de1 100644 --- a/extension/src/openvic-extension/register_types.cpp +++ b/extension/src/openvic-extension/register_types.cpp @@ -51,7 +51,8 @@ void uninitialize_openvic_types(ModuleInitializationLevel p_level) { extern "C" { // Initialization. - GDExtensionBool GDE_EXPORT openvic_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { + GDExtensionBool GDE_EXPORT openvic_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, + GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); init_obj.register_initializer(initialize_openvic_types); -- cgit v1.2.3-56-ga3b1 From 47fff276966d42cba6a2df9093348a5e20a37159 Mon Sep 17 00:00:00 2001 From: hop311 Date: Sun, 29 Oct 2023 14:11:24 +0000 Subject: Clang-format formatting (with manual cleanup) --- .clang-format | 38 ++++-- clang-format.sh | 13 ++ extension/deps/openvic-simulation | 2 +- extension/src/openvic-extension/Checksum.hpp | 4 +- extension/src/openvic-extension/GameSingleton.cpp | 150 +++++++++++++-------- extension/src/openvic-extension/GameSingleton.hpp | 11 +- .../src/openvic-extension/LoadLocalisation.cpp | 20 ++- .../src/openvic-extension/LoadLocalisation.hpp | 2 +- extension/src/openvic-extension/MapMesh.cpp | 23 ++-- extension/src/openvic-extension/Utilities.cpp | 37 ++--- extension/src/openvic-extension/Utilities.hpp | 15 ++- extension/src/openvic-extension/register_types.cpp | 6 +- 12 files changed, 205 insertions(+), 116 deletions(-) create mode 100644 clang-format.sh (limited to 'extension') diff --git a/.clang-format b/.clang-format index e94fe0a..dea31ab 100644 --- a/.clang-format +++ b/.clang-format @@ -5,7 +5,9 @@ Standard: c++20 UseTab: Always TabWidth: 4 IndentWidth: 4 -ColumnLimit: 0 +ColumnLimit: 128 +PointerAlignment: Left +DerivePointerAlignment: false SpacesInSquareBrackets: false SpacesInParentheses: false SpacesInCStyleCastParentheses: false @@ -14,6 +16,7 @@ SpacesInConditionalStatement: false SpacesInAngles: false SpaceInEmptyParentheses: false SpaceInEmptyBlock: false +SpacesInParens: Never SpaceBeforeSquareBrackets: false SpaceBeforeRangeBasedForLoopColon: true SpaceBeforeParens: ControlStatements @@ -23,13 +26,14 @@ SpaceBeforeCpp11BracedList: true SpaceBeforeAssignmentOperators: true SpaceAfterTemplateKeyword: false SpaceAfterLogicalNot: false -PointerAlignment: Left PackConstructorInitializers: BinPack NamespaceIndentation: All -LambdaBodyIndentation: Signature +#LambdaBodyIndentation: Signature IndentExternBlock: Indent -IndentCaseLabels: true +IndentCaseBlocks: false +IndentCaseLabels: false IndentAccessModifiers: false +IndentRequiresClause: false IncludeBlocks: Regroup FixNamespaceComments: false EmptyLineBeforeAccessModifier: LogicalBlock @@ -38,17 +42,35 @@ CompactNamespaces: false BreakConstructorInitializers: BeforeColon BreakBeforeBraces: Attach AlwaysBreakTemplateDeclarations: Yes -AllowShortLambdasOnASingleLine: All -AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AlwaysBreakAfterReturnType: None +PenaltyReturnTypeOnItsOwnLine: 10 +BreakBeforeConceptDeclarations: Always +AllowShortLambdasOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: Never AllowShortEnumsOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true -AlignTrailingComments: true +AllowShortBlocksOnASingleLine: Empty +AllowShortCompoundRequirementOnASingleLine: true +AllowShortFunctionsOnASingleLine: Empty +AllowShortLoopsOnASingleLine: false +AlignTrailingComments: + Kind: Never + OverEmptyLines: 0 AlignEscapedNewlines: DontAlign AlignAfterOpenBracket: BlockIndent +AlignOperands: DontAlign +AlignConsecutiveShortCaseStatements: + Enabled: true + AcrossEmptyLines: true + AcrossComments: true + AlignCaseColons: false BinPackArguments: true BinPackParameters: true -IndentRequiresClause: false AccessModifierOffset: -4 +InsertNewlineAtEOF: true +InsertBraces: true +MaxEmptyLinesToKeep: 2 +RequiresClausePosition: OwnLine IncludeCategories: - Regex: <[[:alnum:]_]+> Priority: 1 diff --git a/clang-format.sh b/clang-format.sh new file mode 100644 index 0000000..3b45543 --- /dev/null +++ b/clang-format.sh @@ -0,0 +1,13 @@ +#/usr/bin/env bash + +echo "\n\nFormatting openvic-extension with clang-format:\n" +find ./extension/src/ -iname *.hpp -o -iname *.cpp | xargs clang-format --verbose -i + +if [ -d ./extension/deps/openvic-simulation ]; then + cd ./extension/deps/openvic-simulation + if [ -f ./clang-format.sh ]; then + ./clang-format.sh + fi +fi + +exit 0 diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index 370567a..ae27421 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit 370567abbd8a9e2929915a3faba95e3e35c20bcc +Subproject commit ae2742113ec7283a2a5afa62f8bfd98a865c4208 diff --git a/extension/src/openvic-extension/Checksum.hpp b/extension/src/openvic-extension/Checksum.hpp index 38839df..c5d8daf 100644 --- a/extension/src/openvic-extension/Checksum.hpp +++ b/extension/src/openvic-extension/Checksum.hpp @@ -7,7 +7,7 @@ namespace OpenVic { GDCLASS(Checksum, godot::Object) // BEGIN BOILERPLATE - inline static Checksum* _checksum = nullptr; + static inline Checksum* _checksum = nullptr; protected: static void _bind_methods() { @@ -15,7 +15,7 @@ namespace OpenVic { } public: - inline static Checksum* get_singleton() { + static inline Checksum* get_singleton() { return _checksum; } diff --git a/extension/src/openvic-extension/GameSingleton.cpp b/extension/src/openvic-extension/GameSingleton.cpp index 877fb4a..311b602 100644 --- a/extension/src/openvic-extension/GameSingleton.cpp +++ b/extension/src/openvic-extension/GameSingleton.cpp @@ -10,9 +10,9 @@ using namespace godot; using namespace OpenVic; +using OpenVic::Utilities::godot_to_std_string; using OpenVic::Utilities::std_to_godot_string; using OpenVic::Utilities::std_view_to_godot_string; -using OpenVic::Utilities::godot_to_std_string; GameSingleton* GameSingleton::singleton = nullptr; @@ -22,7 +22,9 @@ GameSingleton* GameSingleton::singleton = nullptr; void GameSingleton::_bind_methods() { BSM("GameSingleton", D_METHOD("setup_logger"), &GameSingleton::setup_logger); BM(D_METHOD("load_defines_compatibility_mode", "file_paths"), &GameSingleton::load_defines_compatibility_mode); - BSM("GameSingleton", D_METHOD("search_for_game_path", "hint_path"), &GameSingleton::search_for_game_path, DEFVAL(String{})); + BSM( + "GameSingleton", D_METHOD("search_for_game_path", "hint_path"), &GameSingleton::search_for_game_path, DEFVAL(String {}) + ); BM(D_METHOD("lookup_file", "path"), &GameSingleton::lookup_file); BM(D_METHOD("setup_game"), &GameSingleton::setup_game); @@ -61,42 +63,56 @@ void GameSingleton::_bind_methods() { BSM("GameSingleton", D_METHOD("get_province_info_region_key"), &GameSingleton::get_province_info_region_key); BSM("GameSingleton", D_METHOD("get_province_info_life_rating_key"), &GameSingleton::get_province_info_life_rating_key); BSM("GameSingleton", D_METHOD("get_province_info_terrain_type_key"), &GameSingleton::get_province_info_terrain_type_key); - BSM("GameSingleton", D_METHOD("get_province_info_total_population_key"), - &GameSingleton::get_province_info_total_population_key); + BSM( + "GameSingleton", D_METHOD("get_province_info_total_population_key"), + &GameSingleton::get_province_info_total_population_key + ); BSM("GameSingleton", D_METHOD("get_province_info_pop_types_key"), &GameSingleton::get_province_info_pop_types_key); - BSM("GameSingleton", D_METHOD("get_province_info_pop_ideologies_key"), &GameSingleton::get_province_info_pop_ideologies_key); + BSM( + "GameSingleton", D_METHOD("get_province_info_pop_ideologies_key"), + &GameSingleton::get_province_info_pop_ideologies_key + ); BSM("GameSingleton", D_METHOD("get_province_info_pop_cultures_key"), &GameSingleton::get_province_info_pop_cultures_key); BSM("GameSingleton", D_METHOD("get_province_info_rgo_key"), &GameSingleton::get_province_info_rgo_key); BSM("GameSingleton", D_METHOD("get_province_info_buildings_key"), &GameSingleton::get_province_info_buildings_key); BSM("GameSingleton", D_METHOD("get_building_info_building_key"), &GameSingleton::get_building_info_building_key); BSM("GameSingleton", D_METHOD("get_building_info_level_key"), &GameSingleton::get_building_info_level_key); - BSM("GameSingleton", D_METHOD("get_building_info_expansion_state_key"), &GameSingleton::get_building_info_expansion_state_key); + BSM( + "GameSingleton", D_METHOD("get_building_info_expansion_state_key"), + &GameSingleton::get_building_info_expansion_state_key + ); BSM("GameSingleton", D_METHOD("get_building_info_start_date_key"), &GameSingleton::get_building_info_start_date_key); BSM("GameSingleton", D_METHOD("get_building_info_end_date_key"), &GameSingleton::get_building_info_end_date_key); - BSM("GameSingleton", D_METHOD("get_building_info_expansion_progress_key"), - &GameSingleton::get_building_info_expansion_progress_key); + BSM( + "GameSingleton", D_METHOD("get_building_info_expansion_progress_key"), + &GameSingleton::get_building_info_expansion_progress_key + ); BSM("GameSingleton", D_METHOD("get_piechart_info_size_key"), &GameSingleton::get_piechart_info_size_key); BSM("GameSingleton", D_METHOD("get_piechart_info_colour_key"), &GameSingleton::get_piechart_info_colour_key); - BSM("GameSingleton", D_METHOD("draw_pie_chart", "image", "stopAngles", "colours", "radius", - "shadow_displacement", "shadow_tightness", "shadow_radius", "shadow_thickness", - "trim_colour", "trim_size", "gradient_falloff", "gradient_base", - "donut", "donut_inner_trim", "donut_inner_radius"), &GameSingleton::draw_pie_chart); + BSM( + "GameSingleton", + D_METHOD( + "draw_pie_chart", "image", "stopAngles", "colours", "radius", "shadow_displacement", "shadow_tightness", + "shadow_radius", "shadow_thickness", "trim_colour", "trim_size", "gradient_falloff", "gradient_base", "donut", + "donut_inner_trim", "donut_inner_radius" + ), + &GameSingleton::draw_pie_chart + ); BSM("GameSingleton", D_METHOD("load_image", "path"), &GameSingleton::load_image); } -void GameSingleton::draw_pie_chart(Ref image, - Array const& stopAngles, Array const& colours, float radius, - Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, - Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, - bool donut, bool donut_inner_trim, float donut_inner_radius) { - - Utilities::draw_pie_chart(image, stopAngles, colours, radius, shadow_displacement, - shadow_tightness, shadow_radius, shadow_thickness, - trim_colour, trim_size, gradient_falloff, gradient_base, - donut, donut_inner_trim, donut_inner_radius); +void GameSingleton::draw_pie_chart( + Ref image, Array const& stopAngles, Array const& colours, float radius, Vector2 shadow_displacement, + float shadow_tightness, float shadow_radius, float shadow_thickness, Color trim_colour, float trim_size, + float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius +) { + Utilities::draw_pie_chart( + image, stopAngles, colours, radius, shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, + trim_colour, trim_size, gradient_falloff, gradient_base, donut, donut_inner_trim, donut_inner_radius + ); } Ref GameSingleton::load_image(String const& path) { @@ -115,10 +131,8 @@ void GameSingleton::_on_state_updated() { /* REQUIREMENTS: * MAP-21, MAP-23, MAP-25, MAP-32, MAP-33, MAP-34 */ -GameSingleton::GameSingleton() : game_manager { - [this]() { - _on_state_updated(); - } } { +GameSingleton::GameSingleton() + : game_manager { std::bind(&GameSingleton::_on_state_updated, this) } { ERR_FAIL_COND(singleton != nullptr); singleton = this; } @@ -227,20 +241,27 @@ StringName const& GameSingleton::get_piechart_info_colour_key() { return key; } -Dictionary GameSingleton::_distribution_to_dictionary(distribution_t const& dist) const { +template T> +static Dictionary _distribution_to_dictionary(decimal_map_t const& dist) { Dictionary dict; - for (distribution_t::value_type const& p : dist) { - Dictionary sub_dict; - sub_dict[get_piechart_info_size_key()] = p.second.to_float(); - sub_dict[get_piechart_info_colour_key()] = Utilities::to_godot_color(p.first->get_colour()); - dict[std_view_to_godot_string(p.first->get_identifier())] = sub_dict; + for (auto const& [key, val] : dist) { + if (key != nullptr) { + Dictionary sub_dict; + sub_dict[GameSingleton::get_piechart_info_size_key()] = val.to_float(); + sub_dict[GameSingleton::get_piechart_info_colour_key()] = Utilities::to_godot_color(key->get_colour()); + dict[std_view_to_godot_string(key->get_identifier())] = std::move(sub_dict); + } else { + UtilityFunctions::push_error("Null distribution key with value ", val.to_float()); + } } return dict; } Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { Province const* province = game_manager.get_map().get_province_by_index(index); - if (province == nullptr) return {}; + if (province == nullptr) { + return {}; + } Dictionary ret; ret[get_province_info_province_key()] = std_view_to_godot_string(province->get_identifier()); @@ -263,13 +284,15 @@ Dictionary GameSingleton::get_province_info_from_index(int32_t index) const { } ret[get_province_info_total_population_key()] = province->get_total_population(); - distribution_t const& pop_types = province->get_pop_type_distribution(); + decimal_map_t const& pop_types = province->get_pop_type_distribution(); if (!pop_types.empty()) { ret[get_province_info_pop_types_key()] = _distribution_to_dictionary(pop_types); } - //distribution_t const& ideologies = province->get_ideology_distribution(); - //if (!ideologies.empty()) ret[get_province_info_pop_ideologies_key()] = _distribution_to_dictionary(ideologies); - distribution_t const& cultures = province->get_culture_distribution(); + decimal_map_t const& ideologies = province->get_ideology_distribution(); + if (!ideologies.empty()) { + ret[get_province_info_pop_ideologies_key()] = _distribution_to_dictionary(ideologies); + } + decimal_map_t const& cultures = province->get_culture_distribution(); if (!cultures.empty()) { ret[get_province_info_pop_cultures_key()] = _distribution_to_dictionary(cultures); } @@ -326,7 +349,8 @@ Ref GameSingleton::get_province_colour_texture() const { Error GameSingleton::_update_colour_image() { static PackedByteArray colour_data_array; - static constexpr int64_t colour_data_array_size = (static_cast(Province::MAX_INDEX) + 1) * Map::MAPMODE_COLOUR_SIZE; + static constexpr int64_t colour_data_array_size = + (static_cast(Province::MAX_INDEX) + 1) * Map::MAPMODE_COLOUR_SIZE; colour_data_array.resize(colour_data_array_size); Error err = OK; @@ -337,15 +361,12 @@ Error GameSingleton::_update_colour_image() { static constexpr int32_t PROVINCE_INDEX_SQRT = 1 << (sizeof(Province::index_t) * 4); if (province_colour_image.is_null()) { province_colour_image.instantiate(); - ERR_FAIL_NULL_V_EDMSG(province_colour_image, FAILED, - "Failed to create province colour image"); + ERR_FAIL_NULL_V_EDMSG(province_colour_image, FAILED, "Failed to create province colour image"); } - province_colour_image->set_data(PROVINCE_INDEX_SQRT, PROVINCE_INDEX_SQRT, - false, Image::FORMAT_RGBA8, colour_data_array); + province_colour_image->set_data(PROVINCE_INDEX_SQRT, PROVINCE_INDEX_SQRT, false, Image::FORMAT_RGBA8, colour_data_array); if (province_colour_texture.is_null()) { province_colour_texture = ImageTexture::create_from_image(province_colour_image); - ERR_FAIL_NULL_V_EDMSG(province_colour_texture, FAILED, - "Failed to create province colour texture"); + ERR_FAIL_NULL_V_EDMSG(province_colour_texture, FAILED, "Failed to create province colour texture"); } else { province_colour_texture->update(province_colour_image); } @@ -439,13 +460,18 @@ Error GameSingleton::_load_map_images(bool flip_vertical) { const Vector2i province_dims { static_cast(game_manager.get_map().get_width()), - static_cast(game_manager.get_map().get_height()) }; + static_cast(game_manager.get_map().get_height()) + }; static constexpr int32_t GPU_DIM_LIMIT = 0x3FFF; - // For each dimension of the image, this finds the small number of equal subdivisions required get the individual texture dims under GPU_DIM_LIMIT - for (int i = 0; i < 2; ++i) - for (image_subdivisions[i] = 1; province_dims[i] / image_subdivisions[i] > GPU_DIM_LIMIT || - province_dims[i] % image_subdivisions[i] != 0; ++image_subdivisions[i]); + // For each dimension of the image, this finds the small number of equal subdivisions + // required get the individual texture dims under GPU_DIM_LIMIT + for (int i = 0; i < 2; ++i) { + image_subdivisions[i] = 1; + while (province_dims[i] / image_subdivisions[i] > GPU_DIM_LIMIT || province_dims[i] % image_subdivisions[i] != 0) { + ++image_subdivisions[i]; + } + } Map::shape_pixel_t const* province_shape_data = game_manager.get_map().get_province_shape_image().data(); const Vector2i divided_dims = province_dims / image_subdivisions; @@ -456,14 +482,16 @@ Error GameSingleton::_load_map_images(bool flip_vertical) { PackedByteArray index_data_array; index_data_array.resize(divided_dims.x * divided_dims.y * sizeof(Map::shape_pixel_t)); - for (int32_t y = 0; y < divided_dims.y; ++y) - memcpy(index_data_array.ptrw() + y * divided_dims.x * sizeof(Map::shape_pixel_t), + for (int32_t y = 0; y < divided_dims.y; ++y) { + memcpy( + index_data_array.ptrw() + y * divided_dims.x * sizeof(Map::shape_pixel_t), province_shape_data + (v * divided_dims.y + y) * province_dims.x + u * divided_dims.x, - divided_dims.x * sizeof(Map::shape_pixel_t)); + divided_dims.x * sizeof(Map::shape_pixel_t) + ); + } - const Ref province_shape_subimage = Image::create_from_data( - divided_dims.x, divided_dims.y, - false, Image::FORMAT_RGB8, index_data_array); + const Ref province_shape_subimage = + Image::create_from_data(divided_dims.x, divided_dims.y, false, Image::FORMAT_RGB8, index_data_array); if (province_shape_subimage.is_null()) { UtilityFunctions::push_error("Failed to create province shape image (", u, ", ", v, ")"); err = FAILED; @@ -497,8 +525,10 @@ Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& ter terrain_sheet->flip_y(); const int32_t sheet_width = terrain_sheet->get_width(), sheet_height = terrain_sheet->get_height(); if (sheet_width < 1 || sheet_width % SHEET_DIMS != 0 || sheet_width != sheet_height) { - UtilityFunctions::push_error("Invalid terrain texture sheet dims: ", sheet_width, "x", sheet_height, - " (must be square with dims positive multiples of ", SHEET_DIMS, ")"); + UtilityFunctions::push_error( + "Invalid terrain texture sheet dims: ", sheet_width, "x", sheet_height, + " (must be square with dims positive multiples of ", SHEET_DIMS, ")" + ); return FAILED; } const int32_t slice_size = sheet_width / SHEET_DIMS; @@ -516,7 +546,9 @@ Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& ter const Rect2i slice { (idx % SHEET_DIMS) * slice_size, (7 - (idx / SHEET_DIMS)) * slice_size, slice_size, slice_size }; const Ref terrain_image = terrain_sheet->get_region(slice); if (terrain_image.is_null() || terrain_image->is_empty()) { - UtilityFunctions::push_error("Failed to extract terrain texture slice ", slice, " from ", terrain_texturesheet_path); + UtilityFunctions::push_error( + "Failed to extract terrain texture slice ", slice, " from ", terrain_texturesheet_path + ); err = FAILED; } terrain_images.append(terrain_image); @@ -531,7 +563,7 @@ Error GameSingleton::_load_terrain_variants_compatibility_mode(String const& ter } Error GameSingleton::load_defines_compatibility_mode(PackedStringArray const& file_paths) { - static const fs::path terrain_texture_file = "map/terrain/texturesheet.tga"; + static constexpr std::string_view terrain_texture_file = "map/terrain/texturesheet.tga"; Dataloader::path_vector_t roots; for (String const& path : file_paths) { diff --git a/extension/src/openvic-extension/GameSingleton.hpp b/extension/src/openvic-extension/GameSingleton.hpp index 8145a39..1d92ef0 100644 --- a/extension/src/openvic-extension/GameSingleton.hpp +++ b/extension/src/openvic-extension/GameSingleton.hpp @@ -33,17 +33,16 @@ namespace OpenVic { godot::Error _update_colour_image(); void _on_state_updated(); - godot::Dictionary _distribution_to_dictionary(distribution_t const& dist) const; - protected: static void _bind_methods(); public: - static void draw_pie_chart(godot::Ref image, - godot::Array const& stopAngles, godot::Array const& colours, float radius, + static void draw_pie_chart( + godot::Ref image, godot::Array const& stopAngles, godot::Array const& colours, float radius, godot::Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, - godot::Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, - bool donut, bool donut_inner_trim, float donut_inner_radius); + godot::Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, bool donut, + bool donut_inner_trim, float donut_inner_radius + ); static godot::Ref load_image(godot::String const& path); diff --git a/extension/src/openvic-extension/LoadLocalisation.cpp b/extension/src/openvic-extension/LoadLocalisation.cpp index 6ed92fd..ee90633 100644 --- a/extension/src/openvic-extension/LoadLocalisation.cpp +++ b/extension/src/openvic-extension/LoadLocalisation.cpp @@ -32,7 +32,7 @@ LoadLocalisation::~LoadLocalisation() { singleton = nullptr; } -Error LoadLocalisation::_load_file_into_translation(String const& file_path, Ref translation) const { +Error LoadLocalisation::_load_file(String const& file_path, Ref translation) const { const Ref file = FileAccess::open(file_path, FileAccess::ModeFlags::READ); Error err = FileAccess::get_open_error(); if (err != OK || file.is_null()) { @@ -46,10 +46,14 @@ Error LoadLocalisation::_load_file_into_translation(String const& file_path, Ref line_number++; if (line.size() < 2 || line[0].is_empty() || line[1].is_empty()) { if (!line[0].is_empty()) { - UtilityFunctions::push_warning("Key \"", line[0], "\" missing value on line ", line_number, " in file: ", file_path); + UtilityFunctions::push_warning( + "Key \"", line[0], "\" missing value on line ", line_number, " in file: ", file_path + ); err = FAILED; } else if (line.size() >= 2 && !line[1].is_empty()) { - UtilityFunctions::push_warning("Value \"", line[1], "\" missing key on line ", line_number, " in file: ", file_path); + UtilityFunctions::push_warning( + "Value \"", line[1], "\" missing key on line ", line_number, " in file: ", file_path + ); err = FAILED; } continue; @@ -75,7 +79,7 @@ Ref LoadLocalisation::_get_translation(String const& locale) const } Error LoadLocalisation::load_file(String const& file_path, String const& locale) const { - return _load_file_into_translation(file_path, _get_translation(locale)); + return _load_file(file_path, _get_translation(locale)); } /* REQUIREMENTS @@ -101,7 +105,7 @@ Error LoadLocalisation::load_locale_dir(String const& dir_path, String const& lo Error err = OK; for (String const& file_name : files) { if (file_name.get_extension().to_lower() == "csv") { - if (_load_file_into_translation(dir_path.path_join(file_name), translation) != OK) { + if (_load_file(dir_path.path_join(file_name), translation) != OK) { err = FAILED; } } @@ -153,8 +157,10 @@ bool LoadLocalisation::add_message(std::string_view key, Dataloader::locale_t lo if (0) { const StringName old_localisation = translation->get_message(godot_key); if (!old_localisation.is_empty()) { - UtilityFunctions::push_warning("Changing translation ", godot_key, " (", Dataloader::locale_names[locale], ") from \"", - old_localisation, "\" to \"", godot_localisation, "\""); + UtilityFunctions::push_warning( + "Changing translation ", godot_key, " (", Dataloader::locale_names[locale], ") from \"", + old_localisation, "\" to \"", godot_localisation, "\"" + ); } } translation->add_message(godot_key, godot_localisation); diff --git a/extension/src/openvic-extension/LoadLocalisation.hpp b/extension/src/openvic-extension/LoadLocalisation.hpp index 4f09ef3..8f6423e 100644 --- a/extension/src/openvic-extension/LoadLocalisation.hpp +++ b/extension/src/openvic-extension/LoadLocalisation.hpp @@ -11,7 +11,7 @@ namespace OpenVic { static LoadLocalisation* singleton; - godot::Error _load_file_into_translation(godot::String const& file_path, godot::Ref translation) const; + godot::Error _load_file(godot::String const& file_path, godot::Ref translation) const; godot::Ref _get_translation(godot::String const& locale) const; protected: diff --git a/extension/src/openvic-extension/MapMesh.cpp b/extension/src/openvic-extension/MapMesh.cpp index 39cee41..e407391 100644 --- a/extension/src/openvic-extension/MapMesh.cpp +++ b/extension/src/openvic-extension/MapMesh.cpp @@ -21,14 +21,21 @@ void MapMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_core_aabb"), &MapMesh::get_core_aabb); ClassDB::bind_method(D_METHOD("is_valid_uv_coord"), &MapMesh::is_valid_uv_coord); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "aspect_ratio", PROPERTY_HINT_NONE, "suffix:m"), - "set_aspect_ratio", "get_aspect_ratio"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "repeat_proportion", PROPERTY_HINT_NONE, "suffix:m"), - "set_repeat_proportion", "get_repeat_proportion"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), - "set_subdivide_width", "get_subdivide_width"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), - "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY( + PropertyInfo(Variant::FLOAT, "aspect_ratio", PROPERTY_HINT_NONE, "suffix:m"), "set_aspect_ratio", "get_aspect_ratio" + ); + ADD_PROPERTY( + PropertyInfo(Variant::FLOAT, "repeat_proportion", PROPERTY_HINT_NONE, "suffix:m"), "set_repeat_proportion", + "get_repeat_proportion" + ); + ADD_PROPERTY( + PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", + "get_subdivide_width" + ); + ADD_PROPERTY( + PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", + "get_subdivide_depth" + ); } void MapMesh::_request_update() { diff --git a/extension/src/openvic-extension/Utilities.cpp b/extension/src/openvic-extension/Utilities.cpp index 87f0422..520f78e 100644 --- a/extension/src/openvic-extension/Utilities.cpp +++ b/extension/src/openvic-extension/Utilities.cpp @@ -75,10 +75,11 @@ static inline float parabola_shadow(float base, float x) { return base * x * x; } -static Color pie_chart_fragment(Vector2 UV, float radius, Array const& stopAngles, Array const& colours, - Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, - Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, - bool donut, bool donut_inner_trim, float donut_inner_radius) { +static Color pie_chart_fragment( + Vector2 UV, float radius, Array const& stopAngles, Array const& colours, Vector2 shadow_displacement, + float shadow_tightness, float shadow_radius, float shadow_thickness, Color trim_colour, float trim_size, + float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius +) { Vector2 coords = getPolar(UV, { 0.5, 0.5 }); float dist = coords.x; @@ -86,8 +87,8 @@ static Color pie_chart_fragment(Vector2 UV, float radius, Array const& stopAngle Vector2 shadow_polar = getPolar(UV, shadow_displacement); float shadow_peak = radius + (radius - donut_inner_radius) / 2.0; - float shadow_gradient = shadow_thickness + parabola_shadow(shadow_tightness * -10.0, - shadow_polar.x + shadow_peak - shadow_radius); + float shadow_gradient = + shadow_thickness + parabola_shadow(shadow_tightness * -10.0, shadow_polar.x + shadow_peak - shadow_radius); // Inner hole of the donut => make it transparent if (donut && dist <= donut_inner_radius) { @@ -119,11 +120,11 @@ static Color pie_chart_fragment(Vector2 UV, float radius, Array const& stopAngle } } -void Utilities::draw_pie_chart(Ref image, - Array const& stopAngles, Array const& colours, float radius, - Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, - Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, - bool donut, bool donut_inner_trim, float donut_inner_radius) { +void Utilities::draw_pie_chart( + Ref image, Array const& stopAngles, Array const& colours, float radius, Vector2 shadow_displacement, + float shadow_tightness, float shadow_radius, float shadow_thickness, Color trim_colour, float trim_size, + float gradient_falloff, float gradient_base, bool donut, bool donut_inner_trim, float donut_inner_radius +) { ERR_FAIL_NULL_EDMSG(image, "Cannot draw pie chart to null image."); const int32_t width = image->get_width(); @@ -135,12 +136,14 @@ void Utilities::draw_pie_chart(Ref image, const int32_t size = std::min(width, height); for (int32_t y = 0; y < size; ++y) { for (int32_t x = 0; x < size; ++x) { - image->set_pixel(x, y, pie_chart_fragment( - Vector2 { static_cast(x), static_cast(y) } / size, - radius, stopAngles, colours, - shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, - trim_colour, trim_size, gradient_falloff, gradient_base, - donut, donut_inner_trim, donut_inner_radius)); + image->set_pixel( + x, y, + pie_chart_fragment( + Vector2 { static_cast(x), static_cast(y) } / size, radius, stopAngles, colours, + shadow_displacement, shadow_tightness, shadow_radius, shadow_thickness, trim_colour, trim_size, + gradient_falloff, gradient_base, donut, donut_inner_trim, donut_inner_radius + ) + ); } } } diff --git a/extension/src/openvic-extension/Utilities.hpp b/extension/src/openvic-extension/Utilities.hpp index 68e72d2..f789f84 100644 --- a/extension/src/openvic-extension/Utilities.hpp +++ b/extension/src/openvic-extension/Utilities.hpp @@ -22,7 +22,11 @@ namespace OpenVic::Utilities { } inline godot::Color to_godot_color(colour_t colour) { - return { colour_byte_to_float((colour >> 16) & 0xFF), colour_byte_to_float((colour >> 8) & 0xFF), colour_byte_to_float(colour & 0xFF) }; + return { + colour_byte_to_float((colour >> 16) & 0xFF), + colour_byte_to_float((colour >> 8) & 0xFF), + colour_byte_to_float(colour & 0xFF) + }; } inline godot::Vector2i to_godot_ivec2(ivec2_t vec) { @@ -31,9 +35,10 @@ namespace OpenVic::Utilities { godot::Ref load_godot_image(godot::String const& path); - void draw_pie_chart(godot::Ref image, - godot::Array const& stopAngles, godot::Array const& colours, float radius, + void draw_pie_chart( + godot::Ref image, godot::Array const& stopAngles, godot::Array const& colours, float radius, godot::Vector2 shadow_displacement, float shadow_tightness, float shadow_radius, float shadow_thickness, - godot::Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, - bool donut, bool donut_inner_trim, float donut_inner_radius); + godot::Color trim_colour, float trim_size, float gradient_falloff, float gradient_base, bool donut, + bool donut_inner_trim, float donut_inner_radius + ); } diff --git a/extension/src/openvic-extension/register_types.cpp b/extension/src/openvic-extension/register_types.cpp index c954de1..2739e2e 100644 --- a/extension/src/openvic-extension/register_types.cpp +++ b/extension/src/openvic-extension/register_types.cpp @@ -51,8 +51,10 @@ void uninitialize_openvic_types(ModuleInitializationLevel p_level) { extern "C" { // Initialization. - GDExtensionBool GDE_EXPORT openvic_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, - GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { + GDExtensionBool GDE_EXPORT openvic_library_init( + GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, + GDExtensionInitialization* r_initialization + ) { GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); init_obj.register_initializer(initialize_openvic_types); -- cgit v1.2.3-56-ga3b1