mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Imgui fixes (#2720) 

* Pass Meta key modifier to ImGui

* Use index offset provided by ImGui

* Use vertex offset provided by ImGui

We need to tell ImGui we can support per-draw vertex offsets. Useful for
complex widgets like implot.
This commit is contained in:
pezcode 2022-02-07 02:31:27 +01:00 committed by GitHub
parent 9b976d7e98
commit 841ab98cfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/common/imgui/imgui.cpp
View File

@ -117,7 +117,6 @@ struct OcornutImguiContext
bgfx::Encoder* encoder = bgfx::begin();
uint32_t offset = 0;
for (const ImDrawCmd* cmd = drawList->CmdBuffer.begin(), *cmdEnd = drawList->CmdBuffer.end(); cmd != cmdEnd; ++cmd)
{
if (cmd->UserCallback)
@ -176,13 +175,11 @@ struct OcornutImguiContext
encoder->setState(state);
encoder->setTexture(0, s_tex, th);
encoder->setVertexBuffer(0, &tvb, 0, numVertices);
encoder->setIndexBuffer(&tib, offset, cmd->ElemCount);
encoder->setVertexBuffer(0, &tvb, cmd->VtxOffset, numVertices);
encoder->setIndexBuffer(&tib, cmd->IdxOffset, cmd->ElemCount);
encoder->submit(m_viewId, program);
}
}
offset += cmd->ElemCount;
}
bgfx::end(encoder);
@ -215,6 +212,8 @@ struct OcornutImguiContext
setupStyle(true);
io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;
#if USE_ENTRY
io.KeyMap[ImGuiKey_Tab] = (int)entry::Key::Tab;
io.KeyMap[ImGuiKey_LeftArrow] = (int)entry::Key::Left;
@ -400,6 +399,7 @@ struct OcornutImguiContext
io.KeyShift = 0 != (modifiers & (entry::Modifier::LeftShift | entry::Modifier::RightShift) );
io.KeyCtrl = 0 != (modifiers & (entry::Modifier::LeftCtrl | entry::Modifier::RightCtrl ) );
io.KeyAlt = 0 != (modifiers & (entry::Modifier::LeftAlt | entry::Modifier::RightAlt ) );
io.KeySuper = 0 != (modifiers & (entry::Modifier::LeftMeta | entry::Modifier::RightMeta ) );
for (int32_t ii = 0; ii < (int32_t)entry::Key::Count; ++ii)
{
io.KeysDown[ii] = inputGetKeyState(entry::Key::Enum(ii) );