Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for multiple windows and example 22 (#2483)

Browse Source
This commit is contained in:
pezcode
2021-04-20 00:30:03 +02:00
committed by GitHub
parent 19fe73d00d
commit e8d4b3dcce
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
examples/22-windows/windows.cpp
View File

@@ -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 };

2
examples/common/entry/entry_windows.cpp
View File

@@ -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;

2
src/bgfx.cpp
View File

@@ -1406,7 +1406,7 @@ namespace bgfx
{
viewRemap[m_viewRemap[ii] ] = ViewId(ii);
View& view = s_ctx->m_view[ii];
View& view = m_view[ii];
Rect rect(0, 0, uint16_t(m_resolution.width), uint16_t(m_resolution.height) );
if (isValid(view.m_fbh) )

1
src/renderer_d3d12.cpp
View File

@@ -1021,6 +1021,7 @@ namespace bgfx { namespace d3d12
m_resolution.width = _init.resolution.width;
m_resolution.height = _init.resolution.height;
m_windows[0] = BGFX_INVALID_HANDLE;
m_numWindows = 1;
#if BX_PLATFORM_WINDOWS