mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

uidriver/mobile: No need to use sync.Once

Browse Source 
devicescale.At is already locked by a mutex and keeps values in its
cache.
This commit is contained in:
Hajime Hoshi 2019-08-19 02:32:35 +09:00
parent 2c23860226
commit 42c70e48ff
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/uidriver/mobile/ui.go
View File

@ -104,16 +104,8 @@ type UserInterface struct {
m sync.RWMutex m sync.RWMutex
} }
var ( func deviceScale() float64 {
deviceScaleVal float64 return devicescale.GetAt(0, 0)
deviceScaleOnce sync.Once
)
func getDeviceScale() float64 {
deviceScaleOnce.Do(func() {
deviceScaleVal = devicescale.GetAt(0, 0)
})
return deviceScaleVal
} }
// appMain is the main routine for gomobile-build mode. // appMain is the main routine for gomobile-build mode.
@ -149,7 +141,7 @@ func (u *UserInterface) appMain(a app.App) {
case touch.Event: case touch.Event:
switch e.Type { switch e.Type {
case touch.TypeBegin, touch.TypeMove: case touch.TypeBegin, touch.TypeMove:
s := getDeviceScale() s := deviceScale()
x, y := float64(e.X)/s, float64(e.Y)/s x, y := float64(e.X)/s, float64(e.Y)/s
// TODO: Is it ok to cast from int64 to int here? // TODO: Is it ok to cast from int64 to int here?
touches[e.Sequence] = &Touch{ touches[e.Sequence] = &Touch{
@ -239,7 +231,7 @@ func (u *UserInterface) updateSize(context driver.UIContext) {
if sizeChanged { if sizeChanged {
width = u.width width = u.width
height = u.height height = u.height
actualScale = u.scaleImpl() * getDeviceScale() actualScale = u.scaleImpl() * deviceScale()
} }
u.sizeChanged = false u.sizeChanged = false
u.m.Unlock() u.m.Unlock()
@ -252,7 +244,7 @@ func (u *UserInterface) updateSize(context driver.UIContext) {
func (u *UserInterface) ActualScale() float64 { func (u *UserInterface) ActualScale() float64 {
u.m.Lock() u.m.Lock()
s := u.scaleImpl() * getDeviceScale() s := u.scaleImpl() * deviceScale()
u.m.Unlock() u.m.Unlock()
return s return s
} }
@ -351,7 +343,7 @@ func (u *UserInterface) updateFullscreenScaleIfNeeded() {
if scale > scaleY { if scale > scaleY {
scale = scaleY scale = scaleY
} }
u.fullscreenScale = scale / getDeviceScale() u.fullscreenScale = scale / deviceScale()
u.sizeChanged = true u.sizeChanged = true
} }
@ -366,7 +358,7 @@ func (u *UserInterface) screenPaddingImpl() (x0, y0, x1, y1 float64) {
if u.fullscreenScale == 0 { if u.fullscreenScale == 0 {
return 0, 0, 0, 0 return 0, 0, 0, 0
} }
s := u.fullscreenScale * getDeviceScale() s := u.fullscreenScale * deviceScale()
ox := (float64(u.fullscreenWidthPx) - float64(u.width)*s) / 2 ox := (float64(u.fullscreenWidthPx) - float64(u.width)*s) / 2
oy := (float64(u.fullscreenHeightPx) - float64(u.height)*s) / 2 oy := (float64(u.fullscreenHeightPx) - float64(u.height)*s) / 2
return ox, oy, ox, oy return ox, oy, ox, oy
@ -375,7 +367,7 @@ func (u *UserInterface) screenPaddingImpl() (x0, y0, x1, y1 float64) {
func (u *UserInterface) adjustPosition(x, y int) (int, int) { func (u *UserInterface) adjustPosition(x, y int) (int, int) {
ox, oy, _, _ := u.screenPaddingImpl() ox, oy, _, _ := u.screenPaddingImpl()
s := u.scaleImpl() s := u.scaleImpl()
as := s * getDeviceScale() as := s * deviceScale()
return int(float64(x)/s - ox/as), int(float64(y)/s - oy/as) return int(float64(x)/s - ox/as), int(float64(y)/s - oy/as)
} }
@ -436,7 +428,7 @@ func (u *UserInterface) SetVsyncEnabled(enabled bool) {
} }
func (u *UserInterface) DeviceScaleFactor() float64 { func (u *UserInterface) DeviceScaleFactor() float64 {
return getDeviceScale() return deviceScale()
} }
func (u *UserInterface) Input() driver.Input { func (u *UserInterface) Input() driver.Input {