mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-14 23:17:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "inpututil: refactoring: use clear"

Browse Source 
This reverts commit d6427d63ca.

Reason: wrong clear usages
This commit is contained in:
Hajime Hoshi 2024-10-26 16:52:17 +09:00
parent d6427d63ca
commit 7fe50478a7
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
inpututil/inpututil.go
View File

@ -107,23 +107,31 @@ func (i *inputState) update() {
// Gamepads // Gamepads
// Copy the gamepad IDs. // Copy the gamepad IDs.
clear(i.prevGamepadIDs) for id := range i.prevGamepadIDs {
delete(i.prevGamepadIDs, id)
}
for id := range i.gamepadIDs { for id := range i.gamepadIDs {
i.prevGamepadIDs[id] = struct{}{} i.prevGamepadIDs[id] = struct{}{}
} }
// Copy the gamepad button durations. // Copy the gamepad button durations.
clear(i.prevGamepadButtonDurations) for id := range i.prevGamepadButtonDurations {
delete(i.prevGamepadButtonDurations, id)
}
for id, ds := range i.gamepadButtonDurations { for id, ds := range i.gamepadButtonDurations {
i.prevGamepadButtonDurations[id] = append([]int{}, ds...) i.prevGamepadButtonDurations[id] = append([]int{}, ds...)
} }
clear(i.prevStandardGamepadButtonDurations) for id := range i.prevStandardGamepadButtonDurations {
delete(i.prevStandardGamepadButtonDurations, id)
}
for id, ds := range i.standardGamepadButtonDurations { for id, ds := range i.standardGamepadButtonDurations {
i.prevStandardGamepadButtonDurations[id] = append([]int{}, ds...) i.prevStandardGamepadButtonDurations[id] = append([]int{}, ds...)
} }
clear(i.gamepadIDs) for id := range i.gamepadIDs {
delete(i.gamepadIDs, id)
}
i.gamepadIDsBuf = ebiten.AppendGamepadIDs(i.gamepadIDsBuf[:0]) i.gamepadIDsBuf = ebiten.AppendGamepadIDs(i.gamepadIDsBuf[:0])
for _, id := range i.gamepadIDsBuf { for _, id := range i.gamepadIDsBuf {
i.gamepadIDs[id] = struct{}{} i.gamepadIDs[id] = struct{}{}
@ -151,25 +159,35 @@ func (i *inputState) update() {
} }
} }
for id := range i.gamepadButtonDurations { for id := range i.gamepadButtonDurations {
clear(i.gamepadButtonDurations[id]) if _, ok := i.gamepadIDs[id]; !ok {
delete(i.gamepadButtonDurations, id)
}
} }
for id := range i.standardGamepadButtonDurations { for id := range i.standardGamepadButtonDurations {
clear(i.standardGamepadButtonDurations[id]) if _, ok := i.gamepadIDs[id]; !ok {
delete(i.standardGamepadButtonDurations, id)
}
} }
// Touches // Touches
// Copy the touch durations and positions. // Copy the touch durations and positions.
clear(i.prevTouchDurations) for id := range i.prevTouchDurations {
delete(i.prevTouchDurations, id)
}
for id := range i.touchDurations { for id := range i.touchDurations {
i.prevTouchDurations[id] = i.touchDurations[id] i.prevTouchDurations[id] = i.touchDurations[id]
} }
clear(i.prevTouchPositions) for id := range i.prevTouchPositions {
delete(i.prevTouchPositions, id)
}
for id := range i.touchPositions { for id := range i.touchPositions {
i.prevTouchPositions[id] = i.touchPositions[id] i.prevTouchPositions[id] = i.touchPositions[id]
} }
clear(i.touchIDs) for id := range i.touchIDs {
delete(i.touchIDs, id)
}
i.touchIDsBuf = ebiten.AppendTouchIDs(i.touchIDsBuf[:0]) i.touchIDsBuf = ebiten.AppendTouchIDs(i.touchIDsBuf[:0])
for _, id := range i.touchIDsBuf { for _, id := range i.touchIDsBuf {
i.touchIDs[id] = struct{}{} i.touchIDs[id] = struct{}{}