imgui
This commit is contained in:
@@ -322,43 +322,16 @@ struct OcornutImguiContext
|
||||
{
|
||||
m_viewId = _viewId;
|
||||
|
||||
ImGuiIO& io = ImGui::GetIO();
|
||||
if (_inputChar >= 0)
|
||||
{
|
||||
io.AddInputCharacter(_inputChar);
|
||||
}
|
||||
|
||||
io.DisplaySize = ImVec2((float)_width, (float)_height);
|
||||
// ImGuiIO& io = ImGui::GetIO();
|
||||
// io.DisplaySize = ImVec2((float)_width, (float)_height);
|
||||
|
||||
const int64_t now = bx::getHPCounter();
|
||||
const int64_t frameTime = now - m_last;
|
||||
m_last = now;
|
||||
const double freq = double(bx::getHPFrequency());
|
||||
io.DeltaTime = float(frameTime / freq);
|
||||
|
||||
io.AddMousePosEvent((float)_mx, (float)_my);
|
||||
io.AddMouseButtonEvent(ImGuiMouseButton_Left, 0 != (_button & IMGUI_MBUT_LEFT));
|
||||
io.AddMouseButtonEvent(ImGuiMouseButton_Right, 0 != (_button & IMGUI_MBUT_RIGHT));
|
||||
io.AddMouseButtonEvent(ImGuiMouseButton_Middle, 0 != (_button & IMGUI_MBUT_MIDDLE));
|
||||
io.AddMouseWheelEvent(0.0f, (float)(_scroll - m_lastScroll));
|
||||
m_lastScroll = _scroll;
|
||||
|
||||
#if USE_ENTRY
|
||||
uint8_t modifiers = inputGetModifiersState();
|
||||
io.AddKeyEvent(ImGuiMod_Shift, 0 != (modifiers & (entry::Modifier::LeftShift | entry::Modifier::RightShift)));
|
||||
io.AddKeyEvent(ImGuiMod_Ctrl, 0 != (modifiers & (entry::Modifier::LeftCtrl | entry::Modifier::RightCtrl)));
|
||||
io.AddKeyEvent(ImGuiMod_Alt, 0 != (modifiers & (entry::Modifier::LeftAlt | entry::Modifier::RightAlt)));
|
||||
io.AddKeyEvent(ImGuiMod_Super, 0 != (modifiers & (entry::Modifier::LeftMeta | entry::Modifier::RightMeta)));
|
||||
for (int32_t ii = 0; ii < (int32_t)entry::Key::Count; ++ii)
|
||||
{
|
||||
io.AddKeyEvent(m_keyMap[ii], inputGetKeyState(entry::Key::Enum(ii)));
|
||||
io.SetKeyEventNativeData(m_keyMap[ii], 0, 0, ii);
|
||||
}
|
||||
#endif // USE_ENTRY
|
||||
// const double freq = double(bx::getHPFrequency());
|
||||
// io.DeltaTime = float(frameTime / freq);
|
||||
|
||||
ImGui::NewFrame();
|
||||
|
||||
// ImGuizmo::BeginFrame();
|
||||
}
|
||||
|
||||
void endFrame()
|
||||
|
||||
Reference in New Issue
Block a user