From 5e909b3f889174a435ad30d898aed558a2fcdfc6 Mon Sep 17 00:00:00 2001
From: faiface <faiface@ksp.sk>
Date: Thu, 24 Nov 2016 15:13:05 +0100
Subject: [PATCH] use Color from image/color
---
util.go | 13 +++++++++++++
window.go | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 util.go
diff --git a/util.go b/util.go
new file mode 100644
index 0000000..90d996d
--- /dev/null
+++ b/util.go
@@ -0,0 +1,13 @@
+package pixel
+
+import "image/color"
+
+// colorToRGBA converts a color from image/color to RGBA components in interval [0, 1)
+func colorToRGBA(c color.Color) (r, g, b, a float64) {
+ ri, gi, bi, ai := c.RGBA()
+ r = float64(ri) / 0xffff
+ g = float64(gi) / 0xffff
+ b = float64(bi) / 0xffff
+ a = float64(ai) / 0xffff
+ return
+}
diff --git a/window.go b/window.go
index d2bfe18..6139bb5 100644
--- a/window.go
+++ b/window.go
@@ -1,6 +1,7 @@
package pixel
import (
+ "image/color"
"sync"
"github.com/faiface/pixel/pixelgl"
@@ -73,9 +74,9 @@ func NewWindow(config WindowConfig) (*Window, error) {
}
// Clear clears the window with a color.
-func (w *Window) Clear(r, g, b, a float64) {
+func (w *Window) Clear(c color.Color) {
w.Begin()
- pixelgl.Clear(r, g, b, a)
+ pixelgl.Clear(colorToRGBA(c))
w.End()
}
--
GitLab