mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-09-20 05:12:18 +02:00
Rename mod key names
This commit is contained in:
parent
90ab31a872
commit
4eaa16b8d1
@ -35,7 +35,7 @@ var keyNames = map[ebiten.Key]string{
|
|||||||
ebiten.KeyComma: "','",
|
ebiten.KeyComma: "','",
|
||||||
ebiten.KeyDelete: "Delete",
|
ebiten.KeyDelete: "Delete",
|
||||||
ebiten.KeyEnter: "Enter",
|
ebiten.KeyEnter: "Enter",
|
||||||
ebiten.KeyEscape: "Escape",
|
ebiten.KeyEscape: "Esc",
|
||||||
ebiten.KeyPeriod: "'.'",
|
ebiten.KeyPeriod: "'.'",
|
||||||
ebiten.KeySpace: "Space",
|
ebiten.KeySpace: "Space",
|
||||||
ebiten.KeyTab: "Tab",
|
ebiten.KeyTab: "Tab",
|
||||||
@ -47,9 +47,9 @@ var keyNames = map[ebiten.Key]string{
|
|||||||
ebiten.KeyUp: "Up",
|
ebiten.KeyUp: "Up",
|
||||||
|
|
||||||
// Mods
|
// Mods
|
||||||
ebiten.KeyLeftShift: "Shift",
|
ebiten.KeyShift: "Shift",
|
||||||
ebiten.KeyLeftControl: "Ctrl",
|
ebiten.KeyControl: "Ctrl",
|
||||||
ebiten.KeyLeftAlt: "Alt",
|
ebiten.KeyAlt: "Alt",
|
||||||
}
|
}
|
||||||
|
|
||||||
func update(screen *ebiten.Image) error {
|
func update(screen *ebiten.Image) error {
|
||||||
|
28
genkeys.go
28
genkeys.go
@ -37,10 +37,10 @@ func init() {
|
|||||||
keyCodeToName = map[int]string{
|
keyCodeToName = map[int]string{
|
||||||
0xBC: "Comma",
|
0xBC: "Comma",
|
||||||
0xBE: "Period",
|
0xBE: "Period",
|
||||||
0x12: "LeftAlt",
|
0x12: "Alt",
|
||||||
0x14: "CapsLock",
|
0x14: "CapsLock",
|
||||||
0x11: "LeftControl",
|
0x11: "Control",
|
||||||
0x10: "LeftShift",
|
0x10: "Shift",
|
||||||
0x0D: "Enter",
|
0x0D: "Enter",
|
||||||
0x20: "Space",
|
0x20: "Space",
|
||||||
0x09: "Tab",
|
0x09: "Tab",
|
||||||
@ -114,8 +114,14 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var glfwKeyCodeToKey = map[glfw.Key]Key{
|
var glfwKeyCodeToKey = map[glfw.Key]Key{
|
||||||
{{range $index, $name := .KeyNames}}glfw.Key{{$name}}: Key{{$name}},
|
{{range $index, $name := .KeyNamesWithoutMods}}glfw.Key{{$name}}: Key{{$name}},
|
||||||
{{end}}
|
{{end}}
|
||||||
|
glfw.KeyLeftAlt: KeyAlt,
|
||||||
|
glfw.KeyRightAlt: KeyAlt,
|
||||||
|
glfw.KeyLeftControl: KeyControl,
|
||||||
|
glfw.KeyRightControl: KeyControl,
|
||||||
|
glfw.KeyLeftShift: KeyShift,
|
||||||
|
glfw.KeyRightShift: KeyShift,
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
@ -218,12 +224,17 @@ func main() {
|
|||||||
license := "// " + strings.Join(lines[:len(lines)-1], "\n// ")
|
license := "// " + strings.Join(lines[:len(lines)-1], "\n// ")
|
||||||
|
|
||||||
names := []string{}
|
names := []string{}
|
||||||
|
namesWithoutMods := []string{}
|
||||||
codes := []int{}
|
codes := []int{}
|
||||||
for code, name := range keyCodeToName {
|
for code, name := range keyCodeToName {
|
||||||
names = append(names, name)
|
names = append(names, name)
|
||||||
codes = append(codes, code)
|
codes = append(codes, code)
|
||||||
|
if name != "Alt" && name != "Control" && name != "Shift" {
|
||||||
|
namesWithoutMods = append(namesWithoutMods, name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
sort.Sort(KeyNames(names))
|
sort.Sort(KeyNames(names))
|
||||||
|
sort.Sort(KeyNames(namesWithoutMods))
|
||||||
sort.Ints(codes)
|
sort.Ints(codes)
|
||||||
|
|
||||||
for path, tmpl := range map[string]string{
|
for path, tmpl := range map[string]string{
|
||||||
@ -243,10 +254,11 @@ func main() {
|
|||||||
}
|
}
|
||||||
// NOTE: According to godoc, maps are automatically sorted by key.
|
// NOTE: According to godoc, maps are automatically sorted by key.
|
||||||
tmpl.Execute(f, map[string]interface{}{
|
tmpl.Execute(f, map[string]interface{}{
|
||||||
"License": license,
|
"License": license,
|
||||||
"KeyCodeToName": keyCodeToName,
|
"KeyCodeToName": keyCodeToName,
|
||||||
"Codes": codes,
|
"Codes": codes,
|
||||||
"KeyNames": names,
|
"KeyNames": names,
|
||||||
|
"KeyNamesWithoutMods": namesWithoutMods,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,9 +53,11 @@ const (
|
|||||||
KeyX
|
KeyX
|
||||||
KeyY
|
KeyY
|
||||||
KeyZ
|
KeyZ
|
||||||
|
KeyAlt
|
||||||
KeyBackspace
|
KeyBackspace
|
||||||
KeyCapsLock
|
KeyCapsLock
|
||||||
KeyComma
|
KeyComma
|
||||||
|
KeyControl
|
||||||
KeyDelete
|
KeyDelete
|
||||||
KeyDown
|
KeyDown
|
||||||
KeyEnd
|
KeyEnd
|
||||||
@ -76,13 +78,11 @@ const (
|
|||||||
KeyHome
|
KeyHome
|
||||||
KeyInsert
|
KeyInsert
|
||||||
KeyLeft
|
KeyLeft
|
||||||
KeyLeftAlt
|
|
||||||
KeyLeftControl
|
|
||||||
KeyLeftShift
|
|
||||||
KeyPageDown
|
KeyPageDown
|
||||||
KeyPageUp
|
KeyPageUp
|
||||||
KeyPeriod
|
KeyPeriod
|
||||||
KeyRight
|
KeyRight
|
||||||
|
KeyShift
|
||||||
KeySpace
|
KeySpace
|
||||||
KeyTab
|
KeyTab
|
||||||
KeyUp
|
KeyUp
|
||||||
|
@ -21,73 +21,77 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var glfwKeyCodeToKey = map[glfw.Key]Key{
|
var glfwKeyCodeToKey = map[glfw.Key]Key{
|
||||||
glfw.Key0: Key0,
|
glfw.Key0: Key0,
|
||||||
glfw.Key1: Key1,
|
glfw.Key1: Key1,
|
||||||
glfw.Key2: Key2,
|
glfw.Key2: Key2,
|
||||||
glfw.Key3: Key3,
|
glfw.Key3: Key3,
|
||||||
glfw.Key4: Key4,
|
glfw.Key4: Key4,
|
||||||
glfw.Key5: Key5,
|
glfw.Key5: Key5,
|
||||||
glfw.Key6: Key6,
|
glfw.Key6: Key6,
|
||||||
glfw.Key7: Key7,
|
glfw.Key7: Key7,
|
||||||
glfw.Key8: Key8,
|
glfw.Key8: Key8,
|
||||||
glfw.Key9: Key9,
|
glfw.Key9: Key9,
|
||||||
glfw.KeyA: KeyA,
|
glfw.KeyA: KeyA,
|
||||||
glfw.KeyB: KeyB,
|
glfw.KeyB: KeyB,
|
||||||
glfw.KeyC: KeyC,
|
glfw.KeyC: KeyC,
|
||||||
glfw.KeyD: KeyD,
|
glfw.KeyD: KeyD,
|
||||||
glfw.KeyE: KeyE,
|
glfw.KeyE: KeyE,
|
||||||
glfw.KeyF: KeyF,
|
glfw.KeyF: KeyF,
|
||||||
glfw.KeyG: KeyG,
|
glfw.KeyG: KeyG,
|
||||||
glfw.KeyH: KeyH,
|
glfw.KeyH: KeyH,
|
||||||
glfw.KeyI: KeyI,
|
glfw.KeyI: KeyI,
|
||||||
glfw.KeyJ: KeyJ,
|
glfw.KeyJ: KeyJ,
|
||||||
glfw.KeyK: KeyK,
|
glfw.KeyK: KeyK,
|
||||||
glfw.KeyL: KeyL,
|
glfw.KeyL: KeyL,
|
||||||
glfw.KeyM: KeyM,
|
glfw.KeyM: KeyM,
|
||||||
glfw.KeyN: KeyN,
|
glfw.KeyN: KeyN,
|
||||||
glfw.KeyO: KeyO,
|
glfw.KeyO: KeyO,
|
||||||
glfw.KeyP: KeyP,
|
glfw.KeyP: KeyP,
|
||||||
glfw.KeyQ: KeyQ,
|
glfw.KeyQ: KeyQ,
|
||||||
glfw.KeyR: KeyR,
|
glfw.KeyR: KeyR,
|
||||||
glfw.KeyS: KeyS,
|
glfw.KeyS: KeyS,
|
||||||
glfw.KeyT: KeyT,
|
glfw.KeyT: KeyT,
|
||||||
glfw.KeyU: KeyU,
|
glfw.KeyU: KeyU,
|
||||||
glfw.KeyV: KeyV,
|
glfw.KeyV: KeyV,
|
||||||
glfw.KeyW: KeyW,
|
glfw.KeyW: KeyW,
|
||||||
glfw.KeyX: KeyX,
|
glfw.KeyX: KeyX,
|
||||||
glfw.KeyY: KeyY,
|
glfw.KeyY: KeyY,
|
||||||
glfw.KeyZ: KeyZ,
|
glfw.KeyZ: KeyZ,
|
||||||
glfw.KeyBackspace: KeyBackspace,
|
glfw.KeyBackspace: KeyBackspace,
|
||||||
glfw.KeyCapsLock: KeyCapsLock,
|
glfw.KeyCapsLock: KeyCapsLock,
|
||||||
glfw.KeyComma: KeyComma,
|
glfw.KeyComma: KeyComma,
|
||||||
glfw.KeyDelete: KeyDelete,
|
glfw.KeyDelete: KeyDelete,
|
||||||
glfw.KeyDown: KeyDown,
|
glfw.KeyDown: KeyDown,
|
||||||
glfw.KeyEnd: KeyEnd,
|
glfw.KeyEnd: KeyEnd,
|
||||||
glfw.KeyEnter: KeyEnter,
|
glfw.KeyEnter: KeyEnter,
|
||||||
glfw.KeyEscape: KeyEscape,
|
glfw.KeyEscape: KeyEscape,
|
||||||
glfw.KeyF1: KeyF1,
|
glfw.KeyF1: KeyF1,
|
||||||
glfw.KeyF2: KeyF2,
|
glfw.KeyF2: KeyF2,
|
||||||
glfw.KeyF3: KeyF3,
|
glfw.KeyF3: KeyF3,
|
||||||
glfw.KeyF4: KeyF4,
|
glfw.KeyF4: KeyF4,
|
||||||
glfw.KeyF5: KeyF5,
|
glfw.KeyF5: KeyF5,
|
||||||
glfw.KeyF6: KeyF6,
|
glfw.KeyF6: KeyF6,
|
||||||
glfw.KeyF7: KeyF7,
|
glfw.KeyF7: KeyF7,
|
||||||
glfw.KeyF8: KeyF8,
|
glfw.KeyF8: KeyF8,
|
||||||
glfw.KeyF9: KeyF9,
|
glfw.KeyF9: KeyF9,
|
||||||
glfw.KeyF10: KeyF10,
|
glfw.KeyF10: KeyF10,
|
||||||
glfw.KeyF11: KeyF11,
|
glfw.KeyF11: KeyF11,
|
||||||
glfw.KeyF12: KeyF12,
|
glfw.KeyF12: KeyF12,
|
||||||
glfw.KeyHome: KeyHome,
|
glfw.KeyHome: KeyHome,
|
||||||
glfw.KeyInsert: KeyInsert,
|
glfw.KeyInsert: KeyInsert,
|
||||||
glfw.KeyLeft: KeyLeft,
|
glfw.KeyLeft: KeyLeft,
|
||||||
glfw.KeyLeftAlt: KeyLeftAlt,
|
glfw.KeyPageDown: KeyPageDown,
|
||||||
glfw.KeyLeftControl: KeyLeftControl,
|
glfw.KeyPageUp: KeyPageUp,
|
||||||
glfw.KeyLeftShift: KeyLeftShift,
|
glfw.KeyPeriod: KeyPeriod,
|
||||||
glfw.KeyPageDown: KeyPageDown,
|
glfw.KeyRight: KeyRight,
|
||||||
glfw.KeyPageUp: KeyPageUp,
|
glfw.KeySpace: KeySpace,
|
||||||
glfw.KeyPeriod: KeyPeriod,
|
glfw.KeyTab: KeyTab,
|
||||||
glfw.KeyRight: KeyRight,
|
glfw.KeyUp: KeyUp,
|
||||||
glfw.KeySpace: KeySpace,
|
|
||||||
glfw.KeyTab: KeyTab,
|
glfw.KeyLeftAlt: KeyAlt,
|
||||||
glfw.KeyUp: KeyUp,
|
glfw.KeyRightAlt: KeyAlt,
|
||||||
|
glfw.KeyLeftControl: KeyControl,
|
||||||
|
glfw.KeyRightControl: KeyControl,
|
||||||
|
glfw.KeyLeftShift: KeyShift,
|
||||||
|
glfw.KeyRightShift: KeyShift,
|
||||||
}
|
}
|
||||||
|
@ -20,9 +20,9 @@ var keyCodeToKey = map[int]Key{
|
|||||||
8: KeyBackspace,
|
8: KeyBackspace,
|
||||||
9: KeyTab,
|
9: KeyTab,
|
||||||
13: KeyEnter,
|
13: KeyEnter,
|
||||||
16: KeyLeftShift,
|
16: KeyShift,
|
||||||
17: KeyLeftControl,
|
17: KeyControl,
|
||||||
18: KeyLeftAlt,
|
18: KeyAlt,
|
||||||
20: KeyCapsLock,
|
20: KeyCapsLock,
|
||||||
27: KeyEscape,
|
27: KeyEscape,
|
||||||
32: KeySpace,
|
32: KeySpace,
|
||||||
|
138
keys.go
138
keys.go
@ -23,73 +23,73 @@ type Key int
|
|||||||
|
|
||||||
// Keys
|
// Keys
|
||||||
const (
|
const (
|
||||||
Key0 = Key(ui.Key0)
|
Key0 = Key(ui.Key0)
|
||||||
Key1 = Key(ui.Key1)
|
Key1 = Key(ui.Key1)
|
||||||
Key2 = Key(ui.Key2)
|
Key2 = Key(ui.Key2)
|
||||||
Key3 = Key(ui.Key3)
|
Key3 = Key(ui.Key3)
|
||||||
Key4 = Key(ui.Key4)
|
Key4 = Key(ui.Key4)
|
||||||
Key5 = Key(ui.Key5)
|
Key5 = Key(ui.Key5)
|
||||||
Key6 = Key(ui.Key6)
|
Key6 = Key(ui.Key6)
|
||||||
Key7 = Key(ui.Key7)
|
Key7 = Key(ui.Key7)
|
||||||
Key8 = Key(ui.Key8)
|
Key8 = Key(ui.Key8)
|
||||||
Key9 = Key(ui.Key9)
|
Key9 = Key(ui.Key9)
|
||||||
KeyA = Key(ui.KeyA)
|
KeyA = Key(ui.KeyA)
|
||||||
KeyB = Key(ui.KeyB)
|
KeyB = Key(ui.KeyB)
|
||||||
KeyC = Key(ui.KeyC)
|
KeyC = Key(ui.KeyC)
|
||||||
KeyD = Key(ui.KeyD)
|
KeyD = Key(ui.KeyD)
|
||||||
KeyE = Key(ui.KeyE)
|
KeyE = Key(ui.KeyE)
|
||||||
KeyF = Key(ui.KeyF)
|
KeyF = Key(ui.KeyF)
|
||||||
KeyG = Key(ui.KeyG)
|
KeyG = Key(ui.KeyG)
|
||||||
KeyH = Key(ui.KeyH)
|
KeyH = Key(ui.KeyH)
|
||||||
KeyI = Key(ui.KeyI)
|
KeyI = Key(ui.KeyI)
|
||||||
KeyJ = Key(ui.KeyJ)
|
KeyJ = Key(ui.KeyJ)
|
||||||
KeyK = Key(ui.KeyK)
|
KeyK = Key(ui.KeyK)
|
||||||
KeyL = Key(ui.KeyL)
|
KeyL = Key(ui.KeyL)
|
||||||
KeyM = Key(ui.KeyM)
|
KeyM = Key(ui.KeyM)
|
||||||
KeyN = Key(ui.KeyN)
|
KeyN = Key(ui.KeyN)
|
||||||
KeyO = Key(ui.KeyO)
|
KeyO = Key(ui.KeyO)
|
||||||
KeyP = Key(ui.KeyP)
|
KeyP = Key(ui.KeyP)
|
||||||
KeyQ = Key(ui.KeyQ)
|
KeyQ = Key(ui.KeyQ)
|
||||||
KeyR = Key(ui.KeyR)
|
KeyR = Key(ui.KeyR)
|
||||||
KeyS = Key(ui.KeyS)
|
KeyS = Key(ui.KeyS)
|
||||||
KeyT = Key(ui.KeyT)
|
KeyT = Key(ui.KeyT)
|
||||||
KeyU = Key(ui.KeyU)
|
KeyU = Key(ui.KeyU)
|
||||||
KeyV = Key(ui.KeyV)
|
KeyV = Key(ui.KeyV)
|
||||||
KeyW = Key(ui.KeyW)
|
KeyW = Key(ui.KeyW)
|
||||||
KeyX = Key(ui.KeyX)
|
KeyX = Key(ui.KeyX)
|
||||||
KeyY = Key(ui.KeyY)
|
KeyY = Key(ui.KeyY)
|
||||||
KeyZ = Key(ui.KeyZ)
|
KeyZ = Key(ui.KeyZ)
|
||||||
KeyBackspace = Key(ui.KeyBackspace)
|
KeyAlt = Key(ui.KeyAlt)
|
||||||
KeyCapsLock = Key(ui.KeyCapsLock)
|
KeyBackspace = Key(ui.KeyBackspace)
|
||||||
KeyComma = Key(ui.KeyComma)
|
KeyCapsLock = Key(ui.KeyCapsLock)
|
||||||
KeyDelete = Key(ui.KeyDelete)
|
KeyComma = Key(ui.KeyComma)
|
||||||
KeyDown = Key(ui.KeyDown)
|
KeyControl = Key(ui.KeyControl)
|
||||||
KeyEnd = Key(ui.KeyEnd)
|
KeyDelete = Key(ui.KeyDelete)
|
||||||
KeyEnter = Key(ui.KeyEnter)
|
KeyDown = Key(ui.KeyDown)
|
||||||
KeyEscape = Key(ui.KeyEscape)
|
KeyEnd = Key(ui.KeyEnd)
|
||||||
KeyF1 = Key(ui.KeyF1)
|
KeyEnter = Key(ui.KeyEnter)
|
||||||
KeyF2 = Key(ui.KeyF2)
|
KeyEscape = Key(ui.KeyEscape)
|
||||||
KeyF3 = Key(ui.KeyF3)
|
KeyF1 = Key(ui.KeyF1)
|
||||||
KeyF4 = Key(ui.KeyF4)
|
KeyF2 = Key(ui.KeyF2)
|
||||||
KeyF5 = Key(ui.KeyF5)
|
KeyF3 = Key(ui.KeyF3)
|
||||||
KeyF6 = Key(ui.KeyF6)
|
KeyF4 = Key(ui.KeyF4)
|
||||||
KeyF7 = Key(ui.KeyF7)
|
KeyF5 = Key(ui.KeyF5)
|
||||||
KeyF8 = Key(ui.KeyF8)
|
KeyF6 = Key(ui.KeyF6)
|
||||||
KeyF9 = Key(ui.KeyF9)
|
KeyF7 = Key(ui.KeyF7)
|
||||||
KeyF10 = Key(ui.KeyF10)
|
KeyF8 = Key(ui.KeyF8)
|
||||||
KeyF11 = Key(ui.KeyF11)
|
KeyF9 = Key(ui.KeyF9)
|
||||||
KeyF12 = Key(ui.KeyF12)
|
KeyF10 = Key(ui.KeyF10)
|
||||||
KeyHome = Key(ui.KeyHome)
|
KeyF11 = Key(ui.KeyF11)
|
||||||
KeyInsert = Key(ui.KeyInsert)
|
KeyF12 = Key(ui.KeyF12)
|
||||||
KeyLeft = Key(ui.KeyLeft)
|
KeyHome = Key(ui.KeyHome)
|
||||||
KeyLeftAlt = Key(ui.KeyLeftAlt)
|
KeyInsert = Key(ui.KeyInsert)
|
||||||
KeyLeftControl = Key(ui.KeyLeftControl)
|
KeyLeft = Key(ui.KeyLeft)
|
||||||
KeyLeftShift = Key(ui.KeyLeftShift)
|
KeyPageDown = Key(ui.KeyPageDown)
|
||||||
KeyPageDown = Key(ui.KeyPageDown)
|
KeyPageUp = Key(ui.KeyPageUp)
|
||||||
KeyPageUp = Key(ui.KeyPageUp)
|
KeyPeriod = Key(ui.KeyPeriod)
|
||||||
KeyPeriod = Key(ui.KeyPeriod)
|
KeyRight = Key(ui.KeyRight)
|
||||||
KeyRight = Key(ui.KeyRight)
|
KeyShift = Key(ui.KeyShift)
|
||||||
KeySpace = Key(ui.KeySpace)
|
KeySpace = Key(ui.KeySpace)
|
||||||
KeyTab = Key(ui.KeyTab)
|
KeyTab = Key(ui.KeyTab)
|
||||||
KeyUp = Key(ui.KeyUp)
|
KeyUp = Key(ui.KeyUp)
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user