scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source
This commit is contained in:
Branimir Karadžić 2015-01-19 22:15:50 -08:00
parent 501d260c3f
commit d5bea0e7fd
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/common/imgui/imgui.cpp
View file

@ -773,7 +773,7 @@ struct Imgui
void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar, uint8_t _view)
{
IMGUI_beginFrame(_mx, _my, _button, _width, _height, _view);
IMGUI_beginFrame(_mx, _my, _button, _width, _height, _inputChar, _view);
m_view = _view;
m_viewWidth = _width;

9
examples/common/imgui/ocornut_imgui.cpp
View file

@ -140,7 +140,7 @@ struct OcornutImguiContext
const bgfx::Memory* mem = bgfx::alloc((uint32_t)(tex_y * pitch));
memcpy(mem->data, tex_data, size_t(pitch * tex_y));
m_texture = bgfx::createTexture2D((uint16_t)tex_x
m_texture = bgfx::createTexture2D( (uint16_t)tex_x
, (uint16_t)tex_y
, 1
, bgfx::TextureFormat::BGRA8
@ -160,10 +160,11 @@ struct OcornutImguiContext
bgfx::destroyProgram(m_program);
}
void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, uint8_t _viewId)
void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId)
{
m_viewId = _viewId;
ImGuiIO& io = ImGui::GetIO();
io.AddInputCharacter(_inputChar & 0x7f); // ASCII or GTFO! :)
io.DisplaySize = ImVec2((float)_width, (float)_height);
io.DeltaTime = 1.0f / 60.0f;
io.MousePos = ImVec2((float)_mx, (float)_my);
@ -201,9 +202,9 @@ void IMGUI_destroy()
s_ctx.destroy();
}
void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, uint8_t _viewId)
void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId)
{
s_ctx.beginFrame(_mx, _my, _button, _width, _height, _viewId);
s_ctx.beginFrame(_mx, _my, _button, _width, _height, _inputChar, _viewId);
}
void IMGUI_endFrame()

2
examples/common/imgui/ocornut_imgui.h
View file

@ -10,7 +10,7 @@
void IMGUI_create();
void IMGUI_destroy();
void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, uint8_t _viewId = 31);
void IMGUI_beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int _width, int _height, char _inputChar, uint8_t _viewId);
void IMGUI_endFrame();
#endif // OCORNUT_IMGUI_H_HEADER_GUARD