Skip to content

Commit 7b99e34

Browse files
HeliumAntHeliumAnt
committed
sdl3 changes
1 parent 39f3b88 commit 7b99e34

17 files changed

+382
-390
lines changed

‎Source/GUI/GUIUtil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "GUIUtil.h"
22

3-
#include "SDL_clipboard.h"
3+
#include <SDL3/SDL_clipboard.h>
44

55
using namespace RTE;
66

‎Source/GUI/Wrappers/GUIInputWrapper.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "FrameMan.h"
55
#include "UInputMan.h"
66
#include "Timer.h"
7-
#include "SDL.h"
7+
#include <SDL3/SDL.h>
88

99
using namespace RTE;
1010

@@ -21,7 +21,7 @@ GUIInputWrapper::GUIInputWrapper(int whichPlayer, bool keyJoyMouseCursor) :
2121

2222
void GUIInputWrapper::ConvertKeyEvent(SDL_Scancode sdlKey, int guilibKey, float elapsedS) {
2323
int nKeys;
24-
const Uint8* sdlKeyState = SDL_GetKeyboardState(&nKeys);
24+
const bool* sdlKeyState = SDL_GetKeyboardState(&nKeys);
2525
if (sdlKeyState[sdlKey]) {
2626
if (m_KeyHoldDuration[guilibKey] < 0) {
2727
m_KeyboardBuffer[guilibKey] = GUIInput::Pushed;
@@ -69,7 +69,7 @@ void GUIInputWrapper::UpdateKeyboardInput(float keyElapsedTime) {
6969
for (size_t k = 0; k < GUIInput::Constants::KEYBOARD_BUFFER_SIZE; ++k) {
7070
if (g_UInputMan.KeyPressed(static_cast<SDL_Scancode>(k))) {
7171
m_ScanCodeState[k] = GUIInput::Pushed;
72-
uint8_t keyName = static_cast<uint8_t>(SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(k)));
72+
uint8_t keyName = static_cast<uint8_t>(SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(k), NULL, false));
7373
m_KeyboardBuffer[keyName] = GUIInput::Pushed;
7474
}
7575
}
@@ -95,22 +95,22 @@ void GUIInputWrapper::UpdateKeyboardInput(float keyElapsedTime) {
9595
m_Modifier = GUIInput::ModNone;
9696
SDL_Keymod keyShifts = SDL_GetModState();
9797

98-
if (keyShifts & KMOD_SHIFT) {
98+
if (keyShifts & SDL_KMOD_SHIFT) {
9999
m_Modifier |= GUIInput::ModShift;
100100
}
101-
if (keyShifts & KMOD_ALT) {
101+
if (keyShifts & SDL_KMOD_ALT) {
102102
m_Modifier |= GUIInput::ModAlt;
103103
}
104-
if (keyShifts & KMOD_CTRL) {
104+
if (keyShifts & SDL_KMOD_CTRL) {
105105
m_Modifier |= GUIInput::ModCtrl;
106106
}
107-
if (keyShifts & KMOD_GUI) {
107+
if (keyShifts & SDL_KMOD_GUI) {
108108
m_Modifier |= GUIInput::ModCommand;
109109
}
110110
}
111111

112112
void GUIInputWrapper::UpdateMouseInput() {
113-
int discard;
113+
float discard;
114114
Uint32 buttonState = SDL_GetMouseState(&discard, &discard);
115115
Vector mousePos = g_UInputMan.GetAbsoluteMousePosition();
116116

‎Source/GUI/Wrappers/GUIInputWrapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "GUIInput.h"
4-
#include "SDL_scancode.h"
4+
#include <SDL3/SDL_scancode.h>
55

66
#include <array>
77
#include <memory>

‎Source/Lua/LuaBindingRegisterDefinitions.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ namespace RTE {
123123
PER_LUA_BINDING(JoyDirections) \
124124
PER_LUA_BINDING(SDL_Scancode) \
125125
PER_LUA_BINDING(SDL_Keycode) \
126-
PER_LUA_BINDING(SDL_GameControllerButton) \
127-
PER_LUA_BINDING(SDL_GameControllerAxis) \
126+
PER_LUA_BINDING(SDL_GamepadButton) \
127+
PER_LUA_BINDING(SDL_GamepadAxis) \
128128
/* MiscLuaBindings */ \
129129
PER_LUA_BINDING(AlarmEvent) \
130130
PER_LUA_BINDING(Directions) \
@@ -293,8 +293,8 @@ namespace RTE {
293293
LuaBindingRegisterFunctionDeclarationForType(JoyDirections);
294294
LuaBindingRegisterFunctionDeclarationForType(SDL_Scancode);
295295
LuaBindingRegisterFunctionDeclarationForType(SDL_Keycode);
296-
LuaBindingRegisterFunctionDeclarationForType(SDL_GameControllerButton);
297-
LuaBindingRegisterFunctionDeclarationForType(SDL_GameControllerAxis);
296+
LuaBindingRegisterFunctionDeclarationForType(SDL_GamepadButton);
297+
LuaBindingRegisterFunctionDeclarationForType(SDL_GamepadAxis);
298298
};
299299

300300
/// Struct that contains Lua binding registration functions for types that don't really belong in any of the other binding structs.

‎Source/Lua/LuaBindingsInput.cpp

Lines changed: 76 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "LuaBindingRegisterDefinitions.h"
44

5-
#include "SDL_scancode.h"
6-
#include "SDL_keycode.h"
7-
#include "SDL_gamecontroller.h"
5+
#include <SDL3/SDL_scancode.h>
6+
#include <SDL3/SDL_keycode.h>
7+
#include <SDL3/SDL_gamepad.h>
88

99
using namespace RTE;
1010

@@ -99,12 +99,12 @@ LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_Keycode) {
9999
luabind::value("TAB", SDLK_TAB),
100100
luabind::value("SPACE", SDLK_SPACE),
101101
luabind::value("EXCLAIM", SDLK_EXCLAIM),
102-
luabind::value("QUOTEDBL", SDLK_QUOTEDBL),
102+
luabind::value("QUOTEDBL", SDLK_DBLAPOSTROPHE),
103103
luabind::value("HASH", SDLK_HASH),
104104
luabind::value("PERCENT", SDLK_PERCENT),
105105
luabind::value("DOLLAR", SDLK_DOLLAR),
106106
luabind::value("AMPERSAND", SDLK_AMPERSAND),
107-
luabind::value("QUOTE", SDLK_QUOTE),
107+
luabind::value("QUOTE", SDLK_APOSTROPHE),
108108
luabind::value("LEFTPAREN", SDLK_LEFTPAREN),
109109
luabind::value("RIGHTPAREN", SDLK_RIGHTPAREN),
110110
luabind::value("ASTERISK", SDLK_ASTERISK),
@@ -135,33 +135,33 @@ LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_Keycode) {
135135
luabind::value("RIGHTBRACKET", SDLK_RIGHTBRACKET),
136136
luabind::value("CARET", SDLK_CARET),
137137
luabind::value("UNDERSCORE", SDLK_UNDERSCORE),
138-
luabind::value("BACKQUOTE", SDLK_BACKQUOTE),
139-
luabind::value("A", SDLK_a),
140-
luabind::value("B", SDLK_b),
141-
luabind::value("C", SDLK_c),
142-
luabind::value("D", SDLK_d),
143-
luabind::value("E", SDLK_e),
144-
luabind::value("F", SDLK_f),
145-
luabind::value("G", SDLK_g),
146-
luabind::value("H", SDLK_h),
147-
luabind::value("I", SDLK_i),
148-
luabind::value("J", SDLK_j),
149-
luabind::value("K", SDLK_k),
150-
luabind::value("L", SDLK_l),
151-
luabind::value("M", SDLK_m),
152-
luabind::value("N", SDLK_n),
153-
luabind::value("O", SDLK_o),
154-
luabind::value("P", SDLK_p),
155-
luabind::value("Q", SDLK_q),
156-
luabind::value("R", SDLK_r),
157-
luabind::value("S", SDLK_s),
158-
luabind::value("T", SDLK_t),
159-
luabind::value("U", SDLK_u),
160-
luabind::value("V", SDLK_v),
161-
luabind::value("W", SDLK_w),
162-
luabind::value("X", SDLK_x),
163-
luabind::value("Y", SDLK_y),
164-
luabind::value("Z", SDLK_z),
138+
luabind::value("BACKQUOTE", SDLK_GRAVE),
139+
luabind::value("A", SDLK_A),
140+
luabind::value("B", SDLK_B),
141+
luabind::value("C", SDLK_C),
142+
luabind::value("D", SDLK_D),
143+
luabind::value("E", SDLK_E),
144+
luabind::value("F", SDLK_F),
145+
luabind::value("G", SDLK_G),
146+
luabind::value("H", SDLK_H),
147+
luabind::value("I", SDLK_I),
148+
luabind::value("J", SDLK_J),
149+
luabind::value("K", SDLK_K),
150+
luabind::value("L", SDLK_L),
151+
luabind::value("M", SDLK_M),
152+
luabind::value("N", SDLK_N),
153+
luabind::value("O", SDLK_O),
154+
luabind::value("P", SDLK_P),
155+
luabind::value("Q", SDLK_Q),
156+
luabind::value("R", SDLK_R),
157+
luabind::value("S", SDLK_S),
158+
luabind::value("T", SDLK_T),
159+
luabind::value("U", SDLK_U),
160+
luabind::value("V", SDLK_V),
161+
luabind::value("W", SDLK_W),
162+
luabind::value("X", SDLK_X),
163+
luabind::value("Y", SDLK_Y),
164+
luabind::value("Z", SDLK_Z),
165165
luabind::value("CAPSLOCK", SDLK_CAPSLOCK),
166166
luabind::value("F1", SDLK_F1),
167167
luabind::value("F2", SDLK_F2),
@@ -303,30 +303,20 @@ LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_Keycode) {
303303
luabind::value("RALT", SDLK_RALT),
304304
luabind::value("RGUI", SDLK_RGUI),
305305
luabind::value("MODE", SDLK_MODE),
306-
luabind::value("AUDIONEXT", SDLK_AUDIONEXT),
307-
luabind::value("AUDIOPREV", SDLK_AUDIOPREV),
308-
luabind::value("AUDIOSTOP", SDLK_AUDIOSTOP),
309-
luabind::value("AUDIOPLAY", SDLK_AUDIOPLAY),
310-
luabind::value("AUDIOMUTE", SDLK_AUDIOMUTE),
311-
luabind::value("MEDIASELECT", SDLK_MEDIASELECT),
312-
luabind::value("WWW", SDLK_WWW),
313-
luabind::value("MAIL", SDLK_MAIL),
314-
luabind::value("CALCULATOR", SDLK_CALCULATOR),
315-
luabind::value("COMPUTER", SDLK_COMPUTER),
306+
luabind::value("AUDIONEXT", SDLK_MEDIA_NEXT_TRACK),
307+
luabind::value("AUDIOPREV", SDLK_MEDIA_PREVIOUS_TRACK),
308+
luabind::value("AUDIOSTOP", SDLK_MEDIA_STOP),
309+
luabind::value("AUDIOPLAY", SDLK_MEDIA_PLAY),
310+
luabind::value("AUDIOMUTE", SDLK_MUTE),
311+
luabind::value("MEDIASELECT", SDLK_MEDIA_SELECT),
316312
luabind::value("AC_SEARCH", SDLK_AC_SEARCH),
317313
luabind::value("AC_HOME", SDLK_AC_HOME),
318314
luabind::value("AC_BACK", SDLK_AC_BACK),
319315
luabind::value("AC_FORWARD", SDLK_AC_FORWARD),
320316
luabind::value("AC_STOP", SDLK_AC_STOP),
321317
luabind::value("AC_REFRESH", SDLK_AC_REFRESH),
322318
luabind::value("AC_BOOKMARKS", SDLK_AC_BOOKMARKS),
323-
luabind::value("BRIGHTNESSDOWN", SDLK_BRIGHTNESSDOWN),
324-
luabind::value("BRIGHTNESSUP", SDLK_BRIGHTNESSUP),
325-
luabind::value("DISPLAYSWITCH", SDLK_DISPLAYSWITCH),
326-
luabind::value("KBDILLUMTOGGLE", SDLK_KBDILLUMTOGGLE),
327-
luabind::value("KBDILLUMDOWN", SDLK_KBDILLUMDOWN),
328-
luabind::value("KBDILLUMUP", SDLK_KBDILLUMUP),
329-
luabind::value("EJECT", SDLK_EJECT),
319+
luabind::value("EJECT", SDLK_MEDIA_EJECT),
330320
luabind::value("SLEEP", SDLK_SLEEP)];
331321
}
332322

@@ -548,69 +538,57 @@ LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_Scancode) {
548538
luabind::value("RALT", SDL_SCANCODE_RALT),
549539
luabind::value("RGUI", SDL_SCANCODE_RGUI),
550540
luabind::value("MODE", SDL_SCANCODE_MODE),
551-
luabind::value("AUDIONEXT", SDL_SCANCODE_AUDIONEXT),
552-
luabind::value("AUDIOPREV", SDL_SCANCODE_AUDIOPREV),
553-
luabind::value("AUDIOSTOP", SDL_SCANCODE_AUDIOSTOP),
554-
luabind::value("AUDIOPLAY", SDL_SCANCODE_AUDIOPLAY),
555-
luabind::value("AUDIOMUTE", SDL_SCANCODE_AUDIOMUTE),
556-
luabind::value("MEDIASELECT", SDL_SCANCODE_MEDIASELECT),
557-
luabind::value("WWW", SDL_SCANCODE_WWW),
558-
luabind::value("MAIL", SDL_SCANCODE_MAIL),
559-
luabind::value("CALCULATOR", SDL_SCANCODE_CALCULATOR),
560-
luabind::value("COMPUTER", SDL_SCANCODE_COMPUTER),
541+
luabind::value("AUDIONEXT", SDL_SCANCODE_MEDIA_NEXT_TRACK),
542+
luabind::value("AUDIOPREV", SDL_SCANCODE_MEDIA_PREVIOUS_TRACK),
543+
luabind::value("AUDIOSTOP", SDL_SCANCODE_MEDIA_STOP),
544+
luabind::value("AUDIOPLAY", SDL_SCANCODE_MEDIA_PLAY),
545+
luabind::value("AUDIOMUTE", SDL_SCANCODE_MUTE),
546+
luabind::value("MEDIASELECT", SDL_SCANCODE_MEDIA_SELECT),
561547
luabind::value("AC_SEARCH", SDL_SCANCODE_AC_SEARCH),
562548
luabind::value("AC_HOME", SDL_SCANCODE_AC_HOME),
563549
luabind::value("AC_BACK", SDL_SCANCODE_AC_BACK),
564550
luabind::value("AC_FORWARD", SDL_SCANCODE_AC_FORWARD),
565551
luabind::value("AC_STOP", SDL_SCANCODE_AC_STOP),
566552
luabind::value("AC_REFRESH", SDL_SCANCODE_AC_REFRESH),
567553
luabind::value("AC_BOOKMARKS", SDL_SCANCODE_AC_BOOKMARKS),
568-
luabind::value("BRIGHTNESSDOWN", SDL_SCANCODE_BRIGHTNESSDOWN),
569-
luabind::value("BRIGHTNESSUP", SDL_SCANCODE_BRIGHTNESSUP),
570-
luabind::value("DISPLAYSWITCH", SDL_SCANCODE_DISPLAYSWITCH),
571-
luabind::value("KBDILLUMTOGGLE", SDL_SCANCODE_KBDILLUMTOGGLE),
572-
luabind::value("KBDILLUMDOWN", SDL_SCANCODE_KBDILLUMDOWN),
573-
luabind::value("KBDILLUMUP", SDL_SCANCODE_KBDILLUMUP),
574-
luabind::value("EJECT", SDL_SCANCODE_EJECT),
554+
luabind::value("EJECT", SDL_SCANCODE_MEDIA_EJECT),
575555
luabind::value("SLEEP", SDL_SCANCODE_SLEEP),
576-
luabind::value("APP1", SDL_SCANCODE_APP1),
577-
luabind::value("APP2", SDL_SCANCODE_APP2),
578-
luabind::value("AUDIOREWIND", SDL_SCANCODE_AUDIOREWIND),
579-
luabind::value("AUDIOFASTFORWARD", SDL_SCANCODE_AUDIOFASTFORWARD),
580-
luabind::value("NUM_SCANCODES", SDL_NUM_SCANCODES)];
556+
luabind::value("AUDIOREWIND", SDL_SCANCODE_MEDIA_REWIND),
557+
luabind::value("AUDIOFASTFORWARD", SDL_SCANCODE_MEDIA_FAST_FORWARD),
558+
luabind::value("NUM_SCANCODES", SDL_SCANCODE_COUNT)];
581559
}
582560

583-
LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_GameControllerButton) {
561+
LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_GamepadButton) {
584562
return luabind::class_<gamepad_buttons>("GamepadButton")
585563

586-
.enum_("GamepadButton")[luabind::value("INVALID", SDL_CONTROLLER_BUTTON_INVALID),
587-
luabind::value("A", SDL_CONTROLLER_BUTTON_A),
588-
luabind::value("B", SDL_CONTROLLER_BUTTON_B),
589-
luabind::value("X", SDL_CONTROLLER_BUTTON_X),
590-
luabind::value("Y", SDL_CONTROLLER_BUTTON_Y),
591-
luabind::value("BACK", SDL_CONTROLLER_BUTTON_BACK),
592-
luabind::value("GUIDE", SDL_CONTROLLER_BUTTON_GUIDE),
593-
luabind::value("START", SDL_CONTROLLER_BUTTON_START),
594-
luabind::value("LEFTSTICK", SDL_CONTROLLER_BUTTON_LEFTSTICK),
595-
luabind::value("RIGHTSTICK", SDL_CONTROLLER_BUTTON_RIGHTSTICK),
596-
luabind::value("LEFTSHOULDER", SDL_CONTROLLER_BUTTON_LEFTSHOULDER),
597-
luabind::value("RIGHTSHOULDER", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER),
598-
luabind::value("DPAD_UP", SDL_CONTROLLER_BUTTON_DPAD_UP),
599-
luabind::value("DPAD_DOWN", SDL_CONTROLLER_BUTTON_DPAD_DOWN),
600-
luabind::value("DPAD_LEFT", SDL_CONTROLLER_BUTTON_DPAD_LEFT),
601-
luabind::value("DPAD_RIGHT", SDL_CONTROLLER_BUTTON_DPAD_RIGHT),
602-
luabind::value("MAX", SDL_CONTROLLER_BUTTON_MAX)];
564+
.enum_("GamepadButton")[luabind::value("INVALID", SDL_GAMEPAD_BUTTON_INVALID),
565+
luabind::value("A", SDL_GAMEPAD_BUTTON_SOUTH),
566+
luabind::value("B", SDL_GAMEPAD_BUTTON_EAST),
567+
luabind::value("X", SDL_GAMEPAD_BUTTON_WEST),
568+
luabind::value("Y", SDL_GAMEPAD_BUTTON_NORTH),
569+
luabind::value("BACK", SDL_GAMEPAD_BUTTON_BACK),
570+
luabind::value("GUIDE", SDL_GAMEPAD_BUTTON_GUIDE),
571+
luabind::value("START", SDL_GAMEPAD_BUTTON_START),
572+
luabind::value("LEFTSTICK", SDL_GAMEPAD_BUTTON_LEFT_STICK),
573+
luabind::value("RIGHTSTICK", SDL_GAMEPAD_BUTTON_RIGHT_STICK),
574+
luabind::value("LEFTSHOULDER", SDL_GAMEPAD_BUTTON_LEFT_SHOULDER),
575+
luabind::value("RIGHTSHOULDER", SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER),
576+
luabind::value("DPAD_UP", SDL_GAMEPAD_BUTTON_DPAD_UP),
577+
luabind::value("DPAD_DOWN", SDL_GAMEPAD_BUTTON_DPAD_DOWN),
578+
luabind::value("DPAD_LEFT", SDL_GAMEPAD_BUTTON_DPAD_LEFT),
579+
luabind::value("DPAD_RIGHT", SDL_GAMEPAD_BUTTON_DPAD_RIGHT),
580+
luabind::value("MAX", SDL_GAMEPAD_BUTTON_COUNT)];
603581
}
604582

605-
LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_GameControllerAxis) {
583+
LuaBindingRegisterFunctionDefinitionForType(InputLuaBindings, SDL_GamepadAxis) {
606584
return luabind::class_<gamepad_axis>("GamepadAxis")
607585

608-
.enum_("GamepadAxis")[luabind::value("INVALID", SDL_CONTROLLER_AXIS_INVALID),
609-
luabind::value("LEFTX", SDL_CONTROLLER_AXIS_LEFTX),
610-
luabind::value("LEFTY", SDL_CONTROLLER_AXIS_LEFTY),
611-
luabind::value("RIGHTX", SDL_CONTROLLER_AXIS_RIGHTX),
612-
luabind::value("RIGHTY", SDL_CONTROLLER_AXIS_RIGHTY),
613-
luabind::value("TRIGGERLEFT", SDL_CONTROLLER_AXIS_TRIGGERLEFT),
614-
luabind::value("TRIGGERRIGHT", SDL_CONTROLLER_AXIS_TRIGGERRIGHT),
615-
luabind::value("MAX", SDL_CONTROLLER_AXIS_MAX)];
586+
.enum_("GamepadAxis")[luabind::value("INVALID", SDL_GAMEPAD_AXIS_INVALID),
587+
luabind::value("LEFTX", SDL_GAMEPAD_AXIS_LEFTX),
588+
luabind::value("LEFTY", SDL_GAMEPAD_AXIS_LEFTY),
589+
luabind::value("RIGHTX", SDL_GAMEPAD_AXIS_RIGHTX),
590+
luabind::value("RIGHTY", SDL_GAMEPAD_AXIS_RIGHTY),
591+
luabind::value("TRIGGERLEFT", SDL_GAMEPAD_AXIS_LEFT_TRIGGER),
592+
luabind::value("TRIGGERRIGHT", SDL_GAMEPAD_AXIS_RIGHT_TRIGGER),
593+
luabind::value("MAX", SDL_GAMEPAD_AXIS_COUNT)];
616594
}

0 commit comments

Comments
 (0)