Add touch to room placement; unify getting cursor position

ketMix · Jun 30, 2024 · b62f818 · b62f818
1 parent 3a6d8f4
commit b62f818
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/internal/game/game.go b/internal/game/game.go
@@ -213,13 +213,8 @@ func (g *Game) DrawTower(screen *ebiten.Image) {
 }
 
 func (g *Game) CheckUI() (bool, UICheckKind) {
-	mx, my := IntToFloat2(ebiten.CursorPosition())
+	mx, my := g.CursorPosition()
 
-	if len(g.releasedTouchIDs) > 0 && inpututil.IsTouchJustReleased(g.releasedTouchIDs[0]) {
-		mx, my = IntToFloat2(inpututil.TouchPositionInPreviousTick(g.releasedTouchIDs[0]))
-	} else if len(g.touchIDs) > 0 {
-		mx, my = IntToFloat2(ebiten.TouchPosition(g.touchIDs[0]))
-	}
 	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) || len(g.releasedTouchIDs) > 0 {
 		if g.ui.Check(mx, my, UICheckClick) {
 			return true, UICheckClick
@@ -256,6 +251,17 @@ func (g *Game) CheckUI() (bool, UICheckKind) {
 	return false, UICheckNone
 }
 
+func (g *Game) CursorPosition() (float64, float64) {
+	mx, my := IntToFloat2(ebiten.CursorPosition())
+
+	if len(g.releasedTouchIDs) > 0 && inpututil.IsTouchJustReleased(g.releasedTouchIDs[0]) {
+		mx, my = IntToFloat2(inpututil.TouchPositionInPreviousTick(g.releasedTouchIDs[0]))
+	} else if len(g.touchIDs) > 0 {
+		mx, my = IntToFloat2(ebiten.TouchPosition(g.touchIDs[0]))
+	}
+	return mx, my
+}
+
 func (g *Game) UpdateInfo() {
 	if g.tower.targetStories == -1 {
 		g.ui.gameInfoPanel.storyText.SetText(fmt.Sprintf("Stories: %d", len(g.tower.Stories)-1))

diff --git a/internal/game/gamebuild.go b/internal/game/gamebuild.go
@@ -334,7 +334,7 @@ func (s *GameStateBuild) Update(g *Game) GameState {
 	if handled, kind := g.CheckUI(); !handled {
 		// Check for mouse hover and click.
 		if kind == UICheckHover {
-			mx, my := IntToFloat2(ebiten.CursorPosition())
+			mx, my := g.CursorPosition()
 
 			// Center of screen.
 			cx := float64(g.lastWidth) / 2

diff --git a/internal/game/gamepre.go b/internal/game/gamepre.go
@@ -127,14 +127,11 @@ func (s *GameStatePre) Update(g *Game) GameState {
 	s.info.Layout(nil, &g.uiOptions)
 	s.info.SetPosition(w/2-s.info.Width()/2, y)
 
-	mx, my := IntToFloat2(ebiten.CursorPosition())
 	click := ebiten.IsMouseButtonPressed(ebiten.MouseButtonLeft)
 	if len(g.releasedTouchIDs) > 0 && inpututil.IsTouchJustReleased(g.releasedTouchIDs[0]) {
 		click = true
-		mx, my = IntToFloat2(inpututil.TouchPositionInPreviousTick(g.releasedTouchIDs[0]))
-	} else if len(g.touchIDs) > 0 {
-		mx, my = IntToFloat2(ebiten.TouchPosition(g.touchIDs[0]))
 	}
+	mx, my := g.CursorPosition()
 	if s.short.Check(mx, my, UICheckHover) {
 		if click {
 			s.short.Check(mx, my, UICheckClick)