mirror of
https://github.com/GayPizzaSpecifications/voxelotl-engine.git
synced 2025-08-05 06:01:34 +00:00
Fix build errors against release SDL 3.2.0 ABI
This commit is contained in:
@ -92,7 +92,7 @@ public class GameController {
|
||||
//MARK: - Private
|
||||
|
||||
private var _joyInstance: SDL_JoystickID, _sdlPad: OpaquePointer
|
||||
private var _axes = [Int16](repeating: 0, count: Int(SDL_GAMEPAD_AXIS_MAX.rawValue))
|
||||
private var _axes = [Int16](repeating: 0, count: Int(SDL_GAMEPAD_AXIS_COUNT.rawValue))
|
||||
private var _btnCur: Buttons = [], _btnPrv: Buttons = []
|
||||
|
||||
internal var instanceID: SDL_JoystickID { _joyInstance }
|
||||
@ -167,8 +167,8 @@ public class GameController {
|
||||
}
|
||||
}
|
||||
|
||||
internal func buttonEvent(id: SDL_JoystickID, btn: SDL_GamepadButton, state: UInt8) {
|
||||
_pads[id]?.buttonEvent(btn, state == SDL_PRESSED)
|
||||
internal func buttonEvent(id: SDL_JoystickID, btn: SDL_GamepadButton, state: Bool) {
|
||||
_pads[id]?.buttonEvent(btn, state)
|
||||
}
|
||||
|
||||
internal func axisEvent(id: SDL_JoystickID, axis: SDL_GamepadAxis, value: Int16) {
|
||||
|
@ -38,7 +38,7 @@ public class Keyboard {
|
||||
private static let _PRESS: UInt8 = _DOWN | _IMPULSE
|
||||
private static let _RELEASE: UInt8 = _UP | _IMPULSE
|
||||
|
||||
private var _state = [UInt8](repeating: _UP, count: Int(SDL_NUM_SCANCODES.rawValue))
|
||||
private var _state = [UInt8](repeating: _UP, count: Int(SDL_SCANCODE_COUNT.rawValue))
|
||||
|
||||
internal func keyDownEvent(scan: SDL_Scancode, repeat rep: Bool) {
|
||||
var newState = Self._PRESS
|
||||
|
@ -53,8 +53,8 @@ public class Mouse {
|
||||
private func getAbsolute() -> SIMD2<Float> { self._abs * self._dpiScale }
|
||||
private func getDelta() -> SIMD2<Float> { self._delta }
|
||||
|
||||
internal func buttonEvent(btn: UInt32, state: UInt8) {
|
||||
if state == SDL_PRESSED {
|
||||
internal func buttonEvent(btn: UInt32, state: Bool) {
|
||||
if state {
|
||||
self._btns.formUnion(.init(rawValue: btn.buttonMask))
|
||||
} else {
|
||||
self._btns.subtract(.init(rawValue: btn.buttonMask))
|
||||
|
Reference in New Issue
Block a user