diff options
| author | untodesu <kirill@untode.su> | 2025-06-28 01:59:49 +0500 |
|---|---|---|
| committer | untodesu <kirill@untode.su> | 2025-06-28 01:59:49 +0500 |
| commit | 61e5bcef2629e2d68b805a956a96fff264d4f74d (patch) | |
| tree | bca3a94bac79d34e3c0db57c77604f5a823ecbda /game/client/progress_bar.cc | |
| parent | 88c01588aa0830e219eaa62588839e4d1e2883ce (diff) | |
| download | voxelius-61e5bcef2629e2d68b805a956a96fff264d4f74d.tar.bz2 voxelius-61e5bcef2629e2d68b805a956a96fff264d4f74d.zip | |
Restructure dependencies and update to C++20
- Nuked static_assert from almost everywhere in the project
- Nuked binary dependency support. Might add one later though
- Separated dependency headers into a separate include subdirectory
- Grafted a thirdpartylegalnotices.txt generator from RITEG
- Pushed development snapshot version to 2126 (26th week of 2025)
Diffstat (limited to 'game/client/progress_bar.cc')
| -rw-r--r-- | game/client/progress_bar.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/game/client/progress_bar.cc b/game/client/progress_bar.cc index 104a5c9..dfab705 100644 --- a/game/client/progress_bar.cc +++ b/game/client/progress_bar.cc @@ -57,10 +57,10 @@ void progress_bar::layout(void) const float modifier = std::exp(-8.0f * (0.5f + 0.5f * sinval)); ImVec4 color = {}; - color.x = cxpr::lerp(background.x, foreground.x, modifier); - color.y = cxpr::lerp(background.y, foreground.y, modifier); - color.z = cxpr::lerp(background.z, foreground.z, modifier); - color.w = cxpr::lerp(background.w, foreground.w, modifier); + color.x = vx::lerp(background.x, foreground.x, modifier); + color.y = vx::lerp(background.y, foreground.y, modifier); + color.z = vx::lerp(background.z, foreground.z, modifier); + color.w = vx::lerp(background.w, foreground.w, modifier); const ImVec2 start = ImVec2(base_xpos + bar_width * i, base_ypos); const ImVec2 end = ImVec2(start.x + bar_width, start.y + bar_height); @@ -105,6 +105,6 @@ void progress_bar::set_title(const char* title) void progress_bar::set_button(const char* text, const progress_bar_action& action) { - str_button = fmt::format("{}###ProgressBar_Button", language::resolve(text)); + str_button = std::format("{}###ProgressBar_Button", language::resolve(text)); button_action = action; } |
