GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix using Keyboard and Mouse in C# scripting

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-02 09:48:02 +02:00
parent 398fc4be37
commit 33b31f9155
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Platform/Windows/WindowsInput.cpp
View File

@@ -105,14 +105,14 @@ namespace WindowsInputImpl
{
float XInputLastUpdateTime = 0;
bool XInputGamepads[XUSER_MAX_COUNT] = { false };
WindowsMouse Mouse;
WindowsKeyboard Keyboard;
WindowsMouse* Mouse = nullptr;
WindowsKeyboard* Keyboard = nullptr;
}
void WindowsInput::Init()
{
Input::Mouse = &WindowsInputImpl::Mouse;
Input::Keyboard = &WindowsInputImpl::Keyboard;
Input::Mouse = WindowsInputImpl::Mouse = New<WindowsMouse>();
Input::Keyboard = WindowsInputImpl::Keyboard = New<WindowsKeyboard>();
}
void WindowsInput::Update()
@@ -142,9 +142,9 @@ void WindowsInput::Update()
bool WindowsInput::WndProc(Window* window, Windows::UINT msg, Windows::WPARAM wParam, Windows::LPARAM lParam)
{
if (WindowsInputImpl::Mouse.WndProc(window, msg, wParam, lParam))
if (WindowsInputImpl::Mouse->WndProc(window, msg, wParam, lParam))
return true;
if (WindowsInputImpl::Keyboard.WndProc(window, msg, wParam, lParam))
if (WindowsInputImpl::Keyboard->WndProc(window, msg, wParam, lParam))
return true;
return false;
}