From 6520b6c4583ad2f30aecc4299e1b055208826e06 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 12 Jul 2015 10:48:06 -0600 Subject: [PATCH] ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. --- imgui.cpp | 23 +++++++++++++++++++---- imgui.h | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index f4c13809c..49eea35f2 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -9202,10 +9202,10 @@ void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float roun if (r == 0.0f || rounding_corners == 0) { PrimReserve(4*6); - PrimLine(ImVec2(a.x,a.y), ImVec2(b.x,a.y), col); - PrimLine(ImVec2(b.x,a.y), ImVec2(b.x,b.y), col); - PrimLine(ImVec2(b.x,b.y), ImVec2(a.x,b.y), col); - PrimLine(ImVec2(a.x,b.y), ImVec2(a.x,a.y), col); + PrimLine(a, ImVec2(b.x,a.y), col); + PrimLine(ImVec2(b.x,a.y), b, col); + PrimLine(b, ImVec2(a.x,b.y), col); + PrimLine(ImVec2(a.x,b.y), a, col); } else { @@ -9257,6 +9257,21 @@ void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, floa } } +void ImDrawList::AddRectFilledMultiColor(const ImVec2& a, const ImVec2& b, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left) +{ + if (((col_upr_left | col_upr_right | col_bot_right | col_bot_left) >> 24) == 0) + return; + + const ImVec2 uv = GImGui->FontTexUvWhitePixel; + PrimReserve(6); + PrimVtx(a, uv, col_upr_left); + PrimVtx(ImVec2(b.x,a.y), uv, col_upr_right); + PrimVtx(ImVec2(b.x,b.y), uv, col_bot_right); + PrimVtx(a, uv, col_upr_left); + PrimVtx(b, uv, col_bot_right); + PrimVtx(ImVec2(a.x,b.y), uv, col_bot_left); +} + void ImDrawList::AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col) { if ((col >> 24) == 0) diff --git a/imgui.h b/imgui.h index 3964fd946..0f371efd1 100644 --- a/imgui.h +++ b/imgui.h @@ -1044,6 +1044,7 @@ struct ImDrawList IMGUI_API void AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f); IMGUI_API void AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners = 0x0F); IMGUI_API void AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners = 0x0F); + IMGUI_API void AddRectFilledMultiColor(const ImVec2& a, const ImVec2& b, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left); IMGUI_API void AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col); IMGUI_API void AddCircle(const ImVec2& centre, float radius, ImU32 col, int num_segments = 12); IMGUI_API void AddCircleFilled(const ImVec2& centre, float radius, ImU32 col, int num_segments = 12);