diff options
author | Hop311 <Hop3114@gmail.com> | 2024-07-19 22:08:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-19 22:08:06 +0200 |
commit | d4b223b491ec2d9b32393c4c58ad85f18bd9566e (patch) | |
tree | 1fcb4f2c1954b17282dc7a3b09711592bf7c1174 /extension/src/openvic-extension/classes | |
parent | 6c92fc141c3e44526be43720a342beedeab9ad63 (diff) | |
parent | 25e469466fbee51efa958d1ca9dd1f270a41c7af (diff) |
Merge pull request #240 from OpenVicProject/format-cleanup
Update openvic-simulation to OpenVicProject/OpenVic-Simulation@d1f3a96
Diffstat (limited to 'extension/src/openvic-extension/classes')
-rw-r--r-- | extension/src/openvic-extension/classes/GFXPieChartTexture.cpp | 6 | ||||
-rw-r--r-- | extension/src/openvic-extension/classes/MapMesh.cpp | 8 | ||||
-rw-r--r-- | extension/src/openvic-extension/classes/MapMesh.hpp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/extension/src/openvic-extension/classes/GFXPieChartTexture.cpp b/extension/src/openvic-extension/classes/GFXPieChartTexture.cpp index ead72cf..47e32a2 100644 --- a/extension/src/openvic-extension/classes/GFXPieChartTexture.cpp +++ b/extension/src/openvic-extension/classes/GFXPieChartTexture.cpp @@ -11,15 +11,15 @@ using namespace OpenVic; using OpenVic::Utilities::std_view_to_godot_string; StringName const& GFXPieChartTexture::_slice_identifier_key() { - static StringName const slice_identifier_key = "identifier"; + static const StringName slice_identifier_key = "identifier"; return slice_identifier_key; } StringName const& GFXPieChartTexture::_slice_colour_key() { - static StringName const slice_colour_key = "colour"; + static const StringName slice_colour_key = "colour"; return slice_colour_key; } StringName const& GFXPieChartTexture::_slice_weight_key() { - static StringName const slice_weight_key = "weight"; + static const StringName slice_weight_key = "weight"; return slice_weight_key; } diff --git a/extension/src/openvic-extension/classes/MapMesh.cpp b/extension/src/openvic-extension/classes/MapMesh.cpp index 8db3b84..ba1b19f 100644 --- a/extension/src/openvic-extension/classes/MapMesh.cpp +++ b/extension/src/openvic-extension/classes/MapMesh.cpp @@ -45,7 +45,7 @@ void MapMesh::_request_update() { set_add_uv2(get_add_uv2()); } -void MapMesh::set_aspect_ratio(const float ratio) { +void MapMesh::set_aspect_ratio(float ratio) { aspect_ratio = ratio; _request_update(); } @@ -54,7 +54,7 @@ float MapMesh::get_aspect_ratio() const { return aspect_ratio; } -void MapMesh::set_repeat_proportion(const float proportion) { +void MapMesh::set_repeat_proportion(float proportion) { repeat_proportion = proportion; _request_update(); } @@ -63,7 +63,7 @@ float MapMesh::get_repeat_proportion() const { return repeat_proportion; } -void MapMesh::set_subdivide_width(const int32_t divisions) { +void MapMesh::set_subdivide_width(int32_t divisions) { subdivide_w = divisions > 0 ? divisions : 0; _request_update(); } @@ -72,7 +72,7 @@ int32_t MapMesh::get_subdivide_width() const { return subdivide_w; } -void MapMesh::set_subdivide_depth(const int32_t divisions) { +void MapMesh::set_subdivide_depth(int32_t divisions) { subdivide_d = divisions > 0 ? divisions : 0; _request_update(); } diff --git a/extension/src/openvic-extension/classes/MapMesh.hpp b/extension/src/openvic-extension/classes/MapMesh.hpp index 38b208c..20383ca 100644 --- a/extension/src/openvic-extension/classes/MapMesh.hpp +++ b/extension/src/openvic-extension/classes/MapMesh.hpp @@ -14,16 +14,16 @@ namespace OpenVic { void _request_update(); public: - void set_aspect_ratio(const float ratio); + void set_aspect_ratio(float ratio); float get_aspect_ratio() const; - void set_repeat_proportion(const float proportion); + void set_repeat_proportion(float proportion); float get_repeat_proportion() const; - void set_subdivide_width(const int32_t divisions); + void set_subdivide_width(int32_t divisions); int32_t get_subdivide_width() const; - void set_subdivide_depth(const int32_t divisions); + void set_subdivide_depth(int32_t divisions); int32_t get_subdivide_depth() const; godot::AABB get_core_aabb() const; |