mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: refactoring: move AdjustPosition to the package internal/ui

Browse Source
This commit is contained in:
Hajime Hoshi 2022-02-13 18:31:28 +09:00
parent 08ae7006ef
commit 7b164882fc
6 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
internal/ui/context.go
View File

@ -15,6 +15,7 @@
package ui
import (
"math"
"sync/atomic"
"github.com/hajimehoshi/ebiten/v2/internal/buffered"
@ -27,10 +28,7 @@ const DefaultTPS = 60
type Context interface {
UpdateOffscreen(outsideWidth, outsideHeight float64) (int, int)
UpdateFrame(updateCount int, outsideWidth, outsideHeight float64) error
// AdjustPosition can be called from a different goroutine from Update's or Layout's.
AdjustPosition(x, y float64, outsideWidth, outsideHeight float64, deviceScaleFactor float64) (float64, float64)
UpdateFrame(updateCount int, screenScale float64, offsetX, offsetY float64) error
}
type contextImpl struct {
@ -48,16 +46,16 @@ func newContextImpl(context Context) *contextImpl {
}
}
func (c *contextImpl) updateFrame() error {
func (c *contextImpl) updateFrame(deviceScaleFactor float64) error {
// TODO: If updateCount is 0 and vsync is disabled, swapping buffers can be skipped.
return c.updateFrameImpl(clock.Update(theGlobalState.maxTPS()))
return c.updateFrameImpl(clock.Update(theGlobalState.maxTPS()), deviceScaleFactor)
}
func (c *contextImpl) forceUpdateFrame() error {
return c.updateFrameImpl(1)
func (c *contextImpl) forceUpdateFrame(deviceScaleFactor float64) error {
return c.updateFrameImpl(1, deviceScaleFactor)
}
func (c *contextImpl) updateFrameImpl(updateCount int) error {
func (c *contextImpl) updateFrameImpl(updateCount int, deviceScaleFactor float64) error {
ow, oh := c.context.UpdateOffscreen(c.outsideWidth, c.outsideHeight)
c.offscreenWidth = ow
c.offscreenHeight = oh
@ -76,7 +74,10 @@ func (c *contextImpl) updateFrameImpl(updateCount int) error {
if err := buffered.BeginFrame(); err != nil {
return err
}
if err := c.context.UpdateFrame(updateCount, c.outsideWidth, c.outsideHeight); err != nil {
screenScale := c.screenScale(deviceScaleFactor)
offsetX, offsetY := c.offsets(deviceScaleFactor)
if err := c.context.UpdateFrame(updateCount, screenScale, offsetX, offsetY); err != nil {
return err
}
@ -101,8 +102,37 @@ func (c *contextImpl) layout(outsideWidth, outsideHeight float64) {
c.outsideHeight = outsideHeight
}
// TODO: Make adjustPosition concurrent-safe.
func (c *contextImpl) adjustPosition(x, y float64, deviceScaleFactor float64) (float64, float64) {
return c.context.AdjustPosition(x, y, c.outsideWidth, c.outsideHeight, deviceScaleFactor)
ox, oy := c.offsets(deviceScaleFactor)
s := c.screenScale(deviceScaleFactor)
// The scale 0 indicates that the offscreen is not initialized yet.
// As any cursor values don't make sense, just return NaN.
if s == 0 {
return math.NaN(), math.NaN()
}
return (x*deviceScaleFactor - ox) / s, (y*deviceScaleFactor - oy) / s
}
func (c *contextImpl) offsets(deviceScaleFactor float64) (float64, float64) {
if c.offscreenWidth == 0 || c.offscreenHeight == 0 {
return 0, 0
}
s := c.screenScale(deviceScaleFactor)
width := float64(c.offscreenWidth) * s
height := float64(c.offscreenHeight) * s
x := (c.outsideWidth*deviceScaleFactor - width) / 2
y := (c.outsideHeight*deviceScaleFactor - height) / 2
return x, y
}
func (c *contextImpl) screenScale(deviceScaleFactor float64) float64 {
if c.offscreenWidth == 0 || c.offscreenHeight == 0 {
return 0
}
scaleX := c.outsideWidth / float64(c.offscreenWidth) * deviceScaleFactor
scaleY := c.outsideHeight / float64(c.offscreenHeight) * deviceScaleFactor
return math.Min(scaleX, scaleY)
}
var theGlobalState = globalState{

2
internal/ui/ui_cbackend.go
View File

@ -50,7 +50,7 @@ func (u *UserInterface) Run(context Context) error {
cbackend.BeginFrame()
u.input.update(u.context)
if err := u.context.updateFrame(); err != nil {
if err := u.context.updateFrame(deviceScaleFactor); err != nil {
return err
}

8
internal/ui/ui_glfw.go
View File

@ -707,6 +707,7 @@ func (u *UserInterface) registerWindowSetSizeCallback() {
if err := u.runOnAnotherThreadFromMainThread(func() error {
var outsideWidth, outsideHeight float64
var deviceScaleFactor float64
u.t.Call(func() {
if width != 0 || height != 0 {
@ -716,9 +717,10 @@ func (u *UserInterface) registerWindowSetSizeCallback() {
}
outsideWidth, outsideHeight = u.updateSize()
deviceScaleFactor = u.deviceScaleFactor(u.currentMonitor())
})
u.context.layout(outsideWidth, outsideHeight)
if err := u.context.forceUpdateFrame(); err != nil {
if err := u.context.forceUpdateFrame(deviceScaleFactor); err != nil {
return err
}
if graphics().IsGL() {
@ -1022,15 +1024,17 @@ func (u *UserInterface) loop() error {
}
var outsideWidth, outsideHeight float64
var deviceScaleFactor float64
var err error
if u.t.Call(func() {
outsideWidth, outsideHeight, err = u.update()
deviceScaleFactor = u.deviceScaleFactor(u.currentMonitor())
}); err != nil {
return err
}
u.context.layout(outsideWidth, outsideHeight)
if err := u.context.updateFrame(); err != nil {
if err := u.context.updateFrame(deviceScaleFactor); err != nil {
return err
}

4
internal/ui/ui_js.go
View File

@ -289,11 +289,11 @@ func (u *UserInterface) updateImpl(force bool) error {
u.input.updateForGo2Cpp()
u.updateSize()
if force {
if err := u.context.forceUpdateFrame(); err != nil {
if err := u.context.forceUpdateFrame(u.DeviceScaleFactor()); err != nil {
return err
}
} else {
if err := u.context.updateFrame(); err != nil {
if err := u.context.updateFrame(u.DeviceScaleFactor()); err != nil {
return err
}
}

2
internal/ui/ui_mobile.go
View File

@ -330,7 +330,7 @@ func (u *UserInterface) update() error {
renderEndCh <- struct{}{}
}()
if err := u.context.updateFrame(); err != nil {
if err := u.context.updateFrame(deviceScale()); err != nil {
return err
}
return nil

41
uicontext.go
View File

@ -16,7 +16,6 @@ package ebiten
import (
"fmt"
"math"
"sync"
"github.com/hajimehoshi/ebiten/v2/internal/debug"
@ -91,30 +90,7 @@ func (c *uiContext) setScreenClearedEveryFrame(cleared bool) {
}
}
func (c *uiContext) screenScale(outsideWidth, outsideHeight float64, deviceScaleFactor float64) float64 {
if c.offscreen == nil {
return 0
}
sw, sh := c.offscreen.Size()
scaleX := outsideWidth / float64(sw) * deviceScaleFactor
scaleY := outsideHeight / float64(sh) * deviceScaleFactor
return math.Min(scaleX, scaleY)
}
func (c *uiContext) offsets(outsideWidth, outsideHeight float64, deviceScaleFactor float64) (float64, float64) {
if c.offscreen == nil {
return 0, 0
}
sw, sh := c.offscreen.Size()
s := c.screenScale(outsideWidth, outsideHeight, deviceScaleFactor)
width := float64(sw) * s
height := float64(sh) * s
x := (outsideWidth*deviceScaleFactor - width) / 2
y := (outsideHeight*deviceScaleFactor - height) / 2
return x, y
}
func (c *uiContext) UpdateFrame(updateCount int, outsideWidth, outsideHeight float64) error {
func (c *uiContext) UpdateFrame(updateCount int, screenScale float64, offsetX, offsetY float64) error {
// Ensure that Update is called once before Draw so that Update can be used for initialization.
if !c.updateCalled && updateCount == 0 {
updateCount = 1
@ -147,7 +123,7 @@ func (c *uiContext) UpdateFrame(updateCount int, outsideWidth, outsideHeight flo
op := &DrawImageOptions{}
s := c.screenScale(outsideWidth, outsideHeight, ui.Get().DeviceScaleFactor())
s := screenScale
switch vd := ui.FramebufferYDirection(); vd {
case graphicsdriver.Upward:
op.GeoM.Scale(s, -s)
@ -159,7 +135,7 @@ func (c *uiContext) UpdateFrame(updateCount int, outsideWidth, outsideHeight flo
panic(fmt.Sprintf("ebiten: invalid v-direction: %d", vd))
}
op.GeoM.Translate(c.offsets(outsideWidth, outsideHeight, ui.Get().DeviceScaleFactor()))
op.GeoM.Translate(offsetX, offsetY)
op.CompositeMode = CompositeModeCopy
// filterScreen works with >=1 scale, but does not well with <1 scale.
@ -172,14 +148,3 @@ func (c *uiContext) UpdateFrame(updateCount int, outsideWidth, outsideHeight flo
c.screen.DrawImage(c.offscreen, op)
return nil
}
func (c *uiContext) AdjustPosition(x, y float64, outsideWidth, outsideHeight float64, deviceScaleFactor float64) (float64, float64) {
ox, oy := c.offsets(outsideWidth, outsideHeight, deviceScaleFactor)
s := c.screenScale(outsideWidth, outsideHeight, deviceScaleFactor)
// The scale 0 indicates that the offscreen is not initialized yet.
// As any cursor values don't make sense, just return NaN.
if s == 0 {
return math.NaN(), math.NaN()
}
return (x*deviceScaleFactor - ox) / s, (y*deviceScaleFactor - oy) / s
}