ui: Remove deviceScale struct

This commit is contained in:
Hajime Hoshi 2018-10-08 01:03:18 +09:00
parent effd530026
commit 16a9bac487
2 changed files with 1 additions and 41 deletions

View File

@ -1,38 +0,0 @@
// Copyright 2018 The Ebiten Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package ui
import (
"github.com/hajimehoshi/ebiten/internal/devicescale"
)
type deviceScale struct {
val float64
frame int64
lastUpdated int64
}
func (d *deviceScale) Update() {
d.frame++
}
func (d *deviceScale) Get() float64 {
// As devicescale.DeviceScale accesses OS API, not call this too often.
if d.val == 0 || d.frame-d.lastUpdated > 30 {
d.val = devicescale.Get()
d.lastUpdated = d.frame
}
return d.val
}

View File

@ -41,7 +41,6 @@ type userInterface struct {
windowFocus bool windowFocus bool
pageVisible bool pageVisible bool
deviceScale deviceScale
lastActualScale float64 lastActualScale float64
} }
@ -175,7 +174,7 @@ func (u *userInterface) actualScreenScale() float64 {
// * Chrome just after restoring the lost context // * Chrome just after restoring the lost context
// * Safari // * Safari
// Let's use the devicePixelRatio as it is here. // Let's use the devicePixelRatio as it is here.
return u.getScale() * u.deviceScale.Get() return u.getScale() * deviceScale.GetAt(0, 0)
} }
func (u *userInterface) updateGraphicsContext(g GraphicsContext) { func (u *userInterface) updateGraphicsContext(g GraphicsContext) {
@ -233,7 +232,6 @@ func (u *userInterface) loop(g GraphicsContext) error {
close(ch) close(ch)
return return
} }
u.deviceScale.Update()
if u.vsync { if u.vsync {
requestAnimationFrame.Invoke(cf) requestAnimationFrame.Invoke(cf)
} else { } else {