mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolving some name collision. Mouse constructor was not being called. With this rename it works as expected.

Browse Source
This commit is contained in:
Dario Manesku 2016-04-15 12:07:27 +02:00
parent 1d1ac30ea5
commit 5737270dbc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/common/entry/input.cpp
View File

@ -16,9 +16,9 @@
#include <tinystl/unordered_map.h>
namespace stl = tinystl;
struct Mouse
struct InputMouse
{
Mouse()
InputMouse()
: m_width(1280)
, m_height(720)
, m_wheelDelta(120)
@ -69,9 +69,9 @@ struct Mouse
bool m_lock;
};
struct Keyboard
struct InputKeyboard
{
Keyboard()
InputKeyboard()
: m_ring(BX_COUNTOF(m_char)-4)
{
}
@ -215,7 +215,7 @@ struct Input
for (const InputBinding* binding = _bindings; binding->m_key != entry::Key::None; ++binding)
{
uint8_t modifiers;
bool down = Keyboard::decodeKeyState(m_keyboard.m_key[binding->m_key], modifiers);
bool down = InputKeyboard::decodeKeyState(m_keyboard.m_key[binding->m_key], modifiers);
if (binding->m_flags == 1)
{
@ -278,8 +278,8 @@ struct Input
typedef stl::unordered_map<stl::string, const InputBinding*> InputBindingMap;
InputBindingMap m_inputBindingsMap;
Mouse m_mouse;
Keyboard m_keyboard;
InputKeyboard m_keyboard;
InputMouse m_mouse;
Gamepad m_gamepad[ENTRY_CONFIG_MAX_GAMEPADS];
};