diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-02 20:42:06 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-02 20:42:06 +0100 |
| commit | 444a27726695478e44e0166e75df1f354b6432d5 (patch) | |
| tree | f1f6276c91beceecdfd9b09083d1c91ea8b41b60 /src/openvic-simulation/interface/GFX.cpp | |
| parent | cd6875d5e0ca5e2545fd0e1647678cd18a6c81c2 (diff) | |
| parent | 4a899c1a9e83ab9476b85522751081be434caa35 (diff) | |
Merge pull request #82 from OpenVicProject/backlog
Accumulated changes from Dev Diary GUI focus period
Diffstat (limited to 'src/openvic-simulation/interface/GFX.cpp')
| -rw-r--r-- | src/openvic-simulation/interface/GFX.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/openvic-simulation/interface/GFX.cpp b/src/openvic-simulation/interface/GFX.cpp index f4e2074..927b832 100644 --- a/src/openvic-simulation/interface/GFX.cpp +++ b/src/openvic-simulation/interface/GFX.cpp @@ -42,18 +42,15 @@ bool TextureSprite::_fill_key_map(key_map_t& key_map) { return ret; } -ProgressBar::ProgressBar() -: back_colour {}, back_texture_file {}, - progress_colour {}, progress_texture_file {}, - size {} {} +ProgressBar::ProgressBar() : back_colour {}, progress_colour {} {} bool ProgressBar::_fill_key_map(key_map_t& key_map) { bool ret = Sprite::_fill_key_map(key_map); ret &= add_key_map_entries(key_map, "color", ONE_EXACTLY, expect_colour(assign_variable_callback(back_colour)), "colortwo", ONE_EXACTLY, expect_colour(assign_variable_callback(progress_colour)), - "textureFile1", ZERO_OR_ONE, expect_string(assign_variable_callback_string(back_texture_file)), - "textureFile2", ZERO_OR_ONE, expect_string(assign_variable_callback_string(progress_texture_file)), + "textureFile1", ZERO_OR_ONE, expect_string(assign_variable_callback_string(progress_texture_file)), + "textureFile2", ZERO_OR_ONE, expect_string(assign_variable_callback_string(back_texture_file)), "size", ONE_EXACTLY, expect_ivec2(assign_variable_callback(size)), "effectFile", ONE_EXACTLY, success_callback, @@ -84,12 +81,12 @@ bool LineChart::_fill_key_map(key_map_t& key_map) { return ret; } -MaskedFlag::MaskedFlag() : texture_file {}, mask_file {} {} +MaskedFlag::MaskedFlag() : overlay_file {}, mask_file {} {} bool MaskedFlag::_fill_key_map(key_map_t& key_map) { bool ret = Sprite::_fill_key_map(key_map); ret &= add_key_map_entries(key_map, - "textureFile1", ONE_EXACTLY, expect_string(assign_variable_callback_string(texture_file)), + "textureFile1", ONE_EXACTLY, expect_string(assign_variable_callback_string(overlay_file)), "textureFile2", ONE_EXACTLY, expect_string(assign_variable_callback_string(mask_file)), "effectFile", ONE_EXACTLY, success_callback, "allwaystransparent", ZERO_OR_ONE, success_callback, |