-
-
Notifications
You must be signed in to change notification settings - Fork 278
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate OSX to GLFW3+ #8348
Migrate OSX to GLFW3+ #8348
Conversation
@@ -127,7 +136,6 @@ def configure(conf): | |||
conf.env['STLIB_HID_NULL'] = 'hid_null' | |||
conf.env['STLIB_INPUT'] = 'input' | |||
conf.env['STLIB_LIVEUPDATE'] = 'liveupdate' | |||
conf.env['STLIB_PLATFORM_NULL'] = 'platform_null' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
duplicate
bool is_supported = next->m_IsSupportedCb(); | ||
if (next->m_Priority < selected->m_Priority && is_supported) | ||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we only link with one adapter we never actually do this check..
@@ -58,6 +60,7 @@ namespace dmHID | |||
|
|||
void Update(HContext context) | |||
{ | |||
dmPlatform::PollEvents(context->m_Window); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Old glfw automatically polls for events when doing a swapbuffers, so the hid_null doesn't respond to any mouse events (like being able to close the window).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The editor changes look good to me!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@@ -55,6 +55,15 @@ namespace dmPlatform | |||
DEVICE_STATE_KEYBOARD_NUMBER_PAD = 5, | |||
DEVICE_STATE_KEYBOARD_EMAIL = 6, | |||
DEVICE_STATE_KEYBOARD_PASSWORD = 7, | |||
DEVICE_STATE_KEYBOARD_RESET = 8, | |||
DEVICE_STATE_JOYSTICK_PRESENT = 9, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this JOYSTICK and GAMEPAD in the same header are so annoying ...
engine/hid/src/native/hid_native.cpp
Outdated
@@ -228,7 +225,7 @@ namespace dmHID | |||
Keyboard* keyboard = &context->m_Keyboards[k]; | |||
keyboard->m_Connected = 1; // TODO: Actually detect if the keyboard is present | |||
|
|||
for (uint32_t i = 0; i < MAX_KEY_COUNT; ++i) | |||
for (uint32_t i = 32; i < MAX_KEY_COUNT; ++i) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, why we suddenly don't store things in the first integer (m_Keys[0]) ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eeeh yeah I don't remember actually. I've reverted it
We have removed our old modified GLFW version on OSX in favour of the latest publicly released GLFW 3.4 version. This will enable us to improve our desktop feature set, as well as help fix many legacy OS issues across the board. When we consider that this work is stable enough on OSX, the rest of the desktop platforms will get updated as well.
Fixes #7970