gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-26 20:28:50 -05:00
Code Issues Projects Releases Wiki Activity

made static data static

Browse Source 
minor cleanup
This commit is contained in:
SergeyN 2020-06-07 13:10:42 +02:00
parent 8251e17eef
commit 723122211e
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
implot.cpp
View File

@ -2203,8 +2203,8 @@ struct LineRenderer {
} }
ImU32 Col; ImU32 Col;
float Weight; float Weight;
const int IdxConsumed = 6; static const int IdxConsumed = 6;
const int VtxConsumed = 4; static const int VtxConsumed = 4;
}; };
struct FillRenderer { struct FillRenderer {
@ -2239,8 +2239,8 @@ struct FillRenderer {
} }
ImU32 Col; ImU32 Col;
float Zero; float Zero;
const int IdxConsumed = 6; static const int IdxConsumed = 6;
const int VtxConsumed = 5; static const int VtxConsumed = 5;
}; };
struct RectRenderer { struct RectRenderer {
@ -2275,8 +2275,8 @@ struct RectRenderer {
DrawList._VtxCurrentIdx += 4; DrawList._VtxCurrentIdx += 4;
} }
ImU32 Col; ImU32 Col;
const int IdxConsumed = 6; static const int IdxConsumed = 6;
const int VtxConsumed = 4; static const int VtxConsumed = 4;
}; };
template <typename Getter, typename Transformer, typename Renderer> template <typename Getter, typename Transformer, typename Renderer>
@ -2285,36 +2285,34 @@ inline void RenderPrimitives(Getter getter, Transformer transformer, Renderer re
int prims = getter.Count - 1; int prims = getter.Count - 1;
int i1 = 1; int i1 = 1;
int prims_culled = 0; int prims_culled = 0;
// TODO: replace the 6s and 4s below with I and V
const int I = renderer.IdxConsumed;
const int V = renderer.VtxConsumed;
const ImVec2 uv = DrawList._Data->TexUvWhitePixel; const ImVec2 uv = DrawList._Data->TexUvWhitePixel;
while (prims) { while (prims) {
// find how many can be reserved up to end of current draw command's limit // find how many can be reserved up to end of current draw command's limit
int cnt = (int)ImMin(size_t(prims), (((size_t(1) << sizeof(ImDrawIdx) * 8) - 1 - DrawList._VtxCurrentIdx) / V)); int cnt = (int)ImMin(size_t(prims), (((size_t(1) << sizeof(ImDrawIdx) * 8) - 1 - DrawList._VtxCurrentIdx) / Renderer::VtxConsumed));
// make sure at least this many elements can be rendered to avoid situations where at the end of buffer this slow path is not taken all the time // make sure at least this many elements can be rendered to avoid situations where at the end of buffer this slow path is not taken all the time
if (cnt >= ImMin(64, prims)) { if (cnt >= ImMin(64, prims)) {
if (prims_culled >= cnt) if (prims_culled >= cnt)
prims_culled -= cnt; // reuse previous reservation prims_culled -= cnt; // reuse previous reservation
else { else {
DrawList.PrimReserve((cnt - prims_culled) * I, (cnt - prims_culled) * V); // add more elements to previous reservation DrawList.PrimReserve((cnt - prims_culled) * Renderer::IdxConsumed, (cnt - prims_culled) * Renderer::VtxConsumed); // add more elements to previous reservation
prims_culled = 0; prims_culled = 0;
} }
} }
else else
{ {
if (prims_culled > 0) { if (prims_culled > 0) {
DrawList.PrimUnreserve(prims_culled * I, prims_culled * V); DrawList.PrimUnreserve(prims_culled * Renderer::IdxConsumed, prims_culled * Renderer::VtxConsumed);
prims_culled = 0; prims_culled = 0;
} }
cnt = (int)ImMin(size_t(prims), (((size_t(1) << sizeof(ImDrawIdx) * 8) - 1 - 0/*DrawList._VtxCurrentIdx*/) / V)); cnt = (int)ImMin(size_t(prims), (((size_t(1) << sizeof(ImDrawIdx) * 8) - 1 - 0/*DrawList._VtxCurrentIdx*/) / Renderer::VtxConsumed));
DrawList.PrimReserve(cnt * I, cnt * V); // reserve new draw command DrawList.PrimReserve(cnt * Renderer::IdxConsumed, cnt * Renderer::VtxConsumed); // reserve new draw command
} }
prims -= cnt; prims -= cnt;
for (int ie = i1 + cnt; i1 != ie; ++i1) { for (int ie = i1 + cnt; i1 != ie; ++i1) {
int idx = i1;
ImVec2 p2 = transformer(getter(idx)); ImVec2 p2 = transformer(getter(i1));
// TODO: Put the cull check inside of each Renderer // TODO: Put the cull check inside of each Renderer
if (!cull || gp.BB_Plot.Overlaps(ImRect(ImMin(p1, p2), ImMax(p1, p2)))) if (!cull || gp.BB_Plot.Overlaps(ImRect(ImMin(p1, p2), ImMax(p1, p2))))
renderer.render(DrawList, p1, p2, uv); renderer.render(DrawList, p1, p2, uv);
@ -2324,7 +2322,7 @@ inline void RenderPrimitives(Getter getter, Transformer transformer, Renderer re
} }
} }
if (prims_culled > 0) if (prims_culled > 0)
DrawList.PrimUnreserve(prims_culled * I, prims_culled * V); DrawList.PrimUnreserve(prims_culled * Renderer::IdxConsumed, prims_culled * Renderer::VtxConsumed);
} }
template <typename Getter, typename Transformer> template <typename Getter, typename Transformer>