Merge branch 'LinuxGamepads' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-LinuxGamepads
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "LinuxPlatform.h"
|
||||
#include "LinuxWindow.h"
|
||||
#include "LinuxInput.h"
|
||||
#include "Engine/Core/Log.h"
|
||||
#include "Engine/Core/Types/Guid.h"
|
||||
#include "Engine/Core/Types/String.h"
|
||||
@@ -2203,6 +2204,7 @@ bool LinuxPlatform::Init()
|
||||
|
||||
Input::Mouse = Impl::Mouse = New<LinuxMouse>();
|
||||
Input::Keyboard = Impl::Keyboard = New<LinuxKeyboard>();
|
||||
LinuxInput::Init();
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -2215,6 +2217,8 @@ void LinuxPlatform::Tick()
|
||||
{
|
||||
UnixPlatform::Tick();
|
||||
|
||||
LinuxInput::UpdateState();
|
||||
|
||||
if (!xDisplay)
|
||||
return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user