internal/gamepad: move constants from internal/driver

RiXelanya · Feb 5, 2022 · 1bee10f · 1bee10f
1 parent 3bdd809
commit 1bee10f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/input.go b/input.go
@@ -120,7 +120,7 @@ func IsMouseButtonPressed(mouseButton MouseButton) bool {
 }
 
 // GamepadID represents a gamepad's identifier.
-type GamepadID = driver.GamepadID
+type GamepadID = gamepad.ID
 
 // GamepadSDLID returns a string with the GUID generated in the same way as SDL.
 // To detect devices, see also the community project of gamepad devices database: https://github.com/gabomdq/SDL_GameControllerDB

diff --git a/internal/driver/input.go b/internal/driver/input.go
@@ -14,8 +14,6 @@
 
 package driver
 
-type GamepadID int
-
 type TouchID int
 
 type Input interface {

diff --git a/internal/gamepad/gamepad.go b/internal/gamepad/gamepad.go
@@ -22,6 +22,8 @@ import (
 	"github.com/hajimehoshi/ebiten/v2/internal/gamepaddb"
 )
 
+type ID int
+
 const (
 	hatCentered  = 0
 	hatUp        = 1
@@ -45,7 +47,7 @@ type gamepads struct {
 var theGamepads gamepads
 
 // AppendGamepadIDs is concurrent-safe.
-func AppendGamepadIDs(ids []driver.GamepadID) []driver.GamepadID {
+func AppendGamepadIDs(ids []ID) []ID {
 	return theGamepads.appendGamepadIDs(ids)
 }
 
@@ -55,17 +57,17 @@ func Update() error {
 }
 
 // Get is concurrent-safe.
-func Get(id driver.GamepadID) *Gamepad {
+func Get(id ID) *Gamepad {
 	return theGamepads.get(id)
 }
 
-func (g *gamepads) appendGamepadIDs(ids []driver.GamepadID) []driver.GamepadID {
+func (g *gamepads) appendGamepadIDs(ids []ID) []ID {
 	g.m.Lock()
 	defer g.m.Unlock()
 
 	for i, gp := range g.gamepads {
 		if gp != nil {
-			ids = append(ids, driver.GamepadID(i))
+			ids = append(ids, ID(i))
 		}
 	}
 	return ids
@@ -97,7 +99,7 @@ func (g *gamepads) update() error {
 	return nil
 }
 
-func (g *gamepads) get(id driver.GamepadID) *Gamepad {
+func (g *gamepads) get(id ID) *Gamepad {
 	g.m.Lock()
 	defer g.m.Unlock()