From bd5cc145df75c35f9e126065b2df2ea8af1e031a Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Mon, 19 Jul 2021 00:54:01 +0900 Subject: [PATCH] ebiten: Refactoring: Use aliases for GamepadButton and MouseButton --- gamepad.go | 66 ++++++++++++++++++++++++------------------------- input.go | 4 +-- mousebuttons.go | 8 +++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gamepad.go b/gamepad.go index 6a420c2eb..8856bc5cd 100644 --- a/gamepad.go +++ b/gamepad.go @@ -19,41 +19,41 @@ import ( ) // A GamepadButton represents a gamepad button. -type GamepadButton int +type GamepadButton = driver.GamepadButton // GamepadButtons const ( - GamepadButton0 GamepadButton = GamepadButton(driver.GamepadButton0) - GamepadButton1 GamepadButton = GamepadButton(driver.GamepadButton1) - GamepadButton2 GamepadButton = GamepadButton(driver.GamepadButton2) - GamepadButton3 GamepadButton = GamepadButton(driver.GamepadButton3) - GamepadButton4 GamepadButton = GamepadButton(driver.GamepadButton4) - GamepadButton5 GamepadButton = GamepadButton(driver.GamepadButton5) - GamepadButton6 GamepadButton = GamepadButton(driver.GamepadButton6) - GamepadButton7 GamepadButton = GamepadButton(driver.GamepadButton7) - GamepadButton8 GamepadButton = GamepadButton(driver.GamepadButton8) - GamepadButton9 GamepadButton = GamepadButton(driver.GamepadButton9) - GamepadButton10 GamepadButton = GamepadButton(driver.GamepadButton10) - GamepadButton11 GamepadButton = GamepadButton(driver.GamepadButton11) - GamepadButton12 GamepadButton = GamepadButton(driver.GamepadButton12) - GamepadButton13 GamepadButton = GamepadButton(driver.GamepadButton13) - GamepadButton14 GamepadButton = GamepadButton(driver.GamepadButton14) - GamepadButton15 GamepadButton = GamepadButton(driver.GamepadButton15) - GamepadButton16 GamepadButton = GamepadButton(driver.GamepadButton16) - GamepadButton17 GamepadButton = GamepadButton(driver.GamepadButton17) - GamepadButton18 GamepadButton = GamepadButton(driver.GamepadButton18) - GamepadButton19 GamepadButton = GamepadButton(driver.GamepadButton19) - GamepadButton20 GamepadButton = GamepadButton(driver.GamepadButton20) - GamepadButton21 GamepadButton = GamepadButton(driver.GamepadButton21) - GamepadButton22 GamepadButton = GamepadButton(driver.GamepadButton22) - GamepadButton23 GamepadButton = GamepadButton(driver.GamepadButton23) - GamepadButton24 GamepadButton = GamepadButton(driver.GamepadButton24) - GamepadButton25 GamepadButton = GamepadButton(driver.GamepadButton25) - GamepadButton26 GamepadButton = GamepadButton(driver.GamepadButton26) - GamepadButton27 GamepadButton = GamepadButton(driver.GamepadButton27) - GamepadButton28 GamepadButton = GamepadButton(driver.GamepadButton28) - GamepadButton29 GamepadButton = GamepadButton(driver.GamepadButton29) - GamepadButton30 GamepadButton = GamepadButton(driver.GamepadButton30) - GamepadButton31 GamepadButton = GamepadButton(driver.GamepadButton31) + GamepadButton0 GamepadButton = driver.GamepadButton0 + GamepadButton1 GamepadButton = driver.GamepadButton1 + GamepadButton2 GamepadButton = driver.GamepadButton2 + GamepadButton3 GamepadButton = driver.GamepadButton3 + GamepadButton4 GamepadButton = driver.GamepadButton4 + GamepadButton5 GamepadButton = driver.GamepadButton5 + GamepadButton6 GamepadButton = driver.GamepadButton6 + GamepadButton7 GamepadButton = driver.GamepadButton7 + GamepadButton8 GamepadButton = driver.GamepadButton8 + GamepadButton9 GamepadButton = driver.GamepadButton9 + GamepadButton10 GamepadButton = driver.GamepadButton10 + GamepadButton11 GamepadButton = driver.GamepadButton11 + GamepadButton12 GamepadButton = driver.GamepadButton12 + GamepadButton13 GamepadButton = driver.GamepadButton13 + GamepadButton14 GamepadButton = driver.GamepadButton14 + GamepadButton15 GamepadButton = driver.GamepadButton15 + GamepadButton16 GamepadButton = driver.GamepadButton16 + GamepadButton17 GamepadButton = driver.GamepadButton17 + GamepadButton18 GamepadButton = driver.GamepadButton18 + GamepadButton19 GamepadButton = driver.GamepadButton19 + GamepadButton20 GamepadButton = driver.GamepadButton20 + GamepadButton21 GamepadButton = driver.GamepadButton21 + GamepadButton22 GamepadButton = driver.GamepadButton22 + GamepadButton23 GamepadButton = driver.GamepadButton23 + GamepadButton24 GamepadButton = driver.GamepadButton24 + GamepadButton25 GamepadButton = driver.GamepadButton25 + GamepadButton26 GamepadButton = driver.GamepadButton26 + GamepadButton27 GamepadButton = driver.GamepadButton27 + GamepadButton28 GamepadButton = driver.GamepadButton28 + GamepadButton29 GamepadButton = driver.GamepadButton29 + GamepadButton30 GamepadButton = driver.GamepadButton30 + GamepadButton31 GamepadButton = driver.GamepadButton31 GamepadButtonMax GamepadButton = GamepadButton31 ) diff --git a/input.go b/input.go index 9f1353fac..0283b1c7a 100644 --- a/input.go +++ b/input.go @@ -112,7 +112,7 @@ func Wheel() (xoff, yoff float64) { // // IsMouseButtonPressed is concurrent-safe. func IsMouseButtonPressed(mouseButton MouseButton) bool { - return uiDriver().Input().IsMouseButtonPressed(driver.MouseButton(mouseButton)) + return uiDriver().Input().IsMouseButtonPressed(mouseButton) } // GamepadID represents a gamepad's identifier. @@ -199,7 +199,7 @@ func GamepadButtonNum(id GamepadID) int { // // IsGamepadButtonPressed always returns false on iOS. func IsGamepadButtonPressed(id GamepadID, button GamepadButton) bool { - return uiDriver().Input().IsGamepadButtonPressed(id, driver.GamepadButton(button)) + return uiDriver().Input().IsGamepadButtonPressed(id, button) } // TouchID represents a touch's identifier. diff --git a/mousebuttons.go b/mousebuttons.go index ba4edc513..ec18d2531 100644 --- a/mousebuttons.go +++ b/mousebuttons.go @@ -19,11 +19,11 @@ import ( ) // A MouseButton represents a mouse button. -type MouseButton int +type MouseButton = driver.MouseButton // MouseButtons const ( - MouseButtonLeft MouseButton = MouseButton(driver.MouseButtonLeft) - MouseButtonRight MouseButton = MouseButton(driver.MouseButtonRight) - MouseButtonMiddle MouseButton = MouseButton(driver.MouseButtonMiddle) + MouseButtonLeft MouseButton = driver.MouseButtonLeft + MouseButtonRight MouseButton = driver.MouseButtonRight + MouseButtonMiddle MouseButton = driver.MouseButtonMiddle )