From 5425e0036bd93966cad8b51c5e49a63a7f2629a0 Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Wed, 5 Jul 2023 21:54:37 +0200 Subject: [PATCH] remove ebiten from KeyMap --- konstructor/engine/engine.controller.go | 16 ++++++++-------- konstructor/entity/entity.settings.go | 18 ++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/konstructor/engine/engine.controller.go b/konstructor/engine/engine.controller.go index 72d47fb..2e0511f 100644 --- a/konstructor/engine/engine.controller.go +++ b/konstructor/engine/engine.controller.go @@ -25,33 +25,33 @@ func (e *Engine) ClearKeyPresed() { } func (e *Engine) UpPressed() bool { - return e.PressedKey == e.Settings.KeyMap.Up + return e.PressedKey == e.Settings.KeyMap.Up.(ebiten.Key) } func (e *Engine) DownPressed() bool { - return e.PressedKey == e.Settings.KeyMap.Down + return e.PressedKey == e.Settings.KeyMap.Down.(ebiten.Key) } func (e *Engine) RightPressed() bool { - return e.PressedKey == e.Settings.KeyMap.Right + return e.PressedKey == e.Settings.KeyMap.Right.(ebiten.Key) } func (e *Engine) LeftPressed() bool { - return e.PressedKey == e.Settings.KeyMap.Left + return e.PressedKey == e.Settings.KeyMap.Left.(ebiten.Key) } func (e *Engine) Action0Pressed() bool { - return e.PressedKey == e.Settings.KeyMap.Action0 + return e.PressedKey == e.Settings.KeyMap.Action0.(ebiten.Key) } func (e *Engine) Action1Pressed() bool { - return e.PressedKey == e.Settings.KeyMap.Action1 + return e.PressedKey == e.Settings.KeyMap.Action1.(ebiten.Key) } func (e *Engine) Action2Pressed() bool { - return e.PressedKey == e.Settings.KeyMap.Action2 + return e.PressedKey == e.Settings.KeyMap.Action2.(ebiten.Key) } func (e *Engine) Action3Pressed() bool { - return e.PressedKey == e.Settings.KeyMap.Action3 + return e.PressedKey == e.Settings.KeyMap.Action3.(ebiten.Key) } diff --git a/konstructor/entity/entity.settings.go b/konstructor/entity/entity.settings.go index 7c939b8..78a4bab 100644 --- a/konstructor/entity/entity.settings.go +++ b/konstructor/entity/entity.settings.go @@ -1,16 +1,14 @@ package entity -import "github.com/hajimehoshi/ebiten" - type KeyMap struct { - Up ebiten.Key - Down ebiten.Key - Right ebiten.Key - Left ebiten.Key - Action0 ebiten.Key - Action1 ebiten.Key - Action2 ebiten.Key - Action3 ebiten.Key + Up any + Down any + Right any + Left any + Action0 any + Action1 any + Action2 any + Action3 any } type ScreenSettings struct {