mirror of
https://github.com/bkaradzic/bgfx.git
synced 2026-02-17 20:52:36 +01:00
Fixes for multiple windows and example 22 (#2483)
This commit is contained in:
@@ -177,20 +177,6 @@ public:
|
||||
{
|
||||
entry::MouseState mouseState = m_state.m_mouse;
|
||||
|
||||
imguiBeginFrame(mouseState.m_mx
|
||||
, mouseState.m_my
|
||||
, (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0)
|
||||
| (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0)
|
||||
| (mouseState.m_buttons[entry::MouseButton::Middle] ? IMGUI_MBUT_MIDDLE : 0)
|
||||
, mouseState.m_mz
|
||||
, uint16_t(m_width)
|
||||
, uint16_t(m_height)
|
||||
);
|
||||
|
||||
showExampleDialog(this);
|
||||
|
||||
imguiEndFrame();
|
||||
|
||||
if (isValid(m_state.m_handle) )
|
||||
{
|
||||
if (0 == m_state.m_handle.idx)
|
||||
@@ -231,6 +217,20 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
imguiBeginFrame(mouseState.m_mx
|
||||
, mouseState.m_my
|
||||
, (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0)
|
||||
| (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0)
|
||||
| (mouseState.m_buttons[entry::MouseButton::Middle] ? IMGUI_MBUT_MIDDLE : 0)
|
||||
, mouseState.m_mz
|
||||
, uint16_t(m_width)
|
||||
, uint16_t(m_height)
|
||||
);
|
||||
|
||||
showExampleDialog(this);
|
||||
|
||||
imguiEndFrame();
|
||||
|
||||
const bx::Vec3 at = { 0.0f, 0.0f, 0.0f };
|
||||
const bx::Vec3 eye = { 0.0f, 0.0f, -35.0f };
|
||||
|
||||
|
||||
@@ -573,6 +573,8 @@ namespace entry
|
||||
, (HINSTANCE)GetModuleHandle(NULL)
|
||||
, 0
|
||||
);
|
||||
|
||||
adjust(hwnd, msg->m_width, msg->m_height, true);
|
||||
clear(hwnd);
|
||||
|
||||
m_hwnd[_wparam] = hwnd;
|
||||
|
||||
Reference in New Issue
Block a user