mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-02-03 14:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: rename functions

Browse Source
This commit is contained in:
Hajime Hoshi 2022-12-27 12:52:07 +09:00
parent 41a68bf17b
commit 5e7ec81f5c
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/ui/context.go
View File

@ -243,7 +243,7 @@ func (c *context) layoutGame(outsideWidth, outsideHeight float64, deviceScaleFac
return ow, oh return ow, oh
} }
func (c *context) adjustPosition(x, y float64, deviceScaleFactor float64) (float64, float64) { func (c *context) clientPositionToLogicalPosition(x, y float64, deviceScaleFactor float64) (float64, float64) {
s, ox, oy := c.screenScaleAndOffsets() s, ox, oy := c.screenScaleAndOffsets()
// The scale 0 indicates that the screen is not initialized yet. // The scale 0 indicates that the screen is not initialized yet.
// As any cursor values don't make sense, just return NaN. // As any cursor values don't make sense, just return NaN.

2
internal/ui/input_glfw.go
View File

@ -64,7 +64,7 @@ func (u *userInterfaceImpl) updateInputState() error {
s := u.deviceScaleFactor(m) s := u.deviceScaleFactor(m)
cx = u.dipFromGLFWPixel(cx, m) cx = u.dipFromGLFWPixel(cx, m)
cy = u.dipFromGLFWPixel(cy, m) cy = u.dipFromGLFWPixel(cy, m)
cx, cy = u.context.adjustPosition(cx, cy, s) cx, cy = u.context.clientPositionToLogicalPosition(cx, cy, s)
// AdjustPosition can return NaN at the initialization. // AdjustPosition can return NaN at the initialization.
if !math.IsNaN(cx) && !math.IsNaN(cy) { if !math.IsNaN(cx) && !math.IsNaN(cy) {

6
internal/ui/input_js.go
View File

@ -107,13 +107,13 @@ func (u *userInterfaceImpl) setMouseCursorFromEvent(e js.Value) {
if u.cursorMode == CursorModeCaptured { if u.cursorMode == CursorModeCaptured {
x, y := e.Get("clientX").Int(), e.Get("clientY").Int() x, y := e.Get("clientX").Int(), e.Get("clientY").Int()
u.origCursorX, u.origCursorY = x, y u.origCursorX, u.origCursorY = x, y
dx, dy := u.context.adjustPosition(e.Get("movementX").Float(), e.Get("movementY").Float(), u.DeviceScaleFactor()) dx, dy := u.context.clientPositionToLogicalPosition(e.Get("movementX").Float(), e.Get("movementY").Float(), u.DeviceScaleFactor())
u.inputState.CursorX += int(dx) u.inputState.CursorX += int(dx)
u.inputState.CursorY += int(dy) u.inputState.CursorY += int(dy)
return return
} }
x, y := u.context.adjustPosition(e.Get("clientX").Float(), e.Get("clientY").Float(), u.DeviceScaleFactor()) x, y := u.context.clientPositionToLogicalPosition(e.Get("clientX").Float(), e.Get("clientY").Float(), u.DeviceScaleFactor())
u.inputState.CursorX, u.inputState.CursorY = int(x), int(y) u.inputState.CursorX, u.inputState.CursorY = int(x), int(y)
u.origCursorX, u.origCursorY = int(x), int(y) u.origCursorX, u.origCursorY = int(x), int(y)
} }
@ -130,7 +130,7 @@ func (u *userInterfaceImpl) updateTouchesFromEvent(e js.Value) {
touches := e.Get("targetTouches") touches := e.Get("targetTouches")
for i := 0; i < touches.Length(); i++ { for i := 0; i < touches.Length(); i++ {
t := touches.Call("item", i) t := touches.Call("item", i)
x, y := u.context.adjustPosition(t.Get("clientX").Float(), t.Get("clientY").Float(), u.DeviceScaleFactor()) x, y := u.context.clientPositionToLogicalPosition(t.Get("clientX").Float(), t.Get("clientY").Float(), u.DeviceScaleFactor())
u.inputState.Touches[i] = Touch{ u.inputState.Touches[i] = Touch{
Valid: true, Valid: true,
ID: TouchID(t.Get("identifier").Int()), ID: TouchID(t.Get("identifier").Int()),

2
internal/ui/input_mobile.go
View File

@ -42,7 +42,7 @@ func (u *userInterfaceImpl) updateInputState(keys map[Key]struct{}, runes []rune
u.inputState.Touches[i].Valid = false u.inputState.Touches[i].Valid = false
} }
for i, t := range touches { for i, t := range touches {
x, y := u.context.adjustPosition(t.X, t.Y, u.DeviceScaleFactor()) x, y := u.context.clientPositionToLogicalPosition(t.X, t.Y, u.DeviceScaleFactor())
u.inputState.Touches[i] = Touch{ u.inputState.Touches[i] = Touch{
Valid: true, Valid: true,
ID: t.ID, ID: t.ID,

2
internal/ui/input_nintendosdk.go
View File

@ -28,7 +28,7 @@ func (u *userInterfaceImpl) updateInputState() {
u.inputState.Touches[i].Valid = false u.inputState.Touches[i].Valid = false
} }
for i, t := range u.nativeTouches { for i, t := range u.nativeTouches {
x, y := u.context.adjustPosition(float64(t.X), float64(t.Y), deviceScaleFactor) x, y := u.context.clientPositionToLogicalPosition(float64(t.X), float64(t.Y), deviceScaleFactor)
u.inputState.Touches[i] = Touch{ u.inputState.Touches[i] = Touch{
Valid: true, Valid: true,
ID: TouchID(t.ID), ID: TouchID(t.ID),

5
internal/ui/ui_mobile.go
View File

@ -361,11 +361,6 @@ func (u *userInterfaceImpl) setGBuildSize(widthPx, heightPx int) {
}) })
} }
func (u *userInterfaceImpl) adjustPosition(x, y int) (int, int) {
xf, yf := u.context.adjustPosition(float64(x), float64(y), deviceScale())
return int(xf), int(yf)
}
func (u *userInterfaceImpl) CursorMode() CursorMode { func (u *userInterfaceImpl) CursorMode() CursorMode {
return CursorModeHidden return CursorModeHidden
} }