From e828ac433c840fd1daa7368a78241ac855cee4ae Mon Sep 17 00:00:00 2001 From: catalinvasile Date: Thu, 5 Sep 2024 17:12:01 +0200 Subject: [PATCH] Fixes for the new path_view --- include/IUI/Icons.h | 2 +- include/IUI/imspinner.h | 8 ++++---- src/Icons.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/IUI/Icons.h b/include/IUI/Icons.h index 7520b67..810eda8 100644 --- a/include/IUI/Icons.h +++ b/include/IUI/Icons.h @@ -29,7 +29,7 @@ enum class Placement : uint8_t }; using PlacementSet = tl::flag_set; -void init(tl::lent_ref engineManager, tl::lent_ref filesystem, fs::AbsPath folderPath); +void init(tl::lent_ref engineManager, tl::lent_ref filesystem, fs::AbsPathView folderPath); void shutdown(); struct Icon diff --git a/include/IUI/imspinner.h b/include/IUI/imspinner.h index cc9ee42..59e4666 100644 --- a/include/IUI/imspinner.h +++ b/include/IUI/imspinner.h @@ -1316,7 +1316,7 @@ namespace ImSpinner ImVec2 p1 = ImVec2(centre.x + ImSin(0) * radius, centre.y + ImCos(0) * radius); ImVec2 p2 = ImVec2(centre.x + ImSin(PI_DIV(3) * 2) * radius, centre.y + ImCos(PI_DIV(3) * 2) * radius); ImVec2 p3 = ImVec2(centre.x + ImSin(PI_DIV(3) * 4) * radius, centre.y + ImCos(PI_DIV(3) * 4) * radius); - std::vector subdividedPoints = splitTriangle(p1, p2, p3, (float)dim); + std::vector subdividedPoints = splitTriangle(p1, p2, p3, dim); for (size_t i = 0; i < subdividedPoints.size(); i+=3) { ImVec2 trisCenter = hsumPoints(hsumPoints(subdividedPoints[i], subdividedPoints[i + 1]), subdividedPoints[i + 2]); const float angle = calculateAngle(p1, trisCenter, centre); @@ -1492,8 +1492,8 @@ namespace ImSpinner c.Value.w = ImMax(0.05f, c.Value.w); } - draw_segment(arc_num, 0.f, c, 1.f + arc_num * 0.3f, arc_num > 0 ? -1.f : 1.f); - draw_segment(arc_num, IM_PI, c, 1.f + arc_num * 0.3f, arc_num > 0 ? -1.f : 1.f); + draw_segment((int)arc_num, 0.f, c, 1.f + arc_num * 0.3f, arc_num > 0 ? -1.f : 1.f); + draw_segment((int)arc_num, IM_PI, c, 1.f + arc_num * 0.3f, arc_num > 0 ? -1.f : 1.f); } } @@ -2071,7 +2071,7 @@ namespace ImSpinner { SPINNER_HEADER(pos, size, centre, num_segments); - const float start = ImFmod(ImGui::GetTime() * speed, IM_PI * 2); + const float start = ImFmod(ImGui::GetTime() * speed, IM_PI * 2.f); const int half_segments = num_segments / 2; for (int i = 0; i < arcs; ++i) { diff --git a/src/Icons.cpp b/src/Icons.cpp index f8a2155..c982b4b 100644 --- a/src/Icons.cpp +++ b/src/Icons.cpp @@ -43,7 +43,7 @@ struct TextureData tl::vector s_textures; tl::unordered_map s_icons; -void init(tl::lent_ref engineManager, tl::lent_ref filesystem, fs::AbsPath folderPath) +void init(tl::lent_ref engineManager, tl::lent_ref filesystem, fs::AbsPathView folderPath) { s_engineManager = std::move(engineManager); s_filesystem = std::move(filesystem);