diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 9c18ba386..cc8a96d48 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -265,7 +265,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp index bf60dd8d5..02d17314e 100644 --- a/examples/11-fontsdf/fontsdf.cpp +++ b/examples/11-fontsdf/fontsdf.cpp @@ -132,7 +132,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/12-lod/lod.cpp b/examples/12-lod/lod.cpp index 2a6775ea6..acc8c17d0 100644 --- a/examples/12-lod/lod.cpp +++ b/examples/12-lod/lod.cpp @@ -119,7 +119,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp index c92522945..1493c8230 100644 --- a/examples/13-stencil/stencil.cpp +++ b/examples/13-stencil/stencil.cpp @@ -945,7 +945,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , viewState.m_width , viewState.m_height ); diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index 1613f8ef4..d75797d77 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -2128,7 +2128,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , viewState.m_width , viewState.m_height ); diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp index 5f050f928..cc106298e 100644 --- a/examples/16-shadowmaps/shadowmaps.cpp +++ b/examples/16-shadowmaps/shadowmaps.cpp @@ -1974,7 +1974,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , viewState.m_width , viewState.m_height ); diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp index ba79c7921..9e649dae7 100644 --- a/examples/17-drawstress/drawstress.cpp +++ b/examples/17-drawstress/drawstress.cpp @@ -141,7 +141,7 @@ BX_NO_INLINE bool mainloop() , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/18-ibl/ibl.cpp b/examples/18-ibl/ibl.cpp index 2291fef34..08f3be89b 100644 --- a/examples/18-ibl/ibl.cpp +++ b/examples/18-ibl/ibl.cpp @@ -311,7 +311,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/19-oit/oit.cpp b/examples/19-oit/oit.cpp index 9aa3ff2de..f5f73a964 100644 --- a/examples/19-oit/oit.cpp +++ b/examples/19-oit/oit.cpp @@ -244,7 +244,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/21-deferred/deferred.cpp b/examples/21-deferred/deferred.cpp index 87c93bee9..a477730ee 100644 --- a/examples/21-deferred/deferred.cpp +++ b/examples/21-deferred/deferred.cpp @@ -407,7 +407,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp index 52dfce19e..90d95e56c 100644 --- a/examples/24-nbody/nbody.cpp +++ b/examples/24-nbody/nbody.cpp @@ -221,7 +221,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , mouseState.m_my , (mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) | (mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) - , 0 + , mouseState.m_mz , width , height ); diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index dd2a9ad7f..7661c3bb5 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -824,7 +824,7 @@ struct Imgui const int32_t mx = int32_t(float(_mx)*xscale); const int32_t my = int32_t(float(_my)*yscale); - IMGUI_beginFrame(mx, my, _button, _width, _height, _inputChar, _view); + IMGUI_beginFrame(mx, my, _button, _scroll, _width, _height, _inputChar, _view); nvgBeginFrameScaled(m_nvg, m_viewWidth, m_viewHeight, m_surfaceWidth, m_surfaceHeight, 1.0f); nvgViewId(m_nvg, _view); diff --git a/examples/common/imgui/ocornut_imgui.cpp b/examples/common/imgui/ocornut_imgui.cpp index c38c0dd9f..c9feca10a 100644 --- a/examples/common/imgui/ocornut_imgui.cpp +++ b/examples/common/imgui/ocornut_imgui.cpp @@ -35,7 +35,6 @@ struct OcornutImguiContext { bgfx::TransientVertexBuffer tvb; - const ImDrawList* cmd_list = _lists[ii]; const ImDrawVert* vtx_buffer = cmd_list->vtx_buffer.begin(); uint32_t vtx_size = (uint32_t)cmd_list->vtx_buffer.size(); @@ -56,6 +55,12 @@ struct OcornutImguiContext const ImDrawCmd* pcmd_end = cmd_list->commands.end(); for (const ImDrawCmd* pcmd = pcmd_begin; pcmd != pcmd_end; pcmd++) { + if (pcmd->user_callback) + { + pcmd->user_callback(cmd_list, pcmd); + vtx_offset += pcmd->vtx_count; + continue; + } if (0 == pcmd->vtx_count) { continue; @@ -92,6 +97,7 @@ struct OcornutImguiContext { m_viewId = 255; m_allocator = _allocator; + m_lastScroll = 0; ImGuiIO& io = ImGui::GetIO(); io.RenderDrawListsFn = renderDrawLists; @@ -177,15 +183,19 @@ struct OcornutImguiContext m_allocator = NULL; } - void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId) + void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, int _width, int _height, char _inputChar, uint8_t _viewId) { m_viewId = _viewId; ImGuiIO& io = ImGui::GetIO(); - io.AddInputCharacter(_inputChar & 0x7f); // ASCII or GTFO! :) + if (_inputChar < 0x7f) + io.AddInputCharacter(_inputChar); // ASCII or GTFO! :( io.DisplaySize = ImVec2((float)_width, (float)_height); io.DeltaTime = 1.0f / 60.0f; io.MousePos = ImVec2((float)_mx, (float)_my); io.MouseDown[0] = 0 != (_button & IMGUI_MBUT_LEFT); + io.MouseDown[1] = 0 != (_button & IMGUI_MBUT_RIGHT); + io.MouseWheel = (float)(_scroll - m_lastScroll); + m_lastScroll = _scroll; #if 0 io.KeysDown[ImGuiKey_Tab] = inputGetKeyState(entry::Key::Tab); @@ -223,6 +233,7 @@ struct OcornutImguiContext bgfx::TextureHandle m_texture; bgfx::UniformHandle s_tex; uint8_t m_viewId; + int32_t m_lastScroll; }; static OcornutImguiContext s_ctx; @@ -252,9 +263,9 @@ void IMGUI_destroy() s_ctx.destroy(); } -void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId) +void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, int _width, int _height, char _inputChar, uint8_t _viewId) { - s_ctx.beginFrame(_mx, _my, _button, _width, _height, _inputChar, _viewId); + s_ctx.beginFrame(_mx, _my, _button, _scroll, _width, _height, _inputChar, _viewId); } void IMGUI_endFrame() diff --git a/examples/common/imgui/ocornut_imgui.h b/examples/common/imgui/ocornut_imgui.h index fd5d2503d..450b28176 100644 --- a/examples/common/imgui/ocornut_imgui.h +++ b/examples/common/imgui/ocornut_imgui.h @@ -12,7 +12,7 @@ namespace bx { struct AllocatorI; } void IMGUI_create(const void* _data, uint32_t _size, float _fontSize, bx::AllocatorI* _allocator); void IMGUI_destroy(); -void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId); +void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, int _width, int _height, char _inputChar, uint8_t _viewId); void IMGUI_endFrame(); #endif // OCORNUT_IMGUI_H_HEADER_GUARD