Changes to resolve duplicate inputs when tps and

fps are out of sync
ebitenui · May 13, 2023 · 507f5ce · 507f5ce
1 parent 6a06cc7
commit 507f5ce
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/_examples/demo/main.go b/_examples/demo/main.go
@@ -1,13 +1,15 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"sort"
 
 	"golang.org/x/text/collate"
 	"golang.org/x/text/language"
 
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 
 	"image/color"
 	_ "image/png"
@@ -32,6 +34,7 @@ func main() {
 	ebiten.SetWindowTitle("Ebiten UI Demo")
 	ebiten.SetWindowResizingMode(ebiten.WindowResizingModeEnabled)
 	ebiten.SetScreenClearedEveryFrame(false)
+	ebiten.SetVsyncEnabled(false)
 
 	ui, closeUI, err := createUI()
 	if err != nil {
@@ -380,4 +383,6 @@ func (g *game) Update() error {
 
 func (g *game) Draw(screen *ebiten.Image) {
 	g.ui.Draw(screen)
+
+	ebitenutil.DebugPrint(screen, fmt.Sprintf("FPS: %f", ebiten.ActualFPS()))
 }
diff --git a/_examples/widget_demos/cursor_updater/main.go b/_examples/widget_demos/cursor_updater/main.go
@@ -71,7 +71,9 @@ func (cu *cursor_updater) Update() {
 	cu.systemPosition = image.Point{X, Y}
 
 }
-func (cu *cursor_updater) Draw() {
+func (cu *cursor_updater) Draw(screen *ebiten.Image) {
+}
+func (cu *cursor_updater) AfterDraw(screen *ebiten.Image) {
 }
 
 // MouseButtonPressed returns whether mouse button b is currently pressed.

diff --git a/input/input.go b/input/input.go
@@ -12,7 +12,9 @@ type CursorUpdater interface {
 	//Note that before this is called the current cursor shape is reset to DEFAULT every cycle
 	Update()
 	//Called at the beginning of every Draw call.
-	Draw()
+	Draw(screen *ebiten.Image)
+	//Called at the end of every Draw call
+	AfterDraw(screen *ebiten.Image)
 	// MouseButtonPressed returns whether mouse button b is currently pressed.
 	MouseButtonPressed(b ebiten.MouseButton) bool
 	// MouseButtonJustPressed returns whether mouse button b has just been pressed.
@@ -157,10 +159,10 @@ func Update() {
 
 func Draw(screen *ebiten.Image) {
 	windowSize = screen.Bounds().Max
-	currentCursorUpdater.Draw()
+	currentCursorUpdater.Draw(screen)
 }
 
-func DrawAfter(screen *ebiten.Image) {
+func AfterDraw(screen *ebiten.Image) {
 	posX, posY := currentCursorUpdater.CursorPosition()
 	if posX < 0 || posY < 0 || posX > windowSize.X || posY > windowSize.Y {
 		return
@@ -196,4 +198,5 @@ func DrawAfter(screen *ebiten.Image) {
 			ebiten.SetCursorMode(ebiten.CursorModeHidden)
 		}
 	}
+	currentCursorUpdater.AfterDraw(screen)
 }
diff --git a/internal/input/input.go b/internal/input/input.go
@@ -35,9 +35,6 @@ var InputHandler *DefaultInternalHandler = &DefaultInternalHandler{KeyPressed: m
 
 // Update updates the input system. This is called by the UI.
 func (handler *DefaultInternalHandler) Update() {
-	handler.InputChars = handler.InputChars[:0]
-	handler.WheelX, handler.WheelY = 0, 0
-
 	touches := ebiten.TouchIDs()
 	if len(touches) > 0 {
 		handler.isTouched = true
@@ -74,14 +71,20 @@ func (handler *DefaultInternalHandler) Update() {
 
 }
 
-func (handler *DefaultInternalHandler) Draw() {
+func (handler *DefaultInternalHandler) Draw(screen *ebiten.Image) {
 	handler.LeftMouseButtonJustPressed = handler.LeftMouseButtonPressed && handler.LeftMouseButtonPressed != handler.LastLeftMouseButtonPressed
 	handler.MiddleMouseButtonJustPressed = handler.MiddleMouseButtonPressed && handler.MiddleMouseButtonPressed != handler.LastMiddleMouseButtonPressed
 	handler.RightMouseButtonJustPressed = handler.RightMouseButtonPressed && handler.RightMouseButtonPressed != handler.LastRightMouseButtonPressed
 
 	handler.LastLeftMouseButtonPressed = handler.LeftMouseButtonPressed
 	handler.LastMiddleMouseButtonPressed = handler.MiddleMouseButtonPressed
 	handler.LastRightMouseButtonPressed = handler.RightMouseButtonPressed
+
+}
+
+func (handler *DefaultInternalHandler) AfterDraw(screen *ebiten.Image) {
+	handler.InputChars = handler.InputChars[:0]
+	handler.WheelX, handler.WheelY = 0, 0
 }
 
 func (handler *DefaultInternalHandler) MouseButtonPressed(b ebiten.MouseButton) bool {

diff --git a/ui.go b/ui.go
@@ -53,7 +53,7 @@ func (u *UI) Update() {
 func (u *UI) Draw(screen *ebiten.Image) {
 	event.ExecuteDeferred()
 	input.Draw(screen)
-	defer input.DrawAfter(screen)
+	defer input.AfterDraw(screen)
 	x, y := screen.Bounds().Dx(), screen.Bounds().Dy()
 	rect := image.Rect(0, 0, x, y)