interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use Monitor as pointer (*Monitor)

This commit is contained in:
faiface 2016-11-24 17:21:35 +01:00
parent 40d2c42046
commit 106471a126
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
monitor.go
View File

@ -11,8 +11,8 @@ type Monitor struct {
} }
// PrimaryMonitor returns the main monitor (usually the one with the taskbar and stuff). // PrimaryMonitor returns the main monitor (usually the one with the taskbar and stuff).
func PrimaryMonitor() Monitor { func PrimaryMonitor() *Monitor {
m := Monitor{} m := &Monitor{}
pixelgl.Do(func() { pixelgl.Do(func() {
m.monitor = glfw.GetPrimaryMonitor() m.monitor = glfw.GetPrimaryMonitor()
}) })
@ -20,25 +20,25 @@ func PrimaryMonitor() Monitor {
} }
// Monitors returns a slice of all currently attached monitors. // Monitors returns a slice of all currently attached monitors.
func Monitors() []Monitor { func Monitors() []*Monitor {
var monitors []Monitor var monitors []*Monitor
pixelgl.Do(func() { pixelgl.Do(func() {
for _, monitor := range glfw.GetMonitors() { for _, monitor := range glfw.GetMonitors() {
monitors = append(monitors, Monitor{monitor: monitor}) monitors = append(monitors, &Monitor{monitor: monitor})
} }
}) })
return monitors return monitors
} }
// Name returns a human-readable name of a monitor. // Name returns a human-readable name of a monitor.
func (m Monitor) Name() string { func (m *Monitor) Name() string {
return pixelgl.DoVal(func() interface{} { return pixelgl.DoVal(func() interface{} {
return m.monitor.GetName() return m.monitor.GetName()
}).(string) }).(string)
} }
// PhysicalSize returns the size of the display are of a monitor in millimeters. // PhysicalSize returns the size of the display are of a monitor in millimeters.
func (m Monitor) PhysicalSize() (width, height float64) { func (m *Monitor) PhysicalSize() (width, height float64) {
var w, h float64 var w, h float64
pixelgl.Do(func() { pixelgl.Do(func() {
wi, hi := m.monitor.GetPhysicalSize() wi, hi := m.monitor.GetPhysicalSize()
@ -49,7 +49,7 @@ func (m Monitor) PhysicalSize() (width, height float64) {
} }
// Position returns the position of the upper-left corner of a monitor in screen coordinates. // Position returns the position of the upper-left corner of a monitor in screen coordinates.
func (m Monitor) Position() (x, y float64) { func (m *Monitor) Position() (x, y float64) {
pixelgl.Do(func() { pixelgl.Do(func() {
xi, yi := m.monitor.GetPos() xi, yi := m.monitor.GetPos()
x = float64(xi) x = float64(xi)
@ -59,7 +59,7 @@ func (m Monitor) Position() (x, y float64) {
} }
// Size returns the resolution of a monitor in pixels. // Size returns the resolution of a monitor in pixels.
func (m Monitor) Size() (width, height float64) { func (m *Monitor) Size() (width, height float64) {
var w, h float64 var w, h float64
pixelgl.Do(func() { pixelgl.Do(func() {
mode := m.monitor.GetVideoMode() mode := m.monitor.GetVideoMode()
@ -70,7 +70,7 @@ func (m Monitor) Size() (width, height float64) {
} }
// BitDepth returns the number of bits per color of a monitor. // BitDepth returns the number of bits per color of a monitor.
func (m Monitor) BitDepth() (red, green, blue int) { func (m *Monitor) BitDepth() (red, green, blue int) {
var r, g, b int var r, g, b int
pixelgl.Do(func() { pixelgl.Do(func() {
mode := m.monitor.GetVideoMode() mode := m.monitor.GetVideoMode()
@ -82,7 +82,7 @@ func (m Monitor) BitDepth() (red, green, blue int) {
} }
// RefreshRate returns the refresh frequency of a monitor in Hz (refreshes/second). // RefreshRate returns the refresh frequency of a monitor in Hz (refreshes/second).
func (m Monitor) RefreshRate() float64 { func (m *Monitor) RefreshRate() float64 {
var rate float64 var rate float64
pixelgl.Do(func() { pixelgl.Do(func() {
mode := m.monitor.GetVideoMode() mode := m.monitor.GetVideoMode()